public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-java/, dev-java/netbeans-extide/, dev-java/netbeans-nb/, ...
@ 2016-03-17  9:26 Miroslav Šulc
  0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2016-03-17  9:26 UTC (permalink / raw
  To: gentoo-commits

commit:     7fa632c1b93d29602a348c4a65ba9904417e231b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 09:26:23 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 09:26:23 2016 +0000
URL:        https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=7fa632c1

netbeans: bumped to the latest nightly sources

Package-Manager: portage-2.2.28

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

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index e8fb087..43ddec5 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 3384 SHA256 5daddd74a5e1320640ad7a6cea09ffce0c25a669d6fc44f8352dca5ec286a155 SHA512 dd285243d5a43cf86b74914c9b5ff70ec0bd07977e9288244202f17d19092d47bf4724298c3e9e3c75d8b9c3ec6d99fbd1999226c91aeb2f09266eaea4fc8d1d WHIRLPOOL a9ce0642d90e2a2870d0992e7198f18a0cb8d1523efca5d553320be5ed4f9ae6c408f34200bf354ce577c14065f35de81ada7c22a1ae57872b496f2d9e8001da
@@ -40,4 +41,5 @@ EBUILD netbeans-apisupport-9999_p20160308.ebuild 3384 SHA256 6c1eafecbef9f8e1c65
 EBUILD netbeans-apisupport-9999_p20160310.ebuild 3384 SHA256 47745fc20189deb35664b3b6639f9c86cebf65a00a66ade1b97bff4d86a7a2cf SHA512 aadfc60a2ab1c51073f317c9575d1f87efbd56870e3b57625737eae382736f98d7a247d40e29a6adf8a953baa6bbc269fbbd16c5f19f3c9a769ad5a4d90257a0 WHIRLPOOL bffb7c101011062af829a4783bf6c75e81f9c7db5f0d5001116d1d5c93d12708c98938be2d2b87ea76e2486d96fceaf0a17eb75255b2fd6fc1d7473f76188c1d
 EBUILD netbeans-apisupport-9999_p20160315.ebuild 3384 SHA256 eddc33cae34a58ddb64298e66212de4d29db8627adaf54d66d722b21cb5527b5 SHA512 47c01ef73997196be3294ca032bad5796609b570e908e6ab597ae858a8b4330e7a2b991ae0edb3b0e6df2d952ed508f1b475d3f2aa026b944469575d69c9cecf WHIRLPOOL ca0b2a6abe668df0f92f80d49b7299f3c042fffe68b4f2b68d897bda172ff931b124249cc7bbf5ae39545289e2f29c55dc6a9be4b3c09cd2fcfa01aaec72be06
 EBUILD netbeans-apisupport-9999_p20160316.ebuild 3384 SHA256 2b0dc286cd42bd6d61b58c51f737ea5b4e5a4d827948d0ef7b2b33768f2784a2 SHA512 098f86b858fdf6fe8434bc47f43be7a44191ca81cc8b0e435db1f2e8c22d12023d062b18805cff7bb7aa5ddfc86f7026a22b9569c0366a2a8ec99eaece6cbf1b WHIRLPOOL a2dda23b09b40a15495b2386be00aa1e747bc6692af8cf54421a0e58a17c557c354cd8a4bca2bfb92b2c8f5a48db0513ca5c527b5fd25162be9323d27a1d2f21
+EBUILD netbeans-apisupport-9999_p20160317.ebuild 3384 SHA256 1a071cabfe5f4815a401c0024b9c755e721528c6aa08e27f657003f61d43515b SHA512 ff5c867796d03be732d0e4877c2098c4c7287b7c140416b1f8e257492b5cab8c39eb355ccd28fbbe3cfcf1f0ccbf4b55d774608a76da8042d716f8a29ef5004e WHIRLPOOL 4b5ddeede7455c8163d340d95f40ebdc815bc64c26406b693991c731f56b512da3623b715727f7a517dce15d3a9292057cd3ff0f02d61fee60ad4b80365dfbf9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index 7255942..86cf51c 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -34,6 +34,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4790 SHA256 bbeabbad72c5a0a2ca07c4c9c1d7573788751cc376176375df8de4e7aba4eeef SHA512 34848e0c3bfc54ab1a616d3a77b2d786eadd776a791cfce50c647535ad36e230635f6e8ebcb05d6c5e0a9d84256d76cbe39bb82a409827e27df64ca44a6e39d9 WHIRLPOOL a60479dfdea44d40d74e351b58f33322e921046a9e1a8a47e70b0df2739672a072e6d55f3a3ae7fe0de4a45edc528cd7381fc80142a1762e52687e23ef024aaf
@@ -53,4 +54,5 @@ EBUILD netbeans-cnd-9999_p20160308.ebuild 4790 SHA256 093bbf8dcb97936b28e9d7fc4c
 EBUILD netbeans-cnd-9999_p20160310.ebuild 4790 SHA256 a1ed7e56f6c54d71dd8ba7ca05641057b6966272c002795ec0ee21056488bd79 SHA512 d3ccb5a2f586778d027a098c3805323702bd2a153ccc28584b05b235acc26b249cbaf014b8216adba482e6db06bd70062b171c74c299c70eecd6ffadbf3df863 WHIRLPOOL a0b6dc310e8767ea90cd400f489478248c0c524cc3860cb8d48eebfdb1f7c89cbbce83019f52320a7e67adbd812e63d95cd4ec84979e1d782f4cd7cbc720c273
 EBUILD netbeans-cnd-9999_p20160315.ebuild 4790 SHA256 8c7be18ef04ffda9d3ba73a864bd6751a3ac46b411e9a2c79abb0ca273114a4b SHA512 b71669c247b9065aa64e101cbd1fcbef65fa56110687e0db6876e5d93103eeb0b4ec52a178538542e335b950df7154844aa72572652ddecce936d319becfbc0c WHIRLPOOL bdf5fc8b4b5532cd58df1c56d665978ab96d8971670eb4b1fd897cd0a59a6dd9a76b4b50a6ab6273b13afba3b17034276484b0f5453bb74da65f05ceeb5f03f5
 EBUILD netbeans-cnd-9999_p20160316.ebuild 4790 SHA256 58fd8b3ccf7caf0f0e98d40c46498cbafbb4e3c3dc3c0069c59799689efef8b5 SHA512 a2a109f10d084aac30a7e6aa3d1c665fac9a3e14abf26f3b2bf8e00ec1bc405f54feca62c53e0e991516f380edd961e3832282364eb56f861c1d6b941df59cf4 WHIRLPOOL 60ba0bb3fa15ce41c46ea9df3e8bf766794269f3c48f658519abdcf5eaa2fa026e77f9a4b91151e79bf5991a39714b334b4c4cd45c939969a0c01f4aa20771ed
+EBUILD netbeans-cnd-9999_p20160317.ebuild 4790 SHA256 9033abd5562dc6e6da55eba4d73dce9eabf25b49f3da473e6eaefaaf203f261d SHA512 76aa042f77ef990617dbc9f4f719a2048dcfe32e5ea38ff4d17a0b7ea2c4dc8ff00ed0b5471f53882f0bbe4fc04980e8557dec6b1869b01cc7469ac0a9a9b39e WHIRLPOOL 1832ca113daa66150afdcd73c2af6b7dacb60b70ed298151ee13517dd4d2640a6b2607102573fbcbf50b7df30086ebaebef80aece1ffcdc014d5efe6a856cf32
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 7178182..e2fc9e9 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 2968 SHA256 5c71a5d3b3984fdbcb1d2226f70acfb024f514090341bdb21320f294aa5f710c SHA512 53f8dd01002daef65a7aafaa1dcd8d16f5fa6e6679930eeea987fcfd0c1dd44eb1997eb4f765cb8a017eaf0549c27ceba876e9c3b25610ded868da8df1a2fb78 WHIRLPOOL ab9074b255f9e0041148f5a9d715a6ecff2ea3ce62b931f7eb588b3e71335c66ccd080bf01f8d14d3ad1608f790a3d47b61bef0bc1077ba4f3f667e538696bd0
@@ -43,4 +44,5 @@ EBUILD netbeans-dlight-9999_p20160308.ebuild 2968 SHA256 f75d57d838af04ffe5a90bc
 EBUILD netbeans-dlight-9999_p20160310.ebuild 2968 SHA256 6fb3b94a094e7925d7a107fd662cee5de5a24b2a90b3792a3d3b0c1a17e6dde4 SHA512 dbd318926af34935dcfa6cfc0dd88303353ca75247e7fa7b703be490cb7a2912f88e9ec0de274948eeca0bcca89bce535fe815bd9c9b9584df593ad70a55c1e4 WHIRLPOOL 38446792b8e4c608bb02f407635a330a64024ac4cd9c3cb603f754ce6b1adbbd0bc716f1b4e586a7deb5a413b541c75eb7290d172dfb9c96fd3e3bdb1cd5d26b
 EBUILD netbeans-dlight-9999_p20160315.ebuild 2968 SHA256 8a98e95657fb45aecde854427cc59ffd63787daf402ed49c93b2d99c8ce289f6 SHA512 d69431ce29702503da18b3b39c5fc7556f59d8e0658b72b7459992ae38a3f464091a6aadef1fa6cf6bc4aee771108a1d83c92fe2d92d023278db732c997274b8 WHIRLPOOL a885d9810d46bad6f431ce5810dc0644c26e2d87377a6efeff96d236322f441257bbab2d57f3ac27dd5abe5ae830a92f587f665c9a247c000e422e2847ebe42a
 EBUILD netbeans-dlight-9999_p20160316.ebuild 2968 SHA256 6d1c43401d93014a97b07f85faa1713559797e52aa39c1d449039f93297d1cbe SHA512 31133f6dfe5ec0e2de41b93368499816cfdd6f105ea59cd860ce9dbd9564c4d086ff4589ee94234905ccb83e9831ee88bcc0a1c17a7bb1df7070549295ac8811 WHIRLPOOL f597bcd667d5b7aefb32bb74d6d667e877bfb34d239229fe6692f93f9da6fc3cc47ea7bbbf2991e870e5ad39e60409d2ec55b7a43cbf70086352160948b9970c
+EBUILD netbeans-dlight-9999_p20160317.ebuild 2968 SHA256 8915c4c2d0aa3cafe72d4b55c44cb6db5579e97f47717794c615b6df5343650f SHA512 ecda9c9ded00fbddd9da5b4e381783f10ef2b58e8b86e2128d6964c219539508bb80123291e91647cb65d33ebc4112117e1469390513db4429587067a9d79a42 WHIRLPOOL 8bfa9cd428c26c9e1c47a9b5363634f479671d2aebe3d3f42963ada537d467b57d1ba729a999c632a80170947bfe6fb811566db73c369c2326648b398622a79c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 8e2f628..dea5b4e 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -53,6 +53,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 15825 SHA256 31e2790d5ab2f3cf60e63f961bd691819376197b39ad8280589d7002d2f2faea SHA512 93513a9390f16e5748fd9b51a219f9c7200206fcf3c4f2f40707549350b85a1af11151fdcd7d51cd97dfe27f4d2f9d92da6226bb3dedc23cfb9dd01bb1a45b33 WHIRLPOOL 9aebe0834717768a3f2f140c3b6af9d1c1d59036775f1ee27803b6db5ed3a863b6b1752b5c3a59cde27117ce5c0e09e6d74c4c4deeaae4ec243ecce328a8aced
@@ -72,4 +73,5 @@ EBUILD netbeans-enterprise-9999_p20160308.ebuild 15825 SHA256 f8aaea839748c0eef5
 EBUILD netbeans-enterprise-9999_p20160310.ebuild 15825 SHA256 b3caa6ca50dfbb850e031625a5ef9b64d437de067751f4a9852f4cb06d099bc7 SHA512 c98c5080d69df9863b8764fe0f4ab706c661b739639b958f1cbc3f326724cbcf356b43775c098d38387905878a7fa66803dcf93bdccd678430ca9bff20e7e20e WHIRLPOOL 440c3c3a90ab337b2576e814263afacbd8ef6d73de251be9674f3dc184fc06e633fb23f2dcebb01284463e8b4b4881286097f28f4f24eaf1ebb88a67c1d99659
 EBUILD netbeans-enterprise-9999_p20160315.ebuild 15825 SHA256 c9504a69cabdb1d947544cfcbe1c7ae2c997df698c2158004268aacd70a25d9f SHA512 f92fc4abd2932697dc5e36ab0ba7d9667e5addd8b1fe5cf73c044a522aabe81db628442214bbb25e8790bf3a3af8915d2b5a1256fddcf8738a42179a49921f31 WHIRLPOOL 8bfd8dbb10efa442ee2be6f1742b03e1cc0eade1c9f78d2f63c7b0caa9813e91041c87794dea30e47d3339511ae95ef0e8b556fb53729a017bc14b57aad7c1f4
 EBUILD netbeans-enterprise-9999_p20160316.ebuild 15825 SHA256 ff3f2c1a3e30aacaa3dd133f1c183b74df10890d54405aa05ebd3cd34d225c18 SHA512 34ff07b9414e699db1871da94a0cdbb8b951e5bac8eb40ba4ffbd9fdef6715a93f20df4a8953b961a8e48cf579b58f93c62314b1c9a33511f62fdec9dab1033a WHIRLPOOL d44ee053465e092d53349137252e1d06cf82a6964cbb9b018ea819702cd17fc788fb7f602f94a844abc87e99abd24445a4bd23d5051526431ce47bafcc7aad2e
+EBUILD netbeans-enterprise-9999_p20160317.ebuild 15825 SHA256 4f2fa626c07ffeb3e1cb40e3c5c4087e30a16d842b8d7394568074bad37f1327 SHA512 2d75b7ae04cde94528f22e67661621f6a2128d9ac4cab2666f7d8b7dbb67c543202d391fec60587cf41b7c4ba77df7d223b0e63581606fda4fd9a74d2b284860 WHIRLPOOL 4957421c384f39bf9068af973a6b633d8293836ae3fafe4dc048cf0967f77d5445682591e9bc2e627230e8af559aa32ed250e3d86d065b17dc44c0683befc259
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 460ed29..629c62a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 2913 SHA256 6ff5f86044c351beff5dcefb88b1789dd0e92ce6202a958ee0e3e8bdc63604b8 SHA512 4a9c5cb7f7b45be903cc9005bd179dd7ac402f444669d0297cce4c4d5cacdab0e34db98a75795e29ec80a3b451607f0ef093e3bb58af8293a86caf6b876ca1a1 WHIRLPOOL be19765e738e8cee8298eb87efbe40dc3e037f6d1814a605e339dcdc4b4109cc20156c55b117c8b0cdc3532e2347b78d428729c87427bf1aba2559dc2bf10adf
@@ -40,4 +41,5 @@ EBUILD netbeans-ergonomics-9999_p20160308.ebuild 2913 SHA256 5d1cce946c0e201119e
 EBUILD netbeans-ergonomics-9999_p20160310.ebuild 2913 SHA256 c23b37c04c4fa1f322205e4b66b200be0d8432ce772aa89972d44cb19b00075e SHA512 fab1cfba7addcb0f5d474692559e4b706fd7faa85b2fa2dde4a32a16bdcd8a5ee7fd253814e6cfebe471bfdb7304529e58f6d08af5909c32b84cecbfb6ee5e45 WHIRLPOOL 5f8767566cbb201ad7359c82e90e8c6678b55bef6552c6aa43880c7898a53433c1b4b1a07e05c7d90622f5467cc8352f6b343c98d3d4dbdc831865e49f5a6248
 EBUILD netbeans-ergonomics-9999_p20160315.ebuild 2913 SHA256 7c08e624e7790cb90d4ca4f06bbbcb1acd1e33ecb00688e16415328718a1600b SHA512 08e39ce9eed3c69049c27a6fa3b66cd68a59c08f46ac474c9bed0b86fc6d496920e1cf1b1ebbdb25a8c1f34c3ef3bcb0b8654520ca407a90fc52186560caad5e WHIRLPOOL 5d275f1cd5d2673edee724d0c9e3964adb693d34ded92dd4d3d48bc6e159ab4364490e549e48466cc7225acc8c3e1398dafb4e1fb76571ea267e40c076415e59
 EBUILD netbeans-ergonomics-9999_p20160316.ebuild 2913 SHA256 fdd9d8564ee09ebcd6aadeb102f6db8f94206447b889a60236738f393712e3dd SHA512 0831595349999afa3568bbb2f7b523feebc4506836e6c9d050fed54af42eb4df04754d8389905c5d6bdfd11acdf305a3750c6e0f4aed8c3ed1820101a20630e7 WHIRLPOOL 3ea7aeca83746382a8445d95828486a0f439f8fd9c0094b96f1894ade992dff28f530a2be0b9a55b797dc8615d57e19e73530c192c7d10e70112b49a076bb292
+EBUILD netbeans-ergonomics-9999_p20160317.ebuild 2913 SHA256 52f165b1a959e0d0d1d49ed05825bb48851c8c61a2003b0373dacadd8a7a7dfc SHA512 f18c58e496bc0d2cc1865f3771e1ea33253758624bea93016092a4f8eae3c88df25530ce39624ef3b803ece62afe5ded9ff302c70c5dc6ac8945528b5c5e787c WHIRLPOOL c04d952c243d0e0be48d70d4fa92ad8cbb36e8191d44cf49ae0ec3f8228c71d3f691761bb2dd0539ca6ef3da79807247c439a645fd0102a9b07fb5cf034edd4d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index d3df583..7628046 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 3377 SHA256 d0c25e373788ffe46d79bae6d6d94588c767d48b9c37935cdfe8f5bed5ca93aa SHA512 4341073759bda3e69ca842de17b00235cd105a358a5a9c13386ef5aef3592dd632c5ccd0414bacead5537b065782ce1d4ac68ceef9f90ce63d46489aab7e3a76 WHIRLPOOL 383677b45d93edf0de469d73b148a9a24e9f02d2aec19a838065de72ea3199acbfa9af986f7e8d5600c422c7c2cff0b56edd065693c9e2d456a6e86b7e3e827f
@@ -42,4 +43,5 @@ EBUILD netbeans-extide-9999_p20160308.ebuild 3377 SHA256 2d3f0f1c6eb78c48fd1dd26
 EBUILD netbeans-extide-9999_p20160310.ebuild 3377 SHA256 adf9588306d0ec3643f5ffb31c09e7a2066530dc25771a1f8023d4556df8d65b SHA512 638253cebbdd39b64dc384018b2dcacdcd47e49b93dbf005f8b513f3d738f24516738e3ef4c88ed0a2ecec73e29865e9817845cb80a458790a1156a5aa37d08d WHIRLPOOL 22a08c027473a5df279591ed7c224f3c45dfef698a7ad298e6432bd2cafb2185a8f959158262b5935ab0fa69964e8fd13ad03749170e99bae8a4709cf6a3767e
 EBUILD netbeans-extide-9999_p20160315.ebuild 3377 SHA256 858ca1db2453181db8451fc5d2fc2493447a1f68b2568bcbc2d3b50873208629 SHA512 028f06e4674be683bfeae51b4a99ce531720e9ec67afc631020e2646eede542270a8a84aec885cacfa9bf92d583c181e53e2fddab1d4629ab368dd825c424420 WHIRLPOOL 89a300b698150e71a1f3ed0d7faefbb1248226dc4952ee680a84dab330d5a6544a5c39a1a529ce1ea3d3e83f02dc888be1f219ec5bf6cb9ca8b1970e6aeebc03
 EBUILD netbeans-extide-9999_p20160316.ebuild 3377 SHA256 109463728e454d659cadbc7e828810a2951775ad95e0c80543a1498a28f561ed SHA512 9aea6ebe66ec5d55402b53019829fca6e22b6d6c0ebcd91d967d487c7c8966cb37214b601ac3955f1760de121fc6d20aeb253d97aa477c7f800b7df04a6544fb WHIRLPOOL f492f5a70706a9187931fc3c989de8cae35035e63475ac924c7747238f0466d54865fa721da064d210cf5acaa4f3422db3f0f7a1980a03f6317e4ffe65ba0691
+EBUILD netbeans-extide-9999_p20160317.ebuild 3377 SHA256 f68c3456143ad28df02562514720a6baedeb7fa67223e43a979e937c1510bb8b SHA512 4ef90f0dac9ed68e2c071a3c75fec783434c6e506ae8a92e4e332725b11e063585e1ba983435ce2f526baaa42f37f777059eb79979700bfbed00352b860d3ea9 WHIRLPOOL e1db60ffa1dfb73e9c2b24c202bbe23ba0c10285c0d8cd76d9b717d0f3668cc229e4c8cce99bc8107473640d00c1fd550d5e73af140148ca6650e6d0c7e045d6
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 4fcd831..c7e475b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 3416 SHA256 cc089bee4a8b4574f642ca131ed8c7bfb55588938f452ccdbb6d06fc46833085 SHA512 4ae13ae2b1b43c5f53c3119114bc184974cd402bf9d81d76a369a399d3402a6052ef650f016765310111b3be17a756713cab63a03f6e58056a87c72f1e1bd981 WHIRLPOOL e97e7198d220497f158caaf02f66aa606b05032484e9284d202637ff6d08da8a655a9e2aa5f911748fa3f3ac5b170674b8d4993bcc62d4e0ae2a73b545f59554
@@ -42,4 +43,5 @@ EBUILD netbeans-groovy-9999_p20160308.ebuild 3416 SHA256 5295d23efaa46d7e57bf67f
 EBUILD netbeans-groovy-9999_p20160310.ebuild 3416 SHA256 208f949aea7ef85428eb240e1983f982f4c9287877a5b1c5d3773d8ee0c007a5 SHA512 7eec1914e76298ebbe7f05b25fe7b6bf07d1e5cbae8f2cba2a00afd39663f278a692625bc2b1904e1f47d56f8e733b12bf48bf519b80990e1b04bad998375792 WHIRLPOOL f9cd7c19e392d5a8f582d305988546078c096e4b98a4ce4f4b4f0c003ebc207315a9f6bcd4b15568673e9f6d81093ead8fc914fd4a8040bd42c3fb8f0e7ee40e
 EBUILD netbeans-groovy-9999_p20160315.ebuild 3416 SHA256 707fb6ce8a2effa220886a24aeaf87a203dcd3e30e50d3d39fcc23ccfda38a29 SHA512 f2a65c41e493379a57754c6c0740ba517a428c1a420cd26e8622bfb8e370c1e59225398ba5a48826724d1e1ff02d8a59b28e38039b74391ff878fb5759ae3c4c WHIRLPOOL 05ba822637cb1e1dae8276f436ba82dec7f6c05b3b4afd64a663f2a80dcee584b5b51d85bbb6698d1b0dae9d12aa32f6af1ec0a5ae235dc144d2d65f8dd0679c
 EBUILD netbeans-groovy-9999_p20160316.ebuild 3416 SHA256 98385adf344a4b4ebadb33af9ab0fdb2fcaf0170f33a985b651e0ac72f2c6bfe SHA512 c1ae8a64da34f06296dfb46bbcb94e08183454d600e510d4737533674033196a6f94d125f7d30cd26605a6ea6ba6696f731886c61f406f955ffd6064850f81c4 WHIRLPOOL 85ac1736cd80ce349b53219e7cc82b5f559ea741f4416bd0c0579a0361f4d38ae642ccc3f014cbc1e81445800a4c7f297cf1b1388c909d0c066e2dcde3841eef
+EBUILD netbeans-groovy-9999_p20160317.ebuild 3416 SHA256 c9c15ab6709d20709a6375fff328411d9cca28ab714eb05790fad5432a9a5514 SHA512 97202604f1e4db1a816a1b08fa41565c92c168a7ddbbaf09206f6f00ffdf484ecf5156f9b1985db1e8fda56a98f562192285e86300ff6703032f1ab3704aad1d WHIRLPOOL 8e1732891548a904861eb3be803a4e75a4f1cae2dfa547a07266336d3f1c3d324cf217c4536edbc14bd7e14f23425875c5a17f5b5cdf8eeda075e3b018cd7f36
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 8a534bc..7a0ea1e 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -26,6 +26,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4126 SHA256 57311330141b3f7b60f7e643652f8805bffbc170b1d4de9bb1caa55bd1c2d6c2 SHA512 60b4b0c90306a9249798047d43a152a64b03a13ad46ebd7a417262d69837adafc94b220539d06ec10ff54b1bab55593a90bcff5884c88c4c6b3e677f97f1a93f WHIRLPOOL 132160c30789f7f5a66c84f34555fbae7a76fdb1321e37f6a3559abeac25aba8463fd323a740eee3586c2fcb8b19fb2928a8ff57f562d55d1f1390e9d0cf0ac7
@@ -45,4 +46,5 @@ EBUILD netbeans-harness-9999_p20160308.ebuild 4126 SHA256 3af7dffd7d23f9c0ca131d
 EBUILD netbeans-harness-9999_p20160310.ebuild 4126 SHA256 ccca705905e0e0187c4b6064783a0616a669fd182a8e69a004b333f07517d19a SHA512 22b190ecb5722050364bce36b606a5efc002e5444a935cfd577831a88d0d6b3478f96e217234910a7644a431c8365b477e7f9d22a1def3093afe3b79254b3fba WHIRLPOOL 3809c1d83c1f137d21866881c6e0a0c9b23c74e2f215446cc987d57557c82ab554d71023d11fcda43c34b344728161cb86ddb66b957d5412340b261f800e84ac
 EBUILD netbeans-harness-9999_p20160315.ebuild 4126 SHA256 ddc05082c1cd678882a4126bc08e5715a02e8bc0ee4613e9f5a02a364a3ccc1f SHA512 ab25d6b272454bd23d253c9878b2739e91c4b2800bfa8a82615ffaeb62840b7ce9197cd915bb6d7b912e1129461e1296b889a38fdfcec723ce4bad9626929c6b WHIRLPOOL a8466bf9716b1797f10cada2906188c5304b34aca7adc82dca56c89d59b749358b55c77da33f8a21553f9199830327ac32945612ce57e2462496a9fca20dd7e5
 EBUILD netbeans-harness-9999_p20160316.ebuild 4126 SHA256 6deec86c975f542f29865f0378d933d5cd5b53ef8f687bb44362035d4fb9c7c1 SHA512 2c8ecd5103e783f0b4c489742b34a56bc85f671c0c63a94cb81aec650556844c33cac97534d312caeb37b955f122e50af3d4e21512b76f526b50184480ff2784 WHIRLPOOL 1d65c245b5c444a2468d5310ade6a3b809c04dc978724055252f34f1c938e2c26ad41deb53b0ddd72f6a6e130997ab381ad1a6628c5d4a55d23d9fbd64252192
+EBUILD netbeans-harness-9999_p20160317.ebuild 4126 SHA256 ce03fcd0de453da4e2a92e0f25cf46681fd64c403a5fddd5f4b745ae2eb067ef SHA512 73feb0a1fddc05fcfc8dbdda8ad541359bbd196862c575723c0d217b048d08d8c16d570e18e713299dc7bd0e19e053fccbffaa85d0fb6564f40fd50f0f9cf664 WHIRLPOOL f9cb2cf168be7f07c70c46103ff7d6cb9b649ff98b593ee021920407ff46f3e979b23e5403ed0badc7a13fead4024c557dca000476aec8fb6d99c1666184311d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 1d30b0b..89060f8 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -153,6 +153,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 30235 SHA256 42a75953a9bdeee192bf1f6ba62b4a7d9b2916656e49633c270025726e951844 SHA512 ef07e842663d9de4d43bf95a178f21a54e9ba50c42f77e2b6baf539cb8bed2d92fc277e5be568e6ad5c65cb84ec9f2f9c9d81e43783c222b00bac850fa7770b2 WHIRLPOOL d732d829d40f779573a6a4cb8f669844abf79985aa9afde6e32c0c643def9e0f007daeece0fd275268b44b161d65b7b92f78038c15d4b1655f53e493f566b2cc
@@ -172,4 +173,5 @@ EBUILD netbeans-ide-9999_p20160308.ebuild 30250 SHA256 9a34740bae96811158b5d3d57
 EBUILD netbeans-ide-9999_p20160310.ebuild 30250 SHA256 54670f6da4f9a061341a3543837b8d9783003f82f0c0b5fe6e8393a2726d7b0a SHA512 7f4d032c6741830c08be6d7cdba5f32a5917196923cbed759d10568e9116609028e8c664837117a05f3b394efeb444feec3d38cb3e2ab33b61e64f354305fd0c WHIRLPOOL a6eccd4fd9c1b0a3dfe7222dd15d74c0a41795ad8b0f1caeb04e88b39cbc17f4e26d2095065677e457a14b07853c5cd12d96de01acee57463c5ac0f8766cad84
 EBUILD netbeans-ide-9999_p20160315.ebuild 30250 SHA256 61f00b3029fd34d5d6b8a30b230bafbdca4ad6bfd9957817fef843e995fb54f8 SHA512 d54fdd4444771cdd4bae86f16fa76b6d078347df3970fcd4e59c334b1224e640db979a11b2e697824f85426ff0a39391ddee62b9abd350e2197a309e57226201 WHIRLPOOL 8719528ddf55ad8ed815a4f5862e91cabeb274204140399ea17e9e6c2a5bfcaaf643d51df22ecca21933f0a5eded29ac3375bc8cd06310180ce028da69f6a9b6
 EBUILD netbeans-ide-9999_p20160316.ebuild 30250 SHA256 1c00e9ce20992f520a4ed254db5cb7244f0917bc2c2a6fdb30b04197f5f42a19 SHA512 156358d9d6bd9256b5e40d64ecc010acdf8ec077e0913df4a2deb1397678fa0950f17f75929b327f0485da36661fd7e1cf3d2fd7db8c8799f146bd24be7310e4 WHIRLPOOL 6b4c3180ada9053ef9c16b3e432d560e6256c9cbb94a11ade8cd1826f9f94c224742636431180daa9817e014a97855cfed48f13d6a0409debdec39d34cda6fde
+EBUILD netbeans-ide-9999_p20160317.ebuild 30250 SHA256 280833d0184aa941e05a2bf9ba7292ace7929536eb69b70f66e55e62640101d1 SHA512 84f301cd9a9e442c92f80b0217a553b9c6332355210a8699136d7975d4cb4f0b232285e6b5063825152f8c9814f14148a496d5f412136b69bbb62e5eb19da36a WHIRLPOOL 398ad8adde07f0d1f2c716adfc28078141d015fcf9a7587fe580b4f90558f88914ce9357e2029a20660108c5cacfcc82ace837401296a7b19d1ddc47f7b98b8c
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index d1429d1..ab8e4a6 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -50,6 +50,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 14930 SHA256 b277782f4837d65401fb02c278256ec2644d66f890907769aa8f0723cf2e3680 SHA512 7586e79abd8e88ace311a543b52a76653d8d6d6a2f21c2d19f0ab0e0cd869538fa561552e591188f36d7a0aa5634d71cfbd7f2602deb3143a8deccfa66f49420 WHIRLPOOL e9d97aa78c4786b646e84dc50951b4818440517a328c74c32f59e665f8b775d425f4b9a83d56bf3230cadda12fe9708b676bea680a1f659fa66b068eeff49fc3
@@ -69,4 +70,5 @@ EBUILD netbeans-java-9999_p20160308.ebuild 14930 SHA256 b54059cd3024d988d8d48531
 EBUILD netbeans-java-9999_p20160310.ebuild 14930 SHA256 d823e6b6a3639b39bc2c7f2be8f9093e8c936752c351bc96de5b987807f0a0a4 SHA512 7a6ee5dd345992b1c0c32f1a68b03947be2c79e8140335be05e471fc951be760993aeb9f955cd981a5326c7afd998df3dd898f9d71d3d1fc38515eedd7da7e78 WHIRLPOOL d26666b79ec3ff67f03e4c495db595b25b115448a675d35930fb9bc707e4d195d14268e1c8d2d3e6e22f33d158c29793fc0d0b26f1f92753fa222f8e61eedc39
 EBUILD netbeans-java-9999_p20160315.ebuild 14930 SHA256 3223d62bb9696ef736434c6a75b226ae3d8ffc992d08d1af7b4aad8f2bdcf30c SHA512 a12008c247b1e392d8ad2a8d11cbdba78c67932ae4b22b17a01101c7981a865504c979e3fb4a783ed48ef6ca756eaa68d7e7b19ab8826ab525c9f994375083a6 WHIRLPOOL b6211ddb81da54cc9e741ee10577f43f21695cc8a5c80b6ee5d579a8379ecc84d7c49be5c835bd1bcdf516245eb8e0b16568b80ef7aacde9b103f6c412624847
 EBUILD netbeans-java-9999_p20160316.ebuild 14930 SHA256 825e6e76d356b0cac519ea8f82dbf3ba8cf35a7bee2b90d106ef520bd95e56cb SHA512 9042f1f891fa9a8400058179031a6f521ebefa2fe20af5e25eab70c10204db34e2b6b354404ab5bf4367e1fbcffbf7eb2a23258a3255220f9d303d674fb0f93e WHIRLPOOL 1b1cdac4a6698713f0673ad957c77bf4d2047db611ec999bb17f9d89b24df6ff692c5a53525c3cea0cbb905297b4ce46b6c1a75dab6c4558d7b089653ad4bac9
+EBUILD netbeans-java-9999_p20160317.ebuild 14930 SHA256 795be76cd0800c4bc46f7492e7f69efe55866f87f23e6e6add82ad1f2f22bf79 SHA512 c3da9f0a49e973db43b353c339247b73619787e8806a54178c4683cc15d5dd085ba5d3167bc639985a924fd30d2f71ad84bf3f73e303945a610650779049be70 WHIRLPOOL acf15d379a561863838b99a2816da85aee0a6248a1e5fc69992162be599cb6c4a1e95042907fcf013979cb7e8723b4356041775f449b91e8f831ede3ef73742b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 7df1986..2ce1e7d 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4971 SHA256 81eaadb7b246ee0314f77557067d32da709ce6be3bb6f9fcaafddba33fd6129a SHA512 3c68f002019a464bcf5892befff75778eb4af2dcf63c922cda3f400c78e59eab65bc9034d71e1677d6c1ff54c4fc0bee464c5cb54bff2170f746b3a2306d92c7 WHIRLPOOL 0955a607abd596b29acfcb94a6bfaba00760e8da438b9cbf4ec7561696729078f9747615f68654d902c1be8e448a12256205e75cfadf5455b791b577e2c1bda2
@@ -43,4 +44,5 @@ EBUILD netbeans-javacard-9999_p20160308.ebuild 4971 SHA256 17c6489ce7c9954aa5833
 EBUILD netbeans-javacard-9999_p20160310.ebuild 4971 SHA256 7e399bd066616aa5642300a8a975f9f9c6b4407c9a1d75d351e6b01ba4ad22d2 SHA512 10a3daedf455c741f53679099817985488ccbaa7da7f19bc3afa3a6b661a92964f6d8d97540da4246dbb402f2d5a380d1ffe306576758e34265b3ae6bfe13f59 WHIRLPOOL 9c13c068d14d6c58c292c85e7134d04538c8d3356c0fc38f741e7341e91d4bb82d4c13572ac2f596bc08f89db879012732d78fab56f914ce8f538d4e6b3a7188
 EBUILD netbeans-javacard-9999_p20160315.ebuild 4971 SHA256 4dc593056ecac0ea7ff7159003be241c6407d3dcaeed9f79bf258d5996523a4f SHA512 d285508358b5be857003a4afde142e9d6c74db7d71eb4e9b7652f6fcc1a05bd517148576111a2e14a404a7caba821962e2d710689dd108243ff52193417082da WHIRLPOOL 17760a9dff33d8d4df9458d783e4d1f6f6d9f69def7f60aea18909c61462e58854274dee8e1deeec99903b5fcb437e64491a2a6a84b5d4a0c5a2a44048a0c81a
 EBUILD netbeans-javacard-9999_p20160316.ebuild 4971 SHA256 f49fc339a8fc9eb802540f8602cc83da965793e7e8e9263b732d92944eef31e9 SHA512 01c897c31a975ac8d8f1bea21c5648653fe4e36fb0e7e563c487c092f38d76ae8d4cd354848fdb448a364fd301eed409d4bc8f496499a04402794a65bf748ee3 WHIRLPOOL 7e67fd153f8b0542d37f84b64f8a45cdd100ccca8ccfc407f4bd66a5f5d9febab3a65b8d4ee614355ae1a43cc3c9ad64175bf73af1c5aec27c9f1b59838b1de5
+EBUILD netbeans-javacard-9999_p20160317.ebuild 4971 SHA256 491df3c98164a05ae23d9b5e73223b3b41dc9351feff5cacdb34b97f048c244d SHA512 cfd8484e25fa1695b0f63d230e13819abe002762cb45151e4484f736888dbc5f161adc07898c06e5af5062eb50018f03b05de8d92629153ccf288208c9504cc1 WHIRLPOOL ea3182004a92930e60b3c3ea3edf98a2e9e6610c91b45bb75721d07d1e15b10ed7cb2b23e99b3cd217f239f94c23ebb7b2f838629cffc22a30a9d3b519df38e9
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index ab68738..6e1e9e6 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 6293 SHA256 ab491f58251c66c9b1c0fc2daa7839dd5720ff13a841a34dc19a7b136fb3b747 SHA512 69dccbf92f435fee525321b3fe00e4d615ae89e4c92018492623e8c8c987220dd27bbc772707551c02e07e28e6a104c28d8f88f3fc93da319804190f0607cfbe WHIRLPOOL 52d861f5748d1a6542286c1422dd7a3f2973c531aceac0b23dfdf6da9fd19c3eea37c20555ddc14e7ebd928fe6fc156088b4e84351f116320dd0cffe24c8a5c7
@@ -41,4 +42,5 @@ EBUILD netbeans-javadoc-9999_p20160308.ebuild 6293 SHA256 38a78d0b509023795bd432
 EBUILD netbeans-javadoc-9999_p20160310.ebuild 6293 SHA256 48e8a983d902a78e203b3b46688838a46c2ac5b137c76721a21d5fc3d0992fcd SHA512 6d1f1485d664e46717a3430740edd4c46aecf689ee2e3de41b1d9849f752b56e698b4686916ed90bfd007bbb7cc84db8315ca1eac49e72a8695421553850967b WHIRLPOOL 84a4814cf137768b4487f1f71d39438ebfb49b89599cd73f531d1f7a22ca190b491296e349bf37089c76bf30e4e502c23f774686b20bcd822c1a95bc0dd19bda
 EBUILD netbeans-javadoc-9999_p20160315.ebuild 6293 SHA256 857667472fc304f18c2c51385c6cfff55ec10cf4f16bbe4c1d96cd4c7914f60c SHA512 dfb04f44a781f78a6d7302722a04584807b6b30387df31edb79fbfcf25c9830146a66983b5661230c077cd14112648714c06b6d772e292bb57ad099abfba7f89 WHIRLPOOL 64092e496fb95b6051fa286d0fb7ce7495b043d5c233d0b9b7848c27ab24eff6a4371e5ccfb00aeee4f40b8f42421a88a491707d4b1f481d32330839f703a57a
 EBUILD netbeans-javadoc-9999_p20160316.ebuild 6293 SHA256 522dc944441e51c7cef0fb129c2779588d4282ac2aa315bae1c267821f6a3ef3 SHA512 0cae801105968a8123aaaadb95629cca04fe23dfccc1b0e2872bcacdbb802462d0213315e4846112ec63cee60bca270db63a344a5ce9196c1196a8ae9cd68c8d WHIRLPOOL 99131e7238a64ebbfba835e3ff4716e95fdb76cd192de6fe5e48cfb06328ef05138e56729a2f6e468c0bb7d546ee35332547b3cae3c80f359ca52b795283dfab
+EBUILD netbeans-javadoc-9999_p20160317.ebuild 6293 SHA256 ccba0cc3f2c9c218e249dbcb4212ede5a0cc3aab0ca730c098bb676af31e319f SHA512 0145f315f13f6a0b2ccde9945c1e28abfb060dd4bbb7150de508500bbdede9aa633e38027452c1b6e1a8854e5533f37adb0f4c5c26c49f03c4fe299f32291acd WHIRLPOOL 2c0dcdecb1682c057612b39d91b3eddaec685dda5277a8a1f438890659bd84f55932d6e80114062a9964e78135795ada6e47de7969942a7ee7f16a7b38a7ab97
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 39be7ee..2881725 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -29,6 +29,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4717 SHA256 25d4a8912785b067f6dd613c6514cdfe999b0bebe59f22da20f626ccf2cbfaac SHA512 00f8e10a57e386752083fc639244212f709603d3013abc966b5db24996bbf347074d1ab7a6a37b7bb6faa94d38fe7cf39d93194afb8055ee65be5568c5f01ba2 WHIRLPOOL f7aa8804118828ffd06a2d5226d935d2dac3185ae7a369b6e407df90e89be86ddd3ba13ef7672414826f8e570f8a0507f89b2a7988c243c25157bc28f37063b2
@@ -48,4 +49,5 @@ EBUILD netbeans-javafx-9999_p20160308.ebuild 4717 SHA256 9459861e6ec07d5c2b57f07
 EBUILD netbeans-javafx-9999_p20160310.ebuild 4717 SHA256 31c398271c5e4386412d48c7bd9a75748432af5c194fd0ff34328834a1ced273 SHA512 7112b8ed77d3fb9de1d6751f4d863c2ef99144a0c5b6a746bd41004abb7c4bc0c10ce454b85f1330d0d2cfcc4657899dc0d677213c2ae0cde982297c1407917e WHIRLPOOL 8787b76f1d718c02de39876afdb93edf95c5ba22d73de0a30f64ea40b8a77bf7b1a476342846e5cfee8880f393ca4b4c893d0dbb318dccee491ed3f052bcf04a
 EBUILD netbeans-javafx-9999_p20160315.ebuild 4717 SHA256 7a3117eda7d8012a76c3e05c26220661d1a1b05fa9bdc7cd920557ca2d481a5b SHA512 6eb6f09c3827a0674b0957721d3501c08087ae33b76da139284ce6bfb4daa2c66973f49531817f912175796ff93e42a6c660b03f07301911fbc10f5643b23c68 WHIRLPOOL 78cb1ae0a6ec88f2b1ba8535bd8345ed2c648d3f536761dbbc8dc9766e8bd7adaecf761f2adba445248a322048f1e75cbf5c4fec3f2d77733361f1478286e24a
 EBUILD netbeans-javafx-9999_p20160316.ebuild 4717 SHA256 764340a3f0915bd67ef742dd8403815a517d3d127333fdb0214d8386d42c913f SHA512 975b7c9206e8cdadc9da21fa8c1a783339b1d8178d0012417c22667588a8ce297cbbf1daa59fc966c25dcbde07f05bc8d67fd42cb60f66e4234f208871746b69 WHIRLPOOL cf2273d03cbd3f4c76572e0bd111c836f953b35dd72db8874d1e578a903051fd1deb243b94050f4f08502a7486dd267cd2e9d3dd37ac55821c331e8ebf87deb3
+EBUILD netbeans-javafx-9999_p20160317.ebuild 4717 SHA256 fb1f635f5c5704857ea78a0a16da84600acc9fe2f60abef9e154c639ea8f4f16 SHA512 90b84a7e610f5c7d49eb119bec67cfbfea7bccba2a6d71e3db34e2176f249eda189066950788f4d67202b15ce47bfdd0c2a4c9cf6e56a13feb3cd04d7e32f92b WHIRLPOOL 741d79a2c97aa0e864a9fa8faf7da363b8b5d723060f6f712ca84cfb6f5dd4aeb57ab38c06b5813e349b05168f2228e65e43613945aa666fcca22cadedddd441
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 1406a21..44c6a88 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4412 SHA256 67e415144e9fce632d238454d32f3035f596c3bae87065d5a3b4a8702acbc3b2 SHA512 08b8f044ef846999e65c1fb928ca2f89088755694c87648b5e4de49321e03df67338a3e7cc5a6ef93207236de127074984e56e2c76b2b3ba3a68a7d82dba8a8e WHIRLPOOL 44f24e92b3d3aecf16ba3f5ceaf1caf0616c9ecf26b436690c8d33e6a29bb89717fc1f26d0b645d65edae12ddf4bb58606434f9878db53aa16886b7128a6c3f9
@@ -40,4 +41,5 @@ EBUILD netbeans-mobility-9999_p20160308.ebuild 4412 SHA256 035a962e9eacbf0b7b8c8
 EBUILD netbeans-mobility-9999_p20160310.ebuild 4412 SHA256 b8e5c217297c7ee3c2f05fc97e40c5bf6f60f4c8142c191f59658387becb920d SHA512 e636fee50c941df91a2606ee5ba039b57dc39bc7d9e22e4d239deaadf6b66aadbc7e6cd3b31a6a17cd976d0220ea3e4857421f3afe04390556943b368cb7cd92 WHIRLPOOL 51a17411c426df771277b9368c8a0ac168afcca532c6e1c6cf3db91e3480d58a9c91b4b75c9ef49334398e783a4ca50efa22f274225ea1ea1598bcc0b7157bc4
 EBUILD netbeans-mobility-9999_p20160315.ebuild 4412 SHA256 0c7901b03cc9788d79ff503d620455503a9ba34aef1296e7969e5b708f769042 SHA512 ea357ef71b753cdfc766520b0d2de9ac04933826b245481f284aaa17d6e54d0017c0b04bbbdd5caaa92fa2d03f246e9ca68c9d5555ff21e75fa0bc83a50697e3 WHIRLPOOL 7e66a54607c7e5fcdbd061eab839201b80f34505435851823a94b8ca0d2b493dadb8b9dbce6af44598ca54202ff71f4744e1ffb5ff44c776905b5297bcf45a26
 EBUILD netbeans-mobility-9999_p20160316.ebuild 4412 SHA256 ea5cfd184f876ba7820e0445313ba89d52967b54fd52a2af7be746f0819a1a62 SHA512 170b2967bae914b35b7e6451eef48ef7c9288f7b99694dff9d4fd29831e82526484c979b9118846a5a3c2fd39310745d211fdec281daa8c70eb96eb8b8039b63 WHIRLPOOL 65e40a9b307446b0d03b6fc59175722d12920c53c80a628cc03b8437bc66df9960d50fe5c9f90356559cb01f9e7311588d6a719413dd0293976f0767ba148044
+EBUILD netbeans-mobility-9999_p20160317.ebuild 4412 SHA256 c874d20f71d2227100460844e28bb4bc00bd19aa4d7483eea1b129f5c814e820 SHA512 75e6e3afc5a62312103a33b503208e0493307174fb50dddfa04723b7ce9eeb9fd6ac58a0cf7d688f93cb01671155ba5879fed235d8708dd5e9ebaf8c5b01c80b WHIRLPOOL d5fc34223f3b84d8af14f871b6589e47e0b5417a4446e74d50d088d67392e2944d5e3b690af0168be84310d963a4af03a62402419d21ab7873a7b4aa652ded7d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index faa6c01..8a4b72b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4111 SHA256 d66c45ed0763ad788286b0c2fd3715a213fd405c04414cd2f92d45fcfdbfbdd1 SHA512 0c0e145c7b4b337d590d9cde5798e1797f90116ce61e79dd9aedffa5997c924e4e42d67e01e9d8b7624e76dce151f2e4ad19482ff3d58ec8a47ffb6f368e1310 WHIRLPOOL 2e8816fb5b5f533425570cce925ec834bb5ee5697ab05257949c27984f27cfe7f3e03cf8c582b0d6559d42e82ac9d41ca529cd04f1e65dd71eff0c4e675a8a31
@@ -43,4 +44,5 @@ EBUILD netbeans-nb-9999_p20160308.ebuild 4111 SHA256 a8c1ff6cd7bae3be2eab143f426
 EBUILD netbeans-nb-9999_p20160310.ebuild 4111 SHA256 fb45eb3b793ec6f5d106cbdc498455c916f910ee0b33c1de5eb97fe23c9b01ee SHA512 7844a5c87bcfd38170cd4a143ab2ea771f84fe1a117bcf136038cffe71034cb605d3b4c92d82e49c91d3188e2e08ca01e5432389fbc7eaea70d6fa23d5733534 WHIRLPOOL b270539b89d5ade514c33f124d23196b2d3017ec7362f62012cee1a22873546340682d7c28cbb95a4cae6ae5435e7fd940e812e1451409e20a11b3b8e165ba86
 EBUILD netbeans-nb-9999_p20160315.ebuild 4111 SHA256 b1c57e0ea1fdc5689d75f528274b9c667e4b3a79d741db328dfafc66686472de SHA512 6c866fa57445d6897d0660dbad1a49902b8d34ca3784575ad99bbfef9d078c8b815c7771773e2010b1f6daab38435c2a1007670ce39d057dc93fb939c90887ca WHIRLPOOL 1c2843c182ca57b1eb25050ac01aae8b39912ac71b8c9710b93d222e4ff42f9f72bf86cf3bad7979ceea1e5c6bd8b59338c4232bfa44e9365f8d39c7029be8dd
 EBUILD netbeans-nb-9999_p20160316.ebuild 4111 SHA256 a650d837db80676ff4197417482006dbbffdda62c2acffd226b2d20e2c87d210 SHA512 faa621fc38cd66adaf9203dfaaf1c1ac8fee25112982f37fce6c120ca1856be1d99b592d23259d74316a0896d132782b0660efa5c1b2ab66297675d988c9e0e2 WHIRLPOOL f53d71a336e933f09301bd38de831775355b00685c79f13732800df5dcca47d97b3dfb01537cc7a918b3894355784eb2e09b5f91cf7de0603a00fc3ca59bf0ac
+EBUILD netbeans-nb-9999_p20160317.ebuild 4111 SHA256 04f02792389acbeb49fe367ec5f4f238d337bfc5aff7a7c2fcce0c2c5eecb571 SHA512 8e41affc8d65fa3558d3644fdefca2eaf5c9497bc41169091ef7d963208865c8dec97935218e96bf9f94df01ce40563556df5852550f9fec55f86b4dfc6599a9 WHIRLPOOL d8c5103314289db1f845d4654b6c96f1bacb62cf992c2fe8829f16922bb56879d3bc13cca132aea66d75b5a54da28bea5a9d727b685ed7c457e5fac73ed2dc45
 MISC metadata.xml 392 SHA256 01cdbcc83099b97486bd7b8e813e5b19c1138eb0d8d3e8a5683aafd579820435 SHA512 4d2f9160baa022d6a48b61d5f42e71cfd411d244e7a36436629bc5ee4036e4ce19079134d9a6c704ebe942306c2e0199d0591c1e54f92f8f3c8835147e639246 WHIRLPOOL c1131764e1cec66c56b977ebe36014b29e5a68e35ccc326c0cbadd050a6c625cf191c85c212e0a733661c008dab0d99f9a4cdc4c4ae0cc9d775ba1de554795a9

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

diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 94eeea1..ad92d5e 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 4418 SHA256 52c28929af3a5a4f14c5b096e97f761274a3dbc4c7fa79d781f434ab7ec12251 SHA512 878af2b75881d71d5245309ab37fc30b2d674e7fc25caed52c8d3711df9225b845a6418747ad5f7323138d9ecf111906c798ad07cbecc303d9a9cf61a9bf2788 WHIRLPOOL 5400b24dd76b1276e97459e85b2290d69c96e86b6c5a1eea29b185d96435983e781e99ecf9293a87540738feb1fe578708b58b3dd90ef431ef1b85424941926e
@@ -44,4 +45,5 @@ EBUILD netbeans-php-9999_p20160308.ebuild 4418 SHA256 17516ed39db78ec90527707eb3
 EBUILD netbeans-php-9999_p20160310.ebuild 4418 SHA256 44b8dddbc569d71115513a41cde5234284154eb63009ed764d7b9e8612db994a SHA512 84a64a1c7c46724fb5700be214f9ddcf790e571cec7c91efc61abced72610a22c1acf9f4dbbdee1069a83aa0a10dda39fcb061d2a041c8b5669d4a12a64b1abf WHIRLPOOL bfd6e6362b37a85ef7adb6ad8144a328351ed82eae3b220b734aba942aa0e1eff3259dc7f3ad6ffafc0ddc5210b10257ae589c4f185789a653f6fee071b661d9
 EBUILD netbeans-php-9999_p20160315.ebuild 4418 SHA256 ed5a272b24badc47048c2b3e083d139799411283fa50ab6a0e9370f415a4bdb5 SHA512 076a787aaa485856544effaa9fb111a07e00cc7d9b6c04cb7c390cf4f936fcb4a1eef0a008b2bdd05f0ead59776b70ea6148ae67e1c99f0b3a8ef7db850b100b WHIRLPOOL f0bfb80a00f7227729a214714a06e98b3d7c2bef976e48c73f64a99ed5a520b9ed560e58b636e31eca30b4fed8f0d8e8bc07495d5c94b2b64284f6f825f8cb1b
 EBUILD netbeans-php-9999_p20160316.ebuild 4418 SHA256 ce4a6d03d8de02b48d96c4937068e016d7270bfa9159e785c6163ad9824f1d01 SHA512 dc823be4904e2a33091c5d0123508383db4bf2c3eb3b2cdaf41cbabc0affeed59f86e2ee8dee080fc89acc91e4522f168e3aab020a36591831e54a1b293c040c WHIRLPOOL d06bcfee3f1bcbbb1398e05a0395811a58839261aef0b09f9c98d235fee94b1fc20a13d196dd2c255f9da466c8de1be3b21a403888ac208f1a997c6a29e63d9f
+EBUILD netbeans-php-9999_p20160317.ebuild 4418 SHA256 cb50ef14aba92bd3390ecc90bcfb647a113193a3a6412dce24e6fc32d44a24ea SHA512 bafe62fffdf35eaef18d4bff566a0c4b03eff5401ae022827e24c7e4c7fe95cf30e702b275854ec56c58e7df77ee0cc75021db1fb0d20bb99fe7c536643b780f WHIRLPOOL 53921305b8544475cbffa331832ad9fbf82a521628dcacb051fd92ec0bda789ca2c1b205deb5715aa6179e1578dd08a369f52f907496f501eca20b02dcbf4c5d
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d00b641..25763a5 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -1,3 +1,4 @@
+DIST 0388CADD903570B9FE30140C0EC39DC573389B33-jna-platform-4.2.1-patched.jar 1855698 SHA256 fc5c94bf163a21aef7870b2a7356187cf47eadca801136fd76cb7e97f1cce10a SHA512 904928b00afb9f90f1c1fbf344944728948df1b144c478199b4b490a1b351e1fb6b5c767425f2b090b734734d855c7dfb4a4429a288d37012d9744e10267d903 WHIRLPOOL 59db13e2b613c807e6554079c2666592462c27f8cbed84552828dc0a3d63464f7af75ebb362db0f5cb14a2c2e2596ec73e017b05cc3c6fa305fffd63ae0ed700
 DIST 068B9902E65F2292C9EA30E5423E41FB6B30D8AA-net.java.html.boot.fx-1.2.3.jar 66508 SHA256 f91fd63a87fe119f2c3adfe021de416a6748c53af3399d6c4a6ef132a7ddd219 SHA512 9abc9d3ad65344007d5869767e519b9cfd3f55498d6e821333a39912e988d17e24a3e4b4858f917d66d81b2ad3cd97b87e49efa7985f0568e4edccfc055b129d WHIRLPOOL 76f5e62918a7c057bf1ec74289ef13354d1f1e823335089f27326fd251346408d3c7d4c6e33109b105b92caa8bccf6f7ecf7d6fb5c2e2b382b183e2ddf373025
 DIST 1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar 529233 SHA256 a61000572baa9e216f035b56dc4f2b4119328e8858af5d523af84b356d7857e0 SHA512 55f88f204cafd6968a952d6d08286220a569f678915446aca2b49bfe3bb7e2de6935d5ce834ef55363209d8f23be7d2275cc517a2ce837b75e5e5a6551e9ba9e WHIRLPOOL 4cba5cb7078c4b24ceec00a54aef36898ca288643c6b85c360b271b2a914e516f298bc489f9e78477411c9ecdaa17f3262381d02b360d4309dc5b9308523b7e7
 DIST 1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip 77859 SHA256 1503657e36d02befc5433a57f1134209f98f3d193ea30c9ac0553814a8590a21 SHA512 15834d5448da80be539259e902ffa678a3b94293ffec221ad1e6238f0abd2dd2b588b8c06165f7e89796e96a6660c3166aad13112d34eebbed29163b52074b56 WHIRLPOOL 274c0cf5fa7d44701d7ea82b34758d6fceada1fe88bbea34058a468d350e1661c76f07e7ee0edc6b0c34113f7afc4540f2345e2d1bf6bf577969a305362d4227
@@ -38,6 +39,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 9360 SHA256 78c6427d97d0b1141709c88e2e30b02c68a6cf9474a6cab8830298b77ab8f025 SHA512 ba699c7ed9c2fb54e6cc8232f2214e7f96621cbf3858fca5d797627ce1d898534b21c9ee23ba6dcd91db931f5161d89c15463bb86387c74db66905b96f37603f WHIRLPOOL 750fa3cbccfa07bd00c64057c2f0d68469ea8db774fc975b19f4afe6d574f97adc2ad90cf73b780aff65b06f0a583f8db19dc9b0aab819b8f251e4c393a76b3a
@@ -57,4 +59,5 @@ EBUILD netbeans-platform-9999_p20160308.ebuild 9360 SHA256 22e953141bec93040a999
 EBUILD netbeans-platform-9999_p20160310.ebuild 9360 SHA256 25a7f3dafc302ec8b036b47447904ad6c9ab81fec58c8ee8364325795b06ae6a SHA512 30cc03ff6ac16b0a012aa1975b5349059252cf5a6a2eb1b974d3c362a34dba710731a7ec8d1ac0f022a1ebad9d8f0a7fe1bf922ab13a34e9174597f6886d5fd3 WHIRLPOOL 5019cffdc2aefd98b32e1ef1a595a2f0547a45ef9ed0e325e2e8b079e94209fbd33be7c9bed93295b99d071d5d3d62df3bae44c96d1cef2777672210d63c3def
 EBUILD netbeans-platform-9999_p20160315.ebuild 9360 SHA256 3ecbd4699bcd3e38fda1a063a4dbd20f8681340b2fafe3be51fe7ba3f2181de0 SHA512 acb950ccbde849c08ef0bc3fde208acd752409006d1d19d17ddd9d7afad285c303c02cc467403b6f58f6f8ba6fea715a20a435d9afcade2c7dbedf02158c003d WHIRLPOOL 712193a7a72989d7789497505a8335409c8cd3708125b580a42f9bd343bf3383fac25afcae9676b160eca81f0b1860a93333fa78f3d9b6cfb047a88eb91cabd4
 EBUILD netbeans-platform-9999_p20160316.ebuild 9360 SHA256 9c44bd0fb5330b62798fbb8d0e47676ecdbdbe1402f23150202673bd08c82c9a SHA512 eee06869ee6b0d64edbc1b4540120bf36b36ce08ad613c57432d991af84ba4198e418890e0a8d401f518c9334aebc5bb18f8448c0b330bc7d77180d82764ed72 WHIRLPOOL 584edc403377de5d5c103382124396620000eca813183ac99f342dd2004f34a505d2012deafc4b24d61309e7fa6c76fca6962cef6d477f68a64bed71f4805df9
+EBUILD netbeans-platform-9999_p20160317.ebuild 9421 SHA256 5d9828f5deccf0c5dc717bb6bbcd428a7d9c5ab91b867257a75ca1c933f9d6ba SHA512 ef8bd7e34f946c10a43821ff158a954a5cb118a56b1c3fdeefe63109a902c20ea624194013a9e749fd6998646d33e3808619f7bac8ed56f8c8b7007c7d434551 WHIRLPOOL fef24fc93996fbd6859bcb45a2a3030b16bded499149e0a717351d9e571ce5c50a35fc83bb24f9d5d8031ff340910b96a46ec102ddc267f849b71c9e511dd2ed
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 4764bf0..2721c78 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 3472 SHA256 c38a3b4ea35fb1d709b1fe432edd11de71481cfb45a28e0cf2e7e0468a7c1d8c SHA512 be3e9f9cda15a1ce7aa7503e12c20d43d7cb7761364de396d8b1e25782eba6201542d7687dd70f610ad6142c4f42ca00cebf41999b9026eab2fedeae65ce6219 WHIRLPOOL 6f8bf25def2259566b3c28377407cf49c9ead12e50cd3529bbdb5b10e9d3290c3c4510b982f6d299f144f2385210dc7dcc681ca45a3ad12629635f5507f3bf60
@@ -40,4 +41,5 @@ EBUILD netbeans-profiler-9999_p20160308.ebuild 3472 SHA256 f4a40fc3f32a930be0a49
 EBUILD netbeans-profiler-9999_p20160310.ebuild 3472 SHA256 ed2b0397c14a310eac2075f530d0452efee7788b8574167610e24c437e271272 SHA512 6d82c43017b801f1aa7bc1d37148ea7f31e876608b1fbfa5c1bcaa95d13bed99b07095fcffd2c7cb15bd23cd8549dd48a2d8939433d90d1da2b9f168f27b50bd WHIRLPOOL 48e1773af06a35cc7c0c09946a9764c8be32ef3d2a2301a0aaa2634eb8eeeac203a16a6a2fcdba4cc4fbe9bac18124bbab99ed03d6f88ceb40cae7f01d3d70c4
 EBUILD netbeans-profiler-9999_p20160315.ebuild 3472 SHA256 89264ec877e4adafbb9c50387c556e22f13e36a2a1b104ce22dc996ec53bf2eb SHA512 dca291db2653e70230639350f80a3d5cb1a7a711c46e46e90b841da07fa84bffd00f11de34b33e1b08c9980a22786d8021c7f8a8aba2664e49e5695d77914e27 WHIRLPOOL 55664c898fc201ed3b2967c11a6140e8d6f274b2c022dc887d7a11aceb52e2a45104599b5bc34d08ee29d9df5f3579281ea25351a7a228505cc3fd2fdc62dcef
 EBUILD netbeans-profiler-9999_p20160316.ebuild 3472 SHA256 9bcd46949afed478f5fac0b310cef1e1f4854234bca722a7135737b432f40eb8 SHA512 70c0c0bb426c7f011e7a568b8ae2b16aaad58f796c49c85b7dde20b0e9bcd0774b4da46726cef5f30222d3ab8ed988e7c1ca677796316cba73f2b3a9de9cfcc3 WHIRLPOOL eb002e9a325d9b9f5747d531737d779eacc4df96b4a29f790a83311f144a871301f43908a88ef0dd0a185f63947484a925b6e9bd09fe99e3289604845f56a1aa
+EBUILD netbeans-profiler-9999_p20160317.ebuild 3472 SHA256 a6f563645b63a5d2986310ad8ad0d0dd476c18a2d04dabbd66f91b97e3a55539 SHA512 a99e7bb7c86cccf41009044cd7cd03ee4afa0d1e5dd475fdae83461c1eb9b504c616eb09a05e4d0d2811bf22392dc51852ae5a01bb3b51714c6788545d4c78d9 WHIRLPOOL 0407b5a0283469dcfc0c22edd3f4e01fff5e81858ef328d4b00a75b4957e60c2d7653cedbba09a4fa9a5712c8e77c13b5affad23bf304998c748d1bdbe1e9e4f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index eae5925..23e25a2 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -37,6 +37,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 5280 SHA256 46af50cc127d8757d9c497309373139aba8ef44c6b837d92a96da3b572e5972e SHA512 d2b5310e85cbafa3308117915050d326c28f613121d2e9a1ab0de5816b53a0720d3156dd6d6a679f6e28a107572f6e21dcf8736029d1f0043745793ae0c903ba WHIRLPOOL a47e42f5adf77bbe9ade116423dea10bb5e874ade3dcbe530d6d68f0b0aa8d9363548e907fac1faec32dc6c97f3bb5b704086e840e88ccec8f8d8592106f92da
@@ -56,4 +57,5 @@ EBUILD netbeans-webcommon-9999_p20160308.ebuild 5280 SHA256 01d60f9af036b2902f25
 EBUILD netbeans-webcommon-9999_p20160310.ebuild 5244 SHA256 5d82efd217257d990335406cd1de9fb5adbe54a32e8602c5b68d1dc598e02293 SHA512 04f0f8f1343e9e37d72794ba454c0ff5563b1d6617b6c4b0aba9a56e502e65b420007906fef0bd064ce38599bff046bf0e72f28db26b7d301ecc7a9ec65860a6 WHIRLPOOL f0eebfb5ca7c8d526b9f92e7898d2935caffe2d9d715a7652255fc8b1a1a24da46a953db76237c05ea2fb936a08ffe70ca9fc9fb93c67b7873f44a0a661c88b7
 EBUILD netbeans-webcommon-9999_p20160315.ebuild 5244 SHA256 835727030311efb639f4653c221b0be18003f52d3ddc79ff79573caff7aa937e SHA512 1a3c084660b7bb19d5d790e41be3c43a2f212c0d84e42a05506257393bcfe2a231535b9691360557934d2845db01b2666fc82caa9a85f7aa5bfbc9e0e066acd5 WHIRLPOOL 31383c3b7c25dbb2fa47c6eb5feafd72534657ec5a06658a29b18fc002b036be28c85713c6515b7bbf4d59f2d653d1d66f68f04e6cb6e701a6d1821a6d561fec
 EBUILD netbeans-webcommon-9999_p20160316.ebuild 5244 SHA256 10198edde545dd3cd708ed683d97d9a223b9339e86aa544e1218a5eb703fe657 SHA512 d72ed54cc339c4337acc43c9a814c5245725f6ffcd1e0e82b378faafb83cbf249faaaf7c06407a915f26ace737887f441e06740055db44cf5ef903e7ca641815 WHIRLPOOL a23f9eb4b7303ac2552e6dd6b53ba15fc2989b42dab709bad06413486a33136f865daddf5915f15809e17b7be222e9c57614b8165b0732a7e8d606b096456930
+EBUILD netbeans-webcommon-9999_p20160317.ebuild 5244 SHA256 2700f7310a1ec5e460f25b50f9b6fdcfe104d815d74fda77c9646e039f24c71b SHA512 69ba1d2dc1f3ef5f84fb1da41715f3bf1457a41ef0ee217d35c12ef20efdb83dc7d452b1bc307f5052cc20880cce31d4e9afe63bb3a92d40e97b132ba58a6b2c WHIRLPOOL d2378a652d577bf271f76a80d927cd29100f2fc3a75699f0d40b33a47033ea7ab5557b50374a836965d91ec5e3e96016c23b63cef0965bbd8af242db369c3585
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index d5620e9..c6597e4 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 2721 SHA256 91ae22880cf71f21a6686abe6303d38d1fbc352eab28aa6aceec838df867a617 SHA512 40a3dff775b85c8d392fb55534450e0605aa0cbe33edc7f0355357d8200c5c30656e665281f48897db132ccba682756b58d7a65c98c1bed120685520612f7b0b WHIRLPOOL 267a3ad3e95a7a2c26cc8460fec3a8e45156fad105e9da639cc2d2f33a355929421a0e1e7e7207aea8a0251095174e146f919ac5625453c481294021e25e4d1f
@@ -40,4 +41,5 @@ EBUILD netbeans-websvccommon-9999_p20160308.ebuild 2721 SHA256 fe5fce293f61ee6ab
 EBUILD netbeans-websvccommon-9999_p20160310.ebuild 2721 SHA256 653bc5184ae2689b217008c88bc821f07878215ee4c840826c3693f9238cb4f6 SHA512 b30544d7e69b8043a438ef82b1e3e16e7c5f7a448d1f6321b0808dcb146ed11a665ce368a1048ada2b1829b311ffaebad1cfbadd041ba039345cdac8f87d25a8 WHIRLPOOL 9b64f3f2326e710b7b3c0ca6973a785611ccb86c4ee05ab571df1eda3c538e1235f074458140d0a812b75958c755cd6d309a10dcab3fa898feeb8c6793925a0d
 EBUILD netbeans-websvccommon-9999_p20160315.ebuild 2721 SHA256 c6635aa2d34b04bdf67c139340d492836e2a1ac99fb6d6034f03e5d939147a03 SHA512 313af0fcd157eeb5efa3ef26b7fc4a659ed64596810c5457496bf644848f31d02bfd3ef0e2b65272147d71578471565d38b09a5d7e71064e02b15110d940775d WHIRLPOOL e3d9254d700b7d720fdf49c2a98e0954358304e650e6c04e05cc63c580288bb5baf5c9f7fe031cc4a25ad6865e648c7209e901f4f5741a1c259d78ee4c12d2c7
 EBUILD netbeans-websvccommon-9999_p20160316.ebuild 2721 SHA256 8a07ef88583977f67457beb80754368bce495718c5cb6987bef37993e978e168 SHA512 d5dc1dc2efa9509ab00f0da9d098281ec3af685d9a6dd0a53859dad3f612fb78757d6719596ac542ee68dd7de6f359ed2a7cfc396f4e57559c327e7983aaea9f WHIRLPOOL 7c5503a521ecfdb948ae1d383cfb997b925e9fce20de999e2d5272553544fd1157f9fac358aae688dda0a69ab7377b9dcd5198591b98e7ef49f12a0d46e0f629
+EBUILD netbeans-websvccommon-9999_p20160317.ebuild 2721 SHA256 904ac318e98083851a60b0c19cbcf2d41304f7ef0f80976ca19af23c76405861 SHA512 2e69a65036eb87136767e3bd909434054afeaac3f3861f4524137ce0c32a81b41849462ef8814f35324f8aceca247d463974a8e065dd3f8fd8a3379b8c4a86c3 WHIRLPOOL d7a39c34337a08696fcf72a01920b99a036baa3d43c7a1c654ad56f087beda27a4d818ca1303333b2a6a769d92ca7855160a6b7fc5d7a1ad9c95e6bf9b2c22d0
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740

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

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 7b86e27..4222894 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201603080002-src.zip 209879323 SHA256 f2d92c0bb4c888
 DIST netbeans-trunk-nightly-201603100002-src.zip 209888833 SHA256 f13cb9c43038fc26b0303fe5c51bf7845f466558bf1f601e484252db7df29064 SHA512 72f039eed008f4e35ccab91aa96ff371888e6d92c20e97daa8f36dc50237aa775df29e2c1c40cefbc072339e4101a9cd8163891da089c90096c9d2722ca88c45 WHIRLPOOL 1f5b38f63fb0ce338a1a124eb5b862ecb776298c9be4a25767162abf95d5d5ee6d20c8b0bddff7079b142bfcae43ebcee4e1d0e1b83c36424b407b3a6091f871
 DIST netbeans-trunk-nightly-201603150001-src.zip 210021503 SHA256 b0ea2aa58d93a667cc83dbec9a9534b4693ac7a8d570682ebcda7fb4bc33a1ea SHA512 a06b780cf27f7e83964261d6a2dbb147e99bb353bae9d5bec0fd6bb8ca3fdc564f2da54eaa66b343089f854cc27e808846699fe691e047a4a04a1b1444143532 WHIRLPOOL f135bfcef0de549b44eeeac35f2cc1e49d4e8b21c3d254398cfd35bb04808c3e55e9fe9953a5b96c8acfc23a331d26f9fb9f9f20ec14ee93665aadd072c29e1f
 DIST netbeans-trunk-nightly-201603160001-src.zip 210026634 SHA256 4d66f16a798e9c89599c9d9ca42493a477d2c2d11cae3e5e1e7b6c3876bc953a SHA512 be94af9676f2559c959c213683ff23720798fe3fb8c5849e7d3422a89ab7de011bcd7eb90d7d480789461a8270ed6c2cbac6536f4ba5b5196472a73c1ac3ce73 WHIRLPOOL 53d7422959ba36b979d9b37333863479f811697f880f2e1c1861a1ff83a735364b265c32314e5ecc4a08e94f1478da3e74ed14112bc5a09b5c7b6b9e97385d4d
+DIST netbeans-trunk-nightly-201603170001-src.zip 210039061 SHA256 dbc6ec1a007e00802af0f2b09ce7f8bb66181329339adf912727f0faa8853489 SHA512 0999a494f2c6e93a4caca24c4e50291111fd73c874da130c7bd1a834509689381bc8f59794d5c6d9d6f67e1b8998b12b107efec9d1a19fa31486ad62863c94f1 WHIRLPOOL bf1472b80804371be9fb0ad8f35659c7ac372842b361175d87cc1f580786c8cb064e7aa8447a5957f32ed5aecf3bb0f9b5e89d4157b316e5294e4ff28d5fb9ef
 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_p20160223.ebuild 6939 SHA256 4983a26789624ec9422887100f322c64fe62af55cd7cc9a6dd539d37c475827d SHA512 352e85e53c08e87c671cac68ac2ad62247ed7df5f7c631e0d16cea5936e930e80d22f2e9d118f488faa5db5082d74defc38169dfee231f8771538aff6671b470 WHIRLPOOL de818ecc93fbacc632c4075a3cbfee90795d889eda7f71cfa8e192515025fa552b556482556d68d0e4eaad88ddef3348910ef092574ad2638f7bf1f0916642f5
@@ -43,4 +44,5 @@ EBUILD netbeans-9999_p20160308.ebuild 6939 SHA256 d677cfc53e8ff1797e0fc33af73c47
 EBUILD netbeans-9999_p20160310.ebuild 6939 SHA256 dcb6b43b4837806bef9121774499988eb5a711e0253fa8a80a8e4a8c52d033a8 SHA512 dfcb3379b30a6bdf56b5d91e1eb76d8dba03b7392efb7747479a2c64e9fed22ebea28cdd701d7c45f79ad613e3a32d6d07061c00f633832097aee64ec9644d0e WHIRLPOOL 4286f2e56e985b1a9a8079a6c5e0705cdd755babb32b9ab797326fd7df930313fe3591ddc098b4126a6a388fcf2b9b02b0ea779a642a6c6373d4696ca92823f4
 EBUILD netbeans-9999_p20160315.ebuild 6939 SHA256 50b7d31d9498e199a70e743b3b7c708a405ca683f9545f1206081ed84f53a368 SHA512 22ab2dfed73f2f95986219b9a8405e675848b3a3686976f8e02c332a846c3a1d78a95b4c43c6573adb699345d3f8d46e307cd3c25114f7e1459b2b6c1d741960 WHIRLPOOL b1435ab027649fe973407e4726b8a9a11391a8c1775baf85c2802c451527bbc0a55418f524855e0c57dff76cd2bae6d85a5ce600b1210c86168d94bb9747e041
 EBUILD netbeans-9999_p20160316.ebuild 6939 SHA256 ec060ffffa8905bde4b4cabf768690a1c8cc3c1d3a60e18fdfca1b4b32c43398 SHA512 c83a272a3db907fbe9166062c5b1d563974ed27c34cd40e3867ca47d4a468a7c7db1259c9a5d86ae0f8e1c0d68eac6fe1bd69012d546c69c08d02adc63bfa41d WHIRLPOOL ba5274d9813a707e063d6037ef8f274518dadc5e1cc68a585f8f0163a0a45dfb95744897604d361ae8e09dea7ca7c2f1e5817720e830f63f49bd189e1f2b0bdf
+EBUILD netbeans-9999_p20160317.ebuild 6939 SHA256 a897b7ae94ad8027afe154a2d8dca577d398e647a83220466917e31fed6e8348 SHA512 5d86321a4e2880d1559e7eacf8ffbd1cb3fda93e2864bed0a9070788595eb574eb7edcb403ba1addfa37ca1128bf90e42196c5f2f2d0b2a7dc68bbed864debc7 WHIRLPOOL b7019e854c34dd0fc04d77a7d1be75911828e6bb37dabeb937ed83805feab7f4ba03de0d704db7dd27760c3f9f027fce6cf7983e2aca4058fa01e442481a57ac
 MISC metadata.xml 329 SHA256 8aeaf2a0228f15c2e4140f401b30f083509bd99d0a578873069f3595cd8555f3 SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640 WHIRLPOOL 799a9b79b1b447bda9631f67e2dfaf722376740e1d2037796528a05f9745eeed00d9990a74a65ce09f74bc5e1d60a887abde540c3c62487d7dd49b8377c15834

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-03-17  9:26 UTC | newest]

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

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