netbeans: bumped to the latest nightly sources

Package-Manager: Portage-2.3.18, Repoman-2.3.6
RepoMan-Options: --force

40 files changed, 2780 insertions, 0 deletions

diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index f899ea783..2067c3184 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-apisupport-9999_p20171108.ebuild 3058 SHA256 bd4f1437f06106e76d5febc9b58edf4ba057df654809aff1873c00c316b0cdde SHA512 bfdf35d55567b084a1f17d66648b72b4fde0bb8bb500d4ef56f9451848df29cb0fb08fcd66ecce2401eee4b4389ea33292ad6ffd5c37cebe3ba69dd1261b74ec WHIRLPOOL 9ddb5b0893c803b933fbcd20c79e97608ec6cd89c9aeaf1de2eb64d459160eb4924f0f31cb3dbca0eca1c68adc712c603935ed6c5e6c2976977e75cf80aea841
 EBUILD netbeans-apisupport-9999_p20171109.ebuild 3058 SHA256 e1b326fb330435a0444360284fd2b71520e5df1db2820074d17c44d1b7afb8b3 SHA512 d0f8ca6bbe746f05a54cd6b11de68ef0f58adbf5665e0683fe48605d0dc033ae10ed2b68ff33ef3f8ddc60d2b73d2e40f571441889d2536f583c303007256e4e WHIRLPOOL 1fcde5ccdbcee8622da567a0f634bd9e5973f9924e30c0d14ed6bfd567f5c9b4cd9672fd7fa5544ce37bbf1026a772b312353634b0831ff9d1ebe81e24e565d4
 EBUILD netbeans-apisupport-9999_p20171110.ebuild 3058 SHA256 ff74de006dc6ad50658a94820486c52b955526ef0963ef5e83161bb1b247f1d9 SHA512 3c854215e778b1bfb94f7aa19b4d1a82abf520aa15be4d8f506459939cd8df37b65df73828ba726943d7308c9604aa4de3a8473c235f74aee55be90f2bf200a5 WHIRLPOOL ae1a3a68f90b08840c3e7fe4a42ce7fdd1895e3909116d07dca673daaad7bdbb3fd109407f9d1e7ea2fe676208249171eeb8d956a634b13ffae1ca24feeee287
@@ -35,4 +36,5 @@ EBUILD netbeans-apisupport-9999_p20171204.ebuild 3058 SHA256 010e0809ef7b10a19d8
 EBUILD netbeans-apisupport-9999_p20171206.ebuild 3058 SHA256 9d20ec4ff147949047a9d24a32ac30a790e85631f2c782b0cc524cef8bb23cea SHA512 f18c64160218d76764b6d42fb98ffb9f6e00cdb470e8e8d2c80efb0a19bf92d9f933747ad4c0416a3580281a996681518fc485d68c91469303d6526147441868 WHIRLPOOL a580edbe12ee925c673caeb3f21cf10a91059de4548863c6b9ae3aed8572705d0aa09588ca83ebd807fe0501aad38f3cce7dd4ae55df39dc03ab6e81c2695d8f
 EBUILD netbeans-apisupport-9999_p20171207.ebuild 3058 SHA256 4e8ee382a1e93afcc95eabafe621e908c4b0c7334d62b0987479ecfb5b57ed43 SHA512 adbb48d4c37d4ca0932e85b96e1785b952950c69c74ed4e572d69d96951aa6d2924a0c04bb7956856c4d3e129950bcb3f40c81033feed5138630b247bd99a169 WHIRLPOOL 3e45dfaadd7669856d173af7d44b5d1d4de06135727c7d193a68cdfe7d48d5832df05a2666f6a24abdef34b77b4d0ae2d8ca6fcfa0478e58a1783826b6cf1f16
 EBUILD netbeans-apisupport-9999_p20171208.ebuild 3058 SHA256 8854e34a350af4b159aec279257ec1697d8bcace7b3feb0432731fc65e95e975 SHA512 de0ffa752ff2f4f27b5309261ccd2c430980edd626c9756e51c78e857eb60337ebdc5b0757e3794ae9bbc9a7999c27c6fa4663a2b9f077470c1218bf2bc2f5d9 WHIRLPOOL 1c5d32f549c5b6f651083d414b5d51794fdc3c8770115932c9cc13d45113b3d5053090a2738b56f2ba1c4a91de01ee1d56d8a0f9e8fe9eeb80c22a25f3aee120
+EBUILD netbeans-apisupport-9999_p20171211.ebuild 3058 SHA256 a0517b5ef2328eb2460991b18373dce1c8f5aab1b95818c2a9c1956658ef9168 SHA512 804520a571c1172c71ff298971e3ea56fc33ca86b91b528aa817e0c33ed3035afd3c909b18a79819502520d7a7b412f9b283cb3df5dc69dd9ee68515abeeafb8 WHIRLPOOL 98812bcc448bca1ac2fce13b08041ebfcb99990c924358b60c7252819944a78ecddcbbbb81eca0b2b0d2e5d9caafd73e364f0f2c72c7d329fe3dce6123941cc7
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171211.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171211.ebuild
new file mode 100644
index 000000000..188921751
--- /dev/null
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171211.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 d7f5f44a8..993797aa1 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -24,6 +24,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-cnd-9999_p20171108.ebuild 4686 SHA256 a5177d921cfce26aea695c4628dae4d7a6eb8aae7049599d163610846a060293 SHA512 82fecc80569172ace2ccec5a21ab0f21a845fa40916238f8bfbdfc1621697e933c8b3b3d748f56c412b67c4b45879e00d2c033c657aa40a78527c07292043f87 WHIRLPOOL 9bc1e59c10b3c265ed5c5ffce08234c2b040174a5daf3344bac38dd389b3b0880efa8ea3a028a612d15d94228ba7484000bbc950d4204e30257d21f0c2ac1074
 EBUILD netbeans-cnd-9999_p20171109.ebuild 4686 SHA256 3565fe747111504ce9720eab52bccbf89c89f4bf8fb2a044241066189a99be61 SHA512 73c6eff02575ab3675e0064ab4318ee543fb20f1800d003071c70b8af22c7b9d927f72b58d60c8a0d0e5237ae6c6315f3d8e6b6b701533ea0f353963b3792381 WHIRLPOOL 8a74cee04f4cfeb68dcde0f6fa812e4826d00b867896227efb7054e7d8bdde9e071704efbd07f2cd402ebb3c5b9950496e12ef3becdbe893f76159f6928c208a
 EBUILD netbeans-cnd-9999_p20171110.ebuild 4686 SHA256 8df16d5e6962ca9d115908d207335bad81c3dab762f8999c877ea8089019e69e SHA512 7fe31d63d3336769eea58a01037c2b3ef847c672a73976b0b412d707572af42db2971037d7fce2b1a948cf6bd3a90ef7c4c85d8fe1c2008f1beaf9ec1088c1d9 WHIRLPOOL f52b2f4eb1466e18365c06b9e27cb852834836270f5bf5e262d4e51cfffb2010090eab6d59ce543a1b11178ee4b78c0f0be9ae338a1e2dc98b2ec2899503b754
@@ -42,4 +43,5 @@ EBUILD netbeans-cnd-9999_p20171204.ebuild 4686 SHA256 b2c43997d5ef6eca0b205c31c9
 EBUILD netbeans-cnd-9999_p20171206.ebuild 4686 SHA256 d2247bcb88f44184983ae2bd1b94a2d4aa1ac520886ca34ae8942dacd4f6ac2f SHA512 2258e2d746f8d163e4aa121325f46631974fbd23ee1eddad48de153ce229feebbd09bdea316b98546435c813c6050cf24889d366a89fe62355a7d58d5bc39d04 WHIRLPOOL df6353f262055dcc5f840600e9f7f59511b7458a81c69d93d6c36939fe2f339525a69f8a8c76a5ee933bc1ca7e0c0f86f8b23a2c5acf91bb0429227b07e6f5ff
 EBUILD netbeans-cnd-9999_p20171207.ebuild 4686 SHA256 75204ee88c3c1e430f71553b9320bcff21994dba3ab5c701cd047dc3c97ad354 SHA512 8bf5e4eba67f9ae5097673b08a00c7d4089c3b3b7aeffc0357b00b35d8d87ad9aacbe5040eda8693e840b28fec8fda0bb423a8d5ccf36390f00d2513b3c86d09 WHIRLPOOL ad3a0b85d8d9d76568136ee2c1821e3366369be94fbbfb6cfa1d85bd04b6b126665df586c6f426fe4bd4cfcd04e10ea6d043bab62ecff4101fc78cd749506077
 EBUILD netbeans-cnd-9999_p20171208.ebuild 4686 SHA256 45f6d1763366c3dc376ac062717d5a2ecbd2787e52e812e3c83b4ab2f7f4f4ea SHA512 eca53b0aca2176d839f6d5082f1c3191fe88ca81270033cf203302f3b2b6c1aa876a94d837d85e87a3b510077f2bbf323d301252f995c24e17607e8794db5488 WHIRLPOOL 532f412171f1e33f08aa1fc1753a89efcd0a98a90d122575a6f61581e5a58e4c02b6f57aafdb260b017de52f9a9316dc00fea96f15b408a0dd370a7e84c60b60
+EBUILD netbeans-cnd-9999_p20171211.ebuild 4686 SHA256 cb93a1ac3f8fbdd43246979a7aad31df15b6a6d5907be4658c0f04c85562ecbd SHA512 81adfb51da8609a86b9f183a5b14b290e714dd278fe1427be1fd50764057eb80b65cd5272dd3053ef95d8e361071e4056c67c3f98f2a124b32b02fcdd6d0c5db WHIRLPOOL 63b9f5d5c0189c38380d531281ec02b661e8803453cdacaf2b0d864f1a03093ccca3a285e8123154be30a941ceae294c38ca09b3ad29200f5aabc92fdc66f584
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171211.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171211.ebuild
new file mode 100644
index 000000000..e5e7c8e8d
--- /dev/null
+++ b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171211.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 b77b9e961..70827560e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-dlight-9999_p20171108.ebuild 2643 SHA256 d46ac068c2a3a747dd6af1817fd1dae3c809cc7a499a3d1edb089a43332a4b78 SHA512 b043eb9b6d0d149e3e40478ebfcf00efbd68b78902fd8ca4bf2f714412b98eb362ec749b9421be007eb23dfea7226f87f1f2c535aa5f4e44f9d470fc976a6fd3 WHIRLPOOL 9e8f5324c282915d6cde84d4cc65f55fd7e73629cf6166bbac4a4f82bdfaea98cdc29676407ed95eaba2b18bc881a6404a09802ca33d0efd75f030b428512a04
 EBUILD netbeans-dlight-9999_p20171109.ebuild 2643 SHA256 21354ee3a1956a28c596dceabeaecf3c9578bd4479545c7827c53e3d17876e07 SHA512 596847cce6186961fe226c4ccc2197a5145a6edb9e7f5da4692fac48af8cdde770fe38d642a1e839d44f0016b2e4c1529f15a70b563a191991aa6da812da68f2 WHIRLPOOL 8393e265a397942dc1e5fc00cfa8b2f7e4ed75bdc52571a95959ed043783b729099ceff3c468ad35bc4768b21de6becf96fe2f9450740b46398f6d838376fc19
 EBUILD netbeans-dlight-9999_p20171110.ebuild 2643 SHA256 1336a8489c0e39267e1d152015567203a0ca235dc3b8b1e557535a76af4785e8 SHA512 85b2a4494e3f00c1383729ed199471e8ee8d5fd5e51f461ceff121ed13d9c52dc52e9aa61ac5897f8e9fe4a25455376933dc47a73319d64460ac00707b89b335 WHIRLPOOL 72391a023f9dd9d0ca3037da7ebde35f2279fcb8f3cbea991bf19ae9b65cd57ca1d50c743efbaabcf68ebe9b6ec5c37981d85c31fe5745f9b7a97743817458b1
@@ -36,4 +37,5 @@ EBUILD netbeans-dlight-9999_p20171204.ebuild 2643 SHA256 8e27d8aa99c87e17251caa1
 EBUILD netbeans-dlight-9999_p20171206.ebuild 2643 SHA256 c027a21283340a089ae627fcc6789f31924503e7a016f1d38e022388ab77020a SHA512 1d6c13b989a6cc598896d624d4032efbc33bf4905fa7861c6bd88ce827c18ff739d290be2807bced03258546d16cfa4dab91b6a66229ef4391868518f40eaf37 WHIRLPOOL 2f478d55fad9f83793a6648ed049a9f1e7150ca36d3dea9e567c27f6153ef3d3c778b7e199a4f8bca5e98035c5758bdb0b1eca68db696ab29311b77ba75823d8
 EBUILD netbeans-dlight-9999_p20171207.ebuild 2643 SHA256 0e239bb097c55855c86c1b7974ac51795c212b9df7364731d25d36df7e9886b6 SHA512 130f9389c6c3bdc7b3fdab16d4f5ca35e9cbc13de42de943c33924fd7c0c01393f608b3472795fe0b22df20d2d2a43ac5636c0b7ee4108fae6c4b0c7ff36f7b5 WHIRLPOOL 77d61269e2d9cc7784b5fdc3954bda628aee92cbd2164197e43d609a72dd9d15a1e80ad0a1b05f3692d982239acc13bc7fa0316c77fb8f2eecc490fb279a82fb
 EBUILD netbeans-dlight-9999_p20171208.ebuild 2643 SHA256 980f91ecb95baeb4a3eae81afd9396328f9051dd1a08de29c8eb2aea5526d626 SHA512 8a2069a2ab05070825e48e71580b5afb290f399dbe69616a24dfce12ebe4932d3f42585c46216d54d7c8dee7ec9212c932877833f451770d682e4a10cac7eb81 WHIRLPOOL 4fea46a15fcf29fe8295d15fe733cb6682c0efe63030f804be366c0a4b55586af615f8fbb66478e9af0da24b07f8822d230b3163761e5b0b7f8f3bdd27a4cd94
+EBUILD netbeans-dlight-9999_p20171211.ebuild 2643 SHA256 c9bdcc6f1e6302b01c0fbf90d3249b0644a601cbd21ecee6b740f689bf404bac SHA512 565d9ad378806aca5a6c0d290aaadce7d9a3e9d032b576322958ce965fd28504730a9d911293e1367c02928edb5b43243d7db2efc78f92985ad7962a8c5f3816 WHIRLPOOL edfa48664317f2d8e042d67e6b3afb1eff5245691123366b47f0a7716c63bd6a9c17293f1f4ba194a68b3da97b79717a5f153b17c9fe04d20341e68bd431d149
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171211.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171211.ebuild
new file mode 100644
index 000000000..c5d1483b1
--- /dev/null
+++ b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171211.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 45d1a201f..14b4d83af 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -48,6 +48,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-enterprise-9999_p20171108.ebuild 15530 SHA256 a5a0f36f4b73560017fecc9b11ddc921aba68652658020ce9fa94244224a13eb SHA512 f9ae2080bd16d43aeb1b6ca9d6f531eefc422bdd625d1b1ddc05a5d4aacbc6846f3d963b2be3ff4182952d9b34e920fd4956ac1014716123d703beb974daf86c WHIRLPOOL ebd9db0662e80cc063018d99b9426edd0d098e3437990bc257dc2bd6a4075463163b1bb49a55e3a9f07c012ab6294317815af9f216d2fd33a6be66f1aa6b6108
 EBUILD netbeans-enterprise-9999_p20171109.ebuild 15530 SHA256 e2e11550fa629953569de746155936c773351420641b05cd7902b237e935d82b SHA512 ee15d3ecb22463c7570dc5ed0f609828f36006674cc3c8359cef8d0250b7d7552eeb3885159b1ea93585b209c13ab8b4bf1bf3c9198731678222e419b3c41683 WHIRLPOOL 10bf62132f4cb495a2d403fe2d89fc1dca5473d75ee5b0125b6e6ef1ba1dca083d8b52fb083bf25697875bde8c24a4173400f3c8201b25e2839e6f6da09c8ea4
 EBUILD netbeans-enterprise-9999_p20171110.ebuild 15530 SHA256 8655c0650a89c88043364337abb285b149729b797013a89843e0efe91a1a748c SHA512 a51ac848b977328c4bf6fee5700ae7544436a7c498e688ce0c8de1915f73c60c8e29a67458aa1cb5428d62cf7a80fbbc17ccf62f67c773fac8824c2772d41e28 WHIRLPOOL e492cbd57abea365dbc833ae7d9f625b5192cd4b2a7ab86a2f7a98415a95c6798088a113568bab90c3d950f88a26caffa72b728f1df9822f740f2067a1c06ea0
@@ -66,4 +67,5 @@ EBUILD netbeans-enterprise-9999_p20171204.ebuild 15530 SHA256 fd1f1ec94fd1d63931
 EBUILD netbeans-enterprise-9999_p20171206.ebuild 15530 SHA256 96f0b52dead0a2892833fa71da8c7570128818ab0665a0fa09fb153784c41b93 SHA512 eccfda66a170d27041f24134b5e7b1abc6dd364e88f4d8961f9569cd82378c15b4428da1a2be219212b5e3bddb839d22982435dc89ee7307313a6107dc36722e WHIRLPOOL fdc2daa63d7f0cd6ff7ef80b150e3518f63aa7a0491db66265616235c1d6343d8d39f16b536e990407759455486929b57cf04b98bac2b0c785a4eb447af48b87
 EBUILD netbeans-enterprise-9999_p20171207.ebuild 15530 SHA256 f76f0861fb470ae0dbc77d47f69be1e8bd9dfeb745aacdee02d39f5fdb33bb4c SHA512 892464b1bca13d2bfb5e32a3bfeb81d8f1f2ad3e6ebf5be91df5b1a1c275f53ed93ab985d0806435e81884988691037795a10e42ffed3d603bfddf44d8742732 WHIRLPOOL 012f3ae351c71c54c1248cd94b3e009a8a45812a3ff520b8c691ecef5a68c6c3319a6b51cd43fa8aec5b3f1fa4a2d3838298e494a1a511fc79784c1cffa3a457
 EBUILD netbeans-enterprise-9999_p20171208.ebuild 15530 SHA256 78aec716f1d7e0f7b825847df82f01cdeed588a9def314ae735417ac87babd55 SHA512 bd34072e76e6c3081cf15f97b8db47f56d7d4fb9165d07c4b97bef9fecd591b216d8c7516859e4f7387b929cd61720ae5c37423a5dbede785857c5072bed38d3 WHIRLPOOL de4b0ad180db0d986f2bcc97d3471c776e6c53a560e19257704d40bdcba5a2e5d4475199e59f5e4a194a8e27e52d2697ea9201369d8de065610ab529e54f7641
+EBUILD netbeans-enterprise-9999_p20171211.ebuild 15530 SHA256 2d320aa476e0b3c795e29869b517f5310822fb0adceb4328fdc3f07c79ca7255 SHA512 a1c4279e2fbb03217d419da28a7bd0e42ed4415c0c17c36f7199fcbb3a853400dfd54dc6867d34757aabd167edb93d66396b26ad21be8275366384845dce7241 WHIRLPOOL 31d4cc360a7a0d091516e960eaffa2fe091d49251c11e04fc435981dd580e390d0b97ad0ed4718e29b79fe3e7d16df902db5e741d73d029376c67928c852b02e
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171211.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171211.ebuild
new file mode 100644
index 000000000..0cd0e95de
--- /dev/null
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171211.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 1cafb819b..54d16171b 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-ergonomics-9999_p20171108.ebuild 2587 SHA256 9b851fe075379ac5ea08424eb0807798600b14c36d7ee254a2b6cb95d71f098d SHA512 872e7dfd3af8a907c3db9598debbea04e9686d840c6bd2ebdb9e30fee3a1ed89207155b720dd49a2de4f38572f4ed8efc798e818ed45abca291a188e18039e69 WHIRLPOOL 7287c325949da574f423c64ac49c47435aa8311f373ae5cd7fa4e7410e7c7e4bd23bb84f73ef117fad5a89f6aca9e0380f16a51a155d7b657263074787479e1c
 EBUILD netbeans-ergonomics-9999_p20171109.ebuild 2587 SHA256 56791e5e9720595002d54b5397e5c8c63b84624f2c754b72b672d516ecd624ba SHA512 a03083fecfc355e3e58999ade1c094247bb4d05024f670868e62c57d79ef220655be505c5042d41dad132c18ed17a5f28e0df075daeb9b0374c5cbed5ffcd601 WHIRLPOOL 7d0cbc9085f5d8ac5b5fff03bb48bf5ca8767a26890111f804681879d05bd7b3ffea48e9828cf63cd7cb0ad5bbda86426a27b435d0d4cb56344d52561a8b1c71
 EBUILD netbeans-ergonomics-9999_p20171110.ebuild 2587 SHA256 2fabda536d7aa4ed3aabcb36f672a6f064b1f2f8a041f0007f4742645bd73250 SHA512 39745521a5067076b3704271bd0e6c69d25e0badd5e4163c4c33643bc218fed50f62c1e2b766e2ddd6290800f46a7fee39a15773cd425d0dc38dad5358b2b4b3 WHIRLPOOL 9c3775778a18ee3f89aac94f574ce3554a96bc5e7a521a0a71b83e6f233bdb034ca02cf6acd7af1d13954e93d5b07f72260b22a6e04e31eadfcf97db5a166882
@@ -35,4 +36,5 @@ EBUILD netbeans-ergonomics-9999_p20171204.ebuild 2587 SHA256 41c3c6002b34457c28c
 EBUILD netbeans-ergonomics-9999_p20171206.ebuild 2587 SHA256 57b5e1fc5396710ed216709987afd968c7e39f7a822fa4e7d308979a73acbc4a SHA512 9ddb3b59825687e2004cbd12bf7c59eeb03e364027ef47401cb7f0f6e984de0ba4413d4cd0860912812493e567f53eb5109f7c02a51f33556e6efc5a3cbdf25d WHIRLPOOL 9b8c2de82acb00d157a472041ac00741be351995470048e3bcdb9ef4e757991dce33519a5e93ce22c97a9c0728e15598921face26794e11305f3e8691b86f092
 EBUILD netbeans-ergonomics-9999_p20171207.ebuild 2587 SHA256 f354273a8932d193996189106254208e83bb93391ab9eea35bad4a4b29f25151 SHA512 409e9c317da4bb7166139c10e4165a80e617f3aa9b745f6c2b93316bfc6bef37c994f32fb931dec4e3a732d02ca1f80122f19c14cbbd5a594efa05a78a84b2db WHIRLPOOL 392757f8acbc96bee8492d006f03845cd2bfbfcc3e250735a4b511914082464166167c51c695b936b5dcd10224ddfb2e879e509821e5138853001b3ab3c5a615
 EBUILD netbeans-ergonomics-9999_p20171208.ebuild 2587 SHA256 254cee87608daffa267b9c12c079377e2ba35e283cf62124291f7de61cd60494 SHA512 35f443056a4413baedd371091a2c54c042aeca4c15afa709eb7d3c78cdf41f5d907a0fb5d6527dd010244aff3d837e85b01610ef29c715938a480779fb70b3a7 WHIRLPOOL fc1306e9dc7b383a88bed1652b20f079638f568eb39d22ab6387141e808914393de001ec3f5712e1ab909be39930bdc6ba7b2e7b04af923a2f961fff8502514d
+EBUILD netbeans-ergonomics-9999_p20171211.ebuild 2587 SHA256 741bee6dfb00837e5698622720d990b7da12049720fac369ac4b19b14a82844d SHA512 0cf9b14c03abefb4b2436b0710bffb9006bdf50365b4fedd8cf78c6c59e03f236fb9a740aaaf9732e673c849c45971df3f2aaf08a4e86fb06da76d8de528cdc4 WHIRLPOOL 2e6226a078b8c66504487525f49bd509a24499a66ba71bf019a9d5b944ab37de9363e9a8a6f9cfe60a04b0f8b0a419564e46bb5fc1e0fccb0ba0bde099108669
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171211.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171211.ebuild
new file mode 100644
index 000000000..06eb23144
--- /dev/null
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171211.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 36e4dd906..b1131e438 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -19,6 +19,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-extide-9999_p20171108.ebuild 3059 SHA256 3e00c75e666113a765e0783fe8fd7afadd9e2b24cf5372db8d402cb1bfb35415 SHA512 d702c64e88309c4699dae7f74a2ffbbca781fef4f5ba100f8b1e038d0f074f8497cf88168584ee939064d25c4a1b4d99509d0a3bcd0bd9a0748741f86a78b179 WHIRLPOOL 459c6432ca82c0f4c59d43ba5ffa9610a78007b4a2d2dd1a76778db498f6638537da0efd41744b218665e2dbf822a912515fcd0687f051ff6e6386552da0c27d
 EBUILD netbeans-extide-9999_p20171109.ebuild 3059 SHA256 aad94c280de88e778aaa0b5d384c7ec5e3a57981c83520aa508dfbaaf5a92a48 SHA512 c8e0aa227d9f881b364735849f5ec73149c7afa0fc61267ba71decbb8ceab82e390759e2df5ecd297682b9f02a90488855f157d39bc4f31888ed38e30e79a383 WHIRLPOOL a0f42b277a5b4af828703f34d318560045cf36d2617bdfe9f8be7cee201505a1a3c37c71800706614d974f4a064c890356f9a6426944c1d1112c711c754dd406
 EBUILD netbeans-extide-9999_p20171110.ebuild 3059 SHA256 11f562b7b5b3c7d8f0a80a5d5c69f5e76cc0e9564b6d7b02de2482db04429f68 SHA512 b9d00dce7809bd3c4146cf3d42ebb3b3c7f999a8adca9e9db467e34eacfbb6421627390b2d19518d276d518dd0bb267695bc41307ce0d85a522f2874100b728c WHIRLPOOL 21363c71ad12e9dcb67883925f0eaff52b44b73957583b5f1b660b2a0d761f816b136a579957b43f41741a25066de3358895b1a8cdd17dc062c4ea70902eac3c
@@ -37,4 +38,5 @@ EBUILD netbeans-extide-9999_p20171204.ebuild 3059 SHA256 9900dd1636483ab9e26f7b4
 EBUILD netbeans-extide-9999_p20171206.ebuild 3059 SHA256 83fcf99633dd615e2ed4179f35f2d43e43e0e703987c5b0d2b7451ab3bf722a0 SHA512 a692c08259b0ae52650f4cfdd64d49223ca8fa190ae5515b6f6a940bc2ae18454c962028b9fe17ff3732bab3359e69211e3f919c461221d9d52f34107b2e3882 WHIRLPOOL 3da7cdb4bb7014f7588ada5a08bb3d4a5fe1e60389044deb5a95b7a86d7236332e62c3246f68bdaa4b2ee05afe5e91a0f7cba7c0938dc486a5c6b50bf9bbbf27
 EBUILD netbeans-extide-9999_p20171207.ebuild 3059 SHA256 da68a33e225b571165a0c4f7e9ce45ba5b88e923c3fd47b09ff56cd9426770fd SHA512 161c08541155ee0c131484f58a83133d4f96698fed358d58ed83e3996c41b1c5b3157a0980337aef45c43aa834348c9d2c6fde7a019dddc69e5be884693eb854 WHIRLPOOL 4f0b2caf6191dfb123a848a9d496f4b3c894229de6d401f09447cb16131977fc56186fb08972124ef495953215f33a7c18a01e75036280caa49b28c4dbe64a2d
 EBUILD netbeans-extide-9999_p20171208.ebuild 3059 SHA256 f906790da76d9b60256b7f9f9eae506eac038f8e67386dab3ae27414c3d683bf SHA512 31764f5ccdfb389d110abc72f572207c6568f4e695aea30d9e853b4110db1a0f45d47e0f8bc88b4cc27977cecc10c3f8663116da368b13a6148b28790e3ad7f9 WHIRLPOOL 4f2b8422328e6458e4f79f449844d02f1dfa5812cc6f6705d0595e92cec9f04783632119bcf83c9f1774f1fe354e566014868d7e34696b7500eddb8d63309055
+EBUILD netbeans-extide-9999_p20171211.ebuild 3059 SHA256 be4c014df63c0256e4284dabc50e8c34d82e8aa0e8f499e7a8b0121269cfcd2d SHA512 afde53b48ad3c7e9759f8d35809560a3cccac61a662a5ce9611983b6fd95fe3a710624881bb0159c2189234746c1de26ba83a91dd3d7f1b584179835a8e152c4 WHIRLPOOL 2790e4f361b556ca5473f9dee6963c5c9795f740e9b37ee15775e71cac0755dcb3e859ca82386a19547e30bc3d54bcdebf6199a0c9abd90c85371a39f8a22add
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20171211.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20171211.ebuild
new file mode 100644
index 000000000..672b0e681
--- /dev/null
+++ b/dev-java/netbeans-extide/netbeans-extide-9999_p20171211.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 4307d605d..bb3e47ecc 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-groovy-9999_p20171108.ebuild 3091 SHA256 4e453df2636d4b79a054ead1caee8ccc300a045c721c1ca78cc57295c761a35a SHA512 0328d070f0cdf773baff8026cd71f523e024667f28a5e04e10ad5ab5413d46e11853907e6781b92bdd8fb1e9ed27f258b5f5450a08f0b3fc056302411ef315de WHIRLPOOL f5b201e84afba1a1333c4960bdefdf4f07c012897755bf9e59e825a45100da3e0b4cf063885dbae61e8e133898ab95759eac8c66344e03dd5d544112f7dc514c
 EBUILD netbeans-groovy-9999_p20171109.ebuild 3091 SHA256 7306a6ffb1d09f05410becfa103913b7b5dbd9387eb273a164febce491d091eb SHA512 991c2baa1f2d6f90aa885034e0284083decf63ba382c5842b1acc8cf89259fcdf0e57e829803af41d437af21707eea722d0b7b97f0decb7b02bba02393308359 WHIRLPOOL 19baea4ea316449b5e3f4a26bdff78b85e63fcae10f81afea0f614b8551bc12578a719252a77304a7b8b44e05a670308b49f698c5841b9578d8a1832f4333668
 EBUILD netbeans-groovy-9999_p20171110.ebuild 3091 SHA256 7aba28028b0d9374e017d69ce82419d3e5406b5c174e4dcac2002c783f7b6e33 SHA512 6b29291d3033661a886e94532e316e2e28dc98a1a7f5cb2b2e8e36b3b5ecc900a15f940501ba89227fcfe7532fbcc05f7af876d6ff56dc2a50c3a93ad5c40d12 WHIRLPOOL b83f55c10f4f2fe1387230ed42cba6248f4748c6e088607cfa72d66414d54286ee5c3a840085a6c350cc82148abf747dd179f8233263dca9de5f7c7fc854d850
@@ -36,4 +37,5 @@ EBUILD netbeans-groovy-9999_p20171204.ebuild 3091 SHA256 c55f0fa4c3704708d50c9bd
 EBUILD netbeans-groovy-9999_p20171206.ebuild 3091 SHA256 850d4e9f99878e35b3cd1d0a94f9abd9d26027f3aa8817f7d8db14f47238c533 SHA512 499c819f248186822f1378607cdcab484898a22266f21e70d241b31da383f4316deba251abc917722b6f7b8e1c4654e08cb44f76d3c9edee222b095295692a84 WHIRLPOOL 04effb9623da0acf37b5fef63deeff07c9a8e57822952292e60245f7c499dac7dd8538e9aac1535e972856546605687e71b43dc237c20aff839f32e456296d3b
 EBUILD netbeans-groovy-9999_p20171207.ebuild 3091 SHA256 945a86cf632f3ed744391448151102a4aefe5de3c2c9f271586edb762219c6ab SHA512 556b7279153645e99e50c30c6ace70e483ad963f15875042c015eacd121b6e155368a95afa384c3c2a59842d4345988af495f548dbe0ccfe048f47a6cc5246fb WHIRLPOOL f167bfd63a284e3a181334e9964b939cd6a820b8731d994b3800120e85325258087415e71c2944391c9337e5002c394c6536c7525e7c82186553712a670358d6
 EBUILD netbeans-groovy-9999_p20171208.ebuild 3091 SHA256 84dc10e57ab718cfc884b070c3c94b6485ca0dadba553937e3b71e8e752183d1 SHA512 139e18c44c442eac9b6990727250da43f32e3b5c5bed56a032afe2bf3d976eabf6eb50376eaca09baa7e95acf6d37b13b483c08d56e3d9fb5635b6375703470b WHIRLPOOL 5446d77a7c0c0bff541c4334c59bb0da3b5fd80f7eea1676599e1e4071d94c961a1d5312e5682eeb6f2c2e43504581687d92cb7dde64820e74c9d1f67ea0bafb
+EBUILD netbeans-groovy-9999_p20171211.ebuild 3091 SHA256 09cd03e0f22218496dd1a213166cbc49634b15aaf4312a063824415be1d7e9f3 SHA512 ca028cafcb55446b9aa6bd748f62eaf5b56f84c83eeb94307e6b72742f979c0552545abe40619577c5a341867e6bfc6904b9fd4c7cbfb5fadce2830fbe20aaa7 WHIRLPOOL 2fccdb7f323cfcd6d8f37011f7baa68be049f174367db5a5bf5d8b629b9924e8072aa566160494d36a7140edf746daba8e3ef49984bbcf7bfc1e9653378d0261
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171211.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171211.ebuild
new file mode 100644
index 000000000..d17286aa2
--- /dev/null
+++ b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171211.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 904499866..2b9f58a28 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -22,6 +22,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-harness-9999_p20171108.ebuild 3805 SHA256 73519ab4a1267742feb63cb975df33e7d9250dd71df5837861e79c2dc4216853 SHA512 52da43de0a7a0b824c0b25ec7d9f88f548ae1620a0c355506140e7a6168ed5577009e4c5e9f5c7a180599050d5267d8d54313c060ad3a6c8f007115af290e851 WHIRLPOOL fc09a73d6415db51133b8aefb32897a66803f5b923050d91d56205232588078abf900c5fe373cbc92f558aa9aaf654dadabc475278c73aca3996703817f3fe9b
 EBUILD netbeans-harness-9999_p20171109.ebuild 3805 SHA256 9b76342c57011cbeb8ac1251392f26976a635100f9fd9c8be15578a856dc815d SHA512 844b1be7561b9862cb1ad19a187bd6910d03793f0789186998eda51d41c61ba1c74e727004362c4c013dff4b0124fa23bd8294368b60199eff11855550ab8169 WHIRLPOOL ff26c4c163d72bf7aeddcde5864a55e0bc2c46d8b866d51ee00ab5c31c4f2bc14ac450e5d02a43f7b525a22fb74e36d8fc6f2ab6ec52821699749c9b6ea9cd19
 EBUILD netbeans-harness-9999_p20171110.ebuild 3805 SHA256 61b6cf0b14e2caabd94cdbd8ad2aa46492d4bbba38a4273fcaaf5baf3e382dd6 SHA512 f8653d021160c001574d90bfa2ea50664a7240ea7a3da25cb4c5f775a20d089ac718c63d736b20b9b2d267aa0e39184f8b244015c56034f78c072d255bd82b74 WHIRLPOOL 9a34508dc27b25e6da8d716ad121a35d1ae6675756fb565ad02701b09c338417b5b8051dd3e6a63a3e4d94b5a6c5d825d7c36ab4b710e4e4dd8f5101c6afb727
@@ -40,4 +41,5 @@ EBUILD netbeans-harness-9999_p20171204.ebuild 3805 SHA256 445ea7be455472e7c8a46d
 EBUILD netbeans-harness-9999_p20171206.ebuild 3805 SHA256 b71260137d9be8c2cc5bfbe7b78f761acb0727b1a553275f1f1380f138860dc7 SHA512 4f8f2ec7b5778ed3f93a3ed127b7469d1eedf80b4b9a147ff5423fa749d2433d7e4b681e99d8dd5aa128dc5979159b925382c6c55f239bd0b3c4fb06d44440d7 WHIRLPOOL f30a3002356fc169766ab3bc3c2bdd5abfad8d9317f58ab4b96faa9f2864bbe3cfc03f2b937c444b90b5f2c870c4b61648707b43a1ae8b1266299cc17ffc652b
 EBUILD netbeans-harness-9999_p20171207.ebuild 3805 SHA256 58ced6d5b8d221c2be82a8d653d4f2075d7d85e5343bf2af699c15a1957de447 SHA512 9ef1cdff7ea0a55a69d13474f9870183bfa09482028a5ff895b3acaa8f6c01bbaf6df43782e089da2f23032b0428a0025985747b44cc85fd86bb67d01814127a WHIRLPOOL ae1e7d7c76974fd7ab9aaab828c15246b7c9a76aeca7c4cabee1337c5e1ce51f2438941fcde16ca29af7ea5eb2afb10094d29086cc5b9c52b8e0b888103fc71b
 EBUILD netbeans-harness-9999_p20171208.ebuild 3805 SHA256 eecffdbe439e695ef586a30631b636e4e922bce05246a4053b5f783436b5808f SHA512 d052c1b6576d2752274b266ee48b461369f188237dff5d8f55b10ed0db37cc797be639d9d05129d67e04d6dedf0c711a2e6213312b6387df25c0aa15464103b6 WHIRLPOOL 46cbfcf01fca98e183b14b35c7b577835fa1bc72950ee81be9bb5229a135512ccf9657d45b542a5a20eee4e119111b543997c3714243a010398292062b0e2c76
+EBUILD netbeans-harness-9999_p20171211.ebuild 3805 SHA256 b7020661acd1642de3b3163ae553c74a4c6f2f988bc8e08c1e7b7c87acd9dbc8 SHA512 1a9c6389085d9b77f75659f05fe1ec5a08b69d8f4fc3b4b891724a52a3b23f01c917895c84a2d003d4fc1abe1d21eb16068f7334459048298ce2c961ccedc88a WHIRLPOOL f31d365d1a2595c5181eed6126a950d25ca613fd83c58d6b1e9d596da61f317a481f032100684b076e0d4d111ef461b9116ff94ba641d9b3f864d9aa2283daf5
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20171211.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20171211.ebuild
new file mode 100644
index 000000000..37f33218b
--- /dev/null
+++ b/dev-java/netbeans-harness/netbeans-harness-9999_p20171211.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 d92dd772c..7450e2233 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -88,6 +88,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-ide-9999_p20171108.ebuild 29596 SHA256 3be037eef6f701a51e40658ddc8a7135db864f17c23a75d610bf18f7cfa8eb0d SHA512 60bbe632e01476fcc75fc09aae082fc8976bce319c1441738a573abe970a25156a622093f7839fb1cf03f852bdd63116d9b6cccac158b13a9e0915c6148b8f7c WHIRLPOOL 1e0bb6626edabac2d443d9d03d06097166a72b6abe82f244c8ba206e26f076d6e99e67020a4d5005e163e318c71025fa984a02aa507df872e874b7dc0ff07483
 EBUILD netbeans-ide-9999_p20171109.ebuild 29596 SHA256 37ab9c9f88a0a676033a5f489cdc03efac5bdd85aad15ae2c754fb857f1e7839 SHA512 a9d82f557f8ebc853863009bde3946825d9bbd70a39ea9d67078994fd4259490dbe2b012756afc60bfbbd16239d983de1a8d5d8902aef89129a30424c2464785 WHIRLPOOL c716312ffae9b834f241327544ccd442cf0db7e8a9344b7df26227798f60ec8560a5092b3505ae9b11ea3bebcfda72c943e193a4a8fcea7fdfcd44ecc29267a5
 EBUILD netbeans-ide-9999_p20171110.ebuild 29596 SHA256 0e92d122e59ce3ff9ee158baf6b2fe5141550aac10ad75361b43ce5a3a7a9358 SHA512 7d57fabf31a3d0b85218943a008bb460f0ebab6f90969cc0991cc0741f908259a330148208c775ec4c722add3ee44ef3c32486b5791b16404a645b95d252f1c2 WHIRLPOOL 8379029b27c59c51cb75d64cd2575b0df57e31406507f6a81f95400517fcece80844b5d470fdd509fb284b3118717840b905837e022c4ba4cd0b2e28f46018b3
@@ -106,4 +107,5 @@ EBUILD netbeans-ide-9999_p20171204.ebuild 29596 SHA256 f520b40f6feffec0a67c10cc1
 EBUILD netbeans-ide-9999_p20171206.ebuild 29596 SHA256 dd4603765dace157dfd76703bab5821c2c299d1e1fd2b2e0fbfd73abccfae1a4 SHA512 cd4ef2cb98d76dc97fcf95af2d03f02d959f4de864096d39952fa52e41899a147ef99e47883ab61b4f5ffa79f8c8f5a3dcb619e5a7d9913890f40fe8c04217fd WHIRLPOOL 49f060f7424afadc910e9c6b05f10c263fd1ee162447c8acac2506dc3ce733eacd3bb6de06c6d0eb6e2cf2982f642f25630ac3ef0b6672b92da2715eeec610ee
 EBUILD netbeans-ide-9999_p20171207.ebuild 29596 SHA256 80fd6dc87dc9970f3de74da409837f670ab954d3c81ad3ca4b503d83c9b7c5b4 SHA512 50827ab971ea6fd5dc10a3a215473118f280cf397f21ff1251313187547969985905a917f31bc148ed24492fd33079330d51c6f61ae0b3b544ed86581a0e97d3 WHIRLPOOL 9724a02a37ef1407c7275e443a9bcfc177cdfe7a73c29ceb34805f6bd44dd66c5d8bd6b7c8daf60041d81fe51be190eb3923b0fba60f9c7aebeddc0e8d58ddf4
 EBUILD netbeans-ide-9999_p20171208.ebuild 29596 SHA256 58a87e7a335dd0f8632d90bc0f2e2edb75a9f918a8d89b83b4716b7d2999e527 SHA512 0fb3a2541628919d0efb68a76ec86d01084ca48989ea2077e655273131a1977fbd009e5657286eea5c8b27b67a574a06d2a8d25bfff5d50b92d0ef41e77cfcbb WHIRLPOOL 435c55b61e0605fcec2d22c9cdd36fe5c5ebb1ccfe62ab1474c3952eaa222dba1e5d5a3cc7e8792211641dfbf45836722d21fca741b2a19081474bad7f570b6e
+EBUILD netbeans-ide-9999_p20171211.ebuild 29596 SHA256 54186c576aa0cf864f6265f7cb6eccf7b4e993e6e990d232739d6b01c2919604 SHA512 28fbf849acbd59dcfbae5b3ae146d280804959c11f760dc6b4f4bf37192d51ce7f841eb85a73b3407f1e8af88ee125196ae3ddcdae518c678d13b41495cf6034 WHIRLPOOL 3af484ba51e240b6c72442920920c0fc51437573d59fd32abe60e85f60b3135dd1f78e6aebe1cb716bd1f433ee3babb8f6c6a9c28e193674005d4555dd4e897b
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20171211.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20171211.ebuild
new file mode 100644
index 000000000..c3a54e37c
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-9999_p20171211.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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/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/lucene:3.5
+	dev-java/rhino:1.6
+	dev-java/saxon:9
+	dev-java/smack:2.2
+	dev-java/sun-jaf:0
+	dev-java/tomcat-servlet-api:2.2
+	dev-java/ws-commons-util:0
+	dev-java/xerces:2"
+#	dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+#	app-text/jing:0 our version is probably too old
+#	dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/commons-lang:2.1 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/freemarker:2.3
+#	dev-java/guava:15 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/ini4j:0 our version is too old
+#	dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+#	dev-java/jzlib:0 fails with "Missing manifest tag OpenIDE-Module"
+#	dev-java/trilead-ssh2:0 in overlay
+DEPEND="${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}"/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.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+	java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+	# java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+	java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+	java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+	java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+	java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+	java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jar-from --into xml.jaxb.api/external sun-jaf 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 lucene-core-3.5.0.jar && java-pkg_jar-from --into "${instdir}" lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+	rm mysql-connector-java-5.1.23-bin.jar && java-pkg_jar-from --into "${instdir}" jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+	rm postgresql-9.4.1209.jar && java-pkg_jar-from --into "${instdir}" jdbc-postgresql jdbc-postgresql.jar postgresql-9.4.1209.jar
+	rm saxon9B.jar && java-pkg_jar-from --into "${instdir}" saxon-9 saxon.jar saxon9B.jar
+	rm servlet-2.2.jar && java-pkg_jar-from --into "${instdir}" tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+	rm smack.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smack.jar
+	rm smackx.jar && java-pkg_jar-from --into "${instdir}" smack-2.2 smackx.jar
+	# rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+	rm xerces-2.8.0.jar && java-pkg_jar-from --into "${instdir}" xerces-2 xercesImpl.jar xerces-2.8.0.jar
+	popd >/dev/null || die
+
+	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxb
+	pushd "${instdir}" >/dev/null || die
+	rm activation.jar && java-pkg_jar-from --into "${instdir}" sun-jaf 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 0cbf91900..c5ae636ae 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -42,6 +42,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-java-9999_p20171108.ebuild 15702 SHA256 1f99bed7a00008277f4aab7b0232cec7a6f0f1956c4a70639d7b412b9e009a8c SHA512 164656c5abb27be67d22934fff78cb8adcd2eae63dd79d220ded79641a1e6da6c4e49b8cdc6f59843971103e98c14715989a2e13167877b12e1ef72c88ed5737 WHIRLPOOL a35f841748d546396ea7d0a67c8363ae4320f5408bf265cb17aa0138c0364c4f8539384f050a0228b08e04fb3901fb0a576d294df826887b96d280677defaf3a
 EBUILD netbeans-java-9999_p20171109.ebuild 15702 SHA256 23eb05c6c2ce3f15988c7284a5b35473d0df3311e83a49aae15be350db0c1458 SHA512 34c750ffe7ef9555a20980d1ac0b3976ce5c53d5fdb3533888fe9eb8789fe4287d791a36f952229eb830cc517fe861da9f5764461f58c5438e88edccde49f060 WHIRLPOOL 6fd89315a6bf64ceadd5bfecaa600b7f5c16d16a52db4e9119e685afb04ad3b902df81f544fcd64b11d51bd66325553905956983d27152867e00792020e8836d
 EBUILD netbeans-java-9999_p20171110.ebuild 15702 SHA256 f31348404dd70f2b3704dada41e325bce1b0ced6935a47f2048271d4e9b0e52d SHA512 669d2cff7407abb28d06f5d3050573ca91cbb14c386f2d67140dc45070c9789a1a0811fb566420b2f3b25f2f0b23e3be192b026b37ef871356e1ea07383a76e3 WHIRLPOOL 617d14aea191c9ff424132dac1e904f526be8a0bbba52b1680fcae1a5262f0166607c24eb9105f22e76da25e9740e31758f270b9ac2f506335b1dc8bbb2b9c1a
@@ -60,4 +61,5 @@ EBUILD netbeans-java-9999_p20171204.ebuild 15702 SHA256 9978fa35135f5818209ac560
 EBUILD netbeans-java-9999_p20171206.ebuild 15702 SHA256 6f1dd84c70ea89ee647c37ce3e2997ee108c0b080e3f1db1182455f3f07ef4ca SHA512 89fee442fcc94d336b10924ed176c2febddf4651780319d872bf1964fc1d3704133e6af822bcb81439315276c4eee4b2380e7eb79c13e0c21f74f70b1960dd82 WHIRLPOOL 577b51a4abfbb7de8084729ef96563cf857a9645e1d871b1325019830ea3b0a493de8f1278e319aa64a4bd02afc964cde4d0ac17f1e81700497c89d7b72e7afb
 EBUILD netbeans-java-9999_p20171207.ebuild 15702 SHA256 1485874635a2be8437a4bd1132c3ceb48d2ed4cc3dae6d62702b535c615892af SHA512 9bb8d1b5d806abea4dc5aeb47c05013c8b587cc4067b376e8b003ebb7cf9ae4bff8f3a99285c423218a02087891b6d0db56e4704d6907250f387bf6d901508fc WHIRLPOOL dd8bcacdaa881693d45f30ab86173f4b130fb801d14118460d7d09a7f3574d00026df60d3b682edd1c236ed79a6c5e6938f28830b7eda41e52be49527b745077
 EBUILD netbeans-java-9999_p20171208.ebuild 15702 SHA256 9e0c3c2e96ba8a238d7ff40d867b440b55081c2982ab1e54de6d5e9af0b93bc3 SHA512 d0971bdcbacedde4d523aec0afe08747e67cd13e4f965866a34436c347b29d9974d7d0621785d3a512ba5e00b01e94183936bb2b6d78a0569e66cb4af4aff593 WHIRLPOOL afec680585585f07013998efed5809d2bfa87e42a970a9b4f1559bd5bdbf979499b45a9c98055ec5e7bdd78a8cf98179d7b7e768f70ce024b322b85885e7abab
+EBUILD netbeans-java-9999_p20171211.ebuild 15702 SHA256 17b3e8289cafbf4309d7fc9084d39f7f48271668b03d2cb00ce593c0cbeab720 SHA512 8c4d005d61faa4845122c58b054be416636872bfa15c1ebd2b8343f6ba4341b54ff4351c6af0c1ef40666b32ec3c5557099215e23ca155f48ca9d0cc8fa00079 WHIRLPOOL 37c06d6f6c275b78f58213602508cb52a5fb1c280d83baaf0c499cb2f017f8adcb6cc383dd1c5f15148990b0d143757e31edb43fe835cbfa9be53931e844f909
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20171211.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20171211.ebuild
new file mode 100644
index 000000000..865447961
--- /dev/null
+++ b/dev-java/netbeans-java/netbeans-java-9999_p20171211.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 9ab5a11a2..aa9bda995 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-javacard-9999_p20171108.ebuild 4648 SHA256 99021043d47a2fd46f47be368f0569e595551242079bd14ee38d66246698f7a3 SHA512 8cec10697801c4185f7d7705a9677f08859d45a72322e853878c9291096b439695a0239c0d430e894abbe82472a78b6117b10c1c23c72b12bbc5a0f960ca1e62 WHIRLPOOL 84a48e07f4a5306caa98115261b5012120cd7f5154e7da335b458ffb1f19c8e8b8fc114077ab33968a912e61e66e00ca24880dfd3127f2ce1bae7bf6b65c5533
 EBUILD netbeans-javacard-9999_p20171109.ebuild 4648 SHA256 ba883fd0e38fb927f24ca2875e8195356c17265c5e7a7dff0072a3519f328fde SHA512 33bc3e5d041fdc8952c5bd25e75a6ecd530b254b12b1248c062ebc4c78d0f9174438d5b884dc548926c3fd40b4ee17f34a694b9c358f0ee116b80121fb63600d WHIRLPOOL e7d10f13e1fc4179192cb62040e6d8cfb64d7a7d74a517814fc2f3dd85b9ee18b616b98b9ce7eab685f084cd63e2882a29969d292eea61a9413a94dd416cd99f
 EBUILD netbeans-javacard-9999_p20171110.ebuild 4648 SHA256 d28b87f4295bba7e158a427ad1157f533b33b0026bf7e9f76776df38381a1181 SHA512 2d24c943bb79c407119917b87cfc6586ff38eb33651de99029764c615f63fcff14d32afbdb5912225b65d1fe71544edd4e3ce597a7c261b52e0df22b8f49ee09 WHIRLPOOL 70feffd19748ccee399cbafd737d05efdd64236c2696cffaa2c45ed15e021dac48c3d29630553bd08c012096eace7990982c7264260e105138166bfbd6e4c624
@@ -38,4 +39,5 @@ EBUILD netbeans-javacard-9999_p20171204.ebuild 4648 SHA256 27618a6ba64caf9c1f346
 EBUILD netbeans-javacard-9999_p20171206.ebuild 4648 SHA256 08d5c1006ca053777559ff4e4dc3ba6bfe6838fb17365f444ae4e6bd0a29ca1d SHA512 2f4d0f69bcd0798b08b38d129500ff8982a46358ca21aca2da4aa7e77d985bd6a2eeafa8c85b4e2678211b7e2f937c1c7abc0efe6133419731f2f1f5d117bdee WHIRLPOOL 564d40a75251742f2ffe8710c9f3f88c91a7aa69ee0b3569c602fe0033fca9821ef73078606f53d31bf3a400b7d58446d659b348e22ab93c87c2d05e276dd8ee
 EBUILD netbeans-javacard-9999_p20171207.ebuild 4648 SHA256 eca58a7f345b0fcfa947f9a23ba113d1b101cac3efe739e652b509421e3f687c SHA512 d9918df424477030f95734e9d47485245435a6dc1bcb3a216b35b9630100eccdbcd512d1ac95be52d6f639e83a39226949cc58aaa5b5a87701f84d06cba2b5a3 WHIRLPOOL 8ca363fca7552108015beafcc6fe2c1506dfaea438d3eec2f99034c334585b2d1a343de5eb34e9ad209d3ba1e286a40182eae647d6a0429dc33cf9542cdfd119
 EBUILD netbeans-javacard-9999_p20171208.ebuild 4648 SHA256 10408da8dab5b950e1dc239f8a9bd0a92cea7f99260426514935c475b3dea024 SHA512 5647523b1d596fffd95f4f5b8a26411d587b0feebfbdfea09189c8840c5d3e7c48769509927979d32bc706a192086ce0c4a1d069aff48b29bcb80cdd6f85446f WHIRLPOOL 917eddc4f909ef9e9e15e9ae5be1ab694996b04c11ec5181147dc8a57209d5fb7747d13484d249f2487f93e30cb9feafaaa13ccf7b5855214f52fd6f522eb287
+EBUILD netbeans-javacard-9999_p20171211.ebuild 4648 SHA256 ebd5c48d212999517b38f4b9669499151733f81743443bb3b066f458ca8bb3c9 SHA512 fb43afce687e7565ee66985502f2b7aba4f4fb3c7eb5933a9e752ed3e9c4526107fc4a4619c8579523c269aa078408ed046c21fde1faa0366eb4aeb8a332932f WHIRLPOOL f8aaa4bb98ad7a41d83572cd6846cdb9aef3ccd5d89d73c3526d96ce4fb6b506b64695be15e7b51b942d274741985742bc2f28a5c6472bb9b3691b09a63557bd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171211.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171211.ebuild
new file mode 100644
index 000000000..c073a9c87
--- /dev/null
+++ b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171211.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 fbc98e8e4..9f3488c03 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -18,6 +18,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-javadoc-9999_p20171108.ebuild 5992 SHA256 c885a97019cd06e8375435ca5cfb06944e462d30a619282840302fa5eb4e9b56 SHA512 2509d623fc77e25ee9189f7c6de1d92f7b287b21e6726bf10ed998ba006540fa29243ef260a9b8948d4c171fa2b9710a8eb8f76cd7b65678bd5d1f7a694393a7 WHIRLPOOL ccc70b73c2c2d97d2a5dad33f09cfefdbd1134a42f0b6d53c0324405f1d9980a078904079c7a6d4f7344fe3354482b7da8c23fe1aa3561b1d302bdf2b7e6a82d
 EBUILD netbeans-javadoc-9999_p20171109.ebuild 5992 SHA256 515e37726b18ba68b20115fbb17ae3e4544229a6ca0fa85b882a3ee87d0b98ef SHA512 c14296ae8627a5d96f058d4b254bd1bd46e310304df793b25d2911922ff5c741d23a04cde9426a82bb74f3ce8da239c791b3a032b49c4ba0a4089611659d2fed WHIRLPOOL 2a9b867bcf72d19086a84a04ae95d626179bdaa0b3af0ee449019ece4dbec290af13d43fa85fe9501d21b6ab8cbf3383f5210c79b2f6417c686c06428daeb596
 EBUILD netbeans-javadoc-9999_p20171110.ebuild 5992 SHA256 531dd3212126804669472f6ac440429bb84be536a929805c3a6b1385de471bd2 SHA512 f70bb14e81afadfecb1b9f4d0167651da6df1dd82ea24d91b6da6a6bce305cbe18f8a8e3973e09162d1751547ad2087fb77a2f0469cc7a20e0fe4d96a557fa01 WHIRLPOOL b85bebd9bd551e865081c38fe8800e161f565b72eb772005dd731db703910a87d57d6cec28fb34426379d26cf5c6ce5942ec353f12698b1badaeb41e780c640f
@@ -36,4 +37,5 @@ EBUILD netbeans-javadoc-9999_p20171204.ebuild 5992 SHA256 e024a57b1f0d1804650dc8
 EBUILD netbeans-javadoc-9999_p20171206.ebuild 5992 SHA256 fe87284ef2660c644d9936957c60cb47f167e2ed3a80ccff2939359258931926 SHA512 a98198fcd7fcf9b241a42acfef0856c01b8132946f1b5d99574cf9cae8f47c882def33e41b379d46b7539463a44069122803340cca7524135b027dd696a58400 WHIRLPOOL a067b808571e1cc8695174618f23b81501e9cbf71e24b450faf05c33708bb22c1a04c21202a897283050d670c8c1ad617d53b6352f450f6094c6d7c69fed1784
 EBUILD netbeans-javadoc-9999_p20171207.ebuild 5992 SHA256 729948b070f1d3dcc4ca5a2900f5de93fa249372d3f39e6765848b79dc52b9b4 SHA512 f7f23f454a00741a6edc427fc37e1abd479bb5dddade036981802032c171193c4fd3cd6cc1f723c0d2fd4ffa5284d0836c6f476a9456f6a4ae5c0daca2deaf06 WHIRLPOOL 9a7b980082c64764e94a169e7b59ecc45815457020fed37f01a001518f2c7eac249f7a27398c834f889a5aba6534e90520bccefefdd8c3e7afae15175de483ac
 EBUILD netbeans-javadoc-9999_p20171208.ebuild 5992 SHA256 7a8fd186d06a24faf65384f2c160d512afa456a4259dee074430e79a92b725fa SHA512 ff449515067a954bd95286c18f7fc749ac0c7e608999c68702e9ab3e901ede77c310ef06d990fa005e01c1956c5b5396bee533a3d4225ad04594d963cb41249d WHIRLPOOL 0312e810f2a319cfcc6eb2449a04775f2631a6b087aa8b539e7febca65e9300b02cecfea84a31274e91408af63f1edea55db62d68fe67a7f8d3657cbdc37b5fe
+EBUILD netbeans-javadoc-9999_p20171211.ebuild 5992 SHA256 0d71262c9c4fe4a84b07f048860d343d7b39ed0ceb2b8ecf03310505d8965f21 SHA512 935eb7b662ce80941ca57923b6b5ac5444bfbe2e99bc867a5b4d95106f38b751bd82e0a4a246fe0dc6086a4b2cd1ee49536d4c7f558f4dc82b74ee4e6e5de66a WHIRLPOOL d3305963cafdc188fe523ee867a6377a58fb1693e47c423f51ca249d59a0d03792a235e19aad9376befeb9d27ef69fcd7aa4420dab5048403ec491c9b74b0864
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171211.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171211.ebuild
new file mode 100644
index 000000000..875818eaa
--- /dev/null
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171211.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 6ae598405..c95d81823 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -23,6 +23,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-javafx-9999_p20171108.ebuild 4397 SHA256 2cd17355ed4a85c6bea2089ffed5f56ceb6d93afd701c6955680a3162eb88504 SHA512 71d6a34ae638bd2501948b8b8b736156d6b7dcd89d14d588b721a5908ffa4e37a8bbb67b3cc4d4d33d1112acd4d65652fd35114fbc8ec6eefa15279db6fdc815 WHIRLPOOL ab8a0661aef9d17378bf645a2e7a32bfaf5f51a7870be634b098593896ecb1c9e1b59752779d3aedc9350502fe01567453a11e13ad5bb3d46b143cb07539b7bc
 EBUILD netbeans-javafx-9999_p20171109.ebuild 4397 SHA256 0b93d595a8be7b44369cf5e6c35b323c0973665827d574c7f042989ef6a80e4b SHA512 83913ed616b05b81a377f04b94b63e9540061640631ad592fc4fa4064e2bbaeda27fe7a879d64f1a165f73158acf10d69ac95128d65b7b8e71b0010606da77a2 WHIRLPOOL b8c39509f29996e4ec13a1ab5f076cb5d643225ef58cc1655281709df01b6f1f3fe2bc0be99b4d5775c85a2be618e805c7b49e78a50e96dac7b68cae43ad5adb
 EBUILD netbeans-javafx-9999_p20171110.ebuild 4397 SHA256 7bbd79ad7fd871385d8e2cea5584d9746c7191e1864552be84284a6cba500693 SHA512 c7027993eb83143eba9d5c8c5128afa2727f1375a868e2c5bcdc602a8a32067ef22adf4480bfb03d92a6c7e617e56cfdf56b82473720a47ed9024a1b4c17ecaa WHIRLPOOL bcf3c708f2a849b0d28c5828315cc3c0c0a6f470e25e3af468db8fa61fe1730493f99650383b1b65644b14e44548e06e029c5c664e063be4e1698beea7950020
@@ -41,4 +42,5 @@ EBUILD netbeans-javafx-9999_p20171204.ebuild 4397 SHA256 0c98ffe97d7e60e699c3da2
 EBUILD netbeans-javafx-9999_p20171206.ebuild 4397 SHA256 308dc701ecfb37bc2d4804b43629cf976adc404f682b7165c7662db56d4a34e6 SHA512 2953ce6e5a80f5fd06e3f205a38d28343872b360124dd3d9e3ad4a1906c09b72a6752e177519e1a8df5090521f379760a4524be332d20e749897b4914ec88ada WHIRLPOOL 11857a68655adf293deee121faf377ff4b116f039a3fe229b9fd9100b44f21bc8127e7145c8fc2d0ad3d3acabe60c2acda2b2bb77cc3f4fda39d43993b8fcd85
 EBUILD netbeans-javafx-9999_p20171207.ebuild 4397 SHA256 30d51127450f95430c3fb8d83fb8ebe6205c672353a8de2039d397d88e3ed410 SHA512 617f489c0f7551f3ffe032106b3e0afd4bc6ee7a3f7dc84500f4886cb4805f92203c0242fecacc707eba60e9a1243511f6cd832b9534e46f50551b4287566ab1 WHIRLPOOL 22fc21b1d3150e2cb36d2304a20be22afda5f4b808ae9205da98ea4257ee168be4b6905236ae359a93d8c78d25f3fe1bd02294d1ed8be8e912518cba239ce478
 EBUILD netbeans-javafx-9999_p20171208.ebuild 4397 SHA256 50db0c6616d5178137dd42eaabe482b4c232d2b595849d18037f0c35f79dd1a3 SHA512 c8f96338205ff3c99967a5103e7cdf4dda8aa781bc521a2dd5f2e6d6dfec1703fdf383290a15a3206eb0c601fa32b9d5780237c2871f0402b05de915c93b707f WHIRLPOOL e49048392eac5f5409007fe85022e8e168cd9755d8c78f9fde97f8eadae9e8b0b2980ff1a13f0f7bc8b7355ad044864b62f4e3da02ddc19362366f8ae46dc8f5
+EBUILD netbeans-javafx-9999_p20171211.ebuild 4397 SHA256 503897171ee9b9f1229e11c6ce61a596cf7b810a13683801ce87d03e3ffca5c5 SHA512 3639355c34dc08caeeb30c9566e2af40bdb0d730ed1409df4d6d62eab3f144d58651b3af40fb5214ab6740f8e772df86b0d321025e5980bed9dd91bb64a0d7d4 WHIRLPOOL 5be2ae427f93895376f84ff21bd5f0a47be5f3c057d59fc6f0b9e8faa25f4d24152a6327fa136bf4d5eb35ddacfbdb860f62b754b9e8e4510ac2f3d0a4f88290
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171211.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171211.ebuild
new file mode 100644
index 000000000..9332a850e
--- /dev/null
+++ b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171211.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 3eace2e15..452d0d2e2 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-mobility-9999_p20171108.ebuild 4086 SHA256 a753df359aa5bb1dc91af6fc6acb00ae86dff27cb2a84f3e8577c2c67d8b6b9f SHA512 2b05ea0dc0ebc97da44b5747bf8e5fd58bba5107eaeae0a36ebbb5a686cbb27efa71d2a0267bbca3ba3633970dc334a61526b21492eff1bbd04ca6801455da42 WHIRLPOOL 29df093d93e6c384cf99d39bfe6542fbe1e5f49649666f2d9e23bb2d211a5aa4d582769b95283b2e2ee66ccc5fb93c74fe3ffd256bf451f2bf360089e7bfb536
 EBUILD netbeans-mobility-9999_p20171109.ebuild 4086 SHA256 215afac4d90465fd3ec5abb34a8d8242473e957ca244bd674573c5dd2f494b54 SHA512 c907a55617e3e3825b428dae6f949580f604cc1bad44882161008f8a762710c30304967dbcab0dc87c94b2f821b1f43e1a0b6691d01f4f20d9ef0679e0f23468 WHIRLPOOL 2d3f077f31037fb4b962a9f32f7952704abf558d878da34c5d13bdf1780f0566e28e02d8a8383b8ef228057495e43473840516e96bd5d0a21e340e1334fcbcfa
 EBUILD netbeans-mobility-9999_p20171110.ebuild 4086 SHA256 7589b60338a9d6ba34003931a979a785696f8403b3780c118c743e8049bc171c SHA512 9347c0d520d52a222e9b0ca1f6f1c06327698a407cb07cd6b7c370aea70a1f94568034970042010b6396652f34e0773d5e885ba778d2a4ccfbc796b443d704b0 WHIRLPOOL a503703103a7b7396db95f771f2dbe6cceeed0b77ae7d8f5139126fee7e1ba0a7499db3239f48c1de5ebb425ddaf3e9ab9f980e65f78b66f4908ca3473e54931
@@ -35,4 +36,5 @@ EBUILD netbeans-mobility-9999_p20171204.ebuild 4086 SHA256 7654ed1944b373fdfb7f2
 EBUILD netbeans-mobility-9999_p20171206.ebuild 4086 SHA256 2ce698818b3ccf14b57feef1e1580e9bfe20da79e904fa20f110e37a1f5a5621 SHA512 913d8438fa95e5034d1b5ecc6104f62111e6b9498a84676c7a5576c49da4347c3ed599fbae89b3e72babc2e2236aab2b173ca2ddcb9fd410306983b24b9d6ed0 WHIRLPOOL bdb23b4155386effee51ec4ac8b15f939a9a936bc340f9ca278a17346580739135a01b7a8657eefc9493f45f1967906d829cb94e755b74abb5e5523a604b14aa
 EBUILD netbeans-mobility-9999_p20171207.ebuild 4086 SHA256 aac5890068bb860bd88fae578170da640b7093e2e6bf2dfbe29102a5210baac0 SHA512 3d8f8ac998039ef9b5fccbcb0cebb67b7fe76c483ed7700bce8494fb9c22ca97396a3e4f53beb0945debdc6bf799ec196028521718ab58a8356d04269fd0218e WHIRLPOOL e22284e2004874b5c5fce8ef63d15939a8794ce15613e21fd516ccd6cfe2a43ea57f1bb39bf8bc4799f4e30507e62722faf4fab9a50dda5119b76dc2d8448e47
 EBUILD netbeans-mobility-9999_p20171208.ebuild 4086 SHA256 e20ecadfb49c74b53a44d00448cbc6f32ee3ba384c8bfe1c8ee685fe8dd4f737 SHA512 78d37a23750640639d41794cbc5caf13a3fa24bc99b3511df48e845d0f75ae898eb3d59c9416df9aa4731b5bca8f760f2429e74f1fecc6a363e10c7022fff2b2 WHIRLPOOL 2aedf92266f067e9c2f6423a934d9dbda1385dbf59888fc4b1d1279e306d6be67ebc489d3bd4ca6c978f6687e9cc693972c4fe210033c97f2d6e437652eff9e1
+EBUILD netbeans-mobility-9999_p20171211.ebuild 4086 SHA256 8912512613f4fb40faf6e2df0ac08a4d37485aa9163bda0fe1e337c3438e9bd3 SHA512 9a53bdf06a19cde4e70e7bac3903fd8dd095031688cdece11fea20c270735d34038b6ec85a60f335bd7eae9f5eec0141e93490ed033a61e84ee7fb02587e6146 WHIRLPOOL 22b68ecff234f6fe02ca1b04231a643f55db8aa066ef9e595d553497c93e39e63455b9f6320c6890f84970161232948063e1a3f404438f3751381a68377ed012
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171211.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171211.ebuild
new file mode 100644
index 000000000..cd66398d4
--- /dev/null
+++ b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171211.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 02773030d..d19f1afd7 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-nb-9999_p20171108.ebuild 3786 SHA256 d4e8109445f8b2005b88b800062cd001846acad11e052a7660436719897ceab7 SHA512 5ed5c01c3012e575a110852ba16447c09558e4a27db2a49d43d14fa9ade6c0d493901c38381694c88df70a1797926ce8811de4d3a4ee9b42b010eb5b0341e83e WHIRLPOOL e5a27ecdddedaee322b8098406420a97d644f746ab536a0dcdd48d4218e54cd08c1440134877732695f6b95603c317eff42e5f5bb04fb42a52d74a355af56ed8
 EBUILD netbeans-nb-9999_p20171109.ebuild 3786 SHA256 a821d40d44aa94998ace094d8e0d1632280aaa5137a3cb3f14905d2f89666499 SHA512 0c34cfb425abe95e17d25dfbbe281aeddc2a4b95e74b2cf0e3454544929492aa7cc65be2f0a96c33bfd668953840194818815d2ff1889ccbf23ebffecadca1ba WHIRLPOOL bf3257760208596f74b27c946f3733e838824b1f1fbc1bf349fa12256ae5440215b3e5ed344690738fe129cbd41b263b943559915152c169e187b4c8010c5850
 EBUILD netbeans-nb-9999_p20171110.ebuild 3786 SHA256 eb8ace9f3d95679a12deeb40559fcaa4616ea07d9e0d31acb4e74a016b4b3ada SHA512 ea0e98b9919eb14bf4ca58030096e67afac15e72303e498aa61735ee0ac0c1f98da684a03a4153fcd6c191b2d18ee69717d5813287b99aad28f3fcf5e3de5c81 WHIRLPOOL 215b7557d2b04720c39546b0079375947f9d682a68fd14c0caf2a49c619ceec02c2552e0736e601fc8b71703e345d9c9aa4043db701b3f6127edb0fb150b41df
@@ -38,4 +39,5 @@ EBUILD netbeans-nb-9999_p20171204.ebuild 3786 SHA256 a72670b0a00d6ec156a3b1e5b07
 EBUILD netbeans-nb-9999_p20171206.ebuild 3786 SHA256 4948a79431c0e301980d9b120e5af9f48a47ee1e9a288961f53f4c5c9f1cc666 SHA512 9902f62342e904d10cf8410378fa6f1d1525f78358ca84104644406917246f99f7eb98b3aba7bb8da663f25c0ea79586fd8b6360e9a60acd27fe6653ec3c0243 WHIRLPOOL 0b37e9f8269b38a0315af0fd96b6f7f497962c14169c96e1f0f401c1b947875c2fb4bbb33b89b53ad83b3799ade7d0e90720d99fe88e3e427322c076d3a1fbdc
 EBUILD netbeans-nb-9999_p20171207.ebuild 3786 SHA256 b0701851b012cdb49654e66ea7b94f36bdd00df18a69d19481d8e37b478008b5 SHA512 4c51341d25b610148db6ce08fbeae044433c00513ff1245bc63bfdc76bb9af2a4f356574ac16dd788cc799c0f5b62fecd2f4959775b50ca90177d2d1a89d72c3 WHIRLPOOL d7f589169bb2f9b09ab25c91ee247ba6d40d30e488a6d184be91eea99792f1f03596a0cdb6c8b53701fb6f210cd2e7ec3fc59e62bb8d47f8a83f0c49253cf33d
 EBUILD netbeans-nb-9999_p20171208.ebuild 3786 SHA256 d22fa563f85f9c61c7514f25b3215b0b8c6a836d5cc96f41f83a21ad1100152a SHA512 5ccf245d9d5d7f821411946401077065cdf6d4de4d2b4765e306b8301eed90306bca4562d7be4165f6c451e934e61f87210dfb715634426b02e1231518174f50 WHIRLPOOL 122e3f2cad61a975248bebdbc754169dd6be0fd04988154ea908959fb7e54be1312fd097b427ff5562ec2cdc5d21a478aeb71f1008d14fa202313424d495ddcb
+EBUILD netbeans-nb-9999_p20171211.ebuild 3786 SHA256 a61bbb81af8a2e465dd1d2332f22eada68149789ce69febfed4ad3996a733b46 SHA512 6319d3873edc1fbc2feb29e626d4bb4288a89f66841f398e1405c36a994aacea6c334a62cabb3a393c92741de8a4d34e864e9a5a0fbf8cb58b182f6501c24a8a WHIRLPOOL 88c9880d328b2a030062818d9085c1f8f60a42e85b5d932be2ab53d0ecfe7f2c80592bcdb709346a72b63b824875b6756f145cab6e5b33f1b6d6cc6d4649ce3f
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20171211.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20171211.ebuild
new file mode 100644
index 000000000..aa9343a49
--- /dev/null
+++ b/dev-java/netbeans-nb/netbeans-nb-9999_p20171211.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 8cbd130b5..1e505e5d2 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -20,6 +20,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-php-9999_p20171108.ebuild 4095 SHA256 55deacde430adc60ce58925adc973ef7df911a2816b580793a5a798506c3fec4 SHA512 89511829939d83f090084f7db9c915f7448c4e08877fa78ea6ce48351914a671fd6d242b890cde5153775972b002ce39da42abe856709fea7d2c866430961f46 WHIRLPOOL 88d4cea703e0fb97bfda2391b23b4882a6b65797158b440a10375c43ae1b3b145225599feb17be754224201068f2eed7ef7bac7ee8bdaff9bd9840b49e697807
 EBUILD netbeans-php-9999_p20171109.ebuild 4095 SHA256 da608a6c1cffba6577e9322606c15cf5594dfbf2081b267c03a91a1c1e44b44d SHA512 bebe4e865bd9cc99950118ca6091270b5a183a625e78a99813bf103213c7b9e2aecfd9f1f65930495513d047e5196785c5adcf30a6da7930ebd5937268c79479 WHIRLPOOL 3b91622919d2cd9a3344ec24e36b3d924fdf46143556aa9abd99534d2025700dc57aff3addc3ecdabd3233c20829f6bc9d276ea061edee57863d401db132eea7
 EBUILD netbeans-php-9999_p20171110.ebuild 4095 SHA256 62f276ac6e9dae62a5a6c61c33f1f2a620524ed24b52982e159cfecb57fbb0d1 SHA512 83dda0f3a629ecea667d00099ef05bf2c38aaa92a000fe9f6d7b2620a14c0aa16c1026e412a331931504d544b9b76ea0a17a7aaded07972d26e353201f44ede3 WHIRLPOOL 50e78e1d5d09cafaeeddd1a2762d7f8993c0b2bb0f647507c1042cfad360059cfe9e9748099c0f156b5af5eb9e0889e5f6a1dac4ee1869f311b55468fa03af64
@@ -38,4 +39,5 @@ EBUILD netbeans-php-9999_p20171204.ebuild 4095 SHA256 723b465f8ad56daea9eb08b090
 EBUILD netbeans-php-9999_p20171206.ebuild 4095 SHA256 52bb830f6bc605d2f535a658f46d3fe194746e64add314878d4a41c321f7c643 SHA512 150f5eb347d89c9bcc4aca11616342d4f1043455eb48395a4d9cf97759327899543fddf1cb1d06517bad61c6c15befe06f77f05551a33c8171fc898b000dd49b WHIRLPOOL c0a0e8c18156881f5137c8518a1d211029c820f56a17800a97dc8923a5d5807b6e0d904282d6b26399470951ef1bf0487df6827ecda422d04d673483e5f07f0e
 EBUILD netbeans-php-9999_p20171207.ebuild 4095 SHA256 ffbaabb4399769a1706c41bc2556292e39b9d3b9399ef8e34c3d356629956d9e SHA512 0ebb30a8c9cc91cf8b7a84e38aee625f4cfac773422374704c9a061602a5771f589c38c57b979f02cc689466650f7c21e27cee7af3d67754484d301667967eae WHIRLPOOL 33c8b063f7144b19adb985e4d4f9314c43232bb2f5201a8d9c536e8f859d4d1d2d886753c5bf45b3495bb64d02cd1921a2feee4920126ae5af219aa44feea37c
 EBUILD netbeans-php-9999_p20171208.ebuild 4095 SHA256 d2fdeebb8a93bace4f42ab22207399e0446dfa4bf63a80ca659f6cd813270774 SHA512 e7ffde51fbc669a746b34f8b2fc672ab2c2cbf2ede94ecfc8c2c99725dc3e2f56a4243a9885c358d218cd044cadf6fbc5a23891d5068f795b7b55b21bd9ae215 WHIRLPOOL 803ccb6de73e835e694c09c297bc9f0026adb45b22d7d1cbf4eac2fb82ba849035a1f8f3624b3129341f43dfa920ade4e211b95839af9e81e244481b26f476bf
+EBUILD netbeans-php-9999_p20171211.ebuild 4095 SHA256 1f3963e3a989bb265a535650045436adcf723fb70640a097a9e6c51c41e2bd80 SHA512 ee221cc2d9db851aebaa1ff70c757ae96031f6f5157fe292a96d90ef35385ac6d7c84abd8d54cc53843a54fafc191578584f975af9a0cb50788487a9ac4a4af3 WHIRLPOOL 679074f6f851cc69b10d1e49f56e1fd34f883cf79519a0f23eb411bb49f274898be09d73dfc4eaf24f7fcd00c1aabf350f9394f5627ac9b1b8136885866896d4
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20171211.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20171211.ebuild
new file mode 100644
index 000000000..66c91d17d
--- /dev/null
+++ b/dev-java/netbeans-php/netbeans-php-9999_p20171211.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 e6d600910..e8895e027 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -32,6 +32,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-platform-9999_p20171108.ebuild 9238 SHA256 3ba0876b879670f1bfecd2d996f4bff2008fa1d44f979cdce884fb0994e7327e SHA512 065d04894f878182e804ee66c0ee769a7b7a72e9503540795c1ffedebf7db589a5ddf0cf21f9cea9adc6eef16347e01e56cf05a16b43e653fa9165b2006bce31 WHIRLPOOL b39dc09cba622ae57745fc8c08bc6a5043533829a9be4380af3e2388622c77382462d6aea2ef445d26ba47791b972c97ef3c463540abaae99e3cb782de53d7b9
 EBUILD netbeans-platform-9999_p20171109.ebuild 9238 SHA256 8b434efc0f98f9e3a9d50c7b3c01f8dcebdf1a902903f2ca0578e115205d607d SHA512 9b9d508ce6346f2a35bb836a96aa9ca805ea26a06e5494c914421ad87f656e665ac80fa1b2f0a6acb66987536e3442c433beb4eb4b4faf792b7a9b210ab0533c WHIRLPOOL 5730ef6937f1db22b4805723540b38b68ab826ebcb22869a0d432a055e9524fb6ebb886ffca2d6e0751fb0673ea948e1e3b78aef833b5049ab9ac8b1584a42ae
 EBUILD netbeans-platform-9999_p20171110.ebuild 9238 SHA256 24bfaf3ef4c8d9c122055429b149c347ad5ddaed7240d74cd9a244c61f698827 SHA512 c97f6ac0c49850d5212ae6a24cf35a51132bb4c45964e2fc4bdfe4921c685306bd82669c38b0498c4e19fdda0afb3899abd346d73b682a5872b8b52d0d0822b7 WHIRLPOOL f07486e60eb26b3253f891494b04f01d82b38e13f31d0930c6bb20f3b91dba231cffe0fa37eaf7f04edf6be30c8c70fbe46a0e51f205e2651940a5f0cc5f0f6a
@@ -50,4 +51,5 @@ EBUILD netbeans-platform-9999_p20171204.ebuild 9238 SHA256 14c96fef385541a2e063d
 EBUILD netbeans-platform-9999_p20171206.ebuild 9238 SHA256 92a99c88172b759e03c6f285a154d929998b22ee8e89b236b619d90fbe740d64 SHA512 111447899975fa79f26c796945245d922dd20524cdb7d6c5c43ce91f91651e2b7ea9832513cfff8a5cf960c1e70d89a5f615e7a4db571a28649074f4fd970ec7 WHIRLPOOL d6eac7609e7391c559c57879eef08d22d06ee699ceab463d87cbc724e175da3d646e2980ce928a9355e79df1d257860befb3dd341e529af085f5e9f9d5aa589e
 EBUILD netbeans-platform-9999_p20171207.ebuild 9238 SHA256 48fef08cae7ad902e0127ac19982f90efcfca1fe700815e4a3e69842c6033a1d SHA512 3672f24b33fc4fd55f05485e3e442a1623dfba09bb75e6cb923ed4a57ee005ab4f364374da20f3b36db6823ef42cb9bcf4c7336ddb19e8d8269accbf39167685 WHIRLPOOL f3d75de2309093736e672fa6afecb71e9d997ada23ee5d58eac51d354fe63a09baa96b64194a7246a29aa613a1fffcf4c94878d8c1d4fa9a656757e6de9d94ff
 EBUILD netbeans-platform-9999_p20171208.ebuild 9238 SHA256 14cf94fe55945060ba42289b691de52f3fee1f647f4ee1a9aeb802dbcb2abfaf SHA512 bb6a282755a43dd5ea5b102ddb2d728967953de4ccf47b6066d2ce0c2bc6131534635015374d1fa929c628cfd99cd79fe2d1a3222051579065d366b0cbde759f WHIRLPOOL 9119d2394b18ca677e1c89088792b2f418de67d288f9863777283cafb2f94db39c8d717797d5ac1620591272cad4c496d73d0ecbce65f06442ef5843a2c9f050
+EBUILD netbeans-platform-9999_p20171211.ebuild 9238 SHA256 7d47537a59cfb88eafc00c93b4193bf05663bcc3eb02781f5f0f6465c345b056 SHA512 dbb27442d3c70d4ba1764bf8db36c63e436ad7588ae2c3e335144cf41acae2e037cc30948e399e7a90a975ae51d61eed75328795718ade3500738844f4da380c WHIRLPOOL 2fe810e7c138890f08d198608663efd08d5e4a167e77c8040debacf449615080607f77b3a0c9532c7b75ab44cd38272ad07f89b66b482d365fe9af024acc7406
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20171211.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20171211.ebuild
new file mode 100644
index 000000000..91a6452ea
--- /dev/null
+++ b/dev-java/netbeans-platform/netbeans-platform-9999_p20171211.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 dd560500d..bbde52e9b 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-profiler-9999_p20171108.ebuild 3146 SHA256 217a6de3ddb4d5f4140a7cb6fb55065168e71dfcb0e23c3afac9b886bbe2be76 SHA512 f3e39a68b47fc7a60e21163025e07427748f6849daaf3e241086dc8e8fcc787e165d2a6978dbb31312fec847b42a3eb1fd8415c55cfa00163b299bf5ab25977c WHIRLPOOL 2cebe6e63e25a7daf6cf546ae78038faebe3684393648144db1a2d9f6e858998073721479d2a04afc03a7a1ec5a0ea3332d707c7dc33f5323eff1fb6eb26146c
 EBUILD netbeans-profiler-9999_p20171109.ebuild 3146 SHA256 450abba0f9537e0e41961e41c8687bd2b2ded62b5a232ed69e1925e017ecc827 SHA512 f22191ab70ba2761cb2e94450bbecbac3793276b07a6613c0f867020a1a2a340edf0182f65fe3a9d0b442a080ec71ec9f856b9faf07bbfe5018e8d01a66a7adf WHIRLPOOL fc35b09472f80d7f55f114bd7e7d608233fd0bf2453bb2ef2a17f86d1f3c35793badae0055f22b628f6c679c058e88e6174518d8ae1eac763055a3f8cc643009
 EBUILD netbeans-profiler-9999_p20171110.ebuild 3146 SHA256 67ed6d1b70902967b35695fa2a8d49c980d536afd7e70a606b99ab7e6f9f285a SHA512 48bf8e69f416b3740d80987d55c5418987246886bc771c8a168539be7771f9cf5b131dd345e0479a4dc9ca23e29bf24a97ccaddc14b8eb5e17ea708aec0881cc WHIRLPOOL 8f76ccdb72b462a27825a5a86898183ebe9639b84851b17327c16e7f4f8af116a33812fbefeccd605d7c032eace7b7d90fb381e7638d3bae0bb1afa5697c07bd
@@ -35,4 +36,5 @@ EBUILD netbeans-profiler-9999_p20171204.ebuild 3146 SHA256 cb4ab3683c27c63c65f41
 EBUILD netbeans-profiler-9999_p20171206.ebuild 3146 SHA256 4f3b7a72b9823205295fe4b5e8374dd907ba28b0694432fd50102dd4c4742b1e SHA512 49ab51e2d3d19f67c730a7d69a0ea83ce5dbd29cb956df07f44ab598ff0bfe7f110480ab499f5ca80992d973672614a386df36045158b3bbb1ff1e1b0818b685 WHIRLPOOL f3c9e82c388eeed625d77c7193ca39a0143bb3c8c3fa674c3964cbffc89114feb6b6c7546db93fac854c37aee2db900d9980484e9a9cf4c86b731afd310bc5af
 EBUILD netbeans-profiler-9999_p20171207.ebuild 3146 SHA256 d35d0e965c57e0b28ae1fef1eea9e70e7ad882195c5fa006251c850e4cac2d6a SHA512 98da0bdaaf3cbbd6d1d48dd9f4c774e63b45200a139e24a9c7a78c148512cf4ad3cea8a528c39bacde1d4c700e6e9b8aea56deae3eb2b05562b6309fc0fdd2d2 WHIRLPOOL 847bfe2deb9ee5b23991ff039c54d22a47650978b4a610986fb7391f4f51e3c8b935e12ed8e590b06eda4aecff28004feceb87b5a36a68e3cc55331eadd8a6c3
 EBUILD netbeans-profiler-9999_p20171208.ebuild 3146 SHA256 f5491e2834c9356e7c45bbc72bb86e78c103fb375fd8fb95668d752cdb781aa8 SHA512 537fdd230eb6bde6088330c1450e2b7766eeadb34650da033da4df69cd369248beddcc908c00051455dbd55e3a3f5091219249cc813b73e6b8fc5f1f9131c19e WHIRLPOOL 7717747dcbfd75731586d6fe9a9dfb7a5257f6a2bdaa2c656af47a4ae07638af37d5156b7a438e78786b220d221b9dd2a14fc26e2af8112f00966559e73848ba
+EBUILD netbeans-profiler-9999_p20171211.ebuild 3146 SHA256 87a271c21fe657d873d45de02e0f825a2fe184267133ac36dff12261c0885b74 SHA512 0482955718a8d752588978448c7ba64ccfbdbdf54e025ceb94369e7d71da71f56767852339040f4bb986f926e0f3d42334c0a1694a9b40ed3dae766a9734d950 WHIRLPOOL f15dfb6c4548767a32c54e8d4b83472a60ed1c38b088a9e1a89ccb1e3c94557ac0c4666c7007ff15a21f1dc2e8f778ad00fd67c138ebba74e612b77e63ede077
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171211.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171211.ebuild
new file mode 100644
index 000000000..b44a4fc9f
--- /dev/null
+++ b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171211.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 7a4bb971b..987141486 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -31,6 +31,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-webcommon-9999_p20171108.ebuild 5932 SHA256 25d7d0b2e586aa1854b1b2f4658af5c596d1898b9a09ce4ac440a96537361a37 SHA512 1ac0f72e46fdaa62988ce6eb0c8c763172016777375d00955eb7be2e1f94db49954befbe892893f6d52e09d3c9a637e9706a4995feb1788a60ea128e64dc9464 WHIRLPOOL 2768c070c71904f0c8674a990890d697f2f36c52aca73e9b59b90ed739a537e290957c948f2f755415e49a43471d776b7ca171db74dc02437d5fb555ecc9747d
 EBUILD netbeans-webcommon-9999_p20171109.ebuild 5932 SHA256 4a280a2b0bbe17720a0d76d1dee09a366c31ffb59ccb0b0406aa7810be6d4a89 SHA512 901ee863df68609cd379107a6263dea81690de821a717a416ea2bbea251a4cc69ca206df6565c7e8be0bf25a7174c5534f328be7b6b77eef522c2ddeb2cab0de WHIRLPOOL 47509dcbb6b76f67188c9a352e04b5522aac34dce030bc5c3b0d716e102784fe25783b0631d266507740b367d732a00dc53bcb07f5fa9adb516589e0305de6e3
 EBUILD netbeans-webcommon-9999_p20171110.ebuild 5932 SHA256 3275a23a69876c68504e93938d4bd05b394de3bc0b0e99f43004acab45144c13 SHA512 ba091cccbc6669cd02e7724072ead904ab448271075448e79db43dbd03e5ba943a49ca68744718d6d276ca58cafc5bdb800695e44c6ee77555e092eb2af0f31b WHIRLPOOL edf907587e1e1fe91274ec849ec6926783bbdb32d7fbf18a5a006089a9361ab5d1fe207e5aa910061989b8c7d6ba061f9a6966c49c7e6295cd3bab168321d303
@@ -49,4 +50,5 @@ EBUILD netbeans-webcommon-9999_p20171204.ebuild 5932 SHA256 eb7e38c578d661699501
 EBUILD netbeans-webcommon-9999_p20171206.ebuild 5932 SHA256 46c83f1de6dab432d022ea243acaa61f5bfa5fc15ac0d94f7ca769c25d7e06ec SHA512 159e85389ab6913c3b327959da7004a7662d2c0615e446d74971af2bea811c82b88f59370b1fc096d951bcb5690589078a0b299a1399043add421081fc8c79a6 WHIRLPOOL 39b3de2ec370d262f5a466431e647e444780fc75d9d3ef4c514643c0e67f179e634703bdb7a1ede52541a3f97c21637d57de7dac0adaaee1384f973039d56e91
 EBUILD netbeans-webcommon-9999_p20171207.ebuild 5932 SHA256 593cb3ec38d6985458b33ece8e301b39fcbf4b34484eadb2d63c62c88e2023bb SHA512 4ea903f9456120f9073ce111fdfa3088bb4683aeccda1f2fc919bc0bc10c0dc8e8f9064d2515a0cfd0580bfc1d58b127c3f9a2437db6404cf18ed272e851e1b8 WHIRLPOOL d187a488eb977eafa3e5019771c0a1f628f2e246959a9f12d788cee3d2e4efac8a9b84ab41dd81fa02ebd77aca0c18349dc9a9b202f8eb88b84e8cafb3bc6933
 EBUILD netbeans-webcommon-9999_p20171208.ebuild 5932 SHA256 0ab0a11c90eae8ec16d449644519a3dca7a283e7e8c325ed2385c0aa0195d98f SHA512 488721b64be90841eea961fa017ccbb99ee0e15b49970fa73e1679fbb566b3b441e7a1261a770f8577122edf528adfceef80406f7cdc6d41dd4baa9653919240 WHIRLPOOL 919750fbe5295372024bcaaf4797b6bed497898aafe3d5b7a901598e510fc0d3a2eac45148ca211f95598625667737ef61cb2fe0b8da7a21b16dd1fa2035729b
+EBUILD netbeans-webcommon-9999_p20171211.ebuild 5932 SHA256 256d11569ad487ca9fab660b9edab0fddc0cf648a40b223d43cf5b2bf9bf164c SHA512 0c517fccfd94ad17395abc45c4f2d96ca9d3aca15f084dc7e5efbe34a008cd092a2ea57d1e59ae723b23214ea4623e7c48d7644c4cf189ff15b553257bc25371 WHIRLPOOL 7db849fe853eb7a82c83d6988386e4fd4ec958a952a4d00c1ef202dc52ad0e7fd5e56b2494484f0e033566f2c02bfa046ba39157c197ad0c46aa159172fb0acd
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171211.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171211.ebuild
new file mode 100644
index 000000000..305c2abc9
--- /dev/null
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171211.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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 af3a64457..b52ee5f77 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -17,6 +17,7 @@ DIST netbeans-trunk-nightly-201712040002-src.zip 221062529 SHA256 48a1f216a820ad
 DIST netbeans-trunk-nightly-201712060002-src.zip 221062529 SHA256 84052796c635561a202e88bc5b5d10efc3e568d2df6a40bb9f12372bed5c4027 SHA512 82db272ee7c83f9e7293eaf5f02d45926879e29c656f84b15b76bd0a6c6feacf39fb1c48545b8ef00a8de814b291ffa4d01531ec573ff0ad27ff09f76619aadc WHIRLPOOL 1f5cafdc4376f1922f390e775a2783b7d16f9723b9f08c88203a7143898fc847ad99840d7d1066fc899a09e14b4b70d9b9048cf9bed781386ae0a4bae43c2408
 DIST netbeans-trunk-nightly-201712070002-src.zip 221062529 SHA256 3c5d82b663047a11be9aaf9d58e7284afb684c9b8329fc43056a5098ac198f00 SHA512 07ce12c5cc563b5f6a85acb8f81c5e84697e66b4c6f221f717857be2a1e2719a8bdde94bb374eea8bf4c6956b3cefbedc12dba35658f0b083e454d1c299f67c3 WHIRLPOOL 1e11b9a3476053da5bfdcaf63004aae1b6f19d9b42b543993396c534ccdf4e6f5887d74b0c72fe33a1632804fc54852987253e319629674cd6ba9432a65f09b1
 DIST netbeans-trunk-nightly-201712080002-src.zip 221062529 SHA256 9af712fc4fa1a49767dff4f38dc93e4c0e4094a35a9b90484f93f2e3c9203ba8 SHA512 2d1c1150202ce755c1512f1f972a44642d29d6c4ddad12b5d2b38289f43db78da8e8e6ac915593c10a834a15126b6c709c2740ab09272d2186d11ee021ced10e WHIRLPOOL 4a0d45fb761ad446936e4b8654a18c2bd49043a2934ea0fb997c0d983d6b4f99318fd50dd9c71703af75e0a896e155abf33c74f8436503c4efd70d28f20c860e
+DIST netbeans-trunk-nightly-201712110002-src.zip 221062529 SHA256 b36471ddb46ffa09e69e571cdd15d5f234abeb7edc60e5155dce3136b861c69b SHA512 4c578afbcc251df5a74b17a768d8230d21db42f5ce8d570649a845212ebb2f0b8b6e737d3acfa5ab42961496159849b3fb57c803b9a4fdfeb15b5cf7570d69bc WHIRLPOOL 0f96f8cb2ba050b36d66fd7c49677af594e1582e5b103305012486cf1cc797e6cef06034cea4c8f7e7a61e09d3e0fc6c7121b2fab2a9fd33f77c45df9e4bafcd
 EBUILD netbeans-websvccommon-9999_p20171108.ebuild 2395 SHA256 d7f8013d3796112e59d26b2313deccc7f806f898a63288e0c67d4144b6f32e2c SHA512 3e8d560d7e5a96fe391f8784121b2d381317312bb002723fd72d5c62b80225bb83943e85182362febee8e38107ba209589eaffc45c500d75f3ce26600e4c9229 WHIRLPOOL b0e21cfcb058cb0c8a6c988aa30f8c0883f46417b665ec27e5b9b5a116122acaed14214fc41b353967a7e9c7640fadc178ab9f662fc8370adf88af3d830fa7b6
 EBUILD netbeans-websvccommon-9999_p20171109.ebuild 2395 SHA256 a32e47bd54ed10e75a39fa3071ea4689309ea011bfe8003dabcadc012e2c8937 SHA512 7a4473c0a7684552ff4f087c653809655c67e9e8b44c68c62b4e3976cd1e85135416b56d3080c67b9fdf416d7411adc807516968411021b44254999af0de788c WHIRLPOOL a79aa422af9858527e0ab357f940c284f79cd71d47feba0bcecccf1ba35be61074e0e1d296869dc93447b3264ad10a640b00d437a7a840d12536145db80e90f5
 EBUILD netbeans-websvccommon-9999_p20171110.ebuild 2395 SHA256 c0c41aede0a7510805a45895df1d31ad7ab245a2fd22cc599231a28f803d2438 SHA512 2e55c8cd67a79c867b805f4ab898859f3ee409f7037bb85c3543ea52b8b5204006c72510007dcfc9bee0ec0b2763f1ccdbd1bf0f3b5f1c15996129fd2b898984 WHIRLPOOL 01f7a94fd2a51ad365a921fead6fa3632f31edb7cdd4d603670ec34f2edb6f633913066eb1daf570496bd6159a867b06f3cccd8d4261ce85352ac5a52e7cf2cc
@@ -35,4 +36,5 @@ EBUILD netbeans-websvccommon-9999_p20171204.ebuild 2395 SHA256 ab04648b479c216a3
 EBUILD netbeans-websvccommon-9999_p20171206.ebuild 2395 SHA256 e596515865f65e71f0052aa12382785b394f2d6db9f781f62b267adac3505657 SHA512 b3d596e5f3d8442cb385350404a3b59fd7c8dc50490cfcc1b8c3c287803054870c30716a518ec6bf8b8367cad83cc1bd4ea85327bd85a46a5a67610387718c0b WHIRLPOOL 3e14a0a821df32de3cacc0bec3fde96f12142d05eb6eb82a002350ddcd1864f98b9ae61afcc51293fa97c89f666fefe49f77f935674c44b0d745a60aca3451f8
 EBUILD netbeans-websvccommon-9999_p20171207.ebuild 2395 SHA256 b6d9c82e7c62d4c6d749d77d5d2ad21173098a2586cce488c1bc08fcaa68834a SHA512 b2d3c6d5a3d02549bc1018fd2dded5fd3417529b464bf64ad2094a248c58d43bb6958ec06f9391ed5afc053c8e798d708683c6b64136f41cc49a57f088da3905 WHIRLPOOL 9b0b85d5d08a3cebab099faa824ee107752a3b30157f3b7eeb1e99103ae7fcbff5b7c93c69ff7c5f25ed3a71f892671e2504b3ba6124e27abf808adfbacd5f77
 EBUILD netbeans-websvccommon-9999_p20171208.ebuild 2395 SHA256 12575462c99d3fe43b25d6e3bb3e4293dda4e6f32115393c1febaa54d96e89bf SHA512 1bd3b23833e0dfe7c574926e55ae0f8260dad836c4ec892887e4faa9e4f9e476021ae35659adfb237660f1b6794358477cde75ec926987f0aba06eb6d6a36004 WHIRLPOOL fd2968e2b3e9128edb44592729ea4c49130738def566c49f7032b5161823536eacd142bd9117eb0a9fecea8b139a8af4944f39a0a0b9e9ff86e451afc7d7c4c7
+EBUILD netbeans-websvccommon-9999_p20171211.ebuild 2395 SHA256 c527e859d511b92ff00022d13723144abdca266ad02a07545a89ee7f3c5d7a59 SHA512 d13011268acb3dde8d0397ef5193dc67456a192ab570d4edbb1aebc48b4302933aa22c651cce1464b6a80c57891676e964b3dbfa75385375f055564b831fa1d9 WHIRLPOOL 4d109350c88ab61ba53bc44bc8727d9e7905bfb5404bb7972c5aed1c0f97a8c55b1d1428d9668dcc373018b7a52191fe2144384f4dae6913046364f343978000
 MISC metadata.xml 247 SHA256 8e0ccbf349cdd36adaaa8c3becadea9b65febd7868f27664ef7e70a1197765fe SHA512 1a68c1448a18938e13e6e39e718934a3e700b1d2ca708332d9cefd522d30049794b281c1cc8f788f1d0eb73c468a55b67a4bafbcf6e43317978d661d5d736faf WHIRLPOOL aaa66eab1db9d82717d76e5c65990f7f30e9527a6573006ebc43cc0edb05550ddce87e8e911ba7c7d67de863e6a191cc351b31fed299c4654a7b894f9eb13740
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171211.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171211.ebuild
new file mode 100644
index 000000000..d7aa6bea6
--- /dev/null
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171211.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 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/2017-12-11_00-02-15/zip/netbeans-trunk-nightly-201712110002-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
+}