netbeans: bumped to the latest nightly sources

Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --force
author: Miroslav Šulc <fordfrog@gentoo.org> 2018-02-06 09:55:33 +0100
committer: Miroslav Šulc <fordfrog@gentoo.org> 2018-02-06 09:55:33 +0100
commit: 6c84c99775fb70b2251d44409a898e4358164d77 (patch)
tree: 5287079cf063cda32426e3b3b65d34ce238d6504 /dev-java
parent: netbeans: removed obsolete ebuilds (diff)
download: fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.tar.gz
fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.tar.bz2
fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.zip
40 files changed, 2779 insertions, 0 deletions
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 695228b79..5ac441b66 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-apisupport-9999_p20180105.ebuild 3058 BLAKE2B 99a0f6bcc005d977935cde5f85949157ea8842a12eaf80aa866fd49df234aa7696bb5407d7c689288fbdea5f59a94779c72ea2dcd6e3d65b805659caf12de90a SHA512 33e6aa199136a93b44746583f64c4513e94618f5b054101dcb926a3ec68315cccaac6c6d086d9f9cfeb1f8ef01a6743a577b01f75f27fdde6a51293ded799ae4
 EBUILD netbeans-apisupport-9999_p20180108.ebuild 3058 BLAKE2B 359aabdf857dcd18d988abff305dace360323ff05b9432af5e95f08193ccad6cc8eb9689d09b69766fdb59a0540d41f098cfd03d03acbdc2ec79ca005d016a1e SHA512 9e8dd9e7ede6fd27f2be04b4406753cf5917dc6abda794bba21200deb53dc487d01b4a6bac286eeb6153f2da1a92b1e360930d30404010481996551898c399dc
 EBUILD netbeans-apisupport-9999_p20180109.ebuild 3058 BLAKE2B f3e71615e0be642eaeaf30386cf3dec945aa65f58a6142c33525eb9d011b299ce500c5f9c2b6ec04cb084021f17fda337759d0b1c636c7612f3c2bb0bcbe97ce SHA512 1824d3100ca8e9e031bcb449bfc7a75f9f81d85f108970c63ecd6f750d410584d0b48e33ab3cdcf40c4a58f974778a30ac85035ec7ebed6a1a486d51fb686a58
@@ -37,4 +38,5 @@ EBUILD netbeans-apisupport-9999_p20180131.ebuild 3058 BLAKE2B 53bcb2369ea1c1022e
 EBUILD netbeans-apisupport-9999_p20180201.ebuild 3058 BLAKE2B 02f63f956809bae1f87c31e011ad578b63ce30bd93b458f8c38d8b86e6bdcb0181ace53f3844ba1a23ec33bc805b8e5a6f2442290e66892bb040ca164416da3f SHA512 6017095961646e76e865f7aec4b2283fc65ea7737590414b70a460a8c4804e009ee7220157abad862c882d4253b48bbcfaab22e01ab2bafd820588eb21301242
 EBUILD netbeans-apisupport-9999_p20180202.ebuild 3058 BLAKE2B f055cb88c4fe1f09ac002fc7bf2c0c12ac2c8462f4dcac45b2f5e34b49c9ba634446edda128a2f3f578649999dd8d0e139ae1cd8ca99f1851019e14a9a9b3562 SHA512 002d711a3f8fd98c25a84ed2c21215bdb17e51f4a4fcb44405f57c6bccae87be510af3bc8b2449e4f84684a84bbbdb58816acfcc139b9b9672d25c73f5018f8b
 EBUILD netbeans-apisupport-9999_p20180205.ebuild 3058 BLAKE2B 800fd904411710116c0b60eab6555d1a224cb69a50a85ebd6dea147ba10736ddbd90da52897fdf38a7688d3f7e3761cc373e36d499d934a494751cc171c7a5ef SHA512 e2dc06c2836628864c2898c113a435c17131dbf782489799b99caca1507778a9a48da7adeb7e64c567aadee1408486b9adb4cd1ff55de9d70443f49395d7ead7
+EBUILD netbeans-apisupport-9999_p20180206.ebuild 3058 BLAKE2B d24fe63b126e2929769263867831985075fa42d0b6950be74e501dc6ac7ad185dbfbf0f307663e012d5e3f7539b7f47a3a63e34cad00da35d093cb5b5fbd76a3 SHA512 3c97f73c3983a20601cb9f51a8a5d0b12e41415266b3a10dfab96e79398e4eef094acb81a402cc384b9a92df3b52c2583f6192fb03e7fa8b44f2443d814d303b
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180206.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180206.ebuild
new file mode 100644
index 000000000..70fcafa77
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180206.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans API Support Cluster"
+HOMEPAGE="https://netbeans.org/projects/apisupport"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~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="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 9938112ee..c3c95dc3a 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -25,6 +25,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-cnd-9999_p20180105.ebuild 4686 BLAKE2B 36f5fab280d5b5f0ea49c615fb4829b89ee3f8a062bd16cb25715e31d87b76bf1da17bca8349ff3e4c8da4207745f13f4c5c9f5788df7b2accd3a88bc1c3053b SHA512 ad434882e6ad80ab7092e69d41c7ad315aa5e1cfa4701b1aeb90979dcd710efdac1737115e259811808fbc9a8bcca857676bc8d3789c67465171eb27344c39a4
 EBUILD netbeans-cnd-9999_p20180108.ebuild 4686 BLAKE2B e7233cc3ac34cee47d43fe76f57f0dbc1bb3fc571f55c265ced1ebb6b399859d31b66ef8f375db2e556c2770372a0412c3032b7a16ebe23d9d174525e7de4fd8 SHA512 d717b39a9796845d2db43c04e91abbe4395b3b4e8d3938a2cd745e7e959b4ef1ec48016bf811003159b53ebf3e955bb881e3fb94c637eb545c956cd7e3bc22ae
 EBUILD netbeans-cnd-9999_p20180109.ebuild 4686 BLAKE2B d6bbc499cba0c254d1ac51e15dea503739a1b21f29d4f8c110a3f7657b9a8f04595a57af2a4d735032f128f02870dcf300b75f7cb28ed960db61197a9ec10cac SHA512 dc1223585952f9bf1535dcd925e8f8d6fa09c34225884aeb5f1f9bca7ed424f089021bdf74e1570a6499b3e1382fb849a83c892bb0043ea7d8bba6de2299de9b
@@ -44,4 +45,5 @@ EBUILD netbeans-cnd-9999_p20180131.ebuild 4686 BLAKE2B 843bf652e2ecf5627f9dd7427
 EBUILD netbeans-cnd-9999_p20180201.ebuild 4686 BLAKE2B 98277075ee698e7c81a643b77c95c6bdd29d46ea1bdf216e12015b858d10dd2026bd97c9b08f4e7e485ba050dce132f2dc23b0e3042089f706eae58c8625e663 SHA512 ecf760a779382680691f10b9d5022518075b7567d7de0d21b7cab8d73cdfe1ba4d41453ee6eb3c89eb3e3487dfe6d9b0d4858ee3181762a5f6a212d81fb25ff1
 EBUILD netbeans-cnd-9999_p20180202.ebuild 4686 BLAKE2B ff7f45fab92cea1c99d5e8de6195f95406482d3b0a0ed738f746ccd1f87f9547d476ab62d95720540cebaee75c5bbdf8e26f473d012b2d48275e54aff10c8904 SHA512 c4f90ff526cd57e620418eca6d8de4be4deda24e44e749143f979c522db07a98b9d2084e3630a76fc7fca86503ea7c0e66d6393efe5938176d1a9b5cbf4f7970
 EBUILD netbeans-cnd-9999_p20180205.ebuild 4686 BLAKE2B 8e5eb87c228260e84b8942b53807f5fd403742609186e1a5a5e35325e883983ce835d49ffebf66969e7fc2ff16da9b7bed48ccba2ecb5dac260ca69f282f8de9 SHA512 9eac0f1a41e38eaad4952036a7b9de3d8a67f3879ad777203e70f1b59860d136460800ef9c956929e568c806b52d84f43837d5ade38479f33ad31c43f8a54fdd
+EBUILD netbeans-cnd-9999_p20180206.ebuild 4686 BLAKE2B 6d6215693c992c7f4629aed86cceef9af52a74ad5424f61a82ebe9235ebc65fa1f6a1107706c8988d7a751d98e4cbc0f7f23e5d3b39dfebaf76519678ae6689f SHA512 b7644fc56719dd5d12dbc2c094941651af030161ee9b1555cc2a08010ab5b3fb0abc7bbb0593abd1fd6d1c75a8ec6c8a2773f6b5cc6ccc7c05776ec9872b0ec2
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180206.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180206.ebuild
new file mode 100644
index 000000000..a92c043b4
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180206.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans CND Cluster"
+HOMEPAGE="https://netbeans.org/projects/cnd"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	https://hg.netbeans.org/binaries/BBEBAEE8729CCF165E2080A915542C6875208F97-clank_0.3.9.zip
+	https://hg.netbeans.org/binaries/B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip
+	https://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	https://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
+	https://hg.netbeans.org/binaries/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.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="virtual/jdk:1.8
+	~dev-java/netbeans-dlight-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/jna:4
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-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}"/BBEBAEE8729CCF165E2080A915542C6875208F97-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
+	ln -s "${DISTDIR}"/B7B417DE191ACF30A60E061437B810840128A89D-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
+	ln -s "${DISTDIR}"/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip libs.dbx.support/external/t-common-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-r21-build.xml.patch
+
+	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-4 jna.jar jna-4.4.0.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
+	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.dlight.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
+	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.ide.built
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+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 bee005b62..231bf57ac 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-dlight-9999_p20180105.ebuild 2643 BLAKE2B 7f92810789f2721a863982f567d79303c62dc36a48ffee44d54ada143f3ea5a3f6b8f8ebf8a02058870cefd4eab99669c2ce2ad3f0d0a7037da5ef3684425804 SHA512 dc25e62d86957b1eec72112323f2b1e98dff1e897b05c65fa38b83ca770541764b478cb6556e551cb804ca850fef17b750bed331b097fd769b6270da59326459
 EBUILD netbeans-dlight-9999_p20180108.ebuild 2643 BLAKE2B 60bf6fe517375be192773854b4719246848803bb1b79ccfcad12437a9b98dcf539a250cb34243ca8db38d125f80b06d59642d24ea1ce874a8b704c4680131bed SHA512 26eb4ca0a16fffa736e24820c19cca8dfd75d092578db554f0b89523e5f3ad1df8fc9916b19edad328e8e99beb2cc951fb840b6387aefba692f6b868c768a578
 EBUILD netbeans-dlight-9999_p20180109.ebuild 2643 BLAKE2B e0ff98556065f21fb36f55dee5c01b55a490a560e5a544d10058bcdcaf265258c4d4a3d546d37e7395726aa8fc41b7bab3abe01dc2e01be92d211dbbbcedca4e SHA512 cd161752ac1f6653db93d812457149c7605cb7dce3189fef7c0ca07a7bd63ff46b15df8cd5667b7d9ecd3a3532c9323390ad3a09f0d7c293706442ecbca95526
@@ -38,4 +39,5 @@ EBUILD netbeans-dlight-9999_p20180131.ebuild 2643 BLAKE2B 12c0113dbe95fa59ccb35f
 EBUILD netbeans-dlight-9999_p20180201.ebuild 2643 BLAKE2B 4243bc8949430dfae016f3009fc6338bf800dbca21503736a2a61e75acfdeac3ce8d5bbeb5a2e371f07c6ef3d950ec2d31efcb8d8737253cc5e7a28d9d76956d SHA512 e320c0dfbb245a7945ffe6db4cf8cbeca477068b88b99a8b32bbb3bdfc62808008d2fac5005fdc76e34ce262de7a56ebddac6e989f0798ee772611672c1b325c
 EBUILD netbeans-dlight-9999_p20180202.ebuild 2643 BLAKE2B 541fddb6140b59c2039ac9c0e6776313ae93def9c64b2b249e79ef435c350fd5300d7e5199aa87d631b0e72c6b87eb6b0b9cdeaf24a3305b849b725381e5dec2 SHA512 5ecee0c2540d91e8afad979ddb69262205794dcf2b088d7c980086e778fb11c0a7ab2779360521f630d0df655f4dde44ead65bbecfe1be0c3d3dc0407401aa65
 EBUILD netbeans-dlight-9999_p20180205.ebuild 2643 BLAKE2B 949a839301254c3c27250450e3b7fe5021f50cef3e1bcd8fecb5b2eb4f9113a5a0f02c994095172d42297ed9cacb94a3385ee9b1e841852c4d3322536264284f SHA512 1c01a7309d585eee0f0dabf170fd2b6c0db005636e77b69084bbe4360661394b53aa07157e82c7ca21df5e060763eb086e9639f60724fe23907c4c8935f64e50
+EBUILD netbeans-dlight-9999_p20180206.ebuild 2643 BLAKE2B ccf4b1cc1e7625b7a63db17c6aca92722bcf7c04eee224d8f675b0d8bf78c9a87b9417a23678bae83ee6dd196bfb00478885ddc577e1f1b2334f635daa509cac SHA512 36381f291aee38f872f8d32bdb5a9ecc8b6767db99f1ae875b3d40a4479152f1200e5d34e86c72de9d949756513a3085dbf17fced0577b6b7df62a54c91a5598
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180206.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180206.ebuild
new file mode 100644
index 000000000..4c8f250c2
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180206.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans D-Light Cluster"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/00784557F614BE02268C50C1BA692A6B19F0EE27-fs_server-1.0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/00784557F614BE02268C50C1BA692A6B19F0EE27-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 1cb68d348..9ca7df4d7 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -49,6 +49,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-enterprise-9999_p20180105.ebuild 15530 BLAKE2B 3bb0d31aa7612babb6e831be2c509da838bc25d65211a00d81b120411b98904d91340e1f062badfc242708b3f9c991edd6fa84194f60c26cb87f883948db254a SHA512 0ba99f3221c8085e1ba5312675158c583ce83a4dac3b70e436c77945a111fcbaad0936832392073d6f6aa8beb82101647c989b124af1c0dbf26b6e1e8a9e3221
 EBUILD netbeans-enterprise-9999_p20180108.ebuild 15530 BLAKE2B d6a5b29c3f886814383d14b4a35c0dcd65f41a3d9ec6155bd32aada01f418373fdf1aa37c1134bdc64c5ea8336ddfd055205bee911bb3d1d88919d2a57c33d08 SHA512 ec3a07bc4f8f9df24df621863bc756e26dafb54fb93bb339649f195910646d27837938f61c31afb77a4d98cd34941e360470eb9c4f3827067c000b4fc4088904
 EBUILD netbeans-enterprise-9999_p20180109.ebuild 15530 BLAKE2B 40a725ecc756d0dea211f99fcbaca15e15fe148f003b54162345d47f79ba220a7c0ebd028c6f9d30b26dcad03728e910943501042312aee42da47f48a7b86a8e SHA512 100c0bca5dabd748ca37bc2c89d6c30b1c154b97615eb573bb5cd4080d4d0ce8c3eb49bbada7edd94f13ff566506a493c2ba9eff47133f778f7bf6f0ed8b0133
@@ -68,4 +69,5 @@ EBUILD netbeans-enterprise-9999_p20180131.ebuild 15530 BLAKE2B 455e34728ccc95392
 EBUILD netbeans-enterprise-9999_p20180201.ebuild 15530 BLAKE2B ce10516fe0fe29fabd6c520d654a53e2c9c91daa211af994ba857b0ac1dfcdbd90f95246abbaacab8ec97948ac227a4a83af7ed72cef1adb0846192ddeaef821 SHA512 541dc399a0b5c3cdc7d8aa6e88f382935e734d918f35cad5bae765ea6aa188e42dece973e84c1e7fe6e1c99d6e69fe5bdafafd986153e546acc8693fd8ec7adc
 EBUILD netbeans-enterprise-9999_p20180202.ebuild 15530 BLAKE2B 052f3ec306f71a9ddf8eca242c794f8d3e2c881f172b80f4e2a060a40629c0581bb1ae15b10bdb0029bf98960a8384a6cb5980894e60e2b8a3ea6c5b5437e5a7 SHA512 2e1649bbd4806c5aca442ce4f598c70ead2233c208ad88ac9e68126d74622c990dcfe1e95d982e3086021fb907615bb9110c7c06b3add364a709572a09fefe37
 EBUILD netbeans-enterprise-9999_p20180205.ebuild 15530 BLAKE2B bdfce0ceaa3225a7fe65b0acfca69a82e1d85268647af26cfd73ba1ee608c2ea28c8cc3fce69f93e968d2cfe7afbc9b184fb1ebb86eb718f5fec1654da73f4a5 SHA512 97d00eb7bac046f7bbd31df11a43624bb569adfae8f12a25c6009de14e96016bb60c5575a9da917c6e149722de8d83accf9291c124d84a1b7b1dd2a2ae9472c6
+EBUILD netbeans-enterprise-9999_p20180206.ebuild 15530 BLAKE2B 609745aef43844faa78fb34d150df742d5bc910a7d0dcdd46f285f0f3d2f4c1495c5f8c17f53a8757b2fd009bc954594fe6578506fc5296d37e6ff2238aa1482 SHA512 2853cd20474d339817ec14dc3b5580e3ed28ef0ebbc16bfc60da24dbe3fdc0e38154be816f9aa043bf2a51de9f56186d2d182cf042b4213b59f3c1a54f195b3b
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180206.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180206.ebuild
new file mode 100644
index 000000000..8e6a5f22b
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180206.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Enterprise cluster"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	https://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	https://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	https://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	https://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	https://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	https://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	https://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	https://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	https://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	https://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	https://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	https://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	https://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	https://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	https://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	https://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	https://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	https://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	https://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	https://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	https://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	https://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	https://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	https://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	https://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	https://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	https://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	https://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	https://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	https://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~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="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	>=dev-java/junit-4.4:4
+	dev-java/tomcat-servlet-api:2.3"
+RDEPEND="${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:20
+	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-r21-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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-20 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 4ca239615..d0f2fd132 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-ergonomics-9999_p20180105.ebuild 2587 BLAKE2B c231618997d0ced4aa065e16442cf61dbcc0cb9bc259d9d95c760cfbb8a79bac930e5a0a4d7c1e65d719562acd88cbf86b21be07e90338693b35e354049d6238 SHA512 4910515e7f10276ff09dfd1c1b98e9039b14744b481280c151345e54d52ed58b75dc75463c9292f2ea5224c2cb8d5baca67dbe75756466d9a67c0882a301625d
 EBUILD netbeans-ergonomics-9999_p20180108.ebuild 2587 BLAKE2B 7f574b3e43419c4832841901442948aaa245de54f75972e02c8876012cf76e7cf6ed24736783ca5c2dc4a6dcb9b1ac37a017dd07de696e26fe20da95dc51c8aa SHA512 c8d68ef17bbd78c18e8fd2c9e44bbc8c178308e44d7b1189dc6457336ace6f0941bf46188b701dd75be844c5c7d4983e951ada22ff6a8f3778d060fb1a7d95db
 EBUILD netbeans-ergonomics-9999_p20180109.ebuild 2587 BLAKE2B b22a6b1d8bc762299dea7912225a1bd23b3cf35bee5f2e2236f2af8391564517ff8bf1dbd4200dc80d2590891535d04bf60a78275a2e0671d04f0cfb6e54146b SHA512 6c47dc82ded0283a99e47234533fc1fbd4e6aa0ae2b9b0befb3e831833eb031ed8f8da4917bad4fb85997df36051a9605aa9fcab6a8c1399e2add1b688220e12
@@ -37,4 +38,5 @@ EBUILD netbeans-ergonomics-9999_p20180131.ebuild 2587 BLAKE2B d2839184618f43c1fe
 EBUILD netbeans-ergonomics-9999_p20180201.ebuild 2587 BLAKE2B 992b45be681c37b5b88f6d048daf1105e71f178d640eb11d195172289f0b6e07461e9e11f2b8003fbdf646a04b79b3cd877eb77f3fda2411c78ec19a17f2943a SHA512 fa2fe97404a0279fc4646bb27e3fe88b8235691fb25d12d5608590d172e744eab80a526627d41ee9c2e77df20295ab1de668104ec442e1643ed8bed3ef20135b
 EBUILD netbeans-ergonomics-9999_p20180202.ebuild 2587 BLAKE2B 3062886bd024c283a894652cb2d23010c46de00f1d71dd58032d6cef2a5958ab28cf971accd5f5df188ee04827c1d350f6c9fcafbe35eab1e059916672c5c3dd SHA512 b850d8e914933a067a3f940ab6fb496a726a32671dbddd1f994601e86649ac7aef7e6fc4abaee0e5f92a2e5003261e772dc49e711529fbb4c90c22770f5090b5
 EBUILD netbeans-ergonomics-9999_p20180205.ebuild 2587 BLAKE2B c0ee5553fa498f74c3bb9e54fd6f9fc5cbbe6affc1a1cda4c1fbfa339cc7869ec05e1dddbf8fc3d13573c15f29dae1867c81eb92170e02f6bbce89f8e17dcd11 SHA512 02d8e192be671d350f26cfeb529773b5b7945b03ffe291a81848e658fb13b016def9e32ed4a46aae2a62305fce89b3102b1ebf6d957e2b72ab88a242f7443ec5
+EBUILD netbeans-ergonomics-9999_p20180206.ebuild 2587 BLAKE2B 84e910fade8824c72655a4e324fac92ac43e9c1db03f4bfa79ad483c90da0585607c6c3e7b873b2ca186721653b5f0fe161e6404f3f8a4232445b0f277420acd SHA512 1bd5bcb36d3af2239bd7e9b4b15698cb276e829a51331fadccf3b3cb09bbb164f848ae6f356e8542afa7742b4d79af0b40fa001cf6df04ebe20ea327c8de3556
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180206.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180206.ebuild
new file mode 100644
index 000000000..48fd5d55b
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180206.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Ergonomics Cluster"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 cffaf694c..c0ea2fee8 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-extide-9999_p20180105.ebuild 3059 BLAKE2B 58a779d0b74420671a3cd451b619c9039ea36d39e8099320dda391048743a52d5731f8d54dcebcd5726e24b5a3b35c6fd54d94a7685f99a45d3efed01949b1f3 SHA512 e1da71160895c96e092c59042b7c1fb3a6d7a473ff96928ca13d27dfdca8c26f580734b3b8527f54bd644c12e91c4b5759c53b1ac14eed9700da07a7041526d5
 EBUILD netbeans-extide-9999_p20180108.ebuild 3059 BLAKE2B 18b6797376cc8079cd981823323b20d78d68038471b1ea33633b63f1a2f482748523ec489d08ae805ba494f782fdd3df7042e87e5b37b412947a7cf75ae79bfc SHA512 9c9bd50dbbbac9e8577c438af6601daa1e2c680c8cf7aa898bddee6a8dd943a9104ca61e3a6e141264923364c2a2cdcaa0d0d00e877e1a680096b4db314947b5
 EBUILD netbeans-extide-9999_p20180109.ebuild 3059 BLAKE2B a3499758dc70cf0df96832ea2c1ec524ca1030b325f8aac45bc77a7af4282277904940757952af0c8908e114b01748dc18c1266cb9e731ddc2fedbc3acce4ac8 SHA512 fb6be0e4ba9d5616ac1178e2160073cce58c79ff47667aef46b79322b69fbf23db0299a3ded1e943815e9ad6383a8ec836adb08bfb04a5fdf30b08fee799d662
@@ -39,4 +40,5 @@ EBUILD netbeans-extide-9999_p20180131.ebuild 3059 BLAKE2B 9e3e050d6c706b050a4d35
 EBUILD netbeans-extide-9999_p20180201.ebuild 3059 BLAKE2B 0154b4adb63a0cdaacad98f70c3c1600c09285ee4d633272544252ac0525bea0c561cf9312b791bc4ffdee151efd23cfb9280be57fb18a9af792492c159422b8 SHA512 658d5f61406d495985adea21fa63d995c3cef68f4bbb73c3529994ee9209552226e75052005806861cd4a144592e0f1f05b14f8102f694b765db0b7053743f10
 EBUILD netbeans-extide-9999_p20180202.ebuild 3059 BLAKE2B 5826830ed8e2ce5fecbcde0409621ff32700b8b6a017b922b6189f8c60b2c9d239e84f8eb9c4ac99743009ae4dc5e2aa8d6d2bbcb43197a0a5252db2b33102d8 SHA512 ef7612f5cbebd77a062bf4fff46befadc4da6ac14a20dc252a8ba3c3fbf0bdbf1b872f171a59a463c1299709bcdd30c365e470bfcee98a64c6f0f723354fd4ba
 EBUILD netbeans-extide-9999_p20180205.ebuild 3059 BLAKE2B c6d7978ba0846f262a0771549ff3bb0484c430f9eeced30d473f8e53ba99e5dd4536d3d04383318ebc62a27bae91474899c4f514f7bd254bc53a8454af81baa4 SHA512 7d197148441ff008fad31435354a26e86db1aaa9ea2cc9f3fb3f427969ee14e7b7818302ecd0fd943c77fef4753a3b50c2fb1a8df353ad44aade40419c576b1f
+EBUILD netbeans-extide-9999_p20180206.ebuild 3059 BLAKE2B d0646ebfab420248bf54a31d00ce8be8a957c0176f5006bb50c244d29a63cbe0e978b0d831c57cb7e247d7c1d8ccd94b82603606234acb892a5fc44c50bb61d7 SHA512 d911eee6dd74df95b5a45be5bd63a5deff7538a9ea48bcaaf5ecb252a39c59b5242e47b68c80808fad20c3759117a7c58949b7b217c443706787631784e79ab0
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20180206.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20180206.ebuild
new file mode 100644
index 000000000..cccb6666a
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20180206.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans ExtIDE Cluster"
+HOMEPAGE="https://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip
+	https://hg.netbeans.org/binaries/F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
+	ln -s "${DISTDIR}"/F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip o.apache.tools.ant.module/external/ant-misc-1.10.1.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 13b49e944..ee7d507ac 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-groovy-9999_p20180105.ebuild 3091 BLAKE2B b5aba1a95405c5bb16bfb278f67872422456ac204872d4a01174eb5f1d63edda020c35a9d829a25bb1c3e0da87cea298fb7b8cd8382b95ae7c205fad40e079f5 SHA512 98604532c52bed67c632d52f95b26a0f48e74ffe1e3270cfbfc99a5b50e399325f24277e64166f384cf3d1faed21636e720129dad67e3b39840adab07c2dcccc
 EBUILD netbeans-groovy-9999_p20180108.ebuild 3091 BLAKE2B 305b42dc2e2cd4f7f9fd92b41e133140bae8a4d3c83aa00880db5160610fac95d106ed7d40bec2cdf34f7a18bf6c23197b7b13253fa8aa1d759dd6166f31f234 SHA512 cd4e8c80d880907ffd3e2d40ac75124a9e96ccd1435284cb6f05c5757f1e524cdf6be45c7cad2419f60d13c87f94deee540e5b85f43bce63a0333c899d923aec
 EBUILD netbeans-groovy-9999_p20180109.ebuild 3091 BLAKE2B 53c3fad1a7fbb2f3bff034c32e1a2371637420ad2f68ae9a8e8c821c5c9a848a76698c0436c12980eb9beb9728dc0d0e83f8be4f760962c27bf77cf804d867f0 SHA512 6304c4826a05a6e1ef2b379677c1b728b054235208836ad900498fc6e1196dab4bc237706194f2eeba7554b1e3fa0233ac2b0d9007d581be625fde5bf557bf07
@@ -38,4 +39,5 @@ EBUILD netbeans-groovy-9999_p20180131.ebuild 3091 BLAKE2B 97bcd84669e3c2932f9dc8
 EBUILD netbeans-groovy-9999_p20180201.ebuild 3091 BLAKE2B 1cddab4a61a1f91a7795f1b5ddb3fb6212fd7a778f9437b42de8196d4855cbb9297522d01d5641cb7105cf3863b67ec8870cc01868bf7ab242cca5b77c794de9 SHA512 a0185fe3c1b66c8982f304674c433dd158450430030c8bee362a4bcceb442b47807998eeb9aeabb493a7adac812a3815795f610d8f71a213a82bb8e14cacc1c9
 EBUILD netbeans-groovy-9999_p20180202.ebuild 3091 BLAKE2B 2033758e1fdee9ba93b9416444adce09e70becd03bb1304db1d49a2b29ac140bcbd22abbbe8075e4316d3a757cd9bb786e600f7a6ea43cfd8a905e0c8a1824c2 SHA512 7cd433fb0e02898621c090869fae3dbc8cf8290ac818d5c9c697887094920c26f0508f82d43c7214508789d0865f78387a6d03cbfafb3035719dcdb14605b91b
 EBUILD netbeans-groovy-9999_p20180205.ebuild 3091 BLAKE2B 26a5838f7ad2609950b5c340763405af47809c7bc0022c0f3e6fbd4540929a1fc1d9235d455774133ac6ed60dfdd0aaeeb629f02097ed791758dd91b592f4349 SHA512 94a49e46ef6583327ac9f3264acc17e49042c5447ca8ced0f159f7f9a4447c47e021077ac2ce01e2db0a66e3812e54b216003e8da3f8f3a49aa98b401c8e062e
+EBUILD netbeans-groovy-9999_p20180206.ebuild 3091 BLAKE2B 876c60bed01f2a99caf57a7dc867ec7804d459b7b2c0e45b1c9f375dd5df6ed8e668a193b193910b6d7b3ddbc8ed7b5c026b16451c5c034ae27677f6de7b237a SHA512 f0781aae3b45783dd0ef0ff91433482d3bd1fb6800ccaab58bfee2d55517028922a0767c1e8aea524aa43bd71f0b352c513658d721c3001958a98b931b6a84dc
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180206.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180206.ebuild
new file mode 100644
index 000000000..bdabf440e
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180206.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Groovy Cluster"
+HOMEPAGE="https://netbeans.org/projects/groovy"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://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="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 7e3b5f174..1908dfa5c 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-harness-9999_p20180105.ebuild 3805 BLAKE2B a5ebb342fc8eb781da3c89efcf6a19b95d9f012c5b211ebf90485bfdc04757f5dbbd2e155dceb3bae3f6bffef399896a42da68833aea970d566dc4d02bc6d801 SHA512 9e718808eb1dff85fe04bb6871d8b04625008cc1c82b253141f26138d5a98e8f0bd9eb06714189d017dcbeda81b9bc351a7aeb90ce188fa309d6f13d980d38f4
 EBUILD netbeans-harness-9999_p20180108.ebuild 3805 BLAKE2B 0b0c16d14b23f8a5b3087fc42ee82450e51f1b1e132ace0389e3e35b76487279eade051c7ad9e7002b1d59ce2d39e9d3bb679410ff18a4229a6e4af23c771bd0 SHA512 60b2a712d42c7dcdf4509a1e6850df89a75336c0185a3a546e5b7ea1455a1e179db281f30a28daf24cdf38be30a0694123f7609d5675b2729e341b3857836dcb
 EBUILD netbeans-harness-9999_p20180109.ebuild 3805 BLAKE2B 64186576a57990f020bb6f8b7219b2b2c0721aafd500b8299eb3dd45743e5ff3a115820c8a9c2f72617fba0146aae6a6ea1d31a14ad321e0d8a994fb8e614dbc SHA512 9e9b6211dc700c83eeb76599425016e4cee0c8248196b5a5d77920733606975f95d44c7d739c65b235bfae818f8fb229a5cbf305d38325e946d400849000b695
@@ -42,4 +43,5 @@ EBUILD netbeans-harness-9999_p20180131.ebuild 3805 BLAKE2B f4e235856073012f672f4
 EBUILD netbeans-harness-9999_p20180201.ebuild 3805 BLAKE2B abef6f6a143d26325050eb37bd0103051892dd7c7097fbb7c47a7bb442c317c39538c5a623b45a5523ffff5287252ed9b3396bf2389369ecad55428040fb2425 SHA512 e16e964c43c7ea2f5f9c9a10f5afddadd7d1c4ca9e9f694e3a65c0013f88f31d548aa6c2337d3d06d6a8204b18e64e18c6e8c22cd311237451124ea72149e395
 EBUILD netbeans-harness-9999_p20180202.ebuild 3805 BLAKE2B 07c5c6174fbdebf585168191d469ff8c4d4625a58b0e06e9b5c3ad3a51e9b43a9b039617fe7db3d5d6f11d52b8dc045d7b369e4a08db75a4853f49c1071f2114 SHA512 19dc0d4bf4ec0e1a436b8dbc14832ca704f8f9ec8acf45ae1ec8cb47068e6cee8d52fd5178ad3d5edbc707ad41a1ceba2e16a036be7c1f214b1c73aa6a975e74
 EBUILD netbeans-harness-9999_p20180205.ebuild 3805 BLAKE2B 54e35712f6f5a5762d8ca5cd1bb81de7be012b43dd4fe78dd97bb9b6a3bb0e0c6869a5196ebff1e7d917b832a1198f16130a4504a5b62603a346cf3b7835ed42 SHA512 757013e4ff28cfc467cd8fa21731cf715b027b4d43b52799fadf1c9f57709ba9d01f3290076eaef9eea306882eda91eca05f33be6bab1672f977482cd0bb3d9e
+EBUILD netbeans-harness-9999_p20180206.ebuild 3805 BLAKE2B 7e80ac393f24e5425689c6c2fc2589f7ae23a624facd4dd0bcce79121b1cc6c508cf5eddf79233adef541414a08aca04e999ef4322fb8fe3b50579bf251dd0de SHA512 59314689520856a655ea8851899967863be3277547b34f419817e9403e141e34e852806cf319987d6186e52f3d8d22bed9eea2e988d12f2dc3e3bb4ff32a5e87
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20180206.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20180206.ebuild
new file mode 100644
index 000000000..351d5b91c
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20180206.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Harness"
+HOMEPAGE="https://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	dev-java/javahelp:0"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=dev-java/junit-4.4:4"
+RDEPEND="${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-r21-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 424332948..b303ebcae 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -90,6 +90,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-ide-9999_p20180105.ebuild 29596 BLAKE2B 1c1ecd41a6209b0dfbd2988b418f280ef04eaa198bc1132074b63e095d7326c3b35a465136db4278b24c7ea4c9823f6c2f50f2e8f7854547b5e3283845f00883 SHA512 615ce4ce11d6d11e2c0756731c51e9456ef9345e07157677c9fd72efb22267824a824ac7442f94c7358f10d3b778491abfc03bea4514c895e68facb9443883bf
 EBUILD netbeans-ide-9999_p20180108.ebuild 29593 BLAKE2B 0e05303b2fd3b97c1907c45932ca0633b257fbb5f13e7e620230909d9e72ae41507af48a236a0f4a96e192e451770f65e191a916a386b660d8ff192ded9e1b3d SHA512 162a3b010e24dfabf6a2bcb3aa0ff14f6298585b2c1ebf14d3c3fff83a274caaf2b0d9de25f95b40658c98587f507c21d690f7e6445e4895686e0db3c85f5912
 EBUILD netbeans-ide-9999_p20180109.ebuild 29593 BLAKE2B 40501401113022148cf1327452c81999fffe721236d4ea222c4a7a751bf6dcc5a0d823eff02e147749e34efcab53db1d0c4a3e2f2aefc9af4865ef55702e0c80 SHA512 8276b249b5344a51e87e285f64f13ef6b21427541a47e525544beb2f7e13baa8b3984c9621ef0febd0db3983b747587861802c57a372791cdb39cc3ac2be86a3
@@ -109,4 +110,5 @@ EBUILD netbeans-ide-9999_p20180131.ebuild 29593 BLAKE2B 79edb410fd960c8e8a76bf82
 EBUILD netbeans-ide-9999_p20180201.ebuild 29593 BLAKE2B 0965d850de75be6237810945d8ac2f4873679096ccd41a1815dcb3f3646b508934c8ce5cdf763ba9d2e0e28820d3574f0ec4f094b0da13f7aff91ff56e03cf73 SHA512 fbaa3d8852ca0b969516a94c11431904440be9c5629f374121ddf7721af4b553af769a3f24430d167255088805ae93d4b5887d6573503cd7e0afc5200054cb35
 EBUILD netbeans-ide-9999_p20180202.ebuild 29593 BLAKE2B 3461e6268a08281912dde2465f6dabd81251fdd6acf194af13d0d0eaeee94e8c7ca68e46a679fe555c661fe51d87b8d4b9ed2e039fe261019c67a9895901f415 SHA512 4cc8354658f9e5762938896b755c39612179d05b8729264cabfa66ec6cd752e9981477b74194895757ae95d2e3d284bd1e26e60fc3216c2e2142b08688e632e5
 EBUILD netbeans-ide-9999_p20180205.ebuild 29593 BLAKE2B 43f893881dd2386504ce03e3e12ff7a18dd1a3c9940d3604dcba79e1be801270c09bcbc3a4d4ddeb1cdf044c26cf56b56a85b6b16079ed3e3c7fd391525c659a SHA512 49ee26e461c96d3981b9409d5caa9e1b08695a1890b10b2dde903fc9eac12dad6b0c608753012b8b70cbffa1192d4230aaf60ce477dd781def5bdb27fbe3b70b
+EBUILD netbeans-ide-9999_p20180206.ebuild 29593 BLAKE2B 2c50afeb5669ff9ce2ec3099c99f784539ad88103098cd8aaa1875a65692804ec03386546833470e7197d73562370964992c045cae66b43ed472fbe92d7c7baf SHA512 1944ea1256acedd3224ea00e56dc74651c6456c283379e71a4097a00123201cd49745f1f38a96126b35a0c3da936aebb778e2d0650f3f62a619506fb9af09167
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20180206.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20180206.ebuild
new file mode 100644
index 000000000..daa9bfddf
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20180206.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="https://netbeans.org/projects/ide"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	https://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	https://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	https://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	https://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	https://hg.netbeans.org/binaries/B71DE00508DCB078D2B24B5FA7E538636DE9B3DA-commons-net-3.6.jar
+	https://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	https://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	https://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	https://hg.netbeans.org/binaries/AD56136EB86DE2425C09134285FDAB458E6F6269-exechlp-1.0.zip
+	https://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	https://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	https://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	https://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	https://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	https://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	https://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	https://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	https://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	https://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	https://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	https://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	https://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	https://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	https://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	https://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	https://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	https://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	https://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	https://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	https://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	https://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	https://hg.netbeans.org/binaries/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar
+	https://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	https://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	https://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	https://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	https://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	https://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	https://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	https://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	https://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	https://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	https://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	https://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	https://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	https://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	https://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	https://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	https://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	https://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	https://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	https://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	https://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	https://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	https://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	https://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	https://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	https://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	https://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	https://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	https://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-platform-${PV}
+	dev-java/antlr:4
+	dev-java/commons-compress:0
+	dev-java/commons-httpclient:3
+	dev-java/commons-logging:0
+	dev-java/icu4j:55
+	dev-java/iso-relax:0
+	dev-java/jdbc-mysql:0
+	dev-java/jdbc-postgresql:0
+	dev-java/jsch:0
+	>=dev-java/json-simple-1.1:0
+	dev-java/jsr173:0
+	dev-java/jvyamlb:0
+	dev-java/log4j:0
+	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="${CDEPEND}
+	app-arch/unzip
+	dev-java/commons-codec:0
+	dev-java/javacc:0
+	dev-java/javahelp:0
+	dev-java/jna:4"
+RDEPEND="${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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+	ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+	ln -s "${DISTDIR}"/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar || die
+	ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+	ln -s "${DISTDIR}"/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar o.apache.commons.lang/external/commons-lang-2.6.jar || die
+	ln -s "${DISTDIR}"/B71DE00508DCB078D2B24B5FA7E538636DE9B3DA-commons-net-3.6.jar libs.commons_net/external/commons-net-3.6.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}"/AD56136EB86DE2425C09134285FDAB458E6F6269-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+	ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+	ln -s "${DISTDIR}"/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar c.google.guava/external/guava-15.0.jar || die
+	ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+	ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+	ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+	ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+	ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+	ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+	ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+	ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+	ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+	ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+	ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+	ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+	ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+	ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+	ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+	ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+	ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+	ln -s "${DISTDIR}"/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar c.jcraft.jzlib/external/jzlib-1.0.7.jar || die
+	ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+	ln -s "${DISTDIR}"/90FF0731FAFB05C01FEE4F2247140D56E9C30A3B-lucene-core-3.5.0.jar libs.lucene/external/lucene-core-3.5.0.jar || die
+	ln -s "${DISTDIR}"/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+	ln -s "${DISTDIR}"/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+	ln -s "${DISTDIR}"/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+	ln -s "${DISTDIR}"/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+	ln -s "${DISTDIR}"/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+	ln -s "${DISTDIR}"/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+	ln -s "${DISTDIR}"/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+	ln -s "${DISTDIR}"/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+	ln -s "${DISTDIR}"/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+	ln -s "${DISTDIR}"/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+	ln -s "${DISTDIR}"/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+	ln -s "${DISTDIR}"/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar || die
+	ln -s "${DISTDIR}"/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar || die
+	ln -s "${DISTDIR}"/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar || die
+	ln -s "${DISTDIR}"/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar || die
+	ln -s "${DISTDIR}"/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.markdown.core/external/org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar || die
+	ln -s "${DISTDIR}"/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar || die
+	ln -s "${DISTDIR}"/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar extexecution.process/external/processtreekiller-1.0.7.jar || die
+	ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+	ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+	ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+	ln -s "${DISTDIR}"/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.12.jar || die
+	ln -s "${DISTDIR}"/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.12.jar || die
+	ln -s "${DISTDIR}"/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12.jar || die
+	ln -s "${DISTDIR}"/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.9.3.jar || die
+	ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+	ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+	ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+	ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+	ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+	ln -s "${DISTDIR}"/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar html.validation/external/validator.jar || die
+	ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+	ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+	ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+	ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	einfo "Symlinking external libraries..."
+	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.54.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+	java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	java-pkg_jar-from --into html.validation/external iso-relax iso-relax.jar isorelax.jar
+	java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+	java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+	java-pkg_jar-from --into libs.antlr4.runtime/external antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	java-pkg_jar-from --into libs.commons_compress/external commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.4.0.jar
+	java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+	java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	java-pkg_jar-from --into libs.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 sun-jaf.jar activation.jar
+	java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+	einfo "Linking in other clusters..."
+	mkdir "${S}"/nbbuild/netbeans || die
+	pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.platform.built
+
+	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+	touch nb.cluster.harness.built
+
+	popd >/dev/null || die
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	unset DISPLAY
+	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+	pushd nbbuild/netbeans/ide >/dev/null || die
+
+	insinto ${INSTALL_DIR}
+
+	grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+	doins -r *
+	rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+	rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+	insinto ${INSTALL_DIR}/bin/nativeexecution
+	doins bin/nativeexecution/*
+
+	pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+	for file in *.sh ; do
+		fperms 755 ${file}
+	done
+	popd >/dev/null || die
+
+	if use x86 ; then
+		doins -r bin/nativeexecution/Linux-x86
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	elif use amd64 ; then
+		doins -r bin/nativeexecution/Linux-x86_64
+		pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+		for file in * ; do
+			fperms 755 ${file}
+		done
+		popd >/dev/null || die
+	fi
+
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules
+	pushd "${instdir}" >/dev/null || die
+	rm com-jcraft-jsch.jar && java-pkg_jar-from --into "${instdir}" jsch jsch.jar com-jcraft-jsch.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext
+	pushd "${instdir}" >/dev/null || die
+	rm antlr-runtime-4.5.3.jar && java-pkg_jar-from --into "${instdir}" antlr-4 antlr-runtime.jar antlr-runtime-4.5.3.jar
+	rm commons-compress-1.8.1.jar && java-pkg_jar-from --into "${instdir}" commons-compress commons-compress.jar commons-compress-1.8.1.jar
+	# rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+	rm icu4j-4_4_2.jar && java-pkg_jar-from --into "${instdir}" icu4j-55 icu4j.jar icu4j-4_4_2.jar
+	rm isorelax.jar && java-pkg_jar-from --into "${instdir}" iso-relax iso-relax.jar isorelax.jar
+	rm json-simple-1.1.1.jar && java-pkg_jar-from --into "${instdir}" json-simple json-simple.jar json-simple-1.1.1.jar
+	rm jvyamlb-0.2.7.jar && java-pkg_jar-from --into "${instdir}" jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+	rm log4j-1.2.15.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.15.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf sun-jaf.jar 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 8b5d7f11e..a7a244d33 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -43,6 +43,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-java-9999_p20180105.ebuild 15702 BLAKE2B 2419da6d286074819895cdcdf025a86d0f259c645841c7ff013ebe2a732ad9ac05c3d052929c83e048e0f9a98278cbb0342add88dabb5d5f0fcb95b275375b32 SHA512 c3784af5e0cc1404f97a73031c25c2b8df47ccd7d4e1b3ea42bcf00e4d55bb98f07766ade534ab99b28c999c468b8bfacf9ae3f3154b0e248b280afeb2ca1150
 EBUILD netbeans-java-9999_p20180108.ebuild 15702 BLAKE2B c91d42f761a202e88e17dcfb5edc1a8786c81bea4511bf6c0ec7c79ee594536d253dce4a7b1ddf1b1a023c669b06ad0c52ffebd1793ab0b9f47616220c604b47 SHA512 011b25fc0e6a5ada2ffadcf52578d6f703a081493db579054777768886114380c7437b676f031263889f65663db0e79f3a77b85bd3af28d3db6b9fd9e218572d
 EBUILD netbeans-java-9999_p20180109.ebuild 15702 BLAKE2B a1f76675955a3b43b96ba9cb677687c412e4b94ec79188ae4c34048c9d9809a6c0bda962397ad534512eb27e0debdd274a8b9159c786be1dc344585c90e9b948 SHA512 90c93eb70fa2cd0da13d3e804e309cf0b21f7535b7e299c1a9f6cf2f1efc7866cfaa84f0b63ed07c7b3d881572971b53745862f6cbce63b195ba94d9bf5a7533
@@ -62,4 +63,5 @@ EBUILD netbeans-java-9999_p20180131.ebuild 15702 BLAKE2B 22738c6cea2c000b2e881b1
 EBUILD netbeans-java-9999_p20180201.ebuild 15702 BLAKE2B 4737a31ed8929183b94e1f4cd64f2268d31e5684135f39cc609a1852883d7937c4cdd5c04b296c2fc14f7d75802423b662ab3638c0cf703a914beacbdec01a8c SHA512 36fe4569ae659a0ac0f62ea1c19524e38c974b6e261f850db85e5aaa234ba0517e52aaa2b1a15ee5f25cfeda8a4254c57f39672447eebcef4f4472f359a6b071
 EBUILD netbeans-java-9999_p20180202.ebuild 15702 BLAKE2B ca8be378935386cbd7157d3645be3a7f66e0f687e1a5fbf2a7d34457b5ccef699e5ee6b715f946869a61c9a4aa2ee46f18fe90ee8824dc7585ba4c6d6dc9d23d SHA512 bb06b6b1ca48799e46cb75a7628e07fe8a9c6c304df8c281dc86e8f601408e242eb4b4f2dcddc4f1c8b59a19e39d262cf894543b1b5754fa56fb231c5637095d
 EBUILD netbeans-java-9999_p20180205.ebuild 15702 BLAKE2B 7e0992fc6dcb2fd8cb442a474d2d3bdd1f0f994ba46fd130aaf2eb126add570926a7458836cd62a89062462785cf1a2fa6155c31f19728ec0ff1a460ba8a2cf9 SHA512 2a5e5b4d8ad2d739f3433d8587e957d3bb47004152d28c7eb8e6cced6ef48c0789fec7c5faf0f970bc11945b05adb76f4c610f34207bebf3468144c5ae40df19
+EBUILD netbeans-java-9999_p20180206.ebuild 15702 BLAKE2B f0a27a061ea105f6ad0a8e93ccac5e701155e011f1367004a8a4602e11542f83d0c119eea6849735089adb923e2e9097e6866beee345acbac9a74e61e3ac7fe6 SHA512 50091a36a1b748ab1c0a81fd5bfbf9b384ba1935a2685afa91d0e95f4ba1a2678347a82248e90d74e2450f3eb530d4124b1585f6dc9884948a8dd5d39154cd9e
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20180206.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20180206.ebuild
new file mode 100644
index 000000000..1ae42abf6
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20180206.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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="https://netbeans.org/projects/java"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+# jarjar-1.4 contains also asm libraries
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar
+	https://hg.netbeans.org/binaries/2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F-apache-maven-3.3.9-bin.zip
+	https://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	https://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	https://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	https://hg.netbeans.org/binaries/627EC612B8D50EE42C2D0F13DF5476E26D696634-indexer-core-6.0-SNAPSHOT-patched.jar
+	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	https://hg.netbeans.org/binaries/479C1E06DB31C432330183F5CAE684163F186146-javax.annotation-api-1.2.jar
+	https://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	https://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	https://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	https://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	https://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	https://hg.netbeans.org/binaries/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar
+	https://hg.netbeans.org/binaries/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar
+	https://hg.netbeans.org/binaries/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar
+	https://hg.netbeans.org/binaries/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar
+	https://hg.netbeans.org/binaries/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar
+	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	https://hg.netbeans.org/binaries/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar
+	https://hg.netbeans.org/binaries/BB17923713699B721CDB3BDBBAE863D8C8B291E3-nb-javac-impl.jar
+	https://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	https://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~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="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/json-simple:0
+	dev-java/junit:4"
+RDEPEND="${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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar maven/external/aether-api-1.13.1.jar || die
+	ln -s "${DISTDIR}"/2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F-apache-maven-3.3.9-bin.zip maven.embedder/external/apache-maven-3.3.9-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}"/627EC612B8D50EE42C2D0F13DF5476E26D696634-indexer-core-6.0-SNAPSHOT-patched.jar maven.indexer/external/indexer-core-6.0-SNAPSHOT-patched.jar || die
+	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
+	ln -s "${DISTDIR}"/479C1E06DB31C432330183F5CAE684163F186146-javax.annotation-api-1.2.jar maven.indexer/external/javax.annotation-api-1.2.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}"/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar libs.jshell.compile/external/jshell.jar || die
+	ln -s "${DISTDIR}"/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar maven.indexer/external/lucene-analyzers-common-5.5.3.jar || die
+	ln -s "${DISTDIR}"/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar maven.indexer/external/lucene-core-5.5.3.jar || die
+	ln -s "${DISTDIR}"/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar maven.indexer/external/lucene-highlighter-5.5.3.jar || die
+	ln -s "${DISTDIR}"/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar maven.indexer/external/lucene-queryparser-5.5.3.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}"/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
+	ln -s "${DISTDIR}"/BB17923713699B721CDB3BDBBAE863D8C8B291E3-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
+	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
+	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
+	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
+	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
+	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
+	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
+	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
+	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 glassfish-transaction-api.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 ffd5ea7e6..f94d8cd53 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-javacard-9999_p20180105.ebuild 4648 BLAKE2B 573bf2a046c73a194b6b5d76e4c9a3040587203a45efa6de5291abfec544a32757e3cb9d05e6e271246974a0553083cda2a685b20bd5c40ee1a2fb7526280482 SHA512 c904e1afc8cc36b02ccb8144ac1cff8aab6b0cb287d2a8f61d9df0315d9e973d3753839070e639787d0df69b7a87401ff7da480f00a8c3a5419cbbd04e0a6985
 EBUILD netbeans-javacard-9999_p20180108.ebuild 4648 BLAKE2B dfe2e96721c6a0d82c654c0a4789e1bb3ec925790a7fcc1bd07788eb90a47f823c0748fa5811290f084f5b24a12334aea8647f5b09ab55d14fe536343b73738f SHA512 9ada14a1e976f9607e1b038a26aeb4d2a5355b54296fdbe795d0ab11dab20cab4df200a5469448e6f53331f0f82a94d20c0919040feb6b290910a079634b1982
 EBUILD netbeans-javacard-9999_p20180109.ebuild 4648 BLAKE2B bad2e4953bf8df318f14b9e5c75f78a3eaf656c18d1fc19a3b4ddbec743990f199b0d0b1c8f99239b5de761f1b63904d830b63b5580d0fd2ef20b253f2fb9a0a SHA512 1544899d282d1adce4e46c26be56108142f98149ba5acca5478a8f9e3b553da4f015d28cf221f81ffce23e2e1d1c5fd6bb14548177aa481da2a38083df459c48
@@ -40,4 +41,5 @@ EBUILD netbeans-javacard-9999_p20180131.ebuild 4648 BLAKE2B 0d6f0286d7ce837da872
 EBUILD netbeans-javacard-9999_p20180201.ebuild 4648 BLAKE2B 3170d21017c55066210eab0ee128bb8a691b8172470918c25606eceebee17ab583717f8492a15da3458b98772710fbcfa76eb92bfe0c55dc60eeb69bbf9e0026 SHA512 6d76eaf78a89344a1c9081e58bd2e567a5d30f9481cc21119ff1744c50d7b8969b4b8a7a1d2c85b4cd69a2421e7020cbc3460767314af0bb9dd4c40830c70160
 EBUILD netbeans-javacard-9999_p20180202.ebuild 4648 BLAKE2B 5480a99daf6c2c8535dd7755ae6a73b3b7b35c3f9bfb88bae7bda2da8d5bbcc635ea90ecfe7d88a4c29df3851ce77ed488a9c116ddbcf26a9b6bca59a4165d4e SHA512 6fb88e2e5025cf6e2cc23a93291ee8887d97c10c082c6fca0151c9d575c451a1ba1ba152d270a6f032d98bb6f57700e92703350f06b92a8261ee147ee93bf705
 EBUILD netbeans-javacard-9999_p20180205.ebuild 4648 BLAKE2B 056f7ce9d09cc41a158cd8d3df4c53f7b03f08effb77d412ed9b068dffc2910d04e266725db437ef914680a0b9300677c7e0c1983d487cee56f66a69da68d368 SHA512 11db30a0bf6d1d7ccbc2e169d6a57b54aa8a7e13a383d4f2878837d2fc244010cf0ec719d4ed30ab6ee08914ae08f9596dd58a0378f1b138fe9a4942dac4e6c1
+EBUILD netbeans-javacard-9999_p20180206.ebuild 4648 BLAKE2B 80515e476b6743565138099ccfd0e759d1827b65c1f53ebe7cd5d8adb9e9def6a5bbcc51922b33d0b1855f33ff211a3eebfcfcd6305041d62dad71e849499788 SHA512 0d1302fc3314dfec96da23685b3a0e7774983968301d4bd5886ab2f44737ec32fa3079571615e39b6813bcc4ba738670763738688e92cf8996e997ac9e8847ad
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180206.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180206.ebuild
new file mode 100644
index 000000000..82f0ba93f
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180206.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaCard Cluster"
+HOMEPAGE="https://netbeans.org/projects/javacard"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	https://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	https://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 267ccd510..c0e55c0bc 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-javadoc-9999_p20180105.ebuild 5992 BLAKE2B a015e7fb453abc9c751de04ecfb13297c7dfe1b8847a9c4681914ed3543669721c0f079872e63399b30e30a8a5fa9328bfc98f7c1926a40b24a3604bf288b41f SHA512 e546c762a11ec0a1f3ec56a22248fba6e95f2f6a81ffb682ace9f0d97905532eadf0ddbc58b61d35ea3334d1dc130530a4de67458896105f22a97907d9ef1a10
 EBUILD netbeans-javadoc-9999_p20180108.ebuild 5992 BLAKE2B dd13b03f1c5e799029fce1e14c8de105aa806196982591926bbaa54d788e7a82181ec752f23279e75ebd628765b7a04095f64288c90cf22ba8d57d339238d221 SHA512 81d8dbd54d668a0d1689c42c174454f8220ef388b43df2ddc3de9dac7c5e8b3a91946b2b393c7de4d6f9c9b9e576489d3d68ba402add4af3bc3dcc3f65674508
 EBUILD netbeans-javadoc-9999_p20180109.ebuild 5992 BLAKE2B 442e4dc22678ed0d4947fad7e1993d278721daab3c78d5d05a9869e87b822f81d6913615055115410b569a889550cb51f456945c4f67bd406b30abce3b620609 SHA512 3003b05395f90a9c835658ae3007d3c34a4bf73978cdcae56a309e0118b073b8d7fc6993f733bdad518fb2709d67b53414364db4726804742f7b6a97c863c235
@@ -38,4 +39,5 @@ EBUILD netbeans-javadoc-9999_p20180131.ebuild 5992 BLAKE2B bacdb3005b18537fa9aa5
 EBUILD netbeans-javadoc-9999_p20180201.ebuild 5992 BLAKE2B 1cc5507178ea9fcdc07fb55415fa8d36a0dd583849c4ce8057a8386637d11a4d857a1333a6f2c9b2461918c3f0feeed0cc22020b164bc85dd2548aa4f2e74b63 SHA512 8b803657997b6785af5b63e96e335956a964c0c3e9f1e771ed07367381aa0e305c8fb825c772c1716c1d67d018536b2fe0f7c0dea09ae8d20c7a19d3c3e39d7e
 EBUILD netbeans-javadoc-9999_p20180202.ebuild 5992 BLAKE2B d06288ac00203a39f0c61ae4cf97eba414a9e69e78401b7779363f3f619442b1abd79b6555fb6ebea9133db5a6c65111d488f942dec493c6924d77c7d647c4da SHA512 84a39c0b86e31341409dca9b108d88c7c9dc8c043ed167fa4b08f9d0cb913445e9699720f1af10056e254512d9f900f3313fafb13e39cb197a52d450d63f5d03
 EBUILD netbeans-javadoc-9999_p20180205.ebuild 5992 BLAKE2B 7600516ea0fbf682da336e6f87a7043c3989701a72fca9f543e22ab9817bf04e0753e1d03535a6e8d15abd593d3a51a1644d63738ece4b7d59191467562a3b04 SHA512 eb9a470fc143104d35d7e84679b4b980c71c6f371b4ca6a3e1f9d1fa07661a527d8cd30424d3350a4b6ab6cb73dffc380b741277ab4ceb47fa4e7ce3532d320c
+EBUILD netbeans-javadoc-9999_p20180206.ebuild 5992 BLAKE2B 028bc3f8adef957ff0fd7fa28214adefafbf6d3255d0fb8364c6060720b7a4a6e55b5aa34a7de018017f4aa291f5b0f7c9ef390c7fb18b0262b7a36cf6edf6ed SHA512 73f59af63b907c5012371af3d6774fe04cb6a22fc235f996cabd55a794922107353aee77a392d461eff81d11bce9edaca8ddff738638350ce4abe574567ae47e
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180206.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180206.ebuild
new file mode 100644
index 000000000..dd10e468e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180206.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaDocs"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 2c5e55290..1f2eb6e5c 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-javafx-9999_p20180105.ebuild 4397 BLAKE2B 7908c9a2239a1091e94f11692370d2c65bc30399f8249196ec8bbd30195dff63a6e0bfa6ce4c8e63893c81a76ffe5f11a2573441dd6a1d224d8e29814e4b64ba SHA512 cdacc4172954072e5fcf2399a6346f9e2f834cdf24d7d46d5817d906541bd87acd986b9737e695d6cee4faadfe2acd9b2a60846fc10f8d6ec19b63650e24f84c
 EBUILD netbeans-javafx-9999_p20180108.ebuild 4397 BLAKE2B bbf49d5f56de9c4a7fae8439c4a75a4bf30b2942a60ace8392f0a4f1fc3481d174055aa543c121f73214b17555e6034da77fd4e8289d3e7976f84e38fb50fbf2 SHA512 520bd4713b1d167563165eb89d728894f71005610f4ba989f03be1d5a2ac19c12b177e1a7bc07deea9105c83ab3b00ef955e6119c0c6484842117a96a5f9c6e0
 EBUILD netbeans-javafx-9999_p20180109.ebuild 4397 BLAKE2B abc50085ad74a981c50166952d7654bc610d59b913e053bf555991a5519c08198c40b078e1aa1558ead2593419b67fc72dd8a882361cc670c4f8d707ae0983fd SHA512 335a85e0b0457ea6a71de1b8555ce028ba56468dadab393ac0ed48eb8469c7f959e340bef5dccb5fcff1746b572c3fa2750130be100be809349013210e70a112
@@ -43,4 +44,5 @@ EBUILD netbeans-javafx-9999_p20180131.ebuild 4397 BLAKE2B e457b95d2df0a5a4107766
 EBUILD netbeans-javafx-9999_p20180201.ebuild 4397 BLAKE2B c17bb47664e9713c2258c899e22bc186e7505324e3b70e0720eaaeac8c9737c79932246ae00d2944bf44e25f563313d2f6d0ed1acda761ed3c74284e82b6d059 SHA512 4616047173230d368291bd3f3f299fdb1187ac13e99f069762472ec95e52f9387f1d6c02256906ef97a6683555e2d7bc6aee623923bac27a3fd84bdd38eeba54
 EBUILD netbeans-javafx-9999_p20180202.ebuild 4397 BLAKE2B b8a8be61f90df14e24b635f7b041cf204fbdcae2cab00ce4d8fbfa6fb170f4624b819d0369cd4534e8d62734d92347eb11bd39ef25369d1f857c3e4ba23f8475 SHA512 a012866bd66242fcc44adaf4b32351610aef5f8c223c6d08b51210b2e4b43c71f9840baf9a6d39c4df65932fc9116e8106ac1591da6e45ec758bd82f3d7613a6
 EBUILD netbeans-javafx-9999_p20180205.ebuild 4397 BLAKE2B 8e8530732e635ca1dd8645fe3307d8e29d26c3cdd2ad57800b3826f1c1b1a8e7c52ee53c94b5054e10cf06c3443fc049db5d26f044ba7f62f44dc48a3af9217a SHA512 2c906f6084ff8dbed5dcc64dbd9eed7d2da45d80658da05a1b4cc99e14468d31800e837f3c8d17f649dae9a3c815e4bf8387498a0f315bc88402daaead17ab02
+EBUILD netbeans-javafx-9999_p20180206.ebuild 4397 BLAKE2B dc13bff26e5741ebbaf87dbde253f9419e5d862967e33533d4336de3f8397554a64660e8357195e10a03a708fe2d31ded714ecfc88e4780a56f086380fee7af2 SHA512 1f912e3d5299962483eb7b485d9338afca5a5da78aecfaf24361b5c5bc53782a0c86a2e6ddfa740eb24d3e8d72691ff9bf109af7bdc2b5d1979527e90962eaef
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180206.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180206.ebuild
new file mode 100644
index 000000000..4292e0dee
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180206.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans JavaFX Cluster"
+HOMEPAGE="https://netbeans.org/projects/javafx"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	https://hg.netbeans.org/binaries/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/junit:4"
+RDEPEND="${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-r21-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}"/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 004ad715d..637a7c7b7 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-mobility-9999_p20180105.ebuild 4086 BLAKE2B c7417e9da017f466ea3758dfd7a20ac25ec5738b521b446f7bbed8ea358477540e5851b4628c0af0f5c13bfe2c8a2c7d2115047cabba1f658c91a6e8d69e7b41 SHA512 4238665048aff0bee7c8eb7023a9f144919aeb5d069e3d1aa2cdba9e7f13901650da51c3cb8cfbb6509fdeec14d23364c6e7989e3990fd83d3b00543105003c5
 EBUILD netbeans-mobility-9999_p20180108.ebuild 4086 BLAKE2B ceece1a6a142ed42ff9c840e7feeb28350250a5e7a54a0b615a66d51316c1964405a3c390c1a72342a8af09f3d4239de9b41445d973106c26758faa7a75eff0b SHA512 cb20ad6e61b2bbf23862cde16534886ef5e1cb93eb7119bc52981cd0359b58dbb3e857b305eed0f566dcee3b209307485ed265f78ec169934d19a655177657a5
 EBUILD netbeans-mobility-9999_p20180109.ebuild 4086 BLAKE2B 570eee8da960a7fda1f989047bf3e596cd00ccfb128a6ed356416962f8b9a993c8f82a2b4da06f3ae20b220b27777c9356bf9b7b57f424967117168010ee552e SHA512 be1eeb78b0c832cefe4190ac67c864001b047acfe8a47034e3b547efec54aca80f2b937b7f20f2d5c5f07b8cffaf67b18a4cdb6fb479ed0351f6c3483af1c863
@@ -37,4 +38,5 @@ EBUILD netbeans-mobility-9999_p20180131.ebuild 4086 BLAKE2B 6e409fed647e3b7053fe
 EBUILD netbeans-mobility-9999_p20180201.ebuild 4086 BLAKE2B e983f54fc6e63868809c83c6aa5db04601baef8d2b0a651ef22790351772fd9a3a4f7a436e0ff16a1e10306eb739cd7ca18520a7a9e4ef090c49e3d5d4d10cb5 SHA512 60dcce094dae21a38fec010f2119c9be731ac22f094a63e99eda049dd9458f058f397e79d7c9ed626471d7acb5f45bc4e231616fc579f70b1f5a45354969867c
 EBUILD netbeans-mobility-9999_p20180202.ebuild 4086 BLAKE2B 7464ee03431fa64179993ed317efbe792c70704b254b12ad1c5d863937b9313d35ea7124689efe481716df9def5439ae3932c51fc189ae4fbb27603b1ac561f9 SHA512 537dafe2d4d525c7b0fcf930cafc5fd171ae0c44aa7de73d8093b86316359c68f146ba5b036311436e9b6c2712a2eb0c9aacd3402df7bb82ee6ca912efe6fe48
 EBUILD netbeans-mobility-9999_p20180205.ebuild 4086 BLAKE2B 43a5494bc671b8b07ec1e18d702dcd9fce654e493d5022b0b707a85a1cd4d9740fcf07efd0c73a4a632ec081550241ffd555ad767a2f81cc3ec876ed9437f6be SHA512 cc3373f326f6bba7a0bb01f733d914ff7b564ee23eef542d0764f251c75e4a7cfaca47a91ce1fa0cf500a534a37a3ac71b3d68231c2b01568e8b1baf0b44033f
+EBUILD netbeans-mobility-9999_p20180206.ebuild 4086 BLAKE2B 53680de862c1144f3f93749fb0858a2a72f3ea6c286f287fd301c30f7f31ac36b6846ae3bf4315165b8deafa0a9b020787714d484f804d3c6412fd2882299bdd SHA512 7d617eee1398a0a025a944590fffcb8a31e885995770cf855e2744f544155f5738362d9d2d5cad7825cd01ba5ae2b2d16514bf8c3d5e918df27bd6792b9395fb
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180206.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180206.ebuild
new file mode 100644
index 000000000..bddb5bbc0
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180206.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Mobility Cluster"
+HOMEPAGE="https://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~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="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 021d904a9..fe96c4a8b 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-nb-9999_p20180105.ebuild 3786 BLAKE2B 1730414f857c29ea97a865f626dd027651a7642d1f8837e61b75fe55f861c615c57ec85e96140a1b9add0d766cdf87bd8b2917800f9a217a32a04fd448ae3ca8 SHA512 21fd4dfa1b8fbe2f7e1befd34fcbaf09b2dfa2e0cef2f892d469b0fcc38eab4c74edc33155e2d30fcb1ee5d4b771193277144d51db36fce08d11c201f0a0dfe3
 EBUILD netbeans-nb-9999_p20180108.ebuild 3786 BLAKE2B f20ec013c180b84d290ad18471f839a8032f3f9710065084be08db9895bba17037b34380a2d8ecd29a7b99e1deceeae67e01396514e0f757cb3136ec05c74565 SHA512 62748051f10614f6ba8e1a8b4f8aab739f67e1e3a5f08dfe6d9b9f8727e73bcb919c8cb7b6dc517ecaafade88beeb4d2ae4a46571a5e13549427b2f30816d481
 EBUILD netbeans-nb-9999_p20180109.ebuild 3786 BLAKE2B ccf1c9986b7a97b8cbbd3cb949a4bd38c7e55db6de228116c69fb285e748f63dbcf0ec3c09d7c0b3d9a7ab76d9b59b5f6f1eb088a2d78abd93856054bf3de633 SHA512 79836f95786736f39496038ff7a7c545475bb6698707193f2437c57d40fd0d19ddc622a5ac8b43c3b9380b9d6644fccc716a8f55abb05b8146c876ad02d8a401
@@ -40,4 +41,5 @@ EBUILD netbeans-nb-9999_p20180131.ebuild 3786 BLAKE2B d10429c175dd9a7711fed0d03c
 EBUILD netbeans-nb-9999_p20180201.ebuild 3786 BLAKE2B 2a437000415f5ec51c7164bee91a3fea4406acf08a848e4c6987a2ac9f8a73140d9213b314afcf70fd35d122677c623234633de2fb43d710852eb915d8b955b3 SHA512 13e248b4831e7c3b7415153a55533a558f7203c52c616706b30f2c5e867921521b7dccfe5682c1ba9385cd6fcecf0e823b0988c7cadea3e9ba3a7b81c0eb9078
 EBUILD netbeans-nb-9999_p20180202.ebuild 3786 BLAKE2B a152f194f98f93cb60f8b27b1258dfc92d0675f2d2a0e87cb621cfcd83d40842025f1916eb22f315bcb628593e7fbb85c25a925ef7950a9558cce076a3ac9a37 SHA512 507e8e69fc8d9d202a5c711e2f100c8ed42a1a439d8343cd9fe0e40ce77cb94fc1321542741830eb76265813610441340683d03171d1f2daacca9aea75045813
 EBUILD netbeans-nb-9999_p20180205.ebuild 3786 BLAKE2B 0d72f8a2505a4b9f9af5345f85c60d2bce07d28041111f1186bd68a326724189885f3448e73150a372fa8f8177b84648f6d988ae9efe7d9cd72795936497e61c SHA512 b3e7971d8e2e3643dcecd13d58bddcc64c2fd79567a89532bfd226155a359ddbe5fb3d7e6408ec2a2cbc574e753fcdf3f3ce60d6f36ac2a06bd89e56d3dde41e
+EBUILD netbeans-nb-9999_p20180206.ebuild 3786 BLAKE2B e05231a2dd1975e6b57c4b855513e77ca75d518a129c24aa206ec8f1799caeca01a8b3fcf90a8ed9554968f23739ab951605f3fe765d311132f29bc9401379f4 SHA512 b9ca50365b29f693dbfb5e2759bd62dd67c6ac112936ef151b0c8431f0b98bdd61d6e99555f1e6a992eed13b237fafe3acbe95f62918b9b1994d35272e949454
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20180206.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20180206.ebuild
new file mode 100644
index 000000000..cadde3b24
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20180206.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Branding"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 fdec03f84..1b083baf3 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -21,6 +21,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-php-9999_p20180105.ebuild 4095 BLAKE2B eab92928c5af0054741ae8f54aa6884e68a28d17687b6c91fcf6e6addce195a88880bf98f82867d4004425fa5421efc95943403951d4f07f45f81dfc4439bbbd SHA512 f758fb6f1de5a38e2bc4578216d4e9c0ddd5e0b79aea1fcaecfbdbc1d0871c16676cc8125d2dea1e0f1e94201f5848c9d8329fc22148cea1eecbafdb801949f9
 EBUILD netbeans-php-9999_p20180108.ebuild 4095 BLAKE2B 38554907fdd2c772135b154b9b4160d9b1b9704a1c39d16949ada5209218f691e939a6613ec05bd39b23c32ac832cc02a42b4e00047c209fcb1088cf629b74bf SHA512 9d1e7ed1abab4a6f5b157149d3a15f85252168d98df459f9ad7cc9fb0a3ef5b1a00b890765b1a841af01d669c30522be5dc0ca05835707d87fd1bd50a5cf539f
 EBUILD netbeans-php-9999_p20180109.ebuild 4095 BLAKE2B 1b6ca99b793629f307cad578040f0f87726d95d831a5946789d660bf5ba29277a195ae592c8efbede60da61d4dce63ffa9a34e0784bc6849ec6b0a71b08bafb7 SHA512 fb3c573aea4652dbaf9d1e926e80341c6a2bc14e3521608a5ad820603cd945d92b0d5294d4f6efa8cad472602d57bb44f15754bf4c2c187caa85357f19b491fa
@@ -40,4 +41,5 @@ EBUILD netbeans-php-9999_p20180131.ebuild 4095 BLAKE2B bace97e222eaf62ac09fe2ef0
 EBUILD netbeans-php-9999_p20180201.ebuild 4095 BLAKE2B 0c648c8b7896f79b37072231b2c0bce259dc9ebf8f32543a4693bccfd69411e08df792f7daa82a66339cfedfd58f5ce1b85209f27aed2ffeb3d84588ce118d1c SHA512 f9d3111f2b75362b1c3dc823d795e3b089a87519b0b1ad679018651acd554a5bfa36a17c34cf3db6d8ae43ea12abf65b376ebe73e71b39765a3c6cf7d4d55ec7
 EBUILD netbeans-php-9999_p20180202.ebuild 4095 BLAKE2B 6a1a930023e84c8d7307c87c1b034ee6ffb925275756e25762aed1a8a74f880177aecbea6870ec862e841973dce6b9b88125c9ce6d8970cff2a0baa2a5a4e27d SHA512 705955aabb17678119ee14f54bd1c5fc8c469ff4096b33e837a14e5aae955782e57e5a7a148ac85e3ada52696f59330ec4f02bc976cf357c0931fcd471c2068e
 EBUILD netbeans-php-9999_p20180205.ebuild 4095 BLAKE2B 10c1bc543e1c3999801f77d8a5164c203f1a099ce56ac36e120c97dc9591491957868b524e24e047344dadaf5ab077d36338247ae10d78b904de17eebc9c206e SHA512 9f47c3e2628e8e4779e3ef576bdc6807918be6fd81a5db45bd15bd041c8096e94381895de220a12e9acf6563368278cf601404226730b9c04a7a5bef4b0a2697
+EBUILD netbeans-php-9999_p20180206.ebuild 4095 BLAKE2B dfff6ba34523254ce2201c952b5aae9de7da64c252581608ef197652698483160b5f81753a98fe6ecb69a15a3b28f34c0278c3c44317b23347662fa0a71f22c0 SHA512 e151749dd3436c0d3d79f934a0c8c637adc1f8b1f037fb74626e61699a939e7f1b7b91251454abf0beb1c72c7e7563ee30b7ea18b827834817d9f0579a486df4
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20180206.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20180206.ebuild
new file mode 100644
index 000000000..5fd5c2c84
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20180206.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans PHP Cluster"
+HOMEPAGE="https://netbeans.org/projects/php"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	https://hg.netbeans.org/binaries/537814919B9074FE0FE2B73579B38F691ED23732-phpsigfiles.zip
+	https://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~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="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-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}"/537814919B9074FE0FE2B73579B38F691ED23732-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-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 0b56ebf6d..eccae4131 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -33,6 +33,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-platform-9999_p20180105.ebuild 9238 BLAKE2B 71a56a6e63375b23cce344a3a17e4562a45de1c45a512fceeb65536ca0edc3e233aa9a9a663c97674eda8c5135833a2e11645c5047a1a55dde2fcfd473131fd7 SHA512 2d4fd2ce9897e732c9cf3cc63c8fc418bc01d1afdb765333b72bb9690d037c82404ffd4f022ac77e41400ad77886622d52a5033ae15704fa69c27902b86411c7
 EBUILD netbeans-platform-9999_p20180108.ebuild 9238 BLAKE2B e19945bd3d9fa474339ebb3af5ae4dd5f35253575f3ba1a6ab5b3730d3c48aeecfa9201a68ed53d386eecd018bda489cae17b34046122144c0352cf9aa6a5357 SHA512 4a331ee311ba4db5ced5e45326234c7b100b27f3ee5a7488bd4695cca7fdaaab1cf482c3860b58d19cd72f0f333fb1215bc68d6689aeff16e4e2eb5d0fb54401
 EBUILD netbeans-platform-9999_p20180109.ebuild 9238 BLAKE2B 527927b182741ef6de562251fc248905baa45e35ff2a0ccf2bc4054bab576c848b6f4ac79207b015c34f64367dce9ccac26793c6573906ae7f3bdf4da8ec5a28 SHA512 bf55d9ddd6e5d9b3e61db656f7a40b9673648c9f2b14b4d34c5c52e4defd860949c9fb3716be6eecb70f4df5137aa4aeb97b38349a1e290135bff59753a9a10c
@@ -52,4 +53,5 @@ EBUILD netbeans-platform-9999_p20180131.ebuild 9238 BLAKE2B fe240b2d0c2fcb26decb
 EBUILD netbeans-platform-9999_p20180201.ebuild 9238 BLAKE2B 2a725375d11810ee5c11cc5832673b51723e74dacbf10114d2dd11eec150f741b5c58d307abd8b9e0e4e6da5cc0f85b02de7d17c0eefef834d9dbc76383e0cb9 SHA512 c5c14c2947659ad6f30ee404e2c460ecaddd7ef621c444747b4f1f09d91263703bd7e5b820f8d1133123a17ca38745109f8c5791b83054dff104c39c9540a3db
 EBUILD netbeans-platform-9999_p20180202.ebuild 9238 BLAKE2B 55cbc1a411759161474dd0a715e5f36d678e3b39de6e031e244c8257c9ca18c3b1c4907ea56eee6e1921e65709b2c729d983b1168d86d977e32d0fe6558ed69d SHA512 f4e18d8e267acb0d52be0c4bc074bbefc4d77e11fffffdde42c3230779a80cbce0e8b9bc34dadc53f713389438c26303cf4c58c4b136581f5e916abefcfcbd83
 EBUILD netbeans-platform-9999_p20180205.ebuild 9238 BLAKE2B 82e638472888c6cbe9014a20e27612357fb9a036cad04d3866bc86def37b8c953048984e7a3d14a36d486a7d85163a7db46512bd5a41be8d6cf68b5b3a516e56 SHA512 6651d1ef4e0be481828e0700917aa79f6774fe394303c6017ac12287e75a1a5568a0d33557a8a7deace6589abe9de046cb501719b85ba92614670338fa849be3
+EBUILD netbeans-platform-9999_p20180206.ebuild 9238 BLAKE2B 3fc57597dc7912bc6b229dc75667920391517ead3cc33cacfb992665f5be5e8fccabc33f3e375edac46fe741c3eb55cde934c9e40c77fc7069c1fbfe192fb6eb SHA512 8ac5c31aaba479f66c5565dffc0bdd2adc0f39d7a4619c1d879393fd0e13a0a03076fee2b224df2b87732f2dafe3682100c7e833e3d9b5ebd4fe917093565a42
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20180206.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20180206.ebuild
new file mode 100644
index 000000000..c4e7166a7
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20180206.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Platform"
+HOMEPAGE="https://netbeans.org/features/platform/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	https://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	https://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	https://hg.netbeans.org/binaries/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar
+	https://hg.netbeans.org/binaries/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar
+	https://hg.netbeans.org/binaries/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar
+	https://hg.netbeans.org/binaries/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar
+	https://hg.netbeans.org/binaries/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar
+	https://hg.netbeans.org/binaries/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar
+	https://hg.netbeans.org/binaries/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar
+	https://hg.netbeans.org/binaries/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar
+	https://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	https://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	https://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	https://hg.netbeans.org/binaries/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
+# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/javahelp:0
+	dev-java/jna:4
+	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="${CDEPEND}
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	app-arch/unzip"
+RDEPEND="${CDEPEND}
+	virtual/jdk:1.8"
+
+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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
+	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
+	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
+	ln -s "${DISTDIR}"/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar o.n.html.ko4j/external/ko4j-1.4.jar || die
+	ln -s "${DISTDIR}"/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar net.java.html/external/net.java.html-1.4.jar || die
+	ln -s "${DISTDIR}"/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar net.java.html.boot/external/net.java.html.boot-1.4.jar || die
+	ln -s "${DISTDIR}"/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.4.jar || die
+	ln -s "${DISTDIR}"/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar net.java.html.boot.script/external/net.java.html.boot.script-1.4.jar || die
+	ln -s "${DISTDIR}"/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar net.java.html.geo/external/net.java.html.geo-1.4.jar || die
+	ln -s "${DISTDIR}"/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar net.java.html.json/external/net.java.html.json-1.4.jar || die
+	ln -s "${DISTDIR}"/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar net.java.html.sound/external/net.java.html.sound-1.4.jar || die
+	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
+	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
+	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
+	ln -s "${DISTDIR}"/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar o.n.html.xhr4j/external/xhr4j-1.4.jar || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	# upstream jna jar contains bundled binary libraries so we disable that feature
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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-4 jna.jar jna-4.4.0.jar
+	java-pkg_jar-from --into libs.jna.platform/external jna-4 jna-platform.jar jna-platform-4.4.0.jar
+	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
+	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
+	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
+	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
+	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
+	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
+	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
+
+	java-pkg-2_src_prepare
+	default
+}
+
+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.4.0.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna.jar jna-4.4.0.jar
+	rm jna-platform-4.4.0.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna-platform.jar jna-platform-4.4.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 fd9b04107..702703c73 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-profiler-9999_p20180105.ebuild 3146 BLAKE2B b35ec7013fff78a69f979a38faf080feb28c87849d5defda101a26895d748406cbc55a536bc375b92739a195354fac4a1416fc412ad8d58d09418f09bcacf032 SHA512 c0a4104f7bb832c7ea34c3e8dda219bbd65e05ef745b664065fedbb4d1abc483c572d6e9fd21ab1c287cde2b2087d72d301e514d47f529470d16a7b687ec627d
 EBUILD netbeans-profiler-9999_p20180108.ebuild 3146 BLAKE2B 7ef2f394d6ccb5281d3cfb1adb34fb56f4c0e101071f62eb37b2a8da17bdd1e38b29e3260dbbffeb059bc272b4aada5a1fcd6317f9a5a119836a829d04d5c67f SHA512 e2a89048f65b794a5fa2cf8a6b1b4e114569ec2b4864b34727ac5d354b1c3f7cdc5ad147844a42f726f92b4f92c3f95d006b9acf77fd411f4a8b9c583e8eac67
 EBUILD netbeans-profiler-9999_p20180109.ebuild 3146 BLAKE2B 70022ef572d49c73e82b3b05979ed87d3e94e825fd58facb2a844ecf8fc619dac4f3a585c7a26cfb81f1b19ea01149e18b0f99211e073162945502cda61b3a2c SHA512 2bf6d8cd63b905a701ed021436bd5f17d351bfb002108cce52761ec1e119a82d82510c4ad423d7636b3fb1246a11247f16cfbf9a8a33d3f5cabc3844312be3d0
@@ -37,4 +38,5 @@ EBUILD netbeans-profiler-9999_p20180131.ebuild 3146 BLAKE2B 7616115e78b9c5791a0c
 EBUILD netbeans-profiler-9999_p20180201.ebuild 3146 BLAKE2B 61ed4960d268f559ca49e80e8d4659f4ee12b6310ec834e1a9323adfe995e99656b957bd0f44de73931bedf4bbf230762fb07332d6129fcedf924326768f4086 SHA512 64d7fc1bce45fb6fa5e031334f08dc8bbde75ec30b35ce1e067137764b06352d4daedc57917b92031839717badd7018f1accf7b1ce30072d6e67585d313160e5
 EBUILD netbeans-profiler-9999_p20180202.ebuild 3146 BLAKE2B 3647cf4d858e7afec713e27c9441548b2a49e8edf1eaecaea2bed714d9bc111fa4f91112772b524e5d8751aa2ed8a08fd07a406f260a7f15700f9257db5154e0 SHA512 4120110709e3e971bfdf59ab5ed05aced8b9ad65b15fb300c3a290c6432bcc5d89589fe4ec144ce8583ff81ec116c928052515495720b8720bb93d6faf5474a7
 EBUILD netbeans-profiler-9999_p20180205.ebuild 3146 BLAKE2B 287814023f6faef2117c8434d978e7dd0312e7b154c53d517908a77184c63ffb5f39814f044188c620d1b4ba1a4bd7e8f7aad56c955a1558b82c44b593583494 SHA512 c0cbe7f61386343f25a78872b4dde46a1bb4ae786e9164efe8dfd01caf8a3365fc109dfe81028d321ad6586d1a414bd1054a95a2133ed92bc4f29c563c21297c
+EBUILD netbeans-profiler-9999_p20180206.ebuild 3146 BLAKE2B 785a839722d4c313e0364fd0e8713cdbeb51fa8d2fcf0f66c10e942569038b7c629a49a4b03f739a9f4ebb8031f20b9496bebaf9040357b78280df0d024d8ad2 SHA512 99cbb2dd8f227ad226f859faf1ae1380d7909bd45edee4ea16cee28629a60f559dd613cf589677a2cdd7d3dccd654b2e5c7600cc18207617048b47aa7fca8e4f
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180206.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180206.ebuild
new file mode 100644
index 000000000..57c7b3e94
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180206.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Profiler Cluster"
+HOMEPAGE="https://netbeans.org/projects/profiler"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-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="virtual/jdk:1.8
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-java-${PV}
+	~dev-java/netbeans-platform-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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 65fa4daf6..2151ac763 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-webcommon-9999_p20180105.ebuild 5932 BLAKE2B a0782d93b371718beb886dc7066c2044d0983d430aa5a2dffead378890e31f869c8fc10bf348008d8908689b5bbda0debbc82e00a52aa883eb7f8308f987afad SHA512 72acdb456274921215e39c9996c2c3f2a220677b8813d52c1638fb4fdb65824427fadba7b4498409d1251952c1366b0f2a5bc11d3a7f687211f28e6a25ef6602
 EBUILD netbeans-webcommon-9999_p20180108.ebuild 5932 BLAKE2B 4c3699b5311a428352065ffd336e077fc715d7511c241cc0c06ae8bf52d59a6972275bc59a3485a1f2d291ca665bfc1775f01b73c616d02d0af3078ae8830c23 SHA512 66fd6e2ce70b4219fbf5cff9f60a7985f9b1f622f5e23a2b1b435fc4b034bef56c90732f010c98cbaa0dce3fb522ad6cdd0cf5db5dc26a24fe7fc8914abd1125
 EBUILD netbeans-webcommon-9999_p20180109.ebuild 5932 BLAKE2B 6fc58f766d7fb0e3069367c116b7d9687519550935b8e338ea4a74703114c8d5a72ac11e49aaf1ccc07fe281bcdb7818599b2eb39d85a03fe979c0d71cfaf418 SHA512 6bbea4a398145c65130e355c31ee56d17947e74785b560822ff0b1e6e2bf24d2694855940acaf729c812f65dfe938d374d03798c33585bae8d4308b0eeff425e
@@ -51,4 +52,5 @@ EBUILD netbeans-webcommon-9999_p20180131.ebuild 5932 BLAKE2B 4c963bc6444903ef164
 EBUILD netbeans-webcommon-9999_p20180201.ebuild 5932 BLAKE2B 7e53dcf567e59df6edc82723f81a96bfeb8200a28601674e71aa30cae7cd44514b120ac4f9e82f618efed5b2f8eec4f60be590341cce79f9a5c9ce717b1fc5dc SHA512 78792964292d52dc3d6e69f9c1647d4a0d2529b75fbde4a6b519b2a1f57892c905b61ddb499fd2b4ab7043200e7909828d78eb68e3befea081c795b69ebf3f08
 EBUILD netbeans-webcommon-9999_p20180202.ebuild 5932 BLAKE2B acc11879ccf17034a228a48e52610b19c69dd6b5031c01ece355330d77018ac4f7c24ff3634109a97908bbb3e1aeb69ebcd5c27a3999b6f3b4b897ca9e9b5539 SHA512 d76da271ca63cb70a47c57a93d63a1fcd5d12d28220c615d0aee88f4626f4578737c24381f80d67d11e25c0dcd7f5890070a56b7500682a9d8c3e9075f290b9b
 EBUILD netbeans-webcommon-9999_p20180205.ebuild 5932 BLAKE2B 050729798ab8ca0e2a099e9d4da885d6a014a5e0745b56fc8f3f24c0a1b5b27f38a05a854805b60a0c5eb91684005b0c8212dc36732a3535dc0c88bb1a730fef SHA512 1b144f1473ef1a1f3306511f9cf23335a347a851c3157d12a02ac7d73542ecdf3fa0f2283a988919e6c1a722d19eeb849e9d24f1630e90165ea97f1be79dd8f6
+EBUILD netbeans-webcommon-9999_p20180206.ebuild 5932 BLAKE2B b63ee0ab63d471a638d14b800b8dbc3168af11055ef34b2989b125f810f10e479151f4681608d6c128909696174b8f9616cf6c3a2e2dfd94e64f27c9f817ddcd SHA512 0464716e946a41e4d14ea5ca0fb752a4751b8cf3e92d9caa8f93cd18d1ab1292c03a0602a8b451a97db5c219249a6ec13ba4ff8ec6e692867d743b701e01d3a6
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180206.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180206.ebuild
new file mode 100644
index 000000000..fb1641854
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180206.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Cluster"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
+	https://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
+	https://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	https://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	https://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
+	https://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	https://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	https://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	https://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	https://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	https://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	https://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	https://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	https://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	https://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-extide-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0
+	dev-java/jna:4"
+RDEPEND="${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-r21-build.xml.patch.bz2
+
+	pushd "${S}" >/dev/null || die
+	ln -s "${DISTDIR}"/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
+	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
+	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
+	ln -s "${DISTDIR}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
+	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
+	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
+	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
+	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
+	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
+	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
+	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
+	popd >/dev/null || die
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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-4 jna.jar jna-4.4.0.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
+	default
+}
+
+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 38f76b86e..4e29fff30 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201801310002-src.zip 221062529 BLAKE2B 6617149288b40
 DIST netbeans-trunk-nightly-201802010002-src.zip 221062529 BLAKE2B 8a1deba3bfe45c2eadc7f12ba56fd47723d2f6e523464c4d140ae4b5790e63faec159406e7f5852332c0c34273505d21328bd746f775f4892b5dcccb2aa362c9 SHA512 3edc8ecc797ea3bb04d3006090652abefbe71f791e149d907fb83b8aeac23111b4dedbf31372531627bf92778d096ddc9009208241be44a2c7adcd8833c0b10b
 DIST netbeans-trunk-nightly-201802020002-src.zip 221062529 BLAKE2B f768aa422065302e8ba27956370805f959082161d94369f3c899611db6dc8866d995a275d4df3ae342cbfb53e10e731df1ba7fa04002995009f299eba8ab0b53 SHA512 c2c9c63421c104f73723171deb1bc230e0cc6420baba7e3fd8c25eafea79950a66ae7451f1e0d969a445ad75343a99958195e1198498824dd3775c9247ffc990
 DIST netbeans-trunk-nightly-201802050002-src.zip 221062529 BLAKE2B f64413a8373aa29179213a56c13c4909343713e84c621b38fe558af58181e5bb5d86b78a05d00fdca12a92b4118ea4938cc156253bf2d267ff11e4a3d4e50444 SHA512 5b6046a3f18fc5293106387beb3208d30c624d0b2d623df61df48bf2fbfd3d39cc0374f32ce1eb571b264620aa16243f4c3dfde75dcb700f03862020eff474c0
+DIST netbeans-trunk-nightly-201802060002-src.zip 221062529 BLAKE2B a2cdbbb0e0396b4ee3397eba6baf9135f57509246147eb4fc854f371087b6fd14e160853187e59f7b7536f1b09e580a3a031f394fcf1aea3d5373febd2e2eb70 SHA512 9c9bde3c7bcdbc80498f3073c552f5fa71af506d8355bc32aa085013d404abcafe3ad2ba97773c444b083e8cfe53249dc29afa1e509ac7c5184c7fcb6d39d61b
 EBUILD netbeans-websvccommon-9999_p20180105.ebuild 2395 BLAKE2B 84eba671fbfcbd75f502a69fbdb2de7be6b01d8cb0ab4e708b875b4737a100db56babac3b81eb5b1c05830ecd8ea3df77a0c51b4a7c5161470fccd400a3f64f1 SHA512 8af87479010c556d4425a66540ceb1849d77fb7059d5f96c93bd70fe590f9ecef6884cfecb7b2f3c14e7f6ea5e621d91931482857f769be9a93e6b4d89c1d6ed
 EBUILD netbeans-websvccommon-9999_p20180108.ebuild 2395 BLAKE2B 0c7754c6f0a7db4571e9f133228a28b9c5fb3e95ffbea0528c51cfe24dfdc348eb6f830422f4f4ddde08e569864b6bea3791105a5ffe38b8f6574be95388317f SHA512 3ede0f48ed45ff1a3f7be15307894295ea015a8d30d4407985f433c3b220943d93f79443be118376b2f366a505eb8c4dfad0f78b6370fa31e47ce7f55c7b2840
 EBUILD netbeans-websvccommon-9999_p20180109.ebuild 2395 BLAKE2B cb1e0f889be1e252999bad159d7b4a1c50b70f43031504f49cdf55457c29d1dec1d8ea6ab16e2728890f118bc230950edefd343773571527f68ba2fadc37960e SHA512 22ce19d6e90b44d4ee3b35ef2a9bbdfdcbbe45561c3255e723ac32d507eea6c787c6026410cfffe8512f099b61a3d2fda9dfd4fd17ab9b1f79a79b4f2ffacec2
@@ -37,4 +38,5 @@ EBUILD netbeans-websvccommon-9999_p20180131.ebuild 2395 BLAKE2B 7911727a5f0167c4
 EBUILD netbeans-websvccommon-9999_p20180201.ebuild 2395 BLAKE2B 3632d26d7fa57cbddc94b31af493a7be5805f1495bfe7b60b2bb14094fb2ab2c8b0cfcf248797458dc347c6b0be812321475b16ba90cff17ae0216cfff009380 SHA512 320f1f94e91e1b524968b2a4636c01222eecbbc3efbbc49297f6a00507e60b13fc5d022b84a689ac51ff2d6b60453466b03f63b3428545857f0a1204785080c1
 EBUILD netbeans-websvccommon-9999_p20180202.ebuild 2395 BLAKE2B 065f6a287c02d71100fdc44fb90f27b05b702d0a0811c31a162c12c3f456c530bcb18aae737e43000cf4dcc4408301cb6b12537dd5c4a1dea88d2ca1b4000cbf SHA512 86e9b0b6a4e4f62ee057645a0f8fcb9c646034ebe89b727c3767fbe4422193af95f18526962b2cfcb2a2145823c45dbdae79b65fbf51434930eb9e4a9b1052ca
 EBUILD netbeans-websvccommon-9999_p20180205.ebuild 2395 BLAKE2B 4ebe56cd4cecb8d4aa0c2fe42589cba48a62a3cc16db1651ac51f811615778105028c29df0116f62518719ea443bb3c1cabf623a63e1904dc6bd5cc7be6ab264 SHA512 d55f6b879288c8a669811a1b93fefb8cc08b474b9a0ab5e61f60043149290a29dec322c7e84836eba4f8864ee76fca2ba4291031e84cc462db481eb023d38bc3
+EBUILD netbeans-websvccommon-9999_p20180206.ebuild 2395 BLAKE2B d083ff57d676264b9211497fde1ac4fd5e60a038c3624db1f6676973c06762f61222360b54ce9e54fdf738a096a6ce87ff456df23f5afc15f8deec4d331a0756 SHA512 e470b256aa429d0ec7ba2e3b8ac68d487331a51c3d1315bff266ea6a92c831d06f3327e42055225fba7e03d61429ad32c4edd769a46d83dc3e846cb1f53e9121
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180206.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180206.ebuild
new file mode 100644
index 000000000..c3abb1698
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180206.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans Web Services Common Cluster"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-02-06_00-02-34/zip/netbeans-trunk-nightly-201802060002-src.zip"
+SRC_URI="${SOURCE_URL}
+	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8
+	~dev-java/netbeans-platform-${PV}
+	~dev-java/netbeans-ide-${PV}"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	dev-java/javahelp:0"
+RDEPEND="${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-r21-build.xml.patch.bz2
+}
+
+src_prepare() {
+	einfo "Deleting bundled class files..."
+	find -name "*.class" -type f | xargs rm -vf
+
+	epatch netbeans-9999-r21-build.xml.patch
+
+	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
+	default
+}
+
+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
+}
author	Miroslav Šulc <fordfrog@gentoo.org>	2018-02-06 09:55:33 +0100
committer	Miroslav Šulc <fordfrog@gentoo.org>	2018-02-06 09:55:33 +0100
commit	6c84c99775fb70b2251d44409a898e4358164d77 (patch)
tree	5287079cf063cda32426e3b3b65d34ce238d6504 /dev-java
parent	netbeans: removed obsolete ebuilds (diff)
download	fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.tar.gz fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.tar.bz2 fordfrog-6c84c99775fb70b2251d44409a898e4358164d77.zip