netbeans: bumped to the latest nightly sources

Package-Manager: Portage-2.3.20, Repoman-2.3.6 RepoMan-Options: --force
author: Miroslav Šulc <fordfrog@gentoo.org> 2018-01-29 12:11:25 +0100
committer: Miroslav Šulc <fordfrog@gentoo.org> 2018-01-29 12:11:25 +0100
commit: 89749cf7c2e65253cb21ca5b03ea06a557337fc8 (patch)
tree: 32ddb7f074bf80db48d7e37f7f0d2ca67a553748
parent: netbeans: bumped to the latest nightly sources (diff)
download: fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.tar.gz
fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.tar.bz2
fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.zip
63 files changed, 6032 insertions, 0 deletions
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 44cf1ee1b..a0d4699c0 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-apisupport-9999_p20180102.ebuild 3058 BLAKE2B db86fba1e58cbf4ece5165bac8be6ba9d5b5ff81c16c7e707255fc98582ce8136173ed4612ea4ba3c9f2c257d73cbc72a6e22475ccf94951d7d8db1d755fadcb SHA512 c19a7a2025cd7b63e05ccb2f2651a0d72b53c108327e020741d5df11ab71ccef49e10bd42b56e168d6d8729af3f9741ddc2de585a0aefa979dbe223be434116d
 EBUILD netbeans-apisupport-9999_p20180104.ebuild 3058 BLAKE2B b568bf368f2b9c771b8779670545a28c5c187c69517d59829ea8bcfef0faebd5f39e80784c76f0b3a83bdc54f2d884068a0f8743a1e2c36f80da6f3459a43449 SHA512 8e5d2dca92c6ed4b95ec5f99771661a70affd959dcbd9381a8df1aab00a7ff89b152b2f9c3f60d6b57f80e127d6d34ebb1f275b1c60d0cc0393581af9bc3e1a1
 EBUILD netbeans-apisupport-9999_p20180105.ebuild 3058 BLAKE2B 99a0f6bcc005d977935cde5f85949157ea8842a12eaf80aa866fd49df234aa7696bb5407d7c689288fbdea5f59a94779c72ea2dcd6e3d65b805659caf12de90a SHA512 33e6aa199136a93b44746583f64c4513e94618f5b054101dcb926a3ec68315cccaac6c6d086d9f9cfeb1f8ef01a6743a577b01f75f27fdde6a51293ded799ae4
@@ -27,4 +29,6 @@ EBUILD netbeans-apisupport-9999_p20180122.ebuild 3058 BLAKE2B 8a3b7d05dccbcf92e5
 EBUILD netbeans-apisupport-9999_p20180123.ebuild 3058 BLAKE2B 03e0854464f8020b0a17bb3db27b92774f21f6d7a007e113165d0bbafcd3faafbc1dcf02928c715e298b05ebdbffaaf285ebe1d7f253687b4c1caac6a3d0f2e0 SHA512 2e33a15fce632f355c8e3feab2e315b4a35a342044b5831f30c78c3cb56cf1b831ecbc201aae09de0c0f47e2d8a02385ee10a328b69d4636790dd9126beffa0a
 EBUILD netbeans-apisupport-9999_p20180124.ebuild 3058 BLAKE2B a67fc320d6dc239b1960edd725975d3823b44d1dc9ca051c3f456818c8865854a07519e9316a5422041a6b647cc305ffce6fbc24c8d4fb02d499b942f48d1859 SHA512 a280f7059443557b325f20262a2972f4f219e1374cf7c2f998fc1653fe1a4620219486603634af151fb1ee1feb0b83d003f77fbbabaa77551b2888b21da2cec3
 EBUILD netbeans-apisupport-9999_p20180125.ebuild 3058 BLAKE2B 3406c1ec49bad1df27651495dcc21051b8c09fc464ce10b5ad206dcb3df415d25f80a966a1257f57c5f00b7396a13fb00473a76305901cc2d19fbd6a28898e92 SHA512 f4464061e9b684d8e4de1c936e56353ab30fee0b54090334e883417f74fe904573b509fac90de748a3f454513f87b3854e6b123f0098eac933fafa077aeb16b0
+EBUILD netbeans-apisupport-9999_p20180126.ebuild 3058 BLAKE2B 55347ff2a48bbd6a46cde7b9a816616bcbfede90589751bfda28f3c5cdc457c1bc4d4b28a23157c405c985ccb28380f187c21629f123a0eff351d391d58596b1 SHA512 fe4a2f567ce7e775e59d0089cd7b71a23f5417906b6b9f1d36b1b83111f239cbbd99fb730ae39cabaece448f1ff20fc495e26abf165e9039c688a08c331aa288
+EBUILD netbeans-apisupport-9999_p20180129.ebuild 3058 BLAKE2B 75ce5b9fabc283090f25af7df1a3c0bdd1d59fa65ac5ce8991a17ce88db87956eefb04a9e8484d5fc935a8359419b88466d4b0143e8068e7a9825ac21c2330b3 SHA512 3b871409844f129d7295e369e78dad1893d91f7954c2c492ab0e5a0fcbbd627f898af49fc10e3e121b6e1faeb93a95848f0f31d9f1a3d4646601a11910b15d95
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180126.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180126.ebuild
new file mode 100644
index 000000000..55692f7e7
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-apisupport/netbeans-apisupport-9999_p20180129.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180129.ebuild
new file mode 100644
index 000000000..ae90453c5
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 c1106aeea..a5a9a0985 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -20,6 +20,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-cnd-9999_p20180102.ebuild 4686 BLAKE2B e7b736d7479eb143ab52c31da4fd30e234ff725cf99222afe0f21be7910092c483a8455eef582305237f3e26194e1af4faade3ccaf65e99ecce16dba0e93e6d2 SHA512 410a44251670f33f5c249230f2f252908fcda2c130e24e37961715dfc394023b658340137cc9d1e50ee0bb505d0803bc0147ceba57c8572dfd2bdfd660c53a1a
 EBUILD netbeans-cnd-9999_p20180104.ebuild 4686 BLAKE2B 61e495124b24a3588cf1528b8756820728f7a867806deb06a6e5f09354261a7d75be8a44edc8408eab25a9fe31dd17eee3063843d0524121c47f382237cd79bf SHA512 0e36d889466662654cb31100f3c50ce245e108b24ed029c8e163783c4dd7a00829a9282ea737a67bd9c28d5b894d48c5ec0e38d8b489e345b3e35a2e7614fe93
 EBUILD netbeans-cnd-9999_p20180105.ebuild 4686 BLAKE2B 36f5fab280d5b5f0ea49c615fb4829b89ee3f8a062bd16cb25715e31d87b76bf1da17bca8349ff3e4c8da4207745f13f4c5c9f5788df7b2accd3a88bc1c3053b SHA512 ad434882e6ad80ab7092e69d41c7ad315aa5e1cfa4701b1aeb90979dcd710efdac1737115e259811808fbc9a8bcca857676bc8d3789c67465171eb27344c39a4
@@ -34,4 +36,6 @@ EBUILD netbeans-cnd-9999_p20180122.ebuild 4686 BLAKE2B e15b8a4e61be08ff08c7f50d1
 EBUILD netbeans-cnd-9999_p20180123.ebuild 4686 BLAKE2B d29365cd9fcb2e09fd671a306e48655c436152f819e44e7e6dcdd6187981b3148d8fdf978ee58afd221c66157462366c41c10da92a40f2606186d2e8287d427f SHA512 76b36d42a03ab51b9be6cb07bda1680b41dc5c0101920f60ac8fae2e41a4657ccd8f91bbef8b4dee79091d4fbd7827e5ceede408b7ac3aa5c5e68e7af64b3c1a
 EBUILD netbeans-cnd-9999_p20180124.ebuild 4686 BLAKE2B b80baa2fcc74921149e8d59d6ffe0f44cba9c30b89c925fcd1978b58ad442b0d6ca009316409931a2593697111022b7439ca75d444f646b144a5acfffd75f95a SHA512 07817bec14f1a0d1e153f76801f910ef3a382700be29c314523ae779a448d99f536316c5711416d544a0a117130e3cff00325570e3eea0a3cca4b4c5a95f5e23
 EBUILD netbeans-cnd-9999_p20180125.ebuild 4686 BLAKE2B 2a004401747cfdc7b44a03cb703bf603f758ecf3ec208ed0636f5f17285b96b45b60dffac087c5f833f2623f873a9d1dd229b468f80064dbf3224927fcd8e61e SHA512 5052f461d79c6a46df22158ee06ad6679c4cc21b203aee184ecf138a4d9ae2d8d50ac1c5c55dee9d209a802cde6855a0226a229e85e5838ffcf62504527be8b6
+EBUILD netbeans-cnd-9999_p20180126.ebuild 4686 BLAKE2B 1573d795486952180d3bf92c819cd1038df137aaf01095387c712c47bce20f04bc75213a34d16a81147d628b53a8d9069d6852eda3c5dedcdc9b400508b29bb1 SHA512 fc46c53fa3f5185073d39b732a9e3be722b1b6aee61584bba6979eb30de00fc947989c14bce9eaedd0dbf3b10d9ae4edab1272860845ce9085ed326de36a14fa
+EBUILD netbeans-cnd-9999_p20180129.ebuild 4686 BLAKE2B 52d71cc5a4dedbba02df42791b3cece5571b866c52438e5b48bdc73cd782a87a62f8dc8afa6b952a8d0035d0267544e4fb21f669e3d113bfa1d120d7c2cff1cf SHA512 39b149d767490641e05d13dd1739ad8bede872f86bf6f0e3f2fbd9f6cd5a43830088e4b072bc5c21289d86cae9ae4be2f69d5b33db6cabe9465b57439ab34e63
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180126.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180126.ebuild
new file mode 100644
index 000000000..310d3effb
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-cnd/netbeans-cnd-9999_p20180129.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180129.ebuild
new file mode 100644
index 000000000..90aa4dd52
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 6d7e107a0..75d5f2972 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -14,6 +14,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-dlight-9999_p20180102.ebuild 2643 BLAKE2B 22a8119b4abea4992d4e80a070852231d5d20a6a82bc2704da9b909ec3dc336f53fae30a4a87e243ba831f1b7288c45e09fecc64ad0de1a0c39db6f6908b6e3c SHA512 346c4835ca10d2a4a95b7e7fb6460800c856954b86f07e315e8ae826ba0bd16c42a3e63f56cd1f30595f155568506d884bf4a020fe3ad42999eda66a31bc9352
 EBUILD netbeans-dlight-9999_p20180104.ebuild 2643 BLAKE2B 9daaced90dc0a74849d53ee81bf6d67a628114b0ab1c748847ac6830e4bc14613f9a5e62024df8b0e264fd5a3626d596370c0bf99851883cb324062856d71b67 SHA512 80c0e2d7810d367d304cac430b80c8a829d0f0fda547dbf1c45c656a8c2c1f28e316d6765d28892e259f53b912bbe2d3e66d674db57e5674ab91dc896e3c281a
 EBUILD netbeans-dlight-9999_p20180105.ebuild 2643 BLAKE2B 7f92810789f2721a863982f567d79303c62dc36a48ffee44d54ada143f3ea5a3f6b8f8ebf8a02058870cefd4eab99669c2ce2ad3f0d0a7037da5ef3684425804 SHA512 dc25e62d86957b1eec72112323f2b1e98dff1e897b05c65fa38b83ca770541764b478cb6556e551cb804ca850fef17b750bed331b097fd769b6270da59326459
@@ -28,4 +30,6 @@ EBUILD netbeans-dlight-9999_p20180122.ebuild 2643 BLAKE2B 6c0606557e7aacda21d82c
 EBUILD netbeans-dlight-9999_p20180123.ebuild 2643 BLAKE2B 59b928aed21a8cc810a30346a6e5798fd2ee8df297613ab2033b6b944b5e65853375791575e964b100d55adebd8442badf71ef9e33f6a8f91ff8115ac94c600c SHA512 d26d6ee1a69f1bcb288bfd01248a1255faea6addb97ecfdebc418193d8083e66d88ff68d670686090d2816c6b4a12016a8a13e3a2ef6f73b75868f9a8e3e57a1
 EBUILD netbeans-dlight-9999_p20180124.ebuild 2643 BLAKE2B ad63443bd15a16e1f6983cc3b4996bb07b47257e8aa12d4d510e457f85a4e0322548c38b7d58e6d562c572ddb160b6758b9ae6b85a1691e7cb406c7b8b0ff7c0 SHA512 d2fa9651e4a33c2df8702af8c4e573c052bd893e8c2d7060aca31b83ce69e66bbc981a5797d8ab3e1e1abf8d4b440abdd7a49123fead7fdd584cf4600056352d
 EBUILD netbeans-dlight-9999_p20180125.ebuild 2643 BLAKE2B 752ab061c5ac34e07c964426e53b5219e18352d6bf79abeafef9b8c65af747faafe01158a8c3495aeb20ef1dc3626356d9d057c321cb823b2a909d46c8602305 SHA512 1a7f491b194141037c95abbe2cb0f567d56ed93cf225d44bf8ac029e305627262f45d0cac636f7495401bba547cd324ffc0590e9b4246d9e84ac4614145e0ef7
+EBUILD netbeans-dlight-9999_p20180126.ebuild 2643 BLAKE2B 01f7700534e01b62d6a954413844ebd02c98b6a136078780c19dd1156a911aa9e4c163c15033542ae809bec9f56868ca4f2df08b142b112b9fd5b342ca7e39df SHA512 73f3c4d5339a5190cbe86d8e600e3801c70082c5f7ce49fefb195c95abd0756950e1d0b18330f40efe8b8b797cda3bddb2e515b21ba5bd82f9114b54f0cbcb9d
+EBUILD netbeans-dlight-9999_p20180129.ebuild 2643 BLAKE2B 4ad6f8f936343110fd87ee87d8d7aeab3b7dc997b2115620ca085007084eb665413baac4b39c1cf9ee0149b91429c978638ca14e4009bcd57f4af5f0e6e1c00c SHA512 8b6cd63fd50b731a2e99f53c74df2c0914a6f3b532e0cb3fe6acc1d421a06805e90d17c4d003103a402df2f77c8ae89be694b715eb262b3bcc97fbde16c29df9
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180126.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180126.ebuild
new file mode 100644
index 000000000..e734ca918
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-dlight/netbeans-dlight-9999_p20180129.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180129.ebuild
new file mode 100644
index 000000000..14622dea1
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 62f6d381f..487623b70 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -44,6 +44,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-enterprise-9999_p20180102.ebuild 15530 BLAKE2B 3c5eadbf9de8cc47b80c6e95a93b2a3a278e9306c431decd4975e5a45eb46bf075518cfa38fb1d3f044276464bf9e199297074b10dbb617e92eda4192a8511fb SHA512 2d9a528c7f4f5064358873134e475647ff46b4da5e60682eac3a701922b7190e62b02cae1ecd9be4adde62659bae40f65b036b252aeb88ba2856d703eb49630c
 EBUILD netbeans-enterprise-9999_p20180104.ebuild 15530 BLAKE2B 59229d140b4ca5b4f0d0af09ff99bbd8c71ff5da86256bc6cdd747a5b4cf8ebcdd791e7392e65e15587af8b0a9112acad6dba5fba7e4fb188b45d510832a3ad4 SHA512 407cd7d3592df6356fe72b7e616800b5b5efadaa2d8f9ac85d507d273ef65484c692be07a6372f7a870db3f267bc80078cb586925a3252a4dafcc8ade8844b53
 EBUILD netbeans-enterprise-9999_p20180105.ebuild 15530 BLAKE2B 3bb0d31aa7612babb6e831be2c509da838bc25d65211a00d81b120411b98904d91340e1f062badfc242708b3f9c991edd6fa84194f60c26cb87f883948db254a SHA512 0ba99f3221c8085e1ba5312675158c583ce83a4dac3b70e436c77945a111fcbaad0936832392073d6f6aa8beb82101647c989b124af1c0dbf26b6e1e8a9e3221
@@ -58,4 +60,6 @@ EBUILD netbeans-enterprise-9999_p20180122.ebuild 15530 BLAKE2B 21c64a2ae90a89c6f
 EBUILD netbeans-enterprise-9999_p20180123.ebuild 15530 BLAKE2B a7779d9fb6a1c94e81aae0afe81c73ab062eff5267f6bbfcd8db7113be309b5da3c9e8c57a43436af2ac2f0b7ccf8406478b86fa644e504b6ecd9426241d6f66 SHA512 d348419dd1503705217f570953c2f43831e859bc429583f9d5e5bb0b6feff90b94b6088ec1a31293f040b67da3869e2c650ab2937ed0cb5b4d84d69fb272cad6
 EBUILD netbeans-enterprise-9999_p20180124.ebuild 15530 BLAKE2B 1b1a382bd9f7ad0891c8bf115b4f9a586d49e9833fc03c8903853b7cefb6ee5a307994891eb410208811774e551e5546a1a6b7898d30bf7e540d1bbb2e74239d SHA512 8ff79020f112b517fc73221071d53e2ce2d1bdd4f66a6e4a61e5f8ea1420c2cf27233fc9ba8dfa27b4e9bee7b2a46539859cf731980f100ba708c5b983ff23ca
 EBUILD netbeans-enterprise-9999_p20180125.ebuild 15530 BLAKE2B c789e610a23f2b5f20fdeedeb5b13a5f696a39dde8d12e59050885f603ec8de80bbcbd22c54094b4f9a746a170a5486cb8732932d97ac347825e3ddf7202d8e5 SHA512 cd0e64c1928e2970a12bfcf4a89bd850f8c540de83957a13a56d3b7a9d5805586a83f75d0e5c8499192e765ebb36b0ea0ebf1d89a28dba459869686f9b759e0f
+EBUILD netbeans-enterprise-9999_p20180126.ebuild 15530 BLAKE2B ee74e39ad49a89c30cc058429b06e66fbc2c27e688e7e3a9e4fe25d58c444adf9e6e5e9726f7aee54fc1139cd754668c9c450d85042e92a0e54c68922327e32b SHA512 ff0cdcc59acde2efc6f7ad097c95bac0523edada5f0632a67a1ae401932b46940221afe467d5b68099c839e8783f5825f338ecf32a9b654e056577287cead33e
+EBUILD netbeans-enterprise-9999_p20180129.ebuild 15530 BLAKE2B 6b80e806f8419981774236ff5029007f6433fad6be898c00a6e09fc5469c8f59245f0d36a8f6ce01f2d549ebb617b19060d4494340e0b608dbd3c2fe4aa01efc SHA512 7fe162c1c7f70a05d0f96c2fec8e99079782b65d7f9c5999222a5462331d4c95e8f130482473fa89590551f89afb66c4adcfb1669319fb3cae881946c99b3935
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180126.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180126.ebuild
new file mode 100644
index 000000000..1f5aaaa33
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-enterprise/netbeans-enterprise-9999_p20180129.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180129.ebuild
new file mode 100644
index 000000000..98edc1c1f
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 8b4285a1b..25af5e3cc 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-ergonomics-9999_p20180102.ebuild 2587 BLAKE2B b134cecbcac30e6c5114b313d6d9e4a9b4f39dcc4d2437063454eadeb160371689952026249cc5141c315a5e0ce27d6d5991723bef57606448a886d68975cd72 SHA512 39ab34adaf7786ad37b4d619fc2f46ac813977137ac10cf1ac60a8a2e7d2ca1c85b1a7916b1f93362f1343d65e60a25158dcbca945352fbdffe2ab2c52978cf6
 EBUILD netbeans-ergonomics-9999_p20180104.ebuild 2587 BLAKE2B 2e5bfb39cd7de961c945b7a00c6ff5905871313ee92adac7d8ddbd65a3d310b4b46e99a842c7f53d3088140799dda29ee491a7947759c1734379cc107168f6e1 SHA512 d833018a913fbe8c904c56ec72cf0b055dcbcfe0a451645927eac111ce316b5cc13ca13ff5f27ed5085d086382743a4d9513834e06f26bd345c30b9a2b5c8086
 EBUILD netbeans-ergonomics-9999_p20180105.ebuild 2587 BLAKE2B c231618997d0ced4aa065e16442cf61dbcc0cb9bc259d9d95c760cfbb8a79bac930e5a0a4d7c1e65d719562acd88cbf86b21be07e90338693b35e354049d6238 SHA512 4910515e7f10276ff09dfd1c1b98e9039b14744b481280c151345e54d52ed58b75dc75463c9292f2ea5224c2cb8d5baca67dbe75756466d9a67c0882a301625d
@@ -27,4 +29,6 @@ EBUILD netbeans-ergonomics-9999_p20180122.ebuild 2587 BLAKE2B 8f952dba656eeaf445
 EBUILD netbeans-ergonomics-9999_p20180123.ebuild 2587 BLAKE2B b1e1c1c1dd892396254572b3b5414c384c3bc530f27266d605cc57cf78335ead4ae324aa1fcb86747af9da70054c31f1e1cfee68cc633d4e9a4bc56c221b9de6 SHA512 48fa1902647e204b225e08b338e7a810ce633ba3a38fee31c3b7ae967dbe96bfda5edfce24b7019ff40583d695bdc0028976a2b157970d1a1bbfbaaee74a4cdc
 EBUILD netbeans-ergonomics-9999_p20180124.ebuild 2587 BLAKE2B 87d05ec3a49e96135a7d4c1d9ea6bde2daf21cb82ac021448419c2de869771ffd1e6c1efed994e506efddb821b176b579539d594387bc925b3a1e75ffa860c0a SHA512 0abd095ba1da1703fd37bc5db9ac5317fbaab689f4413a5113c3c939b1e5d3115f78eaeaaf9aa5613c938027e6b711551ec42416348b2183ba92620205e034e2
 EBUILD netbeans-ergonomics-9999_p20180125.ebuild 2587 BLAKE2B 39e397ef6c0d326be657a16d8aa7d8e345fc66dde6171690c582b32b258a9326e27b27b65bf1714096f1b0619631b3be8abac08aa97df2d96acc00fa6316e161 SHA512 870608c33923299924c170987964d659ef4eed4a0be953b4fbdd1e7139d04405528cd7ee6d2de99e69b50b83ae59040955edddbd92b4f624e8b0ed36c317e1c6
+EBUILD netbeans-ergonomics-9999_p20180126.ebuild 2587 BLAKE2B 7643c0bad2e3be59139ef4aba60ce611075f0c320617263672afa26e7d371cc7d2afb8c5fbd7d8d245220a8e62b00d37dad35f1426fafa78854279f723a8ea54 SHA512 3847424677d270ba352ef5833fde63bd58e2254dcf9d150d54187aa93b21be9dd375c44dc1b7e92b3575ab93487676a3e7b145b47f24fe7ea577b369931c669c
+EBUILD netbeans-ergonomics-9999_p20180129.ebuild 2587 BLAKE2B 39a67b243f01f114980c5f0eb63403076079ca5abb800fb2769add83d783144abbeb5805ddd4620ad853b5a53ea556059c0cb90b3750d657d900d7990ceb0b1a SHA512 1302dec2bf8766df0887d7ddeb451d08f4fc04f10add54de35fb73f7bd9beadffc290d0fcf720b8784c145315461f5ecef1227176fc9e4e6a90c3adb6620987c
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180126.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180126.ebuild
new file mode 100644
index 000000000..23febe501
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-ergonomics/netbeans-ergonomics-9999_p20180129.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180129.ebuild
new file mode 100644
index 000000000..e73c2b4c6
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 95e524fb6..9ba9a6d90 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -15,6 +15,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-extide-9999_p20180102.ebuild 3059 BLAKE2B 2c45b6b857d3d89de9e733f7a37c4b6f1bcd34f955d979371905f4503f76fdd45d6235d116aee43fe67b8b26c42514b2c2c720117f6c454bf2b9107cef39ecc8 SHA512 5d5f3a4d1fb82ac3bfba67380f0912df7b3ac2fae48f1509f20ae72a59d3d4fad53313908418313ba1b48c98748a2ea5f301adef8f19bc6a06a3fde186480346
 EBUILD netbeans-extide-9999_p20180104.ebuild 3059 BLAKE2B d69dae14221815025a6d1caa8f35bad438a90dc5910ce8fc6b555132ea9148d401c980fc11195a59ba679efe1acb3af03cc0824e52355c73f1912680417e59de SHA512 361259eeb195c78b49940d4f0e23301015c32a17385327a7b0098be727751940cb7a1e847e74f6881d9092feb73a4910a53532b659c3e4b29d417a9a95f878a4
 EBUILD netbeans-extide-9999_p20180105.ebuild 3059 BLAKE2B 58a779d0b74420671a3cd451b619c9039ea36d39e8099320dda391048743a52d5731f8d54dcebcd5726e24b5a3b35c6fd54d94a7685f99a45d3efed01949b1f3 SHA512 e1da71160895c96e092c59042b7c1fb3a6d7a473ff96928ca13d27dfdca8c26f580734b3b8527f54bd644c12e91c4b5759c53b1ac14eed9700da07a7041526d5
@@ -29,4 +31,6 @@ EBUILD netbeans-extide-9999_p20180122.ebuild 3059 BLAKE2B 7f4918af066f8acb0a7bea
 EBUILD netbeans-extide-9999_p20180123.ebuild 3059 BLAKE2B 08447e0e4d98da0dcbc570bf264a1d956a43112848100de1f5185e99078b1638433b849f8634b57eb669b341a618677dbb50b95a102ebe955327623b1b5f3990 SHA512 822b07e583620129c77b634cfe34ff2c3ffd89cd0ead22dc71e5c178d5d1af13faff0216abe8cb245fd14bbdcb7f0a6cf0799a13e3090aefd97118cc204393f8
 EBUILD netbeans-extide-9999_p20180124.ebuild 3059 BLAKE2B 93e2a19e3f74a2ca79514ee2ffaa5926bed74f5171d8570159d1743f46b03b176de22778fd3b92f9bcec4c5b7f5ba0230383d25b3ab2f8aa472b660a2eaf06f1 SHA512 0e55f754a743f980b6fdd00310a9879020c798158d65fe447bfa6a1fd6b5f9235c1589dc6d79e3889e3d4061e8b0a6860d707f432c22ad081e37eb4d6e4e5337
 EBUILD netbeans-extide-9999_p20180125.ebuild 3059 BLAKE2B e802e36896058c36579f116a4f44a45a388564410e8675897e1029e433906b36ce992fbfb1ae7cded1eea1f9b7e381071fe6538c4a07306fd4bc9cfcb37cd974 SHA512 011d51150aee4d4b6602bc63ee19a3668246f7481bc92520fd52a6c68f3e271d53941825375f4545806de2e9ee6e02ccb3c12f5ac6ec1cef3c081e8b8bf80b57
+EBUILD netbeans-extide-9999_p20180126.ebuild 3059 BLAKE2B fe0bc28150dc183b2f7e9748b71c2bf97ffbdebe8991dc315f39af81abedc46c00465ae0d8bb4b35cd1a63d07d15d32193b0f8892177d27a847b57191052f007 SHA512 8d8535089c7b3216e49c11b2804eb7fdbcd1373c6c5ccc235a65a339f8bb05e8b4d5a7b260fff519cc9abf3e677598c59721e5993f8277e202b4669536896228
+EBUILD netbeans-extide-9999_p20180129.ebuild 3059 BLAKE2B 66affc64c8ab1993ec32f12ea36970ae2f80ea41f0abff0fa7ec865f76897ca9267b263e9391c8a89670c4d819d1659ae2d059cdae4320d03357c6291f88e9f1 SHA512 91d8e49911b215b42ee260d6bde85a5008c7405d0df8f154115a189e110a213eec9e77431daa7074d085a199f004b66cfa32f378cde8b40ffe72db038068f43a
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20180126.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20180126.ebuild
new file mode 100644
index 000000000..398f1ff2f
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-extide/netbeans-extide-9999_p20180129.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20180129.ebuild
new file mode 100644
index 000000000..6add0cab1
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 f9afcbd1a..587446ce6 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -14,6 +14,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-groovy-9999_p20180102.ebuild 3091 BLAKE2B 17f3603cc3b5f950a718e5361d069d2ab6ea0b33fe2fe4abfcf7394b8e31eff0525ab74cc97e19d2e58a6e62272088d18b0fe99f541abbc085d22c2b5b27c784 SHA512 2264a7f7f228f8bfc9c4378021de1e77dad8ba4cfd2231ad44579541411d33c1073a76d2db66acba825e048c18d0699026816c0414bb95d3828f089749792659
 EBUILD netbeans-groovy-9999_p20180104.ebuild 3091 BLAKE2B abd232606170ce8d99afef9fb52ac8f90de67204cb82311f09ae547e3e9d42fabc958fb21f88c335742b07326877494ae4e7cfc250ce6230d3b4afb794ec61c5 SHA512 d47e6e8827aebde74ce5a939f92ca6a09fa2c826a7fb9e7abb03573d3331bfc9e7ccc171fe6560a778d4a65eb4739bcfb9405016da171e84ae2460f1f58c0df0
 EBUILD netbeans-groovy-9999_p20180105.ebuild 3091 BLAKE2B b5aba1a95405c5bb16bfb278f67872422456ac204872d4a01174eb5f1d63edda020c35a9d829a25bb1c3e0da87cea298fb7b8cd8382b95ae7c205fad40e079f5 SHA512 98604532c52bed67c632d52f95b26a0f48e74ffe1e3270cfbfc99a5b50e399325f24277e64166f384cf3d1faed21636e720129dad67e3b39840adab07c2dcccc
@@ -28,4 +30,6 @@ EBUILD netbeans-groovy-9999_p20180122.ebuild 3091 BLAKE2B cb54fe5ec133380d48218c
 EBUILD netbeans-groovy-9999_p20180123.ebuild 3091 BLAKE2B d10a37aad20505a05b0e2b5f6af5c06967671861738388f589f3838165ec5791a6ee626550da238705ac7967b908d2e2fd362029c6d506a936ddcfa9209ec4da SHA512 fae41006fe9367e451aa6765f81834b2b50271120091a61135226ba968177e3cc8b113e5ebeddc4e6488bd608fa774c27332b4f5599767db99e3b93f4995aafd
 EBUILD netbeans-groovy-9999_p20180124.ebuild 3091 BLAKE2B aa03a807ed84ee4d200b3bceffcb46cb22f2d3eb9c871f90c3c8d04d3343faa1308be11be26b6353c7c723fcc4ccfbd7b53681ce7f2b4373482df4ca76a75447 SHA512 512e7070c565808c4255e6c5c62dcc5fc35dbc6a6dc4f4b4816b9f8ab3d84b12255463cf73074cece0b73c7d67f9e3f800f33744aea510fc7a1302a6b10a519d
 EBUILD netbeans-groovy-9999_p20180125.ebuild 3091 BLAKE2B 7711f85b33ba71f2876f2bce161eef505f32d7c1cd5282eced0746e6057a46f0c59bdac20c872712dbcd72454dc44d827a3fa3ae9f69cd7e755b632c8c3dd11e SHA512 863e2e9db5a5d3a29adc511d3f239c596facb6ad7b0b1151e00f9b6b3607b9afa203a5dd9c43c6b54ab2b702a24cfb89c9eb1ea91b95b2047b57c67b3f9a64f8
+EBUILD netbeans-groovy-9999_p20180126.ebuild 3091 BLAKE2B 6b20480eaf9d37a9c91a55680b075eb4858dc197ce26ee0dbccdb61a71fd052b1a39412757dfd29f8eb0cb4d02e4efc228236a07f8aea683c66a5c7926520f14 SHA512 579c9a2347837af163061a545f0ced8714d700db82201ddb80185a11a9046493b244a3cf41e0edc39581fd941b01a4e4ce42f7eba7e15f3b48ff244ea61c2a11
+EBUILD netbeans-groovy-9999_p20180129.ebuild 3091 BLAKE2B 9eae6879ef19b7d5b0fbc0d724ad9a5bd5b2a522e17b7c8faa4c32f056b924af3d037d06c2ed6737c36be48300f64f407fa433be7ddc0397cd2f10d1bd4dd115 SHA512 5e8eed6404f1dfe3748df4f01f4286e5f362de9d14052ed9d6a2f37df501799a1ac70b28267d572faf707540dfc3a79bf5d5122d3f76e8812d227d18a9240e4c
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180126.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180126.ebuild
new file mode 100644
index 000000000..f0749e767
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-groovy/netbeans-groovy-9999_p20180129.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180129.ebuild
new file mode 100644
index 000000000..89462d6b0
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 3c831835b..161c57417 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -18,6 +18,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-harness-9999_p20180102.ebuild 3805 BLAKE2B 0ed65629adf2467bbd1e393fc88e2b0a7dfe41b47fb115bac625aa2867093f48336f71c3794b7c0d42107262ce050ae938caf2a3275bcbd8e68bc7c27980d3a0 SHA512 f7f993893f4478e551504ce2baa56349508b09e165179787e4a09b8f0122118bc3220e6ed72c6af1f31c07d8fee844cd0d5ab1aae64ad60c6ad1801a38e1c812
 EBUILD netbeans-harness-9999_p20180104.ebuild 3805 BLAKE2B 5cdc878ea65b4bb859ca14bc0bc22a19d418b6e254ca1a8eb13a16b196ce5c29b7b0394c20e46c7982912fc272098961e3a90209535f28aadf689d9405faf146 SHA512 6113393a78456e8b52ae7b5e23de96d499ec827c39c23d96ec545da938796af0a65d0133f6edf6d768e757be613a2d8686896fa395aad1fec75dc64942ae4f0c
 EBUILD netbeans-harness-9999_p20180105.ebuild 3805 BLAKE2B a5ebb342fc8eb781da3c89efcf6a19b95d9f012c5b211ebf90485bfdc04757f5dbbd2e155dceb3bae3f6bffef399896a42da68833aea970d566dc4d02bc6d801 SHA512 9e718808eb1dff85fe04bb6871d8b04625008cc1c82b253141f26138d5a98e8f0bd9eb06714189d017dcbeda81b9bc351a7aeb90ce188fa309d6f13d980d38f4
@@ -32,4 +34,6 @@ EBUILD netbeans-harness-9999_p20180122.ebuild 3805 BLAKE2B f64d948d35a7ddc1632d3
 EBUILD netbeans-harness-9999_p20180123.ebuild 3805 BLAKE2B e0a4fb9fc649e461fe1098460aeebd1a9f22f40a114980b038731b6d83b9674acbc4c3b7af5fe305ace36ee7b8598fcf19a8f6182f50786462501b1f1c09ad48 SHA512 4d9c83894782d01d612028ffb2e74e36b4a5263a47d54b3c77e18cf20e54db8813f76493034a14124858fdbc49a9ad8bb71752461627c117465dc5d67b0b6f49
 EBUILD netbeans-harness-9999_p20180124.ebuild 3805 BLAKE2B e33efc3cb9b066bddec4bfaa7c46302df27c5c824fb5dfbe1c9b7912e2b28267886b62c881febe008f71f222dd0bc27452b7b32b4a551896963442ce6247fa9b SHA512 46f966917d1c8ea5451efb9ecb05e12b575d2dcfcda1c119d65a2696bf0cca3aca73eb2ac86293e6eeed7f73b43a702c13ef143dfda67d61d9c560bcb164dc90
 EBUILD netbeans-harness-9999_p20180125.ebuild 3805 BLAKE2B abaa253bc72df14a64c1e3ed028a8c9347c84de106a4ec04bfa5819bd151710b7fbf1b236d94aef505722e9a4883646fc878f98df0028da5fbb7544ab35f36c9 SHA512 66fc8448364030dbc885529dbf82302fca789d5c888f33833690c6ce67d3e55aad19537e6ef7fdd8a538f31846f05763f12f343ad435d8b2f3bd16e5024c505f
+EBUILD netbeans-harness-9999_p20180126.ebuild 3805 BLAKE2B 7727ac49fd788e69b3aa706b4c2c1518fb07da4af9e08e47359bdea7d34359718fc1a68702d4c1e0e3e428c121f2b0d85899a2b6bbb8f3d95a0d49f020581ccf SHA512 88d902ae9edc66d5f7c458d9a6bc427b0c45dcbce8fbd55637f6865584bf76014bf941be6f36fd6e04e813dd508df5535b0f91d9ee5ec16b107de4908768af6a
+EBUILD netbeans-harness-9999_p20180129.ebuild 3805 BLAKE2B 32b5180d37bfa81e20e01777f28616211fb594abc213adaaf478877b7a61f63b8df0225acd94ef1763e30258d6c82d65db4c93b48638bdc5b8830c65f4a78a01 SHA512 b323a5b7479127724e77e9ecd1dee591beddfa799290f7bad48f22a7be6fbd3686f9a982408a5cab940978f48bd79b68e46b2bb4f4be321ebbac4529eff04248
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20180126.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20180126.ebuild
new file mode 100644
index 000000000..a29302c6b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-harness/netbeans-harness-9999_p20180129.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20180129.ebuild
new file mode 100644
index 000000000..41c4f83de
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 b1a1faaac..7659a8af3 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -85,6 +85,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-ide-9999_p20180102.ebuild 29596 BLAKE2B 4fbd6e8f6e3fed4370887f0d16bc9961e69c273d755018d681def49a6900562c94683ef2d84f2ea7ee8930f79ab5d540bc7eaf19add0488a4bdbb82254ceee38 SHA512 a0814b85aaf4eea4c65313cfda8525a27d0f24bcc434a7b39acb2148804847cf2b001938a942b01f74eca663e9e05f02db3cadee4aa372e56c173ed60ea9a28c
 EBUILD netbeans-ide-9999_p20180104.ebuild 29596 BLAKE2B cc79bc2f34f735d97287e0059371d78a488d0bd33dec4c4c0f076b52b4bc6a2a123788e0a0e3b95d52770fd8282ebd36d62391dff4cbedbee6b2c4b950c2157e SHA512 68f7385f51238c0a001dedefca5ff8400cf9e575c51c425fa51684bc9e2ea535601b97efc1b08ea80bc66473686d27739f73d58facbe823e7eebe7be364bf559
 EBUILD netbeans-ide-9999_p20180105.ebuild 29596 BLAKE2B 1c1ecd41a6209b0dfbd2988b418f280ef04eaa198bc1132074b63e095d7326c3b35a465136db4278b24c7ea4c9823f6c2f50f2e8f7854547b5e3283845f00883 SHA512 615ce4ce11d6d11e2c0756731c51e9456ef9345e07157677c9fd72efb22267824a824ac7442f94c7358f10d3b778491abfc03bea4514c895e68facb9443883bf
@@ -99,4 +101,6 @@ EBUILD netbeans-ide-9999_p20180122.ebuild 29593 BLAKE2B 4d9b508db0614ec2a055cf76
 EBUILD netbeans-ide-9999_p20180123.ebuild 29593 BLAKE2B 3078087819c84cbbc6aedb9367a32095828cf1bcf2669ea31c62673f82c8399438c0405469a40407201a5705019ca1b8e09fe9690cc08d775c62d3b8fc9de7e8 SHA512 c45b60edf848bad3d1c8163b4b22fa4aae2ec179fa4d9b9a000640a62053fd596cc4ba5827ca75a04d469d8d7e585ef4c7f85e60f543d808f8fc1bf6eabf46ab
 EBUILD netbeans-ide-9999_p20180124.ebuild 29593 BLAKE2B cb0d9b5f43638e442d884255a66ce671024bb8473f21d47a7d924c08dc8693da6f94b2a480ef8100575b2877ff3cb2022e4b2249afccdfe7a78826723ffc4c6a SHA512 81cab2753c52da51eee1f3aa02c09b3b4f920e78420c92f7148cd7c19e33a36513bea95c76f63524b48e9851169fa2bd9dbdd0884b5a623ae6715852a3e0f46e
 EBUILD netbeans-ide-9999_p20180125.ebuild 29593 BLAKE2B 08afaa6c552f444d5c44713393f95a586b70a806458eb96debe42148dd416f9c6c2190b3cc619692ed95db06c6e3dc11ff049ea14d24112ae525dbdd198f4c68 SHA512 6824bb4e5702cffd8a50db51d02856c217d5e33bb934f027a86842641e10e4306a30e9c99bd0abdc2a8006da0b883e0ed6391b75d1433646ba831342cb151174
+EBUILD netbeans-ide-9999_p20180126.ebuild 29593 BLAKE2B f9d4ac4d1e5b4267b0b148b00b80877923d1ce2ea5aa2540ba643a5fad2721828d7bc8d1e0a4dfae800e7832e16a387dccf6d673a6127cf2d30cbeedce0f6ef8 SHA512 f745f9b3fc62699c5b13f1366bc1c67c4eadee9fc5f55b7ef3de7868f165de21d83acd917a8fc5bb1992f918174c3cc89afa428b1d42639a11418e8347dc67e7
+EBUILD netbeans-ide-9999_p20180129.ebuild 29593 BLAKE2B d247204238a0df0760aa8f167b19dcc535c90fa86546782fc4bb702d9c13ed3966b34eca1b6b5f5aba7fbcc74fb54c45420a762c6573e6e9e8ffcffc6e643b38 SHA512 9ab55fd2f196cfce7297d8e9cf63b2dd3f6e332b0d36033a5573067594b011adf577fb8b21337c526f0ecff83a9841b235600843415b075ace53b60f0080e2c5
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20180126.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20180126.ebuild
new file mode 100644
index 000000000..918ca9949
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-ide/netbeans-ide-9999_p20180129.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20180129.ebuild
new file mode 100644
index 000000000..b42c8ee77
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 d454bbbb6..8bd85b8ae 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -38,6 +38,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-java-9999_p20180102.ebuild 15702 BLAKE2B e2186391562c3269ce1678912ed40bef441fe5ae0f0b070690a70f8d3ebbdffe4648aeafcd3f6bccf11b26b0fead94a47e1357339710ca4d0f13a3792303a44c SHA512 ba84888cda741c4dc81327ea9f30536d2a466508defbdda4898561686f8c43b03ee0a4c6e28c5357b6ca25a35614307a5b48fcf840547d68137090ee53cbf6ff
 EBUILD netbeans-java-9999_p20180104.ebuild 15702 BLAKE2B c1e6e92eb5ca0fd982bda0213e2cd6613b49bd3121f0db13ed3fd9f391f1ea28f8e22f04f9d1f62fe4139116fffa3fc081b6551e9b0d1dcc68f54710191d0688 SHA512 c85108379e6979409360dfe98481f0d0f2fd483e253c60417a19e0a3743d1f3a2ab1c1eef53ae33b21e040ce2136fb466a0b4e99e81641804e90c209e24c921f
 EBUILD netbeans-java-9999_p20180105.ebuild 15702 BLAKE2B 2419da6d286074819895cdcdf025a86d0f259c645841c7ff013ebe2a732ad9ac05c3d052929c83e048e0f9a98278cbb0342add88dabb5d5f0fcb95b275375b32 SHA512 c3784af5e0cc1404f97a73031c25c2b8df47ccd7d4e1b3ea42bcf00e4d55bb98f07766ade534ab99b28c999c468b8bfacf9ae3f3154b0e248b280afeb2ca1150
@@ -52,4 +54,6 @@ EBUILD netbeans-java-9999_p20180122.ebuild 15702 BLAKE2B 629ac211626e6065e1d4f62
 EBUILD netbeans-java-9999_p20180123.ebuild 15702 BLAKE2B 2f3245b860283cb8477d8f419880af68c68200c45065dea18324d78efdc506e734bb3cb33b2dc711e74db6735a08b8af92bad8427e3bf9078450cca5e6bccbad SHA512 5119e48543365ffbeefb07cae4ae891edc08a331dd55edf3c7bbda4dc68d0b870b4646556e78094de538dad8682e59a737c272b8f95f5090267ec89d0c885529
 EBUILD netbeans-java-9999_p20180124.ebuild 15702 BLAKE2B e02da50ab85f82b15a095b5d6bf7e1be9d2c930dd29174a6f6b29acf6970b6bf940e71db3918f9c6ca74cdd954bed9a45ece7afc1a2a6027cb38168f7a7c6119 SHA512 0d395145792d8235acb7755f44f10ffdf44111b9fddd5108eb71cc142abf7c944530f899149eaa1a5ffc8929cf865858fe935746f4ce289ec24aa75e607f6e4d
 EBUILD netbeans-java-9999_p20180125.ebuild 15702 BLAKE2B 84e68bf62b6bd1d0acf4bade601648a4b8fbbbbbc36c3fae1282684afe62cfa6d3125d3075de2b07e908650682fb1336e3bbf53113ab7ac11e2126e0836a3b9b SHA512 b56d00610793d194e5b8daeb672249a9849d2a1340855932c3c8862c56654425dbf000b2d072d84e8c533529ecabc916ef6594f5669956d805aeddcc823d15fc
+EBUILD netbeans-java-9999_p20180126.ebuild 15702 BLAKE2B ec5f6d4bc5db38f30a46086643a3caefb3685296367c6251aa7c684210fe8d23ec88928bf5a767c67d6e1ef8e4580956967f0c097b064d40a6024137e7f3cda7 SHA512 0a76d8a1abed8db5502c2ece2c69cd41bc6e56377606e3970f169e849d307864a39d3a73db335fd79a746e00b5c8520d554b2b9a7830a3a6bb27ec98fcb7fa3e
+EBUILD netbeans-java-9999_p20180129.ebuild 15702 BLAKE2B 91562c22503ba2fcdaef4436b124edf000dc9c4e6fc4bbc5a87411dcca2fb24153a36c463afd1c1a40f6e7a708b8fd66a08ae7db4a90e1753a6de878359126d3 SHA512 de41e03a1d5271abcf5070b0b58f7629a8caa6a499e5a252694e46ad42b49a3e7083faf7571aee6de3927de2b6c8e8e156b1be23a95a000bc3d6187599a7e531
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20180126.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20180126.ebuild
new file mode 100644
index 000000000..11916d552
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-java/netbeans-java-9999_p20180129.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20180129.ebuild
new file mode 100644
index 000000000..5401e470e
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 d4e9d6201..7fd5549a2 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -16,6 +16,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-javacard-9999_p20180102.ebuild 4648 BLAKE2B 4e87860ad8923a88eeabdf4c95e3cb9124e9c166c2138b371d5f81409e3c69940adcdda27424d92905620b4c14c4251e91e8bfe419133ebcb81cfa6251c7afd9 SHA512 912a2d96e4dd56defcca255122f72ad6a56b824c93c09ea6c3356cad2b8e451bbab3cef6b9281fff30607176e27ce9462407ce819c0661d09e6bc48108a233dd
 EBUILD netbeans-javacard-9999_p20180104.ebuild 4648 BLAKE2B 774c50f3f6cb3fc4c015d0a32d0bf25a0ba557b751a0519cee5afbde46f4f2f6f0ec20e9cd16ed180fe0226d08fb2e1e3c43de7356736c896815f2a160d61ff7 SHA512 05c755bfafa799b468872b99e2ac94395ca34fe58c5ad6ca4cdf3a36e2587ba149f2827c5bd6754c76ac97cd7690fa90eeb85206624d783357c7df99df9e4cb9
 EBUILD netbeans-javacard-9999_p20180105.ebuild 4648 BLAKE2B 573bf2a046c73a194b6b5d76e4c9a3040587203a45efa6de5291abfec544a32757e3cb9d05e6e271246974a0553083cda2a685b20bd5c40ee1a2fb7526280482 SHA512 c904e1afc8cc36b02ccb8144ac1cff8aab6b0cb287d2a8f61d9df0315d9e973d3753839070e639787d0df69b7a87401ff7da480f00a8c3a5419cbbd04e0a6985
@@ -30,4 +32,6 @@ EBUILD netbeans-javacard-9999_p20180122.ebuild 4648 BLAKE2B ed0d18e75f7ed915a168
 EBUILD netbeans-javacard-9999_p20180123.ebuild 4648 BLAKE2B 1df04214c72a5a19f864944cd8a202f625fcbb1b97cc69a2b11703c5c74390517b2b2556364c8631a5972aa1d7fb1793486aa30f7ca7405865f5c9c4012c4ece SHA512 b4b1c3b3502d1f6a0dfd7a889d59cd81441511947dff69c8e39d812c815a6766689566e544d4bd42d690a90dd70ff7efe4011f40ce0b8160201c9a313cecb05c
 EBUILD netbeans-javacard-9999_p20180124.ebuild 4648 BLAKE2B 6df10a8de859bd8de0d9642da960416f395a170c527333e8adaa13e3ef93b3b81d38e96356f142258e18a919c3ef1716755c9e19279db9892145708ffabc9cd0 SHA512 5b6f292e6c5b8230f0a2a1471cd20ffc782167a2daf750c9b7ea2493c732a388a145508d279a69d4aac9bd604b3daacee6427388345e863f9ebf62c4d03e5c52
 EBUILD netbeans-javacard-9999_p20180125.ebuild 4648 BLAKE2B bf238b9a3e5e3fca6ef9c2bcce0fb8bff4ccf31ebba75fdf053cefefcce431797f4a4c5520acf40757869be59d9c062c123e955b0e7f35d4cd7e00438a46c369 SHA512 982e664b5f098e7364855fc627c317a333f147a7258b9bc86b5cc282bab9cf1476067623f06318cc44b79691af1d7f3f411970059a676e3000a3b08359f3c32a
+EBUILD netbeans-javacard-9999_p20180126.ebuild 4648 BLAKE2B c6326429a41ef12740ebe2ae09fb9f87640ed61081d75c8913d551a79934a4536115aabf26646cff28666ca0afb224190c19298ec0b4855a184a7279a4da5151 SHA512 5631a695c05b6c856011f1973a0eafeb0985f790a214649694f86332772c8450bff1d78feef0b8f32bfe18ca9e87a9cd120ad8ef59551e26a139d34426bea477
+EBUILD netbeans-javacard-9999_p20180129.ebuild 4648 BLAKE2B 95474de7bb477ddfe146446d01bc888682210590df45b986a33cc0a4e99d6a419f22e7fde8c1807f5fe10822d6180b8d322b51c6036b035399e88a0c74d236f3 SHA512 4fa1f0c68a69dec834629f10888482495aa3a3494ae5136d8d23e2b131268b1e421ffdc5b441a070a1e762eee811f9a923b7d903a37744d40ce574430c09a2ca
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180126.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180126.ebuild
new file mode 100644
index 000000000..f8bce1d19
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-javacard/netbeans-javacard-9999_p20180129.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180129.ebuild
new file mode 100644
index 000000000..ec8a5e5e6
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 e080c6c19..78db1b11b 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -14,6 +14,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-javadoc-9999_p20180102.ebuild 5992 BLAKE2B 7b26c25aebb8784927b1ce5bb56a9acc12ed9217ffb453ba7b131f416df8466dba83a23a60fcc0f4fe3d8799ed4c1a9cff31fa0398483847402d546caf6b8496 SHA512 e80cf3c1b83ddcfa0a1f8148a34a85bb02ccaf67dd35055d92cf1af88aa0aa58cf134ae4de8475198cc42ac09454d2034fa821b2fcb1b5530c5193d517385e91
 EBUILD netbeans-javadoc-9999_p20180104.ebuild 5992 BLAKE2B fff1d8262132297f81560eb4b6b234a2e2c4a132f471b54edf1d2bd69747e0d5b2f84d2a677f8e20675927cb04be0c09e882cb9e3afd478059bf23f353981161 SHA512 f3f697419305e2868971ccad6099ce398d6a55f6cfda7dcca286509291fd16b4bd777b81070993ab668688c7359d8cc2abd29ffbf4897b4ae9afe46299519e84
 EBUILD netbeans-javadoc-9999_p20180105.ebuild 5992 BLAKE2B a015e7fb453abc9c751de04ecfb13297c7dfe1b8847a9c4681914ed3543669721c0f079872e63399b30e30a8a5fa9328bfc98f7c1926a40b24a3604bf288b41f SHA512 e546c762a11ec0a1f3ec56a22248fba6e95f2f6a81ffb682ace9f0d97905532eadf0ddbc58b61d35ea3334d1dc130530a4de67458896105f22a97907d9ef1a10
@@ -28,4 +30,6 @@ EBUILD netbeans-javadoc-9999_p20180122.ebuild 5992 BLAKE2B 004d37ff4dd95639cc0e5
 EBUILD netbeans-javadoc-9999_p20180123.ebuild 5992 BLAKE2B 4bb63a3f0c36c6da7d864c3d64c89b4b2bbe319b2c28f5530f85493d8095bb8e75c248979d6ff7d3a962adf786282e47313cc859d8c96c7c6810c668cf22b44b SHA512 30ed726d8e94a7436ee7365e9abb26d343dd0984e3e8fc7468704801c7d5b920203ae6419ab41bd1e8cb49c2d6b2d77f99cfc31c9b87cd9aa20aed21669313c3
 EBUILD netbeans-javadoc-9999_p20180124.ebuild 5992 BLAKE2B a266820cb2426febac00a42b4b6633ba112b2b7d558018f65635a72a9ac2bf6cf1c9e236e62be952152b85e7144291b9d7c6e640fc2429ba820380d7f4612a82 SHA512 3a805e93d435455cdf0d58020201e5be8228c3244de4671cdb46d622c65875ab5b842deacf52bcbbb63f98c12412ec91c78c92eac7b0bf4f26d816a8f64bfc4c
 EBUILD netbeans-javadoc-9999_p20180125.ebuild 5992 BLAKE2B f285deb724aa083f65c61fafa862c407dd23e1220e6758298d66b0f7b3b2590ebc527e0465c15b8028ebe57dbc5e82977c5c5c9a4ce9b64e3b917097ca7e45bb SHA512 9a60ca2e1803ae426be825b380d80353d27f1575252a3b340ddddedeca81b1e18787496d22276b316f49e126817aa27d4385e355548f04df10017a67b02360b0
+EBUILD netbeans-javadoc-9999_p20180126.ebuild 5992 BLAKE2B dac53b7889ab34ff3602cccd7b83cae21ca1553d7b9e749196fbf8d9e07588f68ffd44302b20c8066b82df8df1226724dc33ae47b0c9460a36b2b3b50f679793 SHA512 dd219242f7ab3c529347a761cec3d8bf0fa04209c436bd72774193239a765397d41d2330ab93231788e9c7676f460207ea0f874ae4e66963b445d921f0ed6c68
+EBUILD netbeans-javadoc-9999_p20180129.ebuild 5992 BLAKE2B e4d0362576a7b0c39abf05f75aef31a5702559dedc06ed720454a4552edab11fec4948cc89b9a992c269e1db4da4823902acffc9d20cce6c2995e5ab3277005c SHA512 6b43c8798b95f14542ad72bb7b4c0993ea83bb36821c707e6a557341438e1450fa580e45eb81641a99f29a7ba7259dbe6b7db6b4aa8aeb2aa8fd3277d92dcdbf
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180126.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180126.ebuild
new file mode 100644
index 000000000..3467eb58e
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-javadoc/netbeans-javadoc-9999_p20180129.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180129.ebuild
new file mode 100644
index 000000000..1ac6fbb8a
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 8a2ae4977..47f859243 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -19,6 +19,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-javafx-9999_p20180102.ebuild 4397 BLAKE2B c722b54a3bc1ce181adb1c7e32d6456e3d77180309ffa4a88df2287cff77c5fb6d5d9033f37e4f61a917d71d2dfc15dbf7f5b399bd71232f9358e743e261f9ed SHA512 923d16e4523a0cb61deb6cce14ca27f40c5d1853397206c1888eaa63ebd05c45c7507d8b949da115cb30394aa26ccd8dafa0bee386bbba46ea66b0a16d84b854
 EBUILD netbeans-javafx-9999_p20180104.ebuild 4397 BLAKE2B 143371e6d9604d51e346b8e2cc75f613ac09a075abecca5b386f7b215f992ceac3142839a13b6c9c70e4536ba137c9c8854f12094015f28fe2eef028d1a08b7b SHA512 79f9efa02c7e8eee61f7cb24208264c417a37007162428dcf254559db0448f256a70969ee040385653c373b29df183958a5a26e10483c3cb51d93f4ea1a7df4d
 EBUILD netbeans-javafx-9999_p20180105.ebuild 4397 BLAKE2B 7908c9a2239a1091e94f11692370d2c65bc30399f8249196ec8bbd30195dff63a6e0bfa6ce4c8e63893c81a76ffe5f11a2573441dd6a1d224d8e29814e4b64ba SHA512 cdacc4172954072e5fcf2399a6346f9e2f834cdf24d7d46d5817d906541bd87acd986b9737e695d6cee4faadfe2acd9b2a60846fc10f8d6ec19b63650e24f84c
@@ -33,4 +35,6 @@ EBUILD netbeans-javafx-9999_p20180122.ebuild 4397 BLAKE2B 8de06d5fac15794bc29233
 EBUILD netbeans-javafx-9999_p20180123.ebuild 4397 BLAKE2B 186d3788dcaf14681599ad0acd18e366cdf49c636a7bbdb7d776e95f3d24dc17f90b60300a542862c59a07275a952ff90a3f98e0333a5150373cf210536a6198 SHA512 51e01d6a3b152c4d0115ca6ce77fc18fd551cfa160f4a6c065865e89cef1f63592e39f461df3f5fe2d1705bcd16ed4cac2998c5775f63eb8851f4612fc3ad32a
 EBUILD netbeans-javafx-9999_p20180124.ebuild 4397 BLAKE2B c66a882cc68a9ff0b808d385c1a54f7cc0de252e060424cfd49651c680b9e2a79ee70164c4906fe90b15c35b39726f852006eca8de21479be4925fd8a16107e4 SHA512 b51e063a68912b4fbc3727390d0605260a75c9975950e7661c73f61d75ad86c69dc48ee2a15726444a15266e10629da22ea8a3ba8c3de02d3fbe8a3490116570
 EBUILD netbeans-javafx-9999_p20180125.ebuild 4397 BLAKE2B 6c187941188d46194b18888c7db143fe2d99cc9a18dd77ac6e78eb3be536b2af38eeeeae3ad0573478a258be1fe27bb3d0e84b4e0ad28e5b2988ed9dde572a9c SHA512 1b7a379384a61307cee7baf3004a9d754bc31cc3ad21e5d37d279f82fc29922e2bdb7c3e53484da45fb475308d4a87c895111f6ffa9f335568d3af5de847e57f
+EBUILD netbeans-javafx-9999_p20180126.ebuild 4397 BLAKE2B 8b115db179d01375cdb96c2c29e2df08250611ece13bd84f2b388348e729ce29e9b11136158d64cac27808aa1c6113eca15fa3af29f10863bdbcdb976c3179b8 SHA512 6d65768f83907bd9f2dcca324e2a7c28e81a335a43510b92739551f835748853417c49136ff14bf63cff03485ceab462e1d0a1f7e7456bebf8e8604c7fe488ff
+EBUILD netbeans-javafx-9999_p20180129.ebuild 4397 BLAKE2B 156aa7899186e938336122ff664321248672aa2aeadb056520f1faeb6fdc55a6f7df1c5d13f0a712908dfa4369a9380bd0439a4db65811f0e531db2815b99566 SHA512 b56fa8ca35c3a6fffd505852e83ae239c6038438cc3aed6e460eeed8cfd5efd0060dfbea8f69c08cb3fd8edc78e18a627ddd9991d39e7f12dbff06948487cfab
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180126.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180126.ebuild
new file mode 100644
index 000000000..e2ec44da0
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-javafx/netbeans-javafx-9999_p20180129.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180129.ebuild
new file mode 100644
index 000000000..f3c09f6b4
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 b7539dace..bbc45cf45 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-mobility-9999_p20180102.ebuild 4086 BLAKE2B 4fa67750ba741214dcd504905cf1c41517a1e3627a363fe8c962f6bf9dbaca96b4d2c9ff609ce9bab4b049bc2ec598e7bd9e71517916a381082ededae8b058fe SHA512 ef547f9229be13d342560b1bb7da6a57fa030f0413f904acb5c30ed61defe77132dfefcc31a0de212f406243a616d4cc7d7d0e25315aa2c0d9add7e3987904f6
 EBUILD netbeans-mobility-9999_p20180104.ebuild 4086 BLAKE2B 2bbef92f86ff644abd6798e337d09a66143ee51ff83e9c922f15f7ec922c3726222ceb13b0f933786ccce330c475a984fab1ead49089fe5651ab8ebcd940d738 SHA512 73cd371ac85d5b2899f8e359d6d9dbae516e2009b146d5a2dfd344f7ec385dfcd46ba325d65f760b5beda79411dd761c4ad3bd06fb62c75659a0865077616777
 EBUILD netbeans-mobility-9999_p20180105.ebuild 4086 BLAKE2B c7417e9da017f466ea3758dfd7a20ac25ec5738b521b446f7bbed8ea358477540e5851b4628c0af0f5c13bfe2c8a2c7d2115047cabba1f658c91a6e8d69e7b41 SHA512 4238665048aff0bee7c8eb7023a9f144919aeb5d069e3d1aa2cdba9e7f13901650da51c3cb8cfbb6509fdeec14d23364c6e7989e3990fd83d3b00543105003c5
@@ -27,4 +29,6 @@ EBUILD netbeans-mobility-9999_p20180122.ebuild 4086 BLAKE2B e26c6e835e81c5ec41a4
 EBUILD netbeans-mobility-9999_p20180123.ebuild 4086 BLAKE2B 055973da46da65aab6dd1bd03f49988569f15f4d5bd0e6168a48a4422b010fa3c8def6aabc743d0fc476de9018f381a0e120e66c4543d2b8de601862a0e25f2d SHA512 d49c09f3778c4db864026eed148f3fbcc9667b898eb1c65f4e4c5458efa3e891520104668f7c889c0167c7974384d30206c458ce4e25d1e950856842dd784fd0
 EBUILD netbeans-mobility-9999_p20180124.ebuild 4086 BLAKE2B cb9351bb9cfecb6a7824b53bd256da9df3e023984048cf7a6c9e2103f448ca517ef23bbe730656b720872ac28ebe3653c6769536e4387944ff5dc184054b41a3 SHA512 38083057d7eb56c1c92efecd2263ded0111ab5ed616c5616dfc5504dda63dd74cd3d32b4d9224c46b3bf413d9b76fec937d45962d0a92a95c461ea7cd18703f5
 EBUILD netbeans-mobility-9999_p20180125.ebuild 4086 BLAKE2B 5e5a6da5e6f088f4efbcab37c1a5a5a6068d2f0f7ef28adbf168bcf827d28c33fba5fb537898d005eb91e14826a292ab7c5079306b96c1f01d6e6a2037c21f13 SHA512 ef9ea358e990b820b5213196a3dc86199b2a0430befae568bb91a33b525e182068a0bd65d7df8c9b368ca1450a3caefdab8441f4af215b10ee0e5730b96f5e90
+EBUILD netbeans-mobility-9999_p20180126.ebuild 4086 BLAKE2B 305aeaaaeeec94ecc5d7c72cbd321804821860e900da1d62a8e155d68df487d6a92d487f2684c9d8e6e224fe71f9ddb7d2bf098ef77116ee6dc634ed70b9ee45 SHA512 d1cca1a8ac58e963e5ecadf8cabb7acd5f4734536d351b6a64c300562c0a6eb9cdc2681a53ab561db5fb51473599dbd314fddc9ca35151c5936629cceb71ce8b
+EBUILD netbeans-mobility-9999_p20180129.ebuild 4086 BLAKE2B a87197c8446bb13421bba53c225fb2b0f424ce1274b317d4e504c89623fb03fead1a8f08915aa1ba461e2933f0ecfc49d76d826742fc16f6bb5e0bd2ffa1e03e SHA512 017bfbe9c668e4c542c836c4ac514e5c69edfb41c4e09d310fe652998d48f10a9ae3859e0ff7be74701faeab743f0100cc22cee0249b01a738841bea7ce7bdfd
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180126.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180126.ebuild
new file mode 100644
index 000000000..adc420dc0
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-mobility/netbeans-mobility-9999_p20180129.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180129.ebuild
new file mode 100644
index 000000000..ba33c8be7
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 2f2cb3f05..0a5ad21b5 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -16,6 +16,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-nb-9999_p20180102.ebuild 3786 BLAKE2B 72c74a79ddb763455094f040b8cde34a64128a984b290d609238a78b6cb96b6828f748ee58672f34d46bd1c1a9b0296d90be0f44beac3b774ea06bb78190838a SHA512 661b12deee4b3b75a1f3bdd53614b648ee5cb3e6b17f3c0b63c75478208b9336f3e0c068e3daa6e3f4c4d0b435c35fd3bb6333e7ef9f84c391d70d06db1447fe
 EBUILD netbeans-nb-9999_p20180104.ebuild 3786 BLAKE2B 62e92517bf10f2228e80fe1fd55b607572e2ab096aef1293e1ea4f9705156361b6b333dec323b29e63e90cedb0ee271f22dfe1f2a97efcf95b63ee17ed74d86c SHA512 301308f59605dd83374a69f94cfe27fc21c72ad49f744095120cc59e67b3a48f244939c59b0c22c9be1b91a307a480eda3250dc1b0d08cce4c015ea7d7cc80df
 EBUILD netbeans-nb-9999_p20180105.ebuild 3786 BLAKE2B 1730414f857c29ea97a865f626dd027651a7642d1f8837e61b75fe55f861c615c57ec85e96140a1b9add0d766cdf87bd8b2917800f9a217a32a04fd448ae3ca8 SHA512 21fd4dfa1b8fbe2f7e1befd34fcbaf09b2dfa2e0cef2f892d469b0fcc38eab4c74edc33155e2d30fcb1ee5d4b771193277144d51db36fce08d11c201f0a0dfe3
@@ -30,4 +32,6 @@ EBUILD netbeans-nb-9999_p20180122.ebuild 3786 BLAKE2B 3ddf5774913f068acc478258f4
 EBUILD netbeans-nb-9999_p20180123.ebuild 3786 BLAKE2B e50102252f9e42bb9bb1a2fa860b3d26c6ae002a4ce9eae9e50cb23478295533ab7be62c580298abdbfd40b939d3398c873431fffbf8fa1c08739c7bd4746e3d SHA512 13cc63dfc058033254b930d9afe3fc2c90f6fc4ef513c88172c96ab25fd17710a7d7eeceb44b60c817eeb43d349cde0124c332c052102e6e57516923f34347b3
 EBUILD netbeans-nb-9999_p20180124.ebuild 3786 BLAKE2B 7e88c90fd73e631eb7ca1a5759f5dfd37a2f6683564fd37b22416e67a34ab13ea507f7a7ebfdf03ae2913cb464f972972973be2fb92b03577c317c2e3a089484 SHA512 44b738a68f91b43b281264c45fb06ba0462a5b5c608dcff6ba0754bbc44d44733c8bb3732a5a3c4dc4cfd94a909065229087cbc8730f907e7993cd5b95492211
 EBUILD netbeans-nb-9999_p20180125.ebuild 3786 BLAKE2B 6b75a266a241ce731448c9304e9faa7256de0e494242123def4545cc50f53663fd27bebe299cc978869c01680800bc93679f0f6c366ef80ad94b5ed64ca4532d SHA512 9a88d80d0dee93c75f4904e1178e333b520155e17b748c9894dd3028fe112384f8b57bf82c1dc44dbd05e952dec64f5c8059f3ebd0f6d05f946131ee8fba02e6
+EBUILD netbeans-nb-9999_p20180126.ebuild 3786 BLAKE2B 4ab968c310f1959318c75c8cc7338211aa4598ad2a8d3b4325345e2be6804a2271f26b2311a196da4251cc99874a07601324d651f07a26259016d867a54302ca SHA512 b092dbe42af1607dcf665afc50aaeb1dabfaf3df50c973384ac72769099592ceffd781c9616628708502a281de2b440b824224de305d4eb044bc969c897f3bd4
+EBUILD netbeans-nb-9999_p20180129.ebuild 3786 BLAKE2B 75e6f67ea036c8d37fef5a5a2400bc409420526c32a41a9936af254e2116d050fa287b2ed49897e8f1382ddd34624018cc4c0245df0fb553d3c24f7d1f0a11a1 SHA512 552fac0216e48b8ff8e6886465d1814eac223a43fca7169be9a27169f9cf86d552e617eb9e61459a529e3f627f860d4c793e50703c33260840327adcb21c2d60
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20180126.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20180126.ebuild
new file mode 100644
index 000000000..375e51cd1
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-nb/netbeans-nb-9999_p20180129.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20180129.ebuild
new file mode 100644
index 000000000..f0a69ea47
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 696b55b17..c3c358ac5 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -16,6 +16,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-php-9999_p20180102.ebuild 4095 BLAKE2B 8763ae5951c131a6e041acd1ed69d70c01c48dcd40c9f4303355401ff92c6e1d796ff5153ad96ab147cad8996706603f01d224ba35c7d6fe0e398da4c509b6eb SHA512 cba131a8d6be62562bf2a1b0c7c6f517ca4b4d04613028d1cfdecde8cc3bbbd6087c650289d10d7ef3f52ede45b2b2311e2eed1df020b3cf4f511923c14c5517
 EBUILD netbeans-php-9999_p20180104.ebuild 4095 BLAKE2B 2f481f8d9988ce70e7f3fa39a6d7beea0d16dbfb7b346afbbf628855568a3361dee4e5a17e7909bb6b26b70f70663ef457c2fac018d023482851c5abc67b0524 SHA512 477f19521e866d73dfebcd1dae970e1bbffe3bda8b5378026639f8692dc74c54e79d2a5bf2293920fc91ea4c4c38d540261860e325f0fbfc9a6fefe0476e2485
 EBUILD netbeans-php-9999_p20180105.ebuild 4095 BLAKE2B eab92928c5af0054741ae8f54aa6884e68a28d17687b6c91fcf6e6addce195a88880bf98f82867d4004425fa5421efc95943403951d4f07f45f81dfc4439bbbd SHA512 f758fb6f1de5a38e2bc4578216d4e9c0ddd5e0b79aea1fcaecfbdbc1d0871c16676cc8125d2dea1e0f1e94201f5848c9d8329fc22148cea1eecbafdb801949f9
@@ -30,4 +32,6 @@ EBUILD netbeans-php-9999_p20180122.ebuild 4095 BLAKE2B c634dac23ea0cc68f4c7182a4
 EBUILD netbeans-php-9999_p20180123.ebuild 4095 BLAKE2B 681cef04d26478e66f253885e6e357ffbc3d5e137a8b1d9de82d457819b14ba6c32be2cf3f6c5c57ca63074ecf274f784cf0a4eab716691ee23f4df7453879c2 SHA512 1fa95038252487a9a6d8817c6fb2aa180c66117ffb4373fa365149324059b1a1fd8bc760032c471ae0a2ce52c97295da6fa6e843551dc6285ab90d36dc37e213
 EBUILD netbeans-php-9999_p20180124.ebuild 4095 BLAKE2B 79f9b3fa777aadeb63681b5d7b81acbcac9f15e89dc0c7ef2dbdf7ea54fd2ab19e2db768d891e6f6af58ae499cf8668bbd8ba4e05bc6f272aa806f9e1822f519 SHA512 720e95c3003b3c2521eaad6914fac89b57b625ff51636fe6045c34ef8269a1060111af2ecfe02fd6046678e0460154dc8852300d26e9e555324791b8e904e043
 EBUILD netbeans-php-9999_p20180125.ebuild 4095 BLAKE2B 124ef0da831f823a3740d1453b0e6cb18c6f16fd0465612698e610988e7a827ad8b66b7938f80436ef98a93a41bceb4744579f2c0088ae5b1bd11958a5943165 SHA512 bb72ab8608cc34b19d49d73e20d89257bceff82594b3f91067e5ba242d927d7e1e885d7606db19390642f31b0eae89d61c29a8ee3ef68b52e68eb54bcfad9ab4
+EBUILD netbeans-php-9999_p20180126.ebuild 4095 BLAKE2B 82cf982f59b64cd5574bd51604b250dc6b27716008c7b1a3e44e922180d676b4a4fd553ab38fec1fc3940b21afb54de2d021514835f2a842124d9ebdd0b06c82 SHA512 459381afe6ac4a5bd9dcaf6b28c97ec8d89533de1d497174ac149699e9301083dcc6a627c912aba678d119516041a72b1672fd47ad3ab81e25df4fe16f7c155a
+EBUILD netbeans-php-9999_p20180129.ebuild 4095 BLAKE2B ab3769e41294327c8156ddb56dfa1360653b33daa8e685466eed7aa34055a8fe7b9c484dd955b678d8da3468b4c9fbebe2ad827aafa7646bf8e71bf2f52a11bf SHA512 44074e6a98ab421998b23ec01547177245d31a8b201ab229ff68e8cb3abf94086618130133d8642efab9530e1402b7e98eefadef1c5645b3f75dc64532b16aa3
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20180126.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20180126.ebuild
new file mode 100644
index 000000000..db899da06
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-php/netbeans-php-9999_p20180129.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20180129.ebuild
new file mode 100644
index 000000000..54a427c03
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 a5ee1407f..2adb13272 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -28,6 +28,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-platform-9999_p20180102.ebuild 9238 BLAKE2B 5b3b46c7509f2a5da5d803b321c7f3ad5f4ae517d15dcf9787e0017e6d90f385bea8f737679d392d4ab3e6e9706f860bb8fc1ef962d58ec4aeedae60e07f0381 SHA512 1b868df74190e8459ab71b496853705d5943ba9e516dcbaf6450e5c9f37d52d6dffe4b7b7611622303a605f8f817ab02d3c5346b96724cb1f2bca7cfdd4c254e
 EBUILD netbeans-platform-9999_p20180104.ebuild 9238 BLAKE2B 355ed536fb511d3936461f645f6b2faa3e7bb507c4b9ff9ceaf2ce5fd7a161d1e15524da81d87d7fd83c8d061ac45e84dd4a6363e6ae39c2b5deab336d2ba931 SHA512 c2248ffb073b76f5e022527f3e7f1a07cc67ec6d118379bc7c8e1b83f25fff29dea0053b4a0e0b7ac95bdda06e7b730935901e8e8993ca14b2c7b4fc0387d554
 EBUILD netbeans-platform-9999_p20180105.ebuild 9238 BLAKE2B 71a56a6e63375b23cce344a3a17e4562a45de1c45a512fceeb65536ca0edc3e233aa9a9a663c97674eda8c5135833a2e11645c5047a1a55dde2fcfd473131fd7 SHA512 2d4fd2ce9897e732c9cf3cc63c8fc418bc01d1afdb765333b72bb9690d037c82404ffd4f022ac77e41400ad77886622d52a5033ae15704fa69c27902b86411c7
@@ -42,4 +44,6 @@ EBUILD netbeans-platform-9999_p20180122.ebuild 9238 BLAKE2B 381d2a3f2ad10b905107
 EBUILD netbeans-platform-9999_p20180123.ebuild 9238 BLAKE2B 21f7ad4d8b98296bdcbdc91e4cb913d608767821493c7f3e9eda1d060ca982d955ac3d256f7ca30ee2d61b2b39fb101714fb0124407f0b585a30f094548f3b78 SHA512 c70224301d914abf28db5fa5ab9198d263e9bde3effef274185fb076e747bde903eec93d26388217da58c14bfa63b42494e8332af8fe97bc4976256b534e5df9
 EBUILD netbeans-platform-9999_p20180124.ebuild 9238 BLAKE2B 67be2e8cc51b1a22dfd6904a3f60349fe912a955eb0df2c35ffb43904f6f8c38a9bb81d08d2706f453781d170e5a3c6f5071a47129602d6448540a3ed4049d22 SHA512 d11dc9650ac737c65fc68383e4936a075c0f583fcff749c7a153a07be3fe94f0ae60d514e84e18bca08373ad4a707c2840d5201fec5ca45093630740e9829ead
 EBUILD netbeans-platform-9999_p20180125.ebuild 9238 BLAKE2B 10091211b8a148da4ab9dafad1f58581342cb7e8bdac04b9437c6b5bc7d9d5b72ba8fdf9de896ccbeec169072b3a2686e786b27cf99b9b3ca47e465fedb3771b SHA512 9fc6677e60d751e70a99e00c0f015b1926a3b6428f703b069ed766349d60f8e35436756246a25fe28a802723c5fe28deee085f128cb4016372823e41fffa68d0
+EBUILD netbeans-platform-9999_p20180126.ebuild 9238 BLAKE2B 2cf769956639535a24238d339f48ee69236d6b588f514a998a07099eabb42b3e3f8c17b02913270c4c828e4a4bafd5e20f22dfeb9a5eae0e95b4f5ff06779d6a SHA512 830e3a77bfdc73d31dc2c78c0e96623e3242e12c3328950169728f5e1bd8d29340a7c115e6b7e1ef1910df7bc9207245356df06f45379f87b99c5c2647361344
+EBUILD netbeans-platform-9999_p20180129.ebuild 9238 BLAKE2B 8ea9e0edc343652867e362ef511e3ab2ded1ed791d8e5dc17653e1f2f39574a537e2fb9daa4d83b2cf46fd55f736b6ffb3bd48a3d958649da8f9b77ce36dbd74 SHA512 2f6df34f1923d4aa1f08d9c781a16723deeb622d05c5819b63ee60e10c3a8c78b4eda83208ad24cccddc23babea885a0d906877c53dd894e7c33d1f1b7f6aec6
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20180126.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20180126.ebuild
new file mode 100644
index 000000000..d5e0f7e87
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-platform/netbeans-platform-9999_p20180129.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20180129.ebuild
new file mode 100644
index 000000000..40fec086c
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 d22eb923a..619d4c408 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-profiler-9999_p20180102.ebuild 3146 BLAKE2B 289441379ad5805cab4db4fedc74b798fc5d4b454945aae297388702e3115a8e63514beca148ebfd44c274fb84c8bc1dd769b70b5b18f1ae0516c73101c70bd7 SHA512 27561356318931885c22abc879dcbd6c917a2270ed736a8e5cb67e1e87afe3dee0c6c80f908db41a237fca468251c34f8a344f6788eb28b26ca5c008090c248b
 EBUILD netbeans-profiler-9999_p20180104.ebuild 3146 BLAKE2B f3a4b024dbf75617eb333e77cc938e16d55e0d87ed945d2824dac555298414dcd5ca68c85a87acbfca6d9afb2a8f6f576a6aa2b33b7d05d00d9d6d70f28022cc SHA512 6dd91722ce75a601358782989e048e1195eacb65940d18acab9931b9e4cac890fa06f843ae34863896f2623b4b2c4dec8305d71e3a4f339bc3b96169165ca23b
 EBUILD netbeans-profiler-9999_p20180105.ebuild 3146 BLAKE2B b35ec7013fff78a69f979a38faf080feb28c87849d5defda101a26895d748406cbc55a536bc375b92739a195354fac4a1416fc412ad8d58d09418f09bcacf032 SHA512 c0a4104f7bb832c7ea34c3e8dda219bbd65e05ef745b664065fedbb4d1abc483c572d6e9fd21ab1c287cde2b2087d72d301e514d47f529470d16a7b687ec627d
@@ -27,4 +29,6 @@ EBUILD netbeans-profiler-9999_p20180122.ebuild 3146 BLAKE2B ee5ee2a70cc94de25f72
 EBUILD netbeans-profiler-9999_p20180123.ebuild 3146 BLAKE2B 4cba44d844641e6d3f5174cea24bf6df2242a4a902fc531b3968e7740d33c6da4f497d90e036ba8604f90aeba3a2b7fb14e30cd99d1a81e21a62459fe93ddab6 SHA512 31b282070e9210e12df35556e43b5f9889f8ac9e38f050ffbdc7a652dc0498ed07c2c8c2421c72992cd241f4ec2dda5c27c488139105cd5358de9791c8edb630
 EBUILD netbeans-profiler-9999_p20180124.ebuild 3146 BLAKE2B f217e103b8eba614ecb983cba31f7990063e0cb689b5d6ce4ca01ddde55ab7cb3c9411d2c3784084dc7a47c270535ae81e7a1ed2d2cc18876296d8d01d762725 SHA512 8868f4fbfef80a527ed94eb0c10240afb4993c4e3163b33e4a465611f7b5da2778c086bacab1d1c3dbe02a7361e70faa03df0e30f8df243181aaf5cab2f39a21
 EBUILD netbeans-profiler-9999_p20180125.ebuild 3146 BLAKE2B fd0efff208b5d12655371c21fa1c70435a7e74c76a6964e093ff78f5876bc6201ca3cc2d6c790e8a272be60f77f350a960d6c10e7f08140a7da4afd09bc85a4c SHA512 ade38372431007555c2591b5399760775f5623f83e7df03f34661d750d6f242c1bcf78b135b5a8dfc1881ac5d0e1fdc0a6515cb77ddca95d505350a1f3c7f4e6
+EBUILD netbeans-profiler-9999_p20180126.ebuild 3146 BLAKE2B 470c3d5d71421c4b3cdc19dbc82e25f5984bd5c717230375666652086aa56f35b44e5055af4cd152b10695f8e713ee4c526323df574283fac399a031a41b2d78 SHA512 488776563bc89b240e6e2f7947216ebbf3635c492ba4076526db77885c182b3e3bf93ffd03a6bf6409f840eb3ef592690335d48d54986ecc1581f1d670a9689a
+EBUILD netbeans-profiler-9999_p20180129.ebuild 3146 BLAKE2B e75d5e1e257bc0db203a6453aa7964a802341f199ee58925b6512867745748f88568ed1b06a82658183f86f9f5ae9c7974824c95764e995963d72036b91b201f SHA512 fb62091f8bf0d48f4f3cdca4e2981d32f7a106a012dd1912bf9ca89757aa8cdd068127e13daf2ca098a1f2573766bf2504d2d949f4fc77cb62f189776f420727
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180126.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180126.ebuild
new file mode 100644
index 000000000..bc14e67f0
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-profiler/netbeans-profiler-9999_p20180129.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180129.ebuild
new file mode 100644
index 000000000..6730cb7ed
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 2c32eb3e3..8cd4199d9 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -27,6 +27,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-webcommon-9999_p20180102.ebuild 5932 BLAKE2B 1afa6d98c45a776ed7efb003c1111d2925221f77352b62f40281588f5ea41ff358bb787fc984aa112a3707ee871e3ab1afb11727965b7a811e506fb224814abe SHA512 aa817c40d3fae2e6bbadcac69eefee3784f04a5da771d76297102e54f6726808d677bfa8455577589f9b8b2176fa29d13e2b61865b075b6c284200e15431538b
 EBUILD netbeans-webcommon-9999_p20180104.ebuild 5932 BLAKE2B 018097e593bdd66ce1b334146e37e7d546b10bb833cd88e0e763fc918fdbc2a2175963d976dbdcdfd102f6c2d748bec923aee363bff72480fa734cb0f6df3137 SHA512 e1149ec0c9e6312718ff58aeda9d78e7ae4df389ea3d15d4b10fd9bcc5a03d42abcaff7303fd2afa82ba6178f0b751f76080adc594374a788054c8b587b21dfb
 EBUILD netbeans-webcommon-9999_p20180105.ebuild 5932 BLAKE2B a0782d93b371718beb886dc7066c2044d0983d430aa5a2dffead378890e31f869c8fc10bf348008d8908689b5bbda0debbc82e00a52aa883eb7f8308f987afad SHA512 72acdb456274921215e39c9996c2c3f2a220677b8813d52c1638fb4fdb65824427fadba7b4498409d1251952c1366b0f2a5bc11d3a7f687211f28e6a25ef6602
@@ -41,4 +43,6 @@ EBUILD netbeans-webcommon-9999_p20180122.ebuild 5932 BLAKE2B 1a2f5971acf3b8244b9
 EBUILD netbeans-webcommon-9999_p20180123.ebuild 5932 BLAKE2B 98c3cdaaa6c8af56362624ad9359ac32da441879fb9b36d6e668316c18ab62d3c45b775925a0f82d24df4a398a194bc0b7073b193bddc5736762234312e80508 SHA512 196d94ed4082de46cf3d7700ea8c690878a2209a24d3418eb6d4b683e613a5223392d07edaf67f1a96b40c47066d13807f70c07893eecc1989acdddf0763e641
 EBUILD netbeans-webcommon-9999_p20180124.ebuild 5932 BLAKE2B 0389370aeab87ae1f5eedeb478bdca3fc38b38683926718d42acf181d573232f27a629388011d97f2258541f194d87ebacb22b13cc545748c44be524e8d3511d SHA512 423b62c022235b0fc2c4b0ba0f6cab110b744d6e3cae5ad9104972b73edc77749d608d877126261d9dd2961cc1f25443932825e95ebf4b2bb0796cd44b1cf6e9
 EBUILD netbeans-webcommon-9999_p20180125.ebuild 5932 BLAKE2B 281e6b2330d3088e01cdce1199c1509d5ee4aad1c001ff7b6fa65930818b8496bfa2010ee0c121471e308b111b145fdcb1a855a0336a65e9f9f56f1e34f33939 SHA512 78c9fa737cd1de5dc43f2d3c4858001086886ab0c70d2f9beebffcb12f96576a8ba04d80bef831c273637ccaa762eb63a03a034908def15af2da3d1763c423d2
+EBUILD netbeans-webcommon-9999_p20180126.ebuild 5932 BLAKE2B ebd2355414a68cf5a2821fabf232f721a0ec3ca7caac156ee7726d7ca14b912b028f58e8d290f12ea24150e1a9f273c70e181600fdf175c1a0f75e414fc8e457 SHA512 74af07e76ecbdd21510be561d059f96a02f6c767cd60a1a6d40fa1d8f162af20d142d5193748006ca529109c3a88f4dfb5d245f65bb254153d80d431489be294
+EBUILD netbeans-webcommon-9999_p20180129.ebuild 5932 BLAKE2B 4811df4e5c1777f1757fea03b0ebf0b26607857d08ab6f02afe2dd63fe109dbd9d9b4f4b60456f2955c09af8c9c719d97bf0350a5e67a78e3d2fae517b16fcff SHA512 96e5cfc31a2fbb2af8f7e20fc042e9297e3fbb31ae73fc550e6a1d5b616a669b9ec2c53872311fb6a7a83e96c1fcf47887bf4ee169b86d205409ce4911f221f8
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180126.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180126.ebuild
new file mode 100644
index 000000000..ad94a386e
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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-webcommon/netbeans-webcommon-9999_p20180129.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180129.ebuild
new file mode 100644
index 000000000..579f7fad7
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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 7af1f8ee1..f4efd032a 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -13,6 +13,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-websvccommon-9999_p20180102.ebuild 2395 BLAKE2B 388bcd07f978af517e33854fcb0c403c329c9dacc28f1e185c9c88630bebfc77565818bf3ab78d32aa4b4816e8f1f6a9970e9d28d39b9f352e52c8c63868b4b6 SHA512 267c002fdad5e926f0f40611beb7b4c60334f583242d4211ed33cf8490099c9e60bd013748dcccddf5aa4b08b482df41db8d3afd5fcfb05ceb4575cd53c6ffd6
 EBUILD netbeans-websvccommon-9999_p20180104.ebuild 2395 BLAKE2B bd0030da8c6043db4e488dae1f74aadd43207f45715f72efa068b78cc6322a393c90b49216c0ccf2012852515cf5c2095f4f0514787eb4f48ff9284af84a1278 SHA512 5c62c41b7d80e77b6512791bc4f56d9bdea6314139eb2d22652e0d503abff46145f44bf72399336b751542027ad187b7ec6c9c92e3c984725bd515f57e23db70
 EBUILD netbeans-websvccommon-9999_p20180105.ebuild 2395 BLAKE2B 84eba671fbfcbd75f502a69fbdb2de7be6b01d8cb0ab4e708b875b4737a100db56babac3b81eb5b1c05830ecd8ea3df77a0c51b4a7c5161470fccd400a3f64f1 SHA512 8af87479010c556d4425a66540ceb1849d77fb7059d5f96c93bd70fe590f9ecef6884cfecb7b2f3c14e7f6ea5e621d91931482857f769be9a93e6b4d89c1d6ed
@@ -27,4 +29,6 @@ EBUILD netbeans-websvccommon-9999_p20180122.ebuild 2395 BLAKE2B 7fc5fa5536b8e7f9
 EBUILD netbeans-websvccommon-9999_p20180123.ebuild 2395 BLAKE2B b96c9615765f36bd78716203995fe1c70a0d46bdb3b024367e2ff2ee2524d727dc68e4919fa38450caf943e4c65c9afe8cf7d84d822a2e0cbb7491ef43d08f25 SHA512 253aea64c034e13b00080811e451dbf1429dcd7339496e36fac395f6eded2dc3459ab7cd5253755c59e2674c22dd180f5b8e6024e9f03eff54ab09d3f76ac297
 EBUILD netbeans-websvccommon-9999_p20180124.ebuild 2395 BLAKE2B 1ed7bb8e53b4de8557f4dcd06f6d12b19f4becd6c8a01b8c6486841d20ec7e8511f14a3d6ce10ef5b95eda047c7e0e85d44aa61dd3fa955ea2f599a1edbf4996 SHA512 b374f5522a23ab50fa03487ed8a905ee6a906db6b50db3d75cff90436c5195697dfce64d34484fc35746865bddd1f9215d636431477c72b64462020d926e2888
 EBUILD netbeans-websvccommon-9999_p20180125.ebuild 2395 BLAKE2B 05b565e544e94981fe90ff4bbd997c6fc0e5c5219ce51ca8cda19086178ee3eb1999a832a7bdf67e573c8a0067385c223013cf059606d09d4cb39f640cea5a45 SHA512 15860e34f5331cc594fe17331ae7be343a461ca3af0acc676cfc16b9ffc542e8f3efcd5880e7cd51b6ece0ab7dc50138e9b1773a318e736de7475d1d641153b5
+EBUILD netbeans-websvccommon-9999_p20180126.ebuild 2395 BLAKE2B 512aa0dc1b4bdbef669eb056bd8fba8dca3a6c41ac07c2d30138494449e4ca25669848c47a3a48bc01284121d73a32b39f4b7239f7c61243e57605c8d0002691 SHA512 58512ad77cc2c3031d91d5099df787493d0080b6bf5f9b40e7e6a9c36e6285035bd6cdddda44bae1eab82c97e5df2d6e0ab220c2cd9158d538aad53ade6e609d
+EBUILD netbeans-websvccommon-9999_p20180129.ebuild 2395 BLAKE2B 7a1eff56a7649879db19e58109e97287242dd256f952d7ebf6676848dcf1ab4a7f0ad459f3637972fb29bf929f3746a7b986ddf16d795b3280f0ee597761d4ea SHA512 1627cdddf9872f06056a1fff8ed67f38a4262acce7414aabfc5a5ea78f5fa70192b2dee748780a528d13fffe0e2c5702dd063c9fb593d9076403c2e87283ac2d
 MISC metadata.xml 247 BLAKE2B fbff0596069b3cf260a3fd1bba160220927b592dfab36a26e86a4b331ec7060e399121c2467e490aaf535755483bfbd631278d07f91e4fbc3dd03d65677c7786 SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180126.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180126.ebuild
new file mode 100644
index 000000000..5de395837
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180126.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-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-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
+}
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180129.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180129.ebuild
new file mode 100644
index 000000000..2a618c8ab
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20180129.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-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-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
+}
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index f12927595..4e0080177 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -14,6 +14,8 @@ DIST netbeans-trunk-nightly-201801220002-src.zip 221062529 BLAKE2B 911bea5093e0f
 DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
 DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
 DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
+DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
+DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 EBUILD netbeans-9999_p20180102.ebuild 6186 BLAKE2B 7faf7aed463b8f9fdab0f30f76063d79663d8476fb9a574906f03557183c4f5ecaf0cab79691edf6c70f2e177caa0233c8459f41bde2a7b549629712b00ff3e6 SHA512 50d352fe4cd0eab66ac5beb099c607f55a42f3f58bfe04e27a3e83d7ea19da52470e2dba92d941d7000b77610498b9ea760fec827120dc154d495085961c7fe9
 EBUILD netbeans-9999_p20180104.ebuild 6186 BLAKE2B 63c7387839ea43185e571b524b5670f97baafd5c33e5d397b5b09ffbdf1f8d28ee62019904ebbe73096739569d4f7051dc503ec2b14a54918d4d160a2f239956 SHA512 edb96028ce6c6d004a4b3ce37340d717ea39aa6a64ecccb1bec7ea0bfb8efdece3f12cc63b95ddba082b37cbb4356f3f443e205331ad1f6332c9e46d7b78902d
 EBUILD netbeans-9999_p20180105.ebuild 6186 BLAKE2B b52c8b6e72b596401a98b218efb47deff0a18f9f77ab13fb8f674200fa14c72e7eb25f36bc18d8b8f7c7a816cff6b12e426393bfae315e95d1278a7106130581 SHA512 2e2ea7994d7ddba73bf50c4d7511d178f67e5d5f82f4a9647cf5547ea95358bf2f0605efd455e73c79c90dec220fe2ad73ed8d0d11ab7d7644e8cd29a1c4fc0e
@@ -28,4 +30,6 @@ EBUILD netbeans-9999_p20180122.ebuild 6186 BLAKE2B 455db3fc8d5ece3d27208485142f8
 EBUILD netbeans-9999_p20180123.ebuild 6186 BLAKE2B 9c6ab5e0f8af16dec2476230a82a419ad66303990d5d16866b475b497f3f4c0595a02de4b814bcfd5ae0692f2c749286b07f50e7d2cc49c26570beb08a6469b1 SHA512 b21d0f30d43c6e49d0f5dfe8f30ad11576fd33ed7a2c9d9f65b24325ee2c642c99d8f73fc3a05770ff9ebe710c7180e7d261db145371663b901d53b372452bc0
 EBUILD netbeans-9999_p20180124.ebuild 6186 BLAKE2B 0f6ad062b82d72586a4096589d8c14fd7922882e457c8602aeb687ea37a49cd3f95ed04be44d985c3d85a0a68b5f8a9d78a6b66c831b9ad73769a4a20532b634 SHA512 2a5fb8bfec44f82e60ad3bfda9156c1b1ea2d69728225282ad82f7f19552941074396bd685f63ede990ed1994ee90d6850399c84c014d373df2c98a4069ec2de
 EBUILD netbeans-9999_p20180125.ebuild 6186 BLAKE2B 889f48c8a7a9f3bf38b9f94eccca83ccd05f02704c0cae686f1d26022cd4d90ef6c154216d8d90d12741b2004ca6bba426ef11af393cb51785eab8e84725ac02 SHA512 e1c528ebf6b666ab8fd5513046a5c25b6676623eaaf625da6a0150725fd68732d2a826273281709104ad3e03700107cc5583ea45b4ebf9213b0c6e443b98a892
+EBUILD netbeans-9999_p20180126.ebuild 6186 BLAKE2B 559dd47232ec9e197c00b3edd3889b185c000960fcc9674aa8390f71e974bd1be990f6a83fb4a7a792e34490337dd82589bfc0a3436bba5f6a79bcf369365010 SHA512 c8915d32859be20aefe4b455436767b2b0ef9f3f285cc7010f1c32acf29caa8feb2fb9500c6d7c258b35d12a3519ca0ba2dc03ed18309a9697e77da96fe8d4b1
+EBUILD netbeans-9999_p20180129.ebuild 6186 BLAKE2B a20459360b4ea79f0e93cd57a0fbefd73b4a61488ac2e621278b54ed3c7b51f5373f9234196b1024ecee80167eb3a73f6036099a645048eae17c579cf32ccb7f SHA512 566e3f211fb007ef42ec445e497436192104f20bd4f6a3d6fb637bf9098326de56d07b15a66f91e67bd668c473baf14ad127fc5c715ce04d489da26bfe864170
 MISC metadata.xml 329 BLAKE2B 88f7b4966ca5fc8e18720ef5488809039344b15344c78cc4f016ab3fa95f76283805ef5d1c85b5c0b419462a0611ed6ceeecb0eee65b5b1b068a605c89efdf6b SHA512 d5d878b3903238db8e1c807862c68fff34e86b972daac3e38a3b283c802ba8a5e6345723740f5ecf7b0313daa5430708a21eca4d4a1415069cf836aaf5429640
diff --git a/dev-util/netbeans/netbeans-9999_p20180126.ebuild b/dev-util/netbeans/netbeans-9999_p20180126.ebuild
new file mode 100644
index 000000000..609cc36e7
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20180126.ebuild
@@ -0,0 +1,235 @@
+# 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"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-01-26_00-02-15/zip/netbeans-trunk-nightly-201801260002-src.zip"
+PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="l10n_af? ( ${ALL_URLS} )
+	l10n_ar? ( ${ALL_URLS} )
+	l10n_bg? ( ${ALL_URLS} )
+	l10n_ca? ( ${ALL_URLS} )
+	l10n_cs? ( ${ALL_URLS} )
+	l10n_de? ( ${ALL_URLS} )
+	l10n_el? ( ${ALL_URLS} )
+	l10n_es? ( ${ALL_URLS} )
+	l10n_fil? ( ${ALL_URLS} )
+	l10n_fr? ( ${ALL_URLS} )
+	l10n_gl? ( ${ALL_URLS} )
+	l10n_hi? ( ${ALL_URLS} )
+	l10n_id? ( ${ALL_URLS} )
+	l10n_it? ( ${ALL_URLS} )
+	l10n_ja? ( ${ALL_URLS} )
+	l10n_ko? ( ${ALL_URLS} )
+	l10n_lt? ( ${ALL_URLS} )
+	l10n_nl? ( ${ALL_URLS} )
+	l10n_pl? ( ${ALL_URLS} )
+	l10n_pt-BR? ( ${ALL_URLS} )
+	l10n_pt-PT? ( ${ALL_URLS} )
+	l10n_ro? ( ${ALL_URLS} )
+	l10n_ru? ( ${ALL_URLS} )
+	l10n_si? ( ${ALL_URLS} )
+	l10n_sq? ( ${ALL_URLS} )
+	l10n_sr? ( ${ALL_URLS} )
+	l10n_sv? ( ${ALL_URLS} )
+	l10n_ta? ( ${ALL_URLS} )
+	l10n_tr? ( ${ALL_URLS} )
+	l10n_vi? ( ${ALL_URLS} )
+	l10n_zh-CN? ( ${ALL_URLS} )
+	l10n_zh-TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_extide
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+netbeans_modules_websvccommon"
+IUSE_L10N="
+	l10n_af
+	l10n_ar
+	l10n_bg
+	l10n_ca
+	l10n_cs
+	l10n_de
+	l10n_el
+	l10n_es
+	l10n_fil
+	l10n_fr
+	l10n_gl
+	l10n_hi
+	l10n_id
+	l10n_it
+	l10n_ja
+	l10n_ko
+	l10n_lt
+	l10n_nl
+	l10n_pl
+	l10n_pt-BR
+	l10n_pt-PT
+	l10n_ro
+	l10n_ru
+	l10n_si
+	l10n_sq
+	l10n_sr
+	l10n_sv
+	l10n_ta
+	l10n_tr
+	l10n_vi
+	l10n_zh-CN
+	l10n_zh-TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8"
+DEPEND="${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_L10N} ; do
+		if use ${lingua} ; then
+			local lang=${lingua/l10n_/}
+			lang=${lang/-/_}
+
+			case ${lang} in
+				ar)  lang="ar_EG,ar_SA" ;;
+				es)  lang="es,es_CO"    ;;
+				fil) lang="fil_PH"	;;
+				gl)  lang="gl_ES"	;;
+				hi)  lang="hi_IN"	;;
+				id)  lang="in_ID"	;;
+				nl)  lang="nl_BE,nl_NL" ;;
+				ta)  lang="ta_IN"	;;
+			esac
+
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r21-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-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
+	fi
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+
+		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
+
+		for lingua in ${IUSE_L10N}; do
+			if use ${lingua} ; then
+				local locales=${lingua/l10n_/}
+				locales=${locales/-/:}
+
+				case ${locales} in
+					ar)  lang="ar:EG ar:SA" ;;
+					es)  lang="es es:CO"    ;;
+					fil) lang="fil:PH"	;;
+					gl)  lang="gl:ES"	;;
+					hi)  lang="hi:IN"	;;
+					id)  lang="in:ID"	;;
+					nl)  lang="nl:BE nl:NL" ;;
+					ta)  lang="ta:IN"	;;
+				esac
+
+				for locale in ${locales}; do
+					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				done
+			fi
+		done
+	fi
+}
diff --git a/dev-util/netbeans/netbeans-9999_p20180129.ebuild b/dev-util/netbeans/netbeans-9999_p20180129.ebuild
new file mode 100644
index 000000000..524d12eec
--- /dev/null
+++ b/dev-util/netbeans/netbeans-9999_p20180129.ebuild
@@ -0,0 +1,235 @@
+# 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"
+HOMEPAGE="https://netbeans.org/"
+SLOT="9999"
+SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-01-29_00-02-33/zip/netbeans-trunk-nightly-201801290002-src.zip"
+PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
+L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
+ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
+SRC_URI="l10n_af? ( ${ALL_URLS} )
+	l10n_ar? ( ${ALL_URLS} )
+	l10n_bg? ( ${ALL_URLS} )
+	l10n_ca? ( ${ALL_URLS} )
+	l10n_cs? ( ${ALL_URLS} )
+	l10n_de? ( ${ALL_URLS} )
+	l10n_el? ( ${ALL_URLS} )
+	l10n_es? ( ${ALL_URLS} )
+	l10n_fil? ( ${ALL_URLS} )
+	l10n_fr? ( ${ALL_URLS} )
+	l10n_gl? ( ${ALL_URLS} )
+	l10n_hi? ( ${ALL_URLS} )
+	l10n_id? ( ${ALL_URLS} )
+	l10n_it? ( ${ALL_URLS} )
+	l10n_ja? ( ${ALL_URLS} )
+	l10n_ko? ( ${ALL_URLS} )
+	l10n_lt? ( ${ALL_URLS} )
+	l10n_nl? ( ${ALL_URLS} )
+	l10n_pl? ( ${ALL_URLS} )
+	l10n_pt-BR? ( ${ALL_URLS} )
+	l10n_pt-PT? ( ${ALL_URLS} )
+	l10n_ro? ( ${ALL_URLS} )
+	l10n_ru? ( ${ALL_URLS} )
+	l10n_si? ( ${ALL_URLS} )
+	l10n_sq? ( ${ALL_URLS} )
+	l10n_sr? ( ${ALL_URLS} )
+	l10n_sv? ( ${ALL_URLS} )
+	l10n_ta? ( ${ALL_URLS} )
+	l10n_tr? ( ${ALL_URLS} )
+	l10n_vi? ( ${ALL_URLS} )
+	l10n_zh-CN? ( ${ALL_URLS} )
+	l10n_zh-TW? ( ${ALL_URLS} )
+"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE_NETBEANS_MODULES="
+	+netbeans_modules_apisupport
+	netbeans_modules_cnd
+	netbeans_modules_dlight
+	netbeans_modules_enterprise
+	netbeans_modules_ergonomics
+	netbeans_modules_extide
+	netbeans_modules_groovy
+	+netbeans_modules_java
+	netbeans_modules_javacard
+	+netbeans_modules_javafx
+	netbeans_modules_mobility
+	netbeans_modules_php
+	+netbeans_modules_profiler
+	netbeans_modules_webcommon
+	+netbeans_modules_websvccommon"
+IUSE_L10N="
+	l10n_af
+	l10n_ar
+	l10n_bg
+	l10n_ca
+	l10n_cs
+	l10n_de
+	l10n_el
+	l10n_es
+	l10n_fil
+	l10n_fr
+	l10n_gl
+	l10n_hi
+	l10n_id
+	l10n_it
+	l10n_ja
+	l10n_ko
+	l10n_lt
+	l10n_nl
+	l10n_pl
+	l10n_pt-BR
+	l10n_pt-PT
+	l10n_ro
+	l10n_ru
+	l10n_si
+	l10n_sq
+	l10n_sr
+	l10n_sv
+	l10n_ta
+	l10n_tr
+	l10n_vi
+	l10n_zh-CN
+	l10n_zh-TW"
+IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
+S="${WORKDIR}"
+
+CDEPEND="virtual/jdk:1.8"
+DEPEND="${CDEPEND}
+	dev-java/javahelp:0"
+RDEPEND="${CDEPEND}
+	~dev-java/netbeans-harness-${PV}
+	~dev-java/netbeans-ide-${PV}
+	~dev-java/netbeans-nb-${PV}
+	~dev-java/netbeans-platform-${PV}
+	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
+	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
+	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
+	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
+	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
+	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
+	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
+	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
+	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
+	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
+	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
+	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
+	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
+	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
+	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
+	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
+
+JAVA_PKG_BSFIX="off"
+NBLOCALES=""
+
+pkg_setup() {
+	for lingua in ${IUSE_L10N} ; do
+		if use ${lingua} ; then
+			local lang=${lingua/l10n_/}
+			lang=${lang/-/_}
+
+			case ${lang} in
+				ar)  lang="ar_EG,ar_SA" ;;
+				es)  lang="es,es_CO"    ;;
+				fil) lang="fil_PH"	;;
+				gl)  lang="gl_ES"	;;
+				hi)  lang="hi_IN"	;;
+				id)  lang="in_ID"	;;
+				nl)  lang="nl_BE,nl_NL" ;;
+				ta)  lang="ta_IN"	;;
+			esac
+
+			if [ -z "${NBLOCALES}" ] ; then
+				NBLOCALES="${lang}"
+			else
+				NBLOCALES="${NBLOCALES},${lang}"
+			fi
+		fi
+	done
+
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	if [ -n "${NBLOCALES}" ] ; then
+		unpack $(basename ${SOURCE_URL})
+		unpack $(basename ${L10N_URL})
+
+		einfo "Deleting bundled jars..."
+		find -name "*.jar" -type f -delete
+
+		unpack netbeans-9999-r21-build.xml.patch.bz2
+	fi
+}
+
+src_prepare() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Deleting bundled class files..."
+		find -name "*.class" -type f | xargs rm -vf
+
+		epatch netbeans-9999-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
+	fi
+
+	java-pkg-2_src_prepare
+	default
+}
+
+src_compile() {
+	if [ -n "${NBLOCALES}" ] ; then
+		einfo "Compiling support for locales: ${NBLOCALES}"
+		eant -f nbbuild/build.xml bootstrap || die
+		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
+			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
+	fi
+}
+
+src_install() {
+	if [ -n "${NBLOCALES}" ] ; then
+		pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
+			if [ -d "${cluster}" ] ; then
+				insinto /usr/share/netbeans-${cluster}-${SLOT}
+				doins -r ${cluster}/*
+			fi
+		done
+
+		if [ -d nb ] ; then
+			insinto /usr/share/netbeans-nb-${SLOT}/nb
+			doins -r nb/*
+		fi
+
+		popd >/dev/null || die
+
+		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
+
+		for lingua in ${IUSE_L10N}; do
+			if use ${lingua} ; then
+				local locales=${lingua/l10n_/}
+				locales=${locales/-/:}
+
+				case ${locales} in
+					ar)  lang="ar:EG ar:SA" ;;
+					es)  lang="es es:CO"    ;;
+					fil) lang="fil:PH"	;;
+					gl)  lang="gl:ES"	;;
+					hi)  lang="hi:IN"	;;
+					id)  lang="in:ID"	;;
+					nl)  lang="nl:BE nl:NL" ;;
+					ta)  lang="ta:IN"	;;
+				esac
+
+				for locale in ${locales}; do
+					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
+				done
+			fi
+		done
+	fi
+}
author	Miroslav Šulc <fordfrog@gentoo.org>	2018-01-29 12:11:25 +0100
committer	Miroslav Šulc <fordfrog@gentoo.org>	2018-01-29 12:11:25 +0100
commit	89749cf7c2e65253cb21ca5b03ea06a557337fc8 (patch)
tree	32ddb7f074bf80db48d7e37f7f0d2ca67a553748
parent	netbeans: bumped to the latest nightly sources (diff)
download	fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.tar.gz fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.tar.bz2 fordfrog-89749cf7c2e65253cb21ca5b03ea06a557337fc8.zip