netbeans: removed obsolete ebuilds

Package-Manager: Portage-2.3.19, Repoman-2.3.6 RepoMan-Options: --force
author: Miroslav Šulc <fordfrog@gentoo.org> 2018-01-15 09:12:32 +0100
committer: Miroslav Šulc <fordfrog@gentoo.org> 2018-01-15 09:12:32 +0100
commit: d539a4b7bf00051627ab03ca156b8bac668ac3c8 (patch)
tree: b4587942074c49a5c3ef4228aab333e46100c34a /dev-java
parent: netbeans: bumped to the latest nightly sources (diff)
download: fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.tar.gz
fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.tar.bz2
fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.zip
60 files changed, 0 insertions, 5560 deletions
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 4bd9b3bf6..9a4058e86 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,6 +1,4 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -9,8 +7,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-apisupport-9999_p20171213.ebuild 3058 SHA256 6d3497f0cae9118a3bfd576e02b15f286b053419bbf23f2518b6c9ff50ffb12f SHA512 bcdf1054bf41696f4dfa451b01359ab9f0f154de1bcea802731a76be14f31f49d92f34f7c0ba7e76b395597ab8c1c890442d64f55c5b2267ab80079966d967b5 WHIRLPOOL 4344e46fc16ee2df36d7ac7b07babb1db1c0c85667c5d2d538e30ba744c4ae0d806af316cb305d1df40fad060f52c9ca489e1b449e95d330bb2df3d06c8bc53b
-EBUILD netbeans-apisupport-9999_p20171214.ebuild 3058 SHA256 fdc9bda7a3ff0373fa92193b4927bd8e64cb2dc78c2d86d3af240d30e77255b0 SHA512 faffab716419ce580f26f20b593096ef0c090e64e03597a5a0f7f625710b807cd407aa3be7dac6d89044d08d5a03960b060eea40aa40c783e9fc046416fab68f WHIRLPOOL df01da0a0ec7b323d421096316cd4beefe4d226213d8fdca53b6260cc60ec60095bad4e7fc5aea00785b59b597eb4097932f33a08f9f4907b3b72753a6cdfcac
 EBUILD netbeans-apisupport-9999_p20171215.ebuild 3058 SHA256 2b2d657eef5d9c509cdc8bf226decdec6e3f4a51b864bc0e6b2370ed6571c555 SHA512 907b394a820ed9e194785c760c11062ae31aa3dd226197fed721eede745ee94949fd83d2683d7b97b00d913aec664f894c88536fa88fc0a20c6c549b5be02b9e WHIRLPOOL d5a0ee27cd6642502b06b31c1c5f181500761e12fee6e00dc716bb561528885ee06ab1691cec7db6de8aef99932726acc2b2ab16c20e1be720fc89ba7f583a04
 EBUILD netbeans-apisupport-9999_p20180102.ebuild 3058 SHA256 0663444684133d270384ab94d19c514da77a21b0399468e99892c2875a587bc0 SHA512 c19a7a2025cd7b63e05ccb2f2651a0d72b53c108327e020741d5df11ab71ccef49e10bd42b56e168d6d8729af3f9741ddc2de585a0aefa979dbe223be434116d WHIRLPOOL 77115b331a24d5af3ed7b2657c1249cbff9d9b8c73aa9f0c70f560e14ff64112fc25af6ea0ae193572614aef5d886cfa98b149045438a35c07bd273611b6fd59
 EBUILD netbeans-apisupport-9999_p20180104.ebuild 3058 SHA256 a7d9de0d36afdd9bd2084a4383258165f2e83508df37937ea74dbf574f6bb76c SHA512 8e5d2dca92c6ed4b95ec5f99771661a70affd959dcbd9381a8df1aab00a7ff89b152b2f9c3f60d6b57f80e127d6d34ebb1f275b1c60d0cc0393581af9bc3e1a1 WHIRLPOOL 142badcf21c193da3255a9c4bcf4a5bd5293da2e546a285021351699ee7910d9a9d214c6bd4b795fe97814ec48d91a42ecbc271ccf73b81776648fab95ac1dc4
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171213.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171213.ebuild
deleted file mode 100644
index 5a0d6504a..000000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171213.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.apisupport -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/apisupport >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/apisupport$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/apisupport
-}
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171214.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171214.ebuild
deleted file mode 100644
index d34d70008..000000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-9999_p20171214.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 9a8c5380d..37f428367 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,8 +6,6 @@ DIST BBEBAEE8729CCF165E2080A915542C6875208F97-clank_0.3.9.zip 48185752 SHA256 2d
 DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 SHA256 71e6d46d9c7e624bc83dbfa4edde20bfdcb47ae76dc2b19dd553d23f22b454e7 SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530 WHIRLPOOL 675db7f81ecadcecfe52f18cf8bd465867c1dac12f818717248da9a7d071d45adeb3c6af2e6ac1863bb5ccca36ae9383722d2361c28af52e51e5f2ac34736e89
 DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 SHA256 33d046408ce7a59158c550c672de03dba87485e0e83ca2e408b704e7a2a60591 SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8 WHIRLPOOL 12cc51c73f8511b84d4860ed8c2545e96c72477755d6027a086537187ac3c16322305a0158480498968a4f71a72ff6513d91d9f7d37ab2c38c8293dceced0da6
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -16,8 +14,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-cnd-9999_p20171213.ebuild 4686 SHA256 66850ca6c55147bee64c1317fe4beeac51abefb2d057675fbf74be4f2e0c3579 SHA512 72de32881e46bb44c26e27863d7df310627da478c4107742b911cc0e70488ff00be0f74502856ad6b8e0d9bb1beed696fa2c399a1ac82622583b9bdb8acda585 WHIRLPOOL 5e6bda1d7585d869b63ba99abdd2f39c378aeeb5da26e61b93f5ea2d9f6ad3c83e5515816411fa2acc772fbff63dd967922cd43eb75b62face3b0af8b127ca8a
-EBUILD netbeans-cnd-9999_p20171214.ebuild 4686 SHA256 c667e56216d93efa1e37b8c508ebe6eee3d36fb617363b1dcee1ea636d55238d SHA512 c144e3731d5feaf9c6933060b4587b63dd5fc79b3da618db86dad845aa4145218bfc260fdbd8b8c3180c3e70ede3abde23089b8add1089a01bdc9a3f9e948cc9 WHIRLPOOL 218c585a8bf01c048711fb3c3d00759e337471b416ae3caffe49edf1ef23918a5d40cc6e46b45f3c5c8c36b6ae0cf7e3bcf94f64041e239e3790a41c1d4340d4
 EBUILD netbeans-cnd-9999_p20171215.ebuild 4686 SHA256 a12aecbd51e11fd0cd979ad7b7a7dd1cbfad7cf59baed68daba7d2ab7b9db818 SHA512 a2f7eb7c4ce2830fe0d7a50ccd92a44bc6a1dfd16813341387175d5d896c50fdc774dd6df929cdcd7d60092142a2e2799a0a0956fc4249627d6ce28ccbf62fc6 WHIRLPOOL aa2a0fa282883bdb4def83584a78d75f0135bdd1f5a34ef301898d09c913132c702a6af03e79ed9908c68305cb657a9c7a571b6926252ccd3b10a4d1bb37db1e
 EBUILD netbeans-cnd-9999_p20180102.ebuild 4686 SHA256 c19d7b77b796d13176ced6f9ae4cb76c038d2f21802778aaf7272d050c8a42b9 SHA512 410a44251670f33f5c249230f2f252908fcda2c130e24e37961715dfc394023b658340137cc9d1e50ee0bb505d0803bc0147ceba57c8572dfd2bdfd660c53a1a WHIRLPOOL 9f6edd4f6606cfb8b56faecfaa1e61b9290ee4d098c166afd7f6298eeaf73bdd43e2513a5954fc67431c74ba96568a948bd34478c7d94515f05c770ea96eaaf6
 EBUILD netbeans-cnd-9999_p20180104.ebuild 4686 SHA256 21698f2a91fa11192162a2e8023c02dcde1a00e564e9798fcaa82962e838d98c SHA512 0e36d889466662654cb31100f3c50ce245e108b24ed029c8e163783c4dd7a00829a9282ea737a67bd9c28d5b894d48c5ec0e38d8b489e345b3e35a2e7614fe93 WHIRLPOOL 18008129f17f729b001b229e35a598341dbf96ac1b5b5c48cd17bf5a5495dedcccc7a58eaaf9796337faa9993d86a3332f0115a50ae6d2380e4f8108edc70d72
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171213.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171213.ebuild
deleted file mode 100644
index edb0d321e..000000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171213.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	https://hg.netbeans.org/binaries/BBEBAEE8729CCF165E2080A915542C6875208F97-clank_0.3.9.zip
-	https://hg.netbeans.org/binaries/B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip
-	https://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	https://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip
-	https://hg.netbeans.org/binaries/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# These files are for remote development and debugging
-QA_PREBUILT="usr/share/netbeans-cnd-${SLOT}/bin/*"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/jna:4
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.cnd -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar libs.antlr3.devel/external/antlr-3.4.jar || die
-	ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
-	ln -s "${DISTDIR}"/BBEBAEE8729CCF165E2080A915542C6875208F97-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
-	ln -s "${DISTDIR}"/B7B417DE191ACF30A60E061437B810840128A89D-cnd-build-trace-1.0.zip cnd.discovery/external/cnd-build-trace-1.0.zip || die
-	ln -s "${DISTDIR}"/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip cnd.remote/external/cnd-rfs-1.0.zip || die
-	ln -s "${DISTDIR}"/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip cnd.modelimpl/external/open-fortran-parser-0.7.1.2.zip || die
-	ln -s "${DISTDIR}"/6356FC5709DA48844F0E64E241657F1B26AE6EF1-t-common-1.0.zip libs.dbx.support/external/t-common-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.4.0.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/cnd >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/cnd$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 bin/dorun.sh
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/cnd
-}
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171214.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171214.ebuild
deleted file mode 100644
index d796d6e2e..000000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-9999_p20171214.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 15ed39481..02fb0deb9 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,7 +1,5 @@
 DIST 00784557F614BE02268C50C1BA692A6B19F0EE27-fs_server-1.0.zip 491826 SHA256 2d0c3147c008ac65f6433d412a546afcf96e17a9065aed56884ef950bb831664 SHA512 c9f520cd59d9088a7868a5e2deffe62711c89a8682bbf88c73f14a116c73fdc6d0dd18cafa2c9fbf425bae91e3e77d6bb9a1c19e65e187454cf979f7cbd0c1cd WHIRLPOOL 0a24f910413129c138620ef585ce5c1769cf73635e8d9cf032bada4f1e8e0c3552177c208e9a18128e903f961fe2267c59773453c0dcb97cfbc4f3d2d704e561
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -10,8 +8,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-dlight-9999_p20171213.ebuild 2643 SHA256 62869b0ddc62b4bb8bbff025e7a7fa151c025dc52b759677b703c32461c905e3 SHA512 07017b439bf9022d38d16afb9b3e813d74374ed36ea359856398c7245fbb92576fa82744128511c98c51a7dede05bdc167fe7a3ad054d0ff4ffd253490e740d9 WHIRLPOOL 4e152f1269ae4a701972b8872cc171cfc338e9488842ae9765bb87e1709f9045d2355c7b000be4ee442ef42cb689c6987fc2966a921bebeb1b5ecfa6a89e6f9f
-EBUILD netbeans-dlight-9999_p20171214.ebuild 2643 SHA256 a5be54e8792068addc3562ed274c94f7868823ecc97ebbdc95ac9331d4b9f3e8 SHA512 012deea4faa59dbf5c57d21a5eb31c331b99fa530314cd76976c6c491ac7884ea3c7ab5028af232e02b45efa845c116d0e1080e6aed4248782fb367c31780e8b WHIRLPOOL 39dab5913ae140da483403d3cb4a65332e192f99b24ae78c70ad6c678a4c8c1312b02209c3497db668691cc279e281da6d08f8e4d7484f92bfa06231f8f6df21
 EBUILD netbeans-dlight-9999_p20171215.ebuild 2643 SHA256 209031f931686fe6bcc7d65fde42e41226df079003f37f7d5a4ff5a9901c4a89 SHA512 e59208451666bae126c07c7e47f6a734ba98479f4ad479b585c61c216ba4e5f11b689b863b68c9d438bd22285d1c4f06b0b73b47ea788fc5909bfc19e67e391c WHIRLPOOL 0c5309500c937fcbbdce01be7fe338604be1f58a471bda5ce919d3790e9b72daa6e4a551ef6873bbfc9ff296f994e967f15c4973e7ed3029f06482a582aa111d
 EBUILD netbeans-dlight-9999_p20180102.ebuild 2643 SHA256 f8ebba2702e775f05c4a207c0380060a35efbd8f770dec524353deed665da4a5 SHA512 346c4835ca10d2a4a95b7e7fb6460800c856954b86f07e315e8ae826ba0bd16c42a3e63f56cd1f30595f155568506d884bf4a020fe3ad42999eda66a31bc9352 WHIRLPOOL 15c41cc4dca8c7b4d75f29a8230b99ac659f8271e8ef4d2079eddfe6569a91371b71cac2a4f8d2d33be753166e87ba164be06f35f5bc35fb45f48e9a202d02c4
 EBUILD netbeans-dlight-9999_p20180104.ebuild 2643 SHA256 4d2dab1afeba8567de38f1db901a4911c323c1a3118fd13643b8466df4a038a4 SHA512 80c0e2d7810d367d304cac430b80c8a829d0f0fda547dbf1c45c656a8c2c1f28e316d6765d28892e259f53b912bbe2d3e66d674db57e5674ab91dc896e3c281a WHIRLPOOL 87efa8b01e2ca2408f5bd66363eb2dc34135151566058a13114816b8e8b8c0d691e5f7acd10dfb6ab3bff09eb7c53ec845ffd0999a39dd6b7840d5723fd8c196
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171213.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171213.ebuild
deleted file mode 100644
index f79b38935..000000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171213.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/00784557F614BE02268C50C1BA692A6B19F0EE27-fs_server-1.0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.dlight -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/00784557F614BE02268C50C1BA692A6B19F0EE27-fs_server-1.0.zip dlight.remote.impl/external/fs_server-1.0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/dlight >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/dlight$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/dlight
-}
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171214.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171214.ebuild
deleted file mode 100644
index ae0d07d07..000000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-9999_p20171214.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 28c5ab5a4..e382d53ac 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -30,8 +30,6 @@ DIST F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar 32522 SHA256 f8fe158c
 DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 SHA256 fd191029e59405a3eedfeed81cfc0aab4e4f44c3d7ff39417a1975cedf12866a SHA512 e5aeeb3c41904ae293bf9186c68b6ad2033a39e48c0f2de4e3dfc3c89a6d3ffada54cd98576b0759cd8a104ddb57180b5860ec52a36d81d5f0cb3f04338abf83 WHIRLPOOL 0586211752a7e6e899a3af64d85b0e795ca3a34afe723b5c0bec8d582a7de4d52d3d765b037678cb2957b1957093e6e23fe4fb057903bb777bf55743a13ef0a8
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 SHA256 7233497b97430016cd84dfcea79907c5c00f44fff09d448070d2b9799aea4592 SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c WHIRLPOOL 065950e0f5f0e08489f8a38148f99cbe0eb1194b21f4725ef9c4ca9e8deb5ab202851f91e0808c5251d31160a0c3df5779edfe8038e54f62e83a6a98aca424e3
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -40,8 +38,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-enterprise-9999_p20171213.ebuild 15530 SHA256 5fb7ec8e06f759101171361d3d180fa8206ed1bcd969b1660491f63c27fdba23 SHA512 4c6109bf11127597a5e135e9c2aad1a9d04a976e560f78ee04933062c56bfd1ef52be426bcb7d5c0ca834afeca57afaf22219ccac80b5b3cbfe8b8cff0af534e WHIRLPOOL 0000d60ef830775abfe9f81355f4447c4bd1e5f36baebc86a261f5e46588b698c0b38682bfc1f77b3eeeadba5a81795a6d83334d59c7b41134228ebfdee75080
-EBUILD netbeans-enterprise-9999_p20171214.ebuild 15530 SHA256 5dadb1b6520c8d05b8941de18887192cd5463184f2547b395a08374bf6be93ae SHA512 432c899a0ba943bb21d31c3820a79f5fa364aad977f5c99f6966db7268b6e420f628a382667ea5bab21778c9e203061e1d06465517aa57c1915968f860dc342e WHIRLPOOL f11bd90dc4bf43994c00552219450413555be339f78bc41e52f8ae1c47dc0b813bd80380bf13fbaf2e823787dea0de495a8fb10d3374ad40fb40f3552cb03272
 EBUILD netbeans-enterprise-9999_p20171215.ebuild 15530 SHA256 8165a0a4f0fcc9879e5905399c60e101888b3a90281d8552fb019c77c6d8d36b SHA512 d9c43273104226ef709a6667210c109b2073f068eb20de47b13759ded2f7bf7be395d6543385f8f90df26b8179091417cef62a61019c4b3ca1fb38040155894a WHIRLPOOL 051fbde278dff555ad4dbefcb0ac7592759f884a050a91082e5f2a13c51582b7c599671e90d9b63b075aa2e9450bfd1e693abeba659b8a8be0089fc8ca40de4f
 EBUILD netbeans-enterprise-9999_p20180102.ebuild 15530 SHA256 e322930488c9e53e91feb94c80a1d512d6a4bb6b69e451c8f6f69dd6651d3080 SHA512 2d9a528c7f4f5064358873134e475647ff46b4da5e60682eac3a701922b7190e62b02cae1ecd9be4adde62659bae40f65b036b252aeb88ba2856d703eb49630c WHIRLPOOL 809dafe224b220b3ec1795efda113e5f023c677145edf2c669092da83bb84a066842024cf03d453a125cef50d92aa7cb634ec0b8ccedf0bf0469a618b3738af6
 EBUILD netbeans-enterprise-9999_p20180104.ebuild 15530 SHA256 01524132f7c3da1685a542e75b8c6676c95b2a2a09e653c44e5866ba7a0b7756 SHA512 407cd7d3592df6356fe72b7e616800b5b5efadaa2d8f9ac85d507d273ef65484c692be07a6372f7a870db3f267bc80078cb586925a3252a4dafcc8ade8844b53 WHIRLPOOL 93f725b98dbda8cc408900912ca10d275b6f324ae1cdfe94a84d0462f7d22c9059a5b73242d384d327f32c5cf764b3769dfd9b10f1e4944f206940cdde7743f0
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171213.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171213.ebuild
deleted file mode 100644
index ce5c1a25d..000000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171213.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	https://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	https://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	https://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	https://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	https://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	https://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	https://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	https://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	https://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	https://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	https://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	https://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	https://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	https://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	https://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	https://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	https://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	https://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	https://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	https://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	https://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	https://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	https://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	https://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	https://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	https://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	https://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	https://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	https://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	https://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/commons-codec:0
-	dev-java/commons-fileupload:0
-	dev-java/commons-logging:0
-	dev-java/glassfish-deployment-api:1.2
-	dev-java/jsr181:0"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0
-	>=dev-java/junit-4.4:4
-	dev-java/tomcat-servlet-api:2.3"
-RDEPEND="${CDEPEND}
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/bsf:2.3
-	dev-java/cglib:3
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-collections:0
-	dev-java/commons-digester:0
-	dev-java/commons-io:1
-	dev-java/commons-validator:0
-	dev-java/glassfish-persistence:0
-	dev-java/guava:20
-	dev-java/jakarta-oro:2.0
-	dev-java/osgi-core-api:0
-	dev-java/validation-api:1.0"
-#	dev-java/commons-chain:1.1 in overlay
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.enterprise -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar libs.amazon/external/aws-java-sdk-1.2.1.jar || die
-	ln -s "${DISTDIR}"/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar libs.elimpl/external/el-impl.jar || die
-	ln -s "${DISTDIR}"/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar web.jspparser/external/glassfish-jspparser-4.0.jar || die
-	ln -s "${DISTDIR}"/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar libs.glassfish_logging/external/glassfish-logging-2.0.jar || die
-	ln -s "${DISTDIR}"/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar libs.amazon/external/httpclient-4.1.1.jar || die
-	ln -s "${DISTDIR}"/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar libs.amazon/external/httpcore-4.1.jar || die
-	ln -s "${DISTDIR}"/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar javaee.api/external/javaee-api-6.0.jar || die
-	ln -s "${DISTDIR}"/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar javaee7.api/external/javaee-api-7.0.jar || die
-	ln -s "${DISTDIR}"/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar javaee.api/external/javaee-web-api-6.0.jar || die
-	ln -s "${DISTDIR}"/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar javaee7.api/external/javaee-web-api-7.0.jar || die
-	ln -s "${DISTDIR}"/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar j2ee.platform/external/javaee-doc-api.jar || die
-	ln -s "${DISTDIR}"/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar javaee.api/external/javax.annotation.jar || die
-	ln -s "${DISTDIR}"/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar javaee7.api/external/javax.annotation-api.jar || die
-	ln -s "${DISTDIR}"/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar javaee7.api/external/javax.xml.soap-api.jar || die
-	ln -s "${DISTDIR}"/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar javaee.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar javaee7.api/external/jaxb-api-osgi.jar || die
-	ln -s "${DISTDIR}"/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip websvc.restlib/external/jaxrs-ri-2.5.1.zip || die
-	ln -s "${DISTDIR}"/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar javaee7.api/external/jaxws-api.jar || die
-	ln -s "${DISTDIR}"/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip web.jsf12/external/jsf-1.2.zip || die
-	ln -s "${DISTDIR}"/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip web.jsf20/external/jsf-2.2.zip || die
-	ln -s "${DISTDIR}"/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip web.jsf.editor/external/jsf-api-docs.zip || die
-	ln -s "${DISTDIR}"/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar libs.jstl/external/jstl-api.jar || die
-	ln -s "${DISTDIR}"/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar libs.jstl/external/jstl-impl.jar || die
-	ln -s "${DISTDIR}"/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip websvc.metro.lib/external/metro-1.4-doc.zip || die
-	ln -s "${DISTDIR}"/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip websvc.metro.lib/external/metro-2.0.zip || die
-	ln -s "${DISTDIR}"/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar web.primefaces/external/primefaces-5.0.jar || die
-	ln -s "${DISTDIR}"/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar servletjspapi/external/servlet3.1-jsp2.3-api.jar || die
-	ln -s "${DISTDIR}"/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip web.struts/external/struts-1.3.10-javadoc.zip || die
-	ln -s "${DISTDIR}"/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip web.struts/external/struts-1.3.10-lib.zip || die
-	ln -s "${DISTDIR}"/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip web.core.syntax/external/syntaxref20.zip || die
-	ln -s "${DISTDIR}"/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar javaee.api/external/webservices-api-osgi.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into j2eeapis/external glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	java-pkg_jar-from --into libs.amazon/external commons-codec commons-codec.jar commons-codec-1.3.jar
-	java-pkg_jar-from --into libs.amazon/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	java-pkg_jar-from --into libs.commons_fileupload/external commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	java-pkg_jar-from --into javaee7.api/external jsr181 jsr181.jar jsr181-api.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --build-only --into web.monitor/external tomcat-servlet-api-2.3 servlet.jar servlet-2.3.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/enterprise >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/enterprise$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm commons-fileupload-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.3.jar
-	rm jsr88javax.jar && java-pkg_jar-from --into "${instdir}" glassfish-deployment-api-1.2 glassfish-deployment-api.jar jsr88javax.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/aws-sdk
-	pushd "${instdir}" >/dev/null || die
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-logging-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/javaee7-endorsed
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jersey2/ext
-	pushd "${instdir}" >/dev/null || die
-	rm cglib-2.2.0-b21.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.0-b21.jar
-	rm guava-14.0.1.jar && java-pkg_jar-from --into "${instdir}" guava-20 guava.jar guava-14.0.1.jar
-	rm org.osgi.core-4.2.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar org.osgi.core-4.2.0.jar
-	rm persistence-api-1.0.jar && java-pkg_jar-from --into "${instdir}" glassfish-persistence glassfish-persistence.jar persistence-api-1.0.jar
-	rm validation-api-1.1.0.Final.jar && java-pkg_jar-from --into "${instdir}" validation-api-1.0 validation-api.jar validation-api-1.1.0.Final.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jsf-1_2
-	pushd "${instdir}" >/dev/null || die
-	rm commons-beanutils.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar
-	rm commons-collections.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar
-	rm commons-digester.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar
-	rm commons-logging.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/struts
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.2.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.2.jar
-	rm bsf-2.3.0.jar && java-pkg_jar-from --into "${instdir}" bsf-2.3 bsf.jar bsf-2.3.0.jar
-	rm commons-beanutils-1.8.0.jar && java-pkg_jar-from --into "${instdir}" commons-beanutils-1.7 commons-beanutils.jar commons-beanutils-1.8.0.jar
-	rm commons-digester-1.8.jar && java-pkg_jar-from --into "${instdir}" commons-digester commons-digester.jar commons-digester-1.8.jar
-	rm commons-fileupload-1.1.1.jar && java-pkg_jar-from --into "${instdir}" commons-fileupload commons-fileupload.jar commons-fileupload-1.1.1.jar
-	rm commons-io-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-io-1 commons-io.jar commons-io-1.1.jar
-	rm commons-logging-1.0.4.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	rm commons-validator-1.3.1.jar && java-pkg_jar-from --into "${instdir}" commons-validator commons-validator.jar commons-validator-1.3.1.jar
-	rm oro-2.0.8.jar && java-pkg_jar-from --into "${instdir}" jakarta-oro-2.0 jakarta-oro.jar oro-2.0.8.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/enterprise
-}
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171214.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171214.ebuild
deleted file mode 100644
index f69680afb..000000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-9999_p20171214.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 39e2ecdf1..bd601266d 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,6 +1,4 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -9,8 +7,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-ergonomics-9999_p20171213.ebuild 2587 SHA256 8280fc0a87daa5bf8d8a400038c45307040bf2b38144285feda3a7e68acfe9b1 SHA512 b1499efcf60ef4413c0ac5646e057aef2c66dc802d0ccca5d90624e7c646a07cccececc1c31ed45da61ebe4cd34d70c165787620b2af3c63a909d04e721bac59 WHIRLPOOL 0e43222c61259eb828ed65db807c068c37ddc973c5861ae5515636cdb7b81cd60f13c794dc3b37fc18e3597b941368267c60218d6b0580514938d3342dbcd955
-EBUILD netbeans-ergonomics-9999_p20171214.ebuild 2587 SHA256 6def3fde898d5a623b845cfd62cea585a0f90278e4c4d8e9158253f32fb82f7f SHA512 2443f5fbf27b5fb572295e73ea532705a7dd873294f29f5d228b28805a1c20356700319fd2a8397d2f97db4adf8986dc47fcad6aa04849e3a74bf4b128d746c0 WHIRLPOOL fc888e909f581c5c40454554b35b7f95ca06f40466578204d7626561641f817a698de3fae69fb3d4b81cefefd6f5d10cc233c052a291cad2db00d0447190e003
 EBUILD netbeans-ergonomics-9999_p20171215.ebuild 2587 SHA256 8700665ff5934c1eb41ac4e90d5f049ae3e98d1ea55d2502e685fb2fc463c169 SHA512 1a998b610bcdb33b6851b00530aa975692cfe42ada1ad5e02970348eab75d37f887d1e8c864a73b741754e7854eb6254c5c007f3a3aaa815223a868993c2355d WHIRLPOOL 9a0cfe2689167acab9eea2fe23891c6764d59deafd40e0e5451da0d6c3a7d7200c211e9525e132fc4d6f89d022846a481ada0fcb4c0b7fdbec06d91689ee2031
 EBUILD netbeans-ergonomics-9999_p20180102.ebuild 2587 SHA256 2ef75e9e8bef72a9a22093173c8aa94cb2f4f1c7a86bc088b29d92cb41a0b47b SHA512 39ab34adaf7786ad37b4d619fc2f46ac813977137ac10cf1ac60a8a2e7d2ca1c85b1a7916b1f93362f1343d65e60a25158dcbca945352fbdffe2ab2c52978cf6 WHIRLPOOL 59e67509b2adc13d39b4ee55941bcc0a958fb307b95df0d1d09dc9c9f4b653553db98096e41ba545357a7e79afcb1e8e415ac2a24133999e80d334132f20fbca
 EBUILD netbeans-ergonomics-9999_p20180104.ebuild 2587 SHA256 dc8515e56d56109d375ec796ca3cccd9973d02c7a0cf3cebc73107809d7e67b0 SHA512 d833018a913fbe8c904c56ec72cf0b055dcbcfe0a451645927eac111ce316b5cc13ca13ff5f27ed5085d086382743a4d9513834e06f26bd345c30b9a2b5c8086 WHIRLPOOL 7e837af72c90b5953e97c4a2f409dad004b1d4629aaf249f91a184c696306d4e212bb1ea818a83c35586adc591cee378518fc4b877cc3cde7a1cbffd057bf5bd
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171213.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171213.ebuild
deleted file mode 100644
index dbd8bb3e0..000000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171213.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ergonomics -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/ergonomics >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/ergonomics$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ergonomics
-}
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171214.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171214.ebuild
deleted file mode 100644
index 4026898f7..000000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-9999_p20171214.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 a2dd83951..aee706a62 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -1,8 +1,6 @@
 DIST 0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip 2485916 SHA256 a9993bb636a962fa46d805b05aa80b53d15d323998b8dfd8d3ec8eb12b2bbb0e SHA512 ada455032c2b05505d060dfed335491b587d3ffb13ce26fe9c609efed739c6c096c1de1009da72ac7417da340ae27d9b8a918d9350cbd41ce3d3cb20209a69a5 WHIRLPOOL 013076d04d2f92d8d9476e07089daa418068304317df1330dbb403057f0ceaca8d07e34c5ca657aea6d92462a8c819775fd2778b26688309a63318e60e7a0f46
 DIST F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip 100462 SHA256 4f66b94b7216e0c5f1a3a6fff39fdb10a9106625953538da15ccc6e20bb15ca8 SHA512 220fd7559e01af8676b1cebf78f602afb0894b870b01508454da8865b84d5a27409e79a406b2e38aa757503ba2cc8d506d4a36838070540461f917f7cbcf5145 WHIRLPOOL ac1b062458aab2bc5d7960b4c908b26b91452c837ec83e3a11f7a2f127a11e30ab755e9aab3f91311cb1a636766a51ea364c2e0efdaf13211549cdfaee98c4ff
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -11,8 +9,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-extide-9999_p20171213.ebuild 3059 SHA256 3a88122896ec18db560195a7c8cfa8618431444c8d0d10c7a2fe8671ed4a8aba SHA512 76924b6f11788e3c85f60fe7454d86573f68e0a7d2cfa023b21484163e228fb4ab29cb8de96a86bf3da411c39713c3233b1f3caf798dce318cdecfe3366f1249 WHIRLPOOL 38c18dfc2a21d638eebe7e881b627073cd250b0e828e85bb668b00eb85646f5e4c801b0e69a093201b0a1197a33889457349975962e29ec95d3509581521a20a
-EBUILD netbeans-extide-9999_p20171214.ebuild 3059 SHA256 aec71a58a44cf2e442fe10e5a017f5128c61cec8e8172eee3d5b76a6e61f1293 SHA512 1b44a3087fe638001413a48e5232868c9eb3088bb6c95109a9057f79890c3732bcc5f0a6838b00c16fcdc51754f50f762bf436044b4c0ecdfa699274adca0152 WHIRLPOOL 1b8924bd6b76d4a34db6081ba4edaefc8527aff0c7612fd5a1b2af8fc4381e044baf17417c6acb0c9c13acd8ac24571d7f9b04c1029a37a49e290b0707d0661f
 EBUILD netbeans-extide-9999_p20171215.ebuild 3059 SHA256 52d26c537c8a61e4aa5aad1507f916a166097e409981c66c4e00863bef07798b SHA512 5546da8e137cf18faafb3a7f4d6b33ea22b442ebd0bc7ce5e8a7ec10fc6c1a10f8dc40a6d16c4b730931603af14453a54bf363db9dbed49775036b4ce46e21b5 WHIRLPOOL 13b1b583e0bf9f7d4f820ed8e3cd245c296b6c8e695658c425a36f9c302d23b905a58317122b4b5bd88d892a215d8640991cfa2135240f94a00dafb687f4ddd1
 EBUILD netbeans-extide-9999_p20180102.ebuild 3059 SHA256 e128ad7f2e7673ed18f035c7439cbe55eaab50f84c45296c51f15028d6961475 SHA512 5d5f3a4d1fb82ac3bfba67380f0912df7b3ac2fae48f1509f20ae72a59d3d4fad53313908418313ba1b48c98748a2ea5f301adef8f19bc6a06a3fde186480346 WHIRLPOOL 2029606104784fa060e93af9d0fbf8b1957be721590781cbfa09a4f8bf9549b02c891035f7cb325c2886c852d7c7aa137444e7b186547d4ba48c8a078a4a049f
 EBUILD netbeans-extide-9999_p20180104.ebuild 3059 SHA256 6add29e808245fc679b5b4434cec63af6f75621b92d26768567a494017f8ae86 SHA512 361259eeb195c78b49940d4f0e23301015c32a17385327a7b0098be727751940cb7a1e847e74f6881d9092feb73a4910a53532b659c3e4b29d417a9a95f878a4 WHIRLPOOL 75c35bb8cb6bb1b1402a26fb75a8937faf8b902b999763d9603de27ad699bb476a3cbb900d0674193b0aa58519edc6ba12b4c4e8b35637dc8a80ea3e27699133
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20171213.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20171213.ebuild
deleted file mode 100644
index 87e4a7f26..000000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20171213.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip
-	https://hg.netbeans.org/binaries/F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.extide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
-	ln -s "${DISTDIR}"/F6E0317E5F315E395DA47E5B008D01FAA48C91FB-ant-misc-1.10.1.zip o.apache.tools.ant.module/external/ant-misc-1.10.1.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/extide >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/extide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/extide
-}
diff --git a/dev-java/netbeans-extide/netbeans-extide-9999_p20171214.ebuild b/dev-java/netbeans-extide/netbeans-extide-9999_p20171214.ebuild
deleted file mode 100644
index 578be0c1a..000000000
--- a/dev-java/netbeans-extide/netbeans-extide-9999_p20171214.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 bfa680550..cc3ec6e0a 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,7 +1,5 @@
 DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 SHA256 6e836dd0bf1fe34756d53ebef564f8c4300ad686676f983f9e155845ba0a2db8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653 WHIRLPOOL 281d30291271da983dd8f5de7d632a02de4a562fef243928219b06f4a11ae0933737f8fb40e737e35f0e971212bcf25a0620320fe95137126bdd43f9df607b4f
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -10,8 +8,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-groovy-9999_p20171213.ebuild 3091 SHA256 7243909dedc9110be2d98afb604e655b9a59318292e4ed7f109890c62317b8f8 SHA512 ea42a54dafc6a22ce73cf5478b45478913647340440ae53250940c9f6bc3caed5b1c42556668514d31accacc301591b0b1000f737c98335c8d8e215c52fdbbe0 WHIRLPOOL 1977aa325e7a0ef93168b3b6858c996156518e88ad02d5b4dfcbc7b44ddbd2946c3c80ce0f25ac427870edec995b2fae1d58f0964cc9cf4aeba5a5c65fa63fa1
-EBUILD netbeans-groovy-9999_p20171214.ebuild 3091 SHA256 ce213cfd4258d452907b8b60979db66b4391f40680a0a6e9d5367464a3865249 SHA512 53cb16da58eb0049dce8d922c2dd76e5ed9ae7ffaa4cc9b066a874ca700529b93cc5802a9e19094fc4838b8410b1bdf844f5e1cb934b0f8fb387ce912a7f7b6b WHIRLPOOL 3820ae3eee1cd4f2b15cf1e9e4b435e64e5ba669145477429f2c08bedfe6767fb5aeba6b2d2b75873c30d2661a21ac47221d64569951714a20200d98f26738ed
 EBUILD netbeans-groovy-9999_p20171215.ebuild 3091 SHA256 c8b35c1fc58e048e283b085c55c896147824c4c429a3799c08040b777230f3d6 SHA512 56de0ae300f58f67912fc4600283303806df7aefe8c6d9e7a07cc6dff1e6f7adb2bac15c90b6335e712781030492572538ab4d71cf9c507e2ac83c3fede5c41a WHIRLPOOL f480a834c5dd042dc5de0d39cfa368a3cee789f963e1f7709685e5eb396665cc021e345a9f9632f2b828638a5116172d948c5f13e1bebf1b5e15400c0fdd95b9
 EBUILD netbeans-groovy-9999_p20180102.ebuild 3091 SHA256 99828ba1d70fd8576e40347f9cbd0cc7a3e5a5a8b80d82b687e9639a876cda21 SHA512 2264a7f7f228f8bfc9c4378021de1e77dad8ba4cfd2231ad44579541411d33c1073a76d2db66acba825e048c18d0699026816c0414bb95d3828f089749792659 WHIRLPOOL f0f97ec9fb508e68e4b3ebfb72514db00785cfeb0893cb135b8ae1cde6b0e5fe460521c48343f106f340d1d6071d356fb9a4babd56a9fcbd22e3a3ddba745e10
 EBUILD netbeans-groovy-9999_p20180104.ebuild 3091 SHA256 03030c7a59ca7c17b0c53f1612b75d8ef4d2be39e2bd672fb39407bc7809048a SHA512 d47e6e8827aebde74ce5a939f92ca6a09fa2c826a7fb9e7abb03573d3331bfc9e7ccc171fe6560a778d4a65eb4739bcfb9405016da171e84ae2460f1f58c0df0 WHIRLPOOL 5a1f91a8f053abceae6d08d94d8c4b7529e8ebe2c220fc203f7ba24c63116b5fd3a881dff3d0ce7b695aae6880afc40536b8dcaa5a53cd06a273437d04ec345f
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171213.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171213.ebuild
deleted file mode 100644
index d0689bb03..000000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171213.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.groovy -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar libs.groovy/external/groovy-all-2.4.5.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/groovy >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/groovy$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/groovy
-}
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171214.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171214.ebuild
deleted file mode 100644
index 8e0f946fc..000000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-9999_p20171214.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 bbe84a367..c5f452341 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -4,8 +4,6 @@ DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 SHA256 18050
 DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -14,8 +12,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-harness-9999_p20171213.ebuild 3805 SHA256 2ab29ee203b1f02448b6a1dc90b3eacb513e744459528ece8012ee8dbc86248a SHA512 a35bc13202d47bb8718503559d62a8046a4bcb269603ffd1e20a9b29864fe9a3efd1c9d4b020cac0d54b9ffea01054f619ec953cc947315b6cfb84697d9b8c5f WHIRLPOOL ec7ba9c9a9a261605b6dd38d3d24d167173180b24167834f7d827dccbdebea135605bc1a8d5cb1fe13b9553dc3107f7eff686bc3821316b0f3daa282e7338009
-EBUILD netbeans-harness-9999_p20171214.ebuild 3805 SHA256 5f8b02297ed052efc2b5879296423371bbe843ac282fcfbdb8b04ec9683863ee SHA512 98091d5143e1f38ea2771042c1a021a77decc65b0d10d168250b92e54dd239c500abe2db68459f6867028f697fc0d047f0bd8c40dd98e4968d95a4959354173f WHIRLPOOL f806744876f0fa500e7fb2976252fdff46f886ba5693c9b07dfb95876af604f67a249aec68309efe84df5f61d6e32b1d7bce6753f3626aac9b3ee77e97970053
 EBUILD netbeans-harness-9999_p20171215.ebuild 3805 SHA256 e432b5b0f91cba63a6b8f8222558ddafba8954a0aad74092d2929e4f934aec75 SHA512 1bca1924e9098f81416fa962390bd43901adece97886ee7805d42940e4adfeee4ee1d9caa62ddeb31c9280d5d54cf77ec81dd2f985745a032685b6a87493ba79 WHIRLPOOL a58827e23432f651dd1e6ce39536a63de28dc35ce2259136a7b2a5427dad03069461db57e6cc985069123e8ad32bbc47a684d95ab09369ed27ad217c2e22226a
 EBUILD netbeans-harness-9999_p20180102.ebuild 3805 SHA256 a73ee64c0ac23c5e38a6be608b52276a9ddd73b8822fb18a4cd8dd6ab9c5f835 SHA512 f7f993893f4478e551504ce2baa56349508b09e165179787e4a09b8f0122118bc3220e6ed72c6af1f31c07d8fee844cd0d5ab1aae64ad60c6ad1801a38e1c812 WHIRLPOOL 28a14b05f4aa60e40bbf12f738631a74bca1ed015664aaa28934ab79fe2f3fbf12311e500cf5717d055c0eb5bdeccaefdc7c7c4501a2f4e71c543fd1cd46f469
 EBUILD netbeans-harness-9999_p20180104.ebuild 3805 SHA256 4dfeb4b916a329ba8e15aa6c08e4ddfe6e473fc8ee30350f1a967bca60c494ce SHA512 6113393a78456e8b52ae7b5e23de96d499ec827c39c23d96ec545da938796af0a65d0133f6edf6d768e757be613a2d8686896fa395aad1fec75dc64942ae4f0c WHIRLPOOL a778154339f8ae4f5c8cbf16c1a19b9a42df78843e89a25d1c7b1b5568e003b2534e68cf430041e0a2d165c15a26c191c941918ed2ec81752ccf33e17beec4b2
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20171213.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20171213.ebuild
deleted file mode 100644
index 71d172f0d..000000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20171213.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	dev-java/javahelp:0"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=dev-java/junit-4.4:4"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.harness -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/harness >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/harness$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	fperms 755 launchers/app.sh
-	find "${D}" -name "*.exe" -type f -delete
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/antlib
-	pushd "${instdir}" >/dev/null || die
-	rm jsearch-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jsearch.jar jsearch-2.0_05.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/harness
-}
diff --git a/dev-java/netbeans-harness/netbeans-harness-9999_p20171214.ebuild b/dev-java/netbeans-harness/netbeans-harness-9999_p20171214.ebuild
deleted file mode 100644
index 7589b83b3..000000000
--- a/dev-java/netbeans-harness/netbeans-harness-9999_p20171214.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 44551e7a1..7c4ee7163 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -71,8 +71,6 @@ DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 SHA256 20e6
 DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar 6599 SHA256 84f986ff0a223cc6922f3ef76e97e71391689579be958ed09b37771477f0080e SHA512 862e3d9b2609df8888a2ab9569234f190583aed6bf553c8009921dd5a3c521f268c8cd91005371a5de6d1f561d6a22113c125d94fe78d18e6d4543246f0ef3d7 WHIRLPOOL cb4509690874beb6d6ddc468e6ed71c351a32bf1d88288066e48ba0316f56c5faf47052bcdac1bca1c178559d28938165fab969723e7d596cbb8093f947653ab
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 SHA256 bc323866c2341105db83621fdaedf14a0076fcbecfe6ebd8361726e76a6fb3d7 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5 WHIRLPOOL 23e901a031122ff301518c1da2df9a98f4ddd1b13e9d2c22f0dc320c181d60d1eaca44e0f2d2b651f1ca30b6c001a3efe831d049bdc8f0f7eb8ede5b21e5bdfc
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -81,8 +79,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-ide-9999_p20171213.ebuild 29596 SHA256 3d80727d51907a07501bf2d5f2f085c1f084f2e71cf8416629aef55e476b3415 SHA512 a52ebe29bae42ae9b77ed320224a786fc1416aa6938e341d55411245b911b5afbd379f551912c1e07d29d22f7fdadcbf9b3f2778e71237b32eeac88e258f985a WHIRLPOOL 00f498d1d9e614cbd8cdc07aa4e3917e083e5357dae95e72be108242e8fdc311ad432bb2a86d9dff6bff4a22ea12038bd9d45d9eade93c510939923ab6be8328
-EBUILD netbeans-ide-9999_p20171214.ebuild 29596 SHA256 5ff346425b8f3434f2693498e35c042746fd0f61d1e46c290017817bf1bd6671 SHA512 4d23e93a388c381305e9d578f30a39e5abf1f4639a9c022fcfbc86f45c83edf60f728a7eeb3c92ba66f365027746377a7958da0d5119fbab98c6f6db1110e46b WHIRLPOOL 8e421479a9ed34c3084edc37436e5ca09d5b779fbe0f3e351a7cc9b42acbc8be07993b4b2e14c8bb011ec89f70c3a54a3d97738eac50b1354552b124bf3c4d35
 EBUILD netbeans-ide-9999_p20171215.ebuild 29596 SHA256 9134ba1f8a5a143065bbd2f6a8044b1d3e3f7dc171686294d8a7b992e7c50306 SHA512 ea65c16f069a2aa54d8835ade63586e729d8fca195c7cad4ba3e7e125593e95273f185dd61512e0a499972f05a52596e71a30497f52268042029fb3856d8dc3a WHIRLPOOL 5d0eea26bb59d17ec3bc2c024875ed0975585669771b11a4500221ef2a07d3252492ae05a6f30fe1f879cf1551a4739965a479f92e3a259013eeecea259c328c
 EBUILD netbeans-ide-9999_p20180102.ebuild 29596 SHA256 1503d78649ef88bfa365b53b55d1c8643638b0c0df8d5a4468a53585856aeb20 SHA512 a0814b85aaf4eea4c65313cfda8525a27d0f24bcc434a7b39acb2148804847cf2b001938a942b01f74eca663e9e05f02db3cadee4aa372e56c173ed60ea9a28c WHIRLPOOL 45e8103ac98207af121a9fbf255854962d42ca0af4491b597fdbd7884e9d5498c377c7e14e968666db049b94d02ff4864d5b7f6f1e14bc27fe8c48ae8deb2dbb
 EBUILD netbeans-ide-9999_p20180104.ebuild 29596 SHA256 33485ad01391d7ef04aa4f0f02a7b23c155d42f94da5bd09a8ce15c6dac4bb42 SHA512 68f7385f51238c0a001dedefca5ff8400cf9e575c51c425fa51684bc9e2ea535601b97efc1b08ea80bc66473686d27739f73d58facbe823e7eebe7be364bf559 WHIRLPOOL cf1934f28c58e1c31b320bf48b56d74ce65e0a05458a1011428332ef9a0fa57463a5744fe20358115e937d17698fbc7def400f13a5090e96f719c1f9aaaf668f
diff --git a/dev-java/netbeans-ide/netbeans-ide-9999_p20171213.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20171213.ebuild
deleted file mode 100644
index cd8a7121a..000000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20171213.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-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-ide/netbeans-ide-9999_p20171214.ebuild b/dev-java/netbeans-ide/netbeans-ide-9999_p20171214.ebuild
deleted file mode 100644
index f5580045c..000000000
--- a/dev-java/netbeans-ide/netbeans-ide-9999_p20171214.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 4201fc757..a33620a64 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -24,8 +24,6 @@ DIST E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar 40273
 DIST E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar 89666 SHA256 ae8dc80232771f8913febfa410c5719e9ba8ded81fb99788e214fd676dbbe13f SHA512 334f3c43b4357a25d402442847cdf4a5e9142a29cbe533818dd06bbee3b20e781b210159982b650319f29e3dfb3d9eca7cd21a6445988355e91b4f81021f0954 WHIRLPOOL 475c5affa536213a6c7a15bd93c6c8321b99ac2b8add948918f2b48368cf13cbc4819bb829aacd72e6de2bd5a7bdf592d792529d553c2e4a8ebbb311d39d1314
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 SHA256 5f41fe1ef8a7607bafbc04baa7814aecaf72b90a6fa796adec0846f50f8ac7f0 SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6 WHIRLPOOL edd56a338e08e788a307849794387069a60b1873a3a8fa29e1e7045fbf8a2f1ff175e68579df3789fdf6af8f7f94de2430560a89de48d64c22e76b1fe95b6505
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -34,8 +32,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-java-9999_p20171213.ebuild 15702 SHA256 3ac449c33daa49a12a540e45be16e35b09249d96cbe36089107b7dc9ae8fc5e9 SHA512 e771ba10102aba3930671b59c211e5d4f411e5a3e166429cd85a577e3b86a4f446e24bc5c200f17037b3ee826a467e51ed7fd361cf2ae29de6b08a37364ecf0b WHIRLPOOL b06562b9577463e0fd05e2fd4beb8a9f334aa38d21267810810c3e7cd70f57b6d0a8bd2025225296c4a4c9c94adcfa455ae9f5d1f099f51823bb11f5eae0c6fe
-EBUILD netbeans-java-9999_p20171214.ebuild 15702 SHA256 0c3902161e4dd2eee586bd6443663457f260a57c08e7d2cb1f447cd3b5cfa52c SHA512 d7f8b192a8bae59e572f750f3e8b822e365cfc9e215462f3a0757708e8ffaf57f335f67beff1477f5eac38e6fe04dc49797f40b5209593f8779b4ed9c9f2cec3 WHIRLPOOL d2288186c0f994496fc16426726e0e8091d308f3079cd342854ad8bc7f7935023db46d45bdbaf19e0a69ecde04a99cf0241371483a16fc75b611d372dc804c14
 EBUILD netbeans-java-9999_p20171215.ebuild 15702 SHA256 2b8887d985acac14640136014c9597469d08eb4667278c87d551995cbd8b2232 SHA512 52c928286200f1b4c123c40c543f00625bdd3992261e6bc7b29684b5b9e4afaf981d992a03fa719ecc4fd7e4cd2f6fada8beb0070fb669d4e0f82c611bc449ae WHIRLPOOL d6c3c1a5e4c2c161da4b80df4b443d49264fa0f9ae2ada6c6c3030c19688e579fa41fd5105c53deaaa6f8532a793326b63f2a5c9fa819517540e92827c746ed0
 EBUILD netbeans-java-9999_p20180102.ebuild 15702 SHA256 ffa898359663b09253f0a686136b7ad8b28f365cb036320ef4dc5435ffcf5f00 SHA512 ba84888cda741c4dc81327ea9f30536d2a466508defbdda4898561686f8c43b03ee0a4c6e28c5357b6ca25a35614307a5b48fcf840547d68137090ee53cbf6ff WHIRLPOOL b17b06a82e431631472463b1d7dc9397115230892943029dd8cfdd7562a71e6ef8dda3ab90eb71d3e77287b53a2e5a00e5b39986258c898c2fc5cc61279962b3
 EBUILD netbeans-java-9999_p20180104.ebuild 15702 SHA256 9c16ed826abe5558cbc848287462595d947787529d954c05314ad3e266dc11bc SHA512 c85108379e6979409360dfe98481f0d0f2fd483e253c60417a19e0a3743d1f3a2ab1c1eef53ae33b21e040ce2136fb466a0b4e99e81641804e90c209e24c921f WHIRLPOOL bca4c696d816e65cf18273254c37912c12974b031221c2fa62e94e60aca54df0b637051679a62836a259cf7d9afb884284e32ba6c2cbb72b3e34a765a12daf7c
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20171213.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20171213.ebuild
deleted file mode 100644
index 86971b560..000000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20171213.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar
-	https://hg.netbeans.org/binaries/2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F-apache-maven-3.3.9-bin.zip
-	https://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	https://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	https://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	https://hg.netbeans.org/binaries/627EC612B8D50EE42C2D0F13DF5476E26D696634-indexer-core-6.0-SNAPSHOT-patched.jar
-	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	https://hg.netbeans.org/binaries/479C1E06DB31C432330183F5CAE684163F186146-javax.annotation-api-1.2.jar
-	https://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	https://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	https://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	https://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	https://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	https://hg.netbeans.org/binaries/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar
-	https://hg.netbeans.org/binaries/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar
-	https://hg.netbeans.org/binaries/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar
-	https://hg.netbeans.org/binaries/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar
-	https://hg.netbeans.org/binaries/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar
-	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	https://hg.netbeans.org/binaries/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar
-	https://hg.netbeans.org/binaries/BB17923713699B721CDB3BDBBAE863D8C8B291E3-nb-javac-impl.jar
-	https://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	https://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	https://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	https://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/beansbinding:0
-	dev-java/cglib:3
-	dev-java/jdom:0"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/json-simple:0
-	dev-java/junit:4"
-RDEPEND="${CDEPEND}
-	dev-java/absolutelayout:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/c3p0:0
-	dev-java/commons-cli:1
-	dev-java/commons-collections:0
-	dev-java/dom4j:1
-	dev-java/fastinfoset:0
-	dev-java/glassfish-transaction-api:0
-	dev-java/javassist:3
-	dev-java/jboss-logging:0
-	dev-java/jsr67:0
-	dev-java/jsr181:0
-	>=dev-java/jtidy-1:0
-	dev-java/log4j:0
-	dev-java/mimepull:0
-	dev-java/oracle-javamail:0
-	dev-java/saaj:0
-	dev-java/slf4j-api:0
-	dev-java/slf4j-log4j12:0
-	dev-java/slf4j-simple:0
-	dev-java/stax-ex:0
-	dev-java/stax2-api:0
-	dev-java/xmlstreambuffer:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.java -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-pkg_pretend() {
-	local die_now=""
-
-	if [ -d /usr/share/netbeans-java-${SLOT}/ant ]; then
-		if [ -n "$(find /usr/share/netbeans-java-${SLOT}/ant -type l)" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-			find /usr/share/netbeans-java-${SLOT}/ant -type l
-			die_now="1"
-		fi
-	fi
-
-	if [ -L /usr/share/netbeans-java-${SLOT}/maven ]; then
-		if [ -z "${die_now}" ]; then
-			eerror "Please remove following symlinks and run emerge again:"
-		fi
-
-		echo "/usr/share/netbeans-java-${SLOT}/maven"
-		die_now="1"
-	fi
-
-	if [ -n "${die_now}" ]; then
-		die "Symlinks exist"
-	fi
-}
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/E48292EAE5E14EC44978AA53DEBB1AF7DDD6DF93-aether-api-1.13.1.jar maven/external/aether-api-1.13.1.jar || die
-	ln -s "${DISTDIR}"/2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F-apache-maven-3.3.9-bin.zip maven.embedder/external/apache-maven-3.3.9-bin.zip || die
-	ln -s "${DISTDIR}"/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip o.jdesktop.beansbinding/external/beansbinding-1.2.1-doc.zip || die
-	ln -s "${DISTDIR}"/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar j2ee.eclipselink/external/eclipselink.jar || die
-	ln -s "${DISTDIR}"/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip hibernate4lib/external/hibernate-release-4.3.1-lib.zip || die
-	ln -s "${DISTDIR}"/627EC612B8D50EE42C2D0F13DF5476E26D696634-indexer-core-6.0-SNAPSHOT-patched.jar maven.indexer/external/indexer-core-6.0-SNAPSHOT-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.jar || die
-	ln -s "${DISTDIR}"/479C1E06DB31C432330183F5CAE684163F186146-javax.annotation-api-1.2.jar maven.indexer/external/javax.annotation-api-1.2.jar || die
-	ln -s "${DISTDIR}"/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar j2ee.eclipselink/external/javax.persistence_2.1.0.v201304241213.jar || die
-	ln -s "${DISTDIR}"/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip websvc.jaxws21/external/jaxws-2.2.6.zip || die
-	ln -s "${DISTDIR}"/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip websvc.jaxws21api/external/jaxws-2.2.6-api.zip || die
-	ln -s "${DISTDIR}"/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip websvc.jaxws21/external/jaxws-api-doc.zip || die
-	ln -s "${DISTDIR}"/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip j2ee.eclipselink/external/JPAjavadocs04032013.zip || die
-	ln -s "${DISTDIR}"/1CA9DE21C6E443E814CB56912BEE872EF7094C49-jshell.jar libs.jshell.compile/external/jshell.jar || die
-	ln -s "${DISTDIR}"/CF734AB72813AF33DC1544CE61ABC5C17B9D35E9-lucene-analyzers-common-5.5.3.jar maven.indexer/external/lucene-analyzers-common-5.5.3.jar || die
-	ln -s "${DISTDIR}"/20540C6347259F35A0D264605B22CE2A13917066-lucene-core-5.5.3.jar maven.indexer/external/lucene-core-5.5.3.jar || die
-	ln -s "${DISTDIR}"/D276E74D57C64ED5F9A09A48DA05B75555E8709A-lucene-highlighter-5.5.3.jar maven.indexer/external/lucene-highlighter-5.5.3.jar || die
-	ln -s "${DISTDIR}"/E2452203D2C44CAC5AC42B34E5DCC0A44BF29A53-lucene-queryparser-5.5.3.jar maven.indexer/external/lucene-queryparser-5.5.3.jar || die
-	ln -s "${DISTDIR}"/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar maven.embedder/external/maven-dependency-tree-2.0.jar || die
-	ln -s "${DISTDIR}"/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/BB17923713699B721CDB3BDBBAE863D8C8B291E3-nb-javac-impl.jar libs.javacimpl/external/nb-javac-impl.jar || die
-	ln -s "${DISTDIR}"/CA4F4DB7B6C140E36B0001873BEEA7C26489D2A1-netbeans-cos.jar maven/external/netbeans-cos.jar || die
-	ln -s "${DISTDIR}"/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselink/external/org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar j2ee.eclipselinkmodelgen/external/org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar || die
-	ln -s "${DISTDIR}"/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip libs.springframework/external/spring-framework-3.2.7.RELEASE.zip || die
-	ln -s "${DISTDIR}"/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip libs.springframework/external/spring-framework-4.0.1.RELEASE.zip || die
-	ln -s "${DISTDIR}"/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar maven.embedder/external/wagon-file-2.10.jar || die
-	ln -s "${DISTDIR}"/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar maven.embedder/external/wagon-http-2.10-shaded.jar || die
-	ln -s "${DISTDIR}"/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar maven.embedder/external/wagon-http-shared-2.10.jar || die
-	ln -s "${DISTDIR}"/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar maven.embedder/external/wagon-provider-api-2.10.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.cglib/external cglib-3 cglib.jar cglib-2.2.jar
-	java-pkg_jar-from --build-only --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	java-pkg_jar-from --into maven.embedder/external jdom jdom.jar jdom-1.0.jar
-	java-pkg_jar-from --into o.jdesktop.beansbinding/external beansbinding beansbinding.jar beansbinding-1.2.1.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/java >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/java$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	chmod 755 "${D}"/${INSTALL_DIR}/maven/bin/mvn* || die
-	rm -fr "${D}"/${INSTALL_DIR}/maven/bin/*.bat || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/maven/lib
-	pushd "${instdir}" >/dev/null || die
-	rm commons-cli-1.2.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm AbsoluteLayout.jar  && java-pkg_jar-from --into "${instdir}" absolutelayout absolutelayout.jar AbsoluteLayout.jar
-	rm beansbinding-1.2.1.jar && java-pkg_jar-from --into "${instdir}" beansbinding beansbinding.jar beansbinding-1.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/hibernate4
-	pushd "${instdir}" >/dev/null || die
-	rm antlr-2.7.7.jar && java-pkg_jar-from --into "${instdir}" antlr antlr.jar antlr-2.7.7.jar
-	rm c3p0-0.9.2.1.jar && java-pkg_jar-from --into "${instdir}" c3p0 c3p0.jar c3p0-0.9.2.1.jar
-	rm cglib-2.2.jar && java-pkg_jar-from --into "${instdir}" cglib-3 cglib.jar cglib-2.2.jar
-	rm commons-collections-3.2.1.jar && java-pkg_jar-from --into "${instdir}" commons-collections commons-collections.jar commons-collections-3.2.1.jar
-	rm dom4j-1.6.1.jar && java-pkg_jar-from --into "${instdir}" dom4j-1 dom4j.jar dom4j-1.6.1.jar
-	rm javassist-3.18.1-GA.jar && java-pkg_jar-from --into "${instdir}" javassist-3 javassist.jar javassist-3.18.1-GA.jar
-	rm jboss-logging-3.1.3.GA.jar && java-pkg_jar-from --into "${instdir}" jboss-logging jboss-logging.jar jboss-logging-3.1.3.GA.jar
-	rm jboss-transaction-api_1.2_spec-1.0.0.Final.jar && java-pkg_jar-from --into "${instdir}" glassfish-transaction-api glassfish-transaction-api.jar jboss-transaction-api_1.2_spec-1.0.0.Final.jar
-	rm jtidy-r8-20060801.jar && java-pkg_jar-from --into "${instdir}" jtidy jtidy.jar jtidy-r8-20060801.jar
-	rm log4j-1.2.12.jar && java-pkg_jar-from --into "${instdir}" log4j log4j.jar log4j-1.2.12.jar
-	rm slf4j-api-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-api slf4j-api.jar slf4j-api-1.6.1.jar
-	rm slf4j-log4j12-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-log4j12 slf4j-log4j12.jar slf4j-log4j12-1.6.1.jar
-	rm slf4j-simple-1.6.1.jar && java-pkg_jar-from --into "${instdir}" slf4j-simple slf4j-simple.jar slf4j-simple-1.6.1.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22
-	pushd "${instdir}" >/dev/null || die
-	rm FastInfoset.jar && java-pkg_jar-from --into "${instdir}" fastinfoset fastinfoset.jar FastInfoset.jar
-	rm javax.mail_1.4.jar && java-pkg_jar-from --into "${instdir}" oracle-javamail mail.jar javax.mail_1.4.jar
-	rm mimepull.jar && java-pkg_jar-from --into "${instdir}" mimepull mimepull.jar
-	rm saaj-impl.jar && java-pkg_jar-from --into "${instdir}" saaj saaj.jar saaj-impl.jar
-	rm stax-ex.jar && java-pkg_jar-from --into "${instdir}" stax-ex stax-ex.jar
-	rm stax2-api.jar && java-pkg_jar-from --into "${instdir}" stax2-api stax2-api.jar
-	rm streambuffer.jar && java-pkg_jar-from --into "${instdir}" xmlstreambuffer xmlstreambuffer.jar streambuffer.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/jaxws22/api
-	pushd "${instdir}" >/dev/null || die
-	rm jsr181-api.jar && java-pkg_jar-from --into "${instdir}" jsr181 jsr181.jar jsr181-api.jar
-	rm saaj-api.jar && java-pkg_jar-from --into "${instdir}" jsr67 jsr67.jar saaj-api.jar
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext/maven
-	pushd "${instdir}" >/dev/null || die
-	rm jdom-1.0.jar && java-pkg_jar-from --into "${instdir}" jdom jdom.jar jdom-1.0.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/java
-}
diff --git a/dev-java/netbeans-java/netbeans-java-9999_p20171214.ebuild b/dev-java/netbeans-java/netbeans-java-9999_p20171214.ebuild
deleted file mode 100644
index ffbbf44ec..000000000
--- a/dev-java/netbeans-java/netbeans-java-9999_p20171214.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 0465b7ad3..f1549fad1 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -2,8 +2,6 @@ DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 SHA256 9d41bd3f
 DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 SHA256 86c9576a56b9f994be663224b0505c1f61f8945d401bec63c70dd78c74fb91fe SHA512 4c61ac191ff528466d7112b7d162596ce6d636484bce84c1781f92e2c865592df8919ad410a1053a418710920815d7f04792b25275c5304a2b9107b5420bf792 WHIRLPOOL 02c0a966f33026e2a454718d8f616f12b67da34aeaa37a114425340a6375d3e12f402247e15d2fd32ae09eda89029089cd6122b4e2ba92ffe0575405ecafdbae
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 SHA256 d2379466134f239b9dd723f021976e3d2ade9624296d3d4a6d3241beeecfc6ba SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c WHIRLPOOL 448f084f425ec8f11922731fc76dc2a16cac8acc21aeb07244722d6f1b7bf7272b875f2b31d396c9f216a23f048698c03258219a7ce097576225f7d05f7bec14
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -12,8 +10,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-javacard-9999_p20171213.ebuild 4648 SHA256 d484bc8eb73d22707681d49fbddcaff10fa2406b3a34e38ab3ef6dee07bf261e SHA512 3161c6982672fd7e4ab8dbfb8fe1f37919d26d3784efe05359ba7167a7098df7be8d6de6d46de5fdb13dd079657c17f41a6448f5328ceb9d0258dd01ae02ca1f WHIRLPOOL 3853890bb928ef9091df124ede40c602fbdb5f4a25a3b7b9e265e1a5c66dd416e367fdda189f50bf319c1f5ab4f7aabb05a60d9e8f11bebfca523eb8ea889f32
-EBUILD netbeans-javacard-9999_p20171214.ebuild 4648 SHA256 36279ed5ab5d3b3464f5c84a9a59e19abf3010dd0e4d1e382b83798caa27c948 SHA512 ce9a7d01cd204f69855148c56c6364836f72afa5f6d70e9d4808955344ae566ae5f0dcc6715a3880641d08a93eaa66039cc79ecb39452e27cd70eaff2cbf3d7f WHIRLPOOL cd5511b686a886a987ea9668686786110c3c6211c360ac841a611cb47159a518072c4ad128a2a8dd20fb2ddd37dd74b39fa2e25a5edf4bd9588f789adc3ace24
 EBUILD netbeans-javacard-9999_p20171215.ebuild 4648 SHA256 ec0deb3a3e439fb7235be26d9f2841de67905b7f188ad10134e397bbfb28f7a5 SHA512 6280d85e0cbe1fd68d118f4b3eca5706db766954154fe415f3f4bce9f620fa64802c36ca9ced9635f654a07a46adac75bd08872c94e1876cd110053e0aeaa3fa WHIRLPOOL a17ea647812bee00faa6c69aa2ea4cadefaf3557049aa5a5376cb7bbd36084f42ce8672ad46ffc1c7541c2f68b805349a6bb3f0e148d912686f3e6bd0f4bcf46
 EBUILD netbeans-javacard-9999_p20180102.ebuild 4648 SHA256 3e147abb99aea35d9d66c7da71774098478857d717101d8dcd11a258579592f3 SHA512 912a2d96e4dd56defcca255122f72ad6a56b824c93c09ea6c3356cad2b8e451bbab3cef6b9281fff30607176e27ce9462407ce819c0661d09e6bc48108a233dd WHIRLPOOL 8d6d954e4fc8723b64a3dcaee03d68c678974df58d0abcb18357af083598d9324ade378d846fc7b22d823f16c62781655cde64dddf4086f4dd23f79c4184cde1
 EBUILD netbeans-javacard-9999_p20180104.ebuild 4648 SHA256 562c486bfca3e0f73dda3e3b56298503451b631efe4747bec28054140a700a46 SHA512 05c755bfafa799b468872b99e2ac94395ca34fe58c5ad6ca4cdf3a36e2587ba149f2827c5bd6754c76ac97cd7690fa90eeb85206624d783357c7df99df9e4cb9 WHIRLPOOL 6b407bb8a9ffa5cd7384351d9e26db9cbfc295e2e5bed8f24a0aabd381a9d9fe7f287123b16a67992db2dfbbf78b56fc40bc39e9f71ec2ea6f3b2070d9afc841
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171213.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171213.ebuild
deleted file mode 100644
index f0edc9791..000000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171213.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	https://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	https://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	dev-java/ant-contrib:0
-	dev-java/asm:3
-	dev-java/bcel:0
-	dev-java/commons-cli:1
-	dev-java/commons-codec:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-logging:0"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javacard -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar javacard.ri.platform/external/anttasks.jar || die
-	ln -s "${DISTDIR}"/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar javacard.apdu.io/external/apduio.jar || die
-	ln -s "${DISTDIR}"/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip javacard.ri.bundle/external/javacard_ri.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javacard >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javacard$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -fr "${D}"/${INSTALL_DIR}/bin || die
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/JCDK3.0.2_ConnectedEdition/lib
-	pushd "${instdir}" >/dev/null || die
-	rm ant-contrib-1.0b3.jar && java-pkg_jar-from --into "${instdir}" ant-contrib ant-contrib.jar ant-contrib-1.0b3.jar
-	rm asm-all-3.1.jar && java-pkg_jar-from --into "${instdir}" asm-3 asm.jar asm-all-3.1.jar
-	rm bcel-5.2.jar && java-pkg_jar-from --into "${instdir}" bcel bcel.jar bcel-5.2.jar
-	rm commons-cli-1.0.jar && java-pkg_jar-from --into "${instdir}" commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	rm commons-codec-1.3.jar && java-pkg_jar-from --into "${instdir}" commons-codec commons-codec.jar commons-codec-1.3.jar
-	rm commons-httpclient-3.0.jar && java-pkg_jar-from --into "${instdir}" commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.0.jar
-	rm commons-logging-1.1.jar && java-pkg_jar-from --into "${instdir}" commons-logging commons-logging.jar commons-logging-1.1.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javacard
-}
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171214.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171214.ebuild
deleted file mode 100644
index 04f6fb616..000000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-9999_p20171214.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 5d88f1890..7c19140cf 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,7 +1,5 @@
 DIST 0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip 2485916 SHA256 a9993bb636a962fa46d805b05aa80b53d15d323998b8dfd8d3ec8eb12b2bbb0e SHA512 ada455032c2b05505d060dfed335491b587d3ffb13ce26fe9c609efed739c6c096c1de1009da72ac7417da340ae27d9b8a918d9350cbd41ce3d3cb20209a69a5 WHIRLPOOL 013076d04d2f92d8d9476e07089daa418068304317df1330dbb403057f0ceaca8d07e34c5ca657aea6d92462a8c819775fd2778b26688309a63318e60e7a0f46
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -10,8 +8,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-javadoc-9999_p20171213.ebuild 5992 SHA256 b9739fdffed983fac994e42ab0de2a0f3541898ff894aa44545df9247b6a060d SHA512 8375110a3bcbbe3e5d54e60f8300a0a59fdd1ba19595d8dbbe65370b526b8a47a4aec484398759492925124a2e29408bef4301f029a48a8ae149e3f25dcd331e WHIRLPOOL d8456a0a65792d0aac6923447fbe7beab2e3cb3cfacc471f9dce236f22f81e3422580dc38f254bb32f1de8c7bba71d8b3292be57c60f00205e133cd58df1e3f4
-EBUILD netbeans-javadoc-9999_p20171214.ebuild 5992 SHA256 c39848aaf86a18e6f1e96722c007965fe064be48e4c19535ecd835c90f186999 SHA512 1ee4ccc1afaae709a5d31aec43b5916af13bf938c72f06cc7e67b78db52ff348e33cc03662aa4a9204975bbcea86f6b7e462587e9f77d441ef5e659dde347bcc WHIRLPOOL 8745b0818bc4248498a89e56dd839f00004e35ef5d51dffe6a1f902f5ff8bdc75636d83b2c931562c1fa08bbdbd40380f294ccc9280251dac269d745163ed72e
 EBUILD netbeans-javadoc-9999_p20171215.ebuild 5992 SHA256 cc19f5b38aae82b9db3b79b62cb594e810b23591c4c90dddf0365ac73b583d10 SHA512 787ad22d69919826dd44a56992e4398f260f9211c40f58d6f1e35cab180a83873543e81155c14d2d9a265b328d9d6ab26bdb35ace2b74488653ebc4fcef5e129 WHIRLPOOL 8858f65c2ea1b11f8062b353c63607ec57c34b9230d2e6b6afebb465ada380c3dbdfb619aff5e32a58609a1b4d4a30a3ed004320b30d86aa9a08750fcbba5d7d
 EBUILD netbeans-javadoc-9999_p20180102.ebuild 5992 SHA256 6658687430ac26e8a31401518ef64038cb1c552dc24c210a906e9612e4f75c74 SHA512 e80cf3c1b83ddcfa0a1f8148a34a85bb02ccaf67dd35055d92cf1af88aa0aa58cf134ae4de8475198cc42ac09454d2034fa821b2fcb1b5530c5193d517385e91 WHIRLPOOL 4a26ad1b795bef9ed5c3eae4342d3ffa505362365b828ff6451ccc41a8f9d954d6de3edb6507f3eeeb79693d4f75ffbcd7d5f9456930f851b6f6fd3f0f6bfc9c
 EBUILD netbeans-javadoc-9999_p20180104.ebuild 5992 SHA256 eabf30a2913d4631a41a70554f20c22d7c62c9f0e97ac990eca6f3cdbbc134c2 SHA512 f3f697419305e2868971ccad6099ce398d6a55f6cfda7dcca286509291fd16b4bd777b81070993ab668688c7359d8cc2abd29ffbf4897b4ae9afe46299519e84 WHIRLPOOL e672c1e8206d3b7446a90391adb4b2671e260f0f8085976468a9edd9285198eec2dc46e9ad0595f00787d9b9ebe95ceba145ade35423c617f9e151a5d2b814bc
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171213.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171213.ebuild
deleted file mode 100644
index 3edb01f7a..000000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171213.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed because of javafx which is not currently packaged separately
-DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-cnd-${PV}
-	~dev-java/netbeans-dlight-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-ergonomics-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-groovy-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-javacard-${PV}
-	~dev-java/netbeans-mobility-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-php-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-profiler-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-RDEPEND=""
-
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0B539A378C2EA52B17BD0326ECE03DF66E3A65E9-ant-libs-1.10.1.zip o.apache.tools.ant.module/external/ant-libs-1.10.1.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-cnd-${SLOT} cnd || die
-	cat /usr/share/netbeans-cnd-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.cnd.built
-
-	ln -s /usr/share/netbeans-dlight-${SLOT} dlight || die
-	cat /usr/share/netbeans-dlight-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.dlight.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-ergonomics-${SLOT} ergonomics || die
-	cat /usr/share/netbeans-ergonomics-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ergonomics.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-groovy-${SLOT} groovy || die
-	cat /usr/share/netbeans-groovy-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.groovy.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-javacard-${SLOT} javacard || die
-	cat /usr/share/netbeans-javacard-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.javacard.built
-
-	ln -s /usr/share/netbeans-mobility-${SLOT} mobility || die
-	cat /usr/share/netbeans-mobility-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.mobility.built
-
-	ln -s /usr/share/netbeans-nb-${SLOT}/nb nb || die
-	cat /usr/share/netbeans-nb-${SLOT}/nb/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.nb.built
-
-	ln -s /usr/share/netbeans-php-${SLOT} php || die
-	cat /usr/share/netbeans-php-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.php.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-profiler-${SLOT} profiler || die
-	cat /usr/share/netbeans-profiler-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.profiler.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
-	ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f nbbuild/javadoctools/build.xml build-javadoc
-}
-
-src_install() {
-	rm nbbuild/build/javadoc/*.zip
-	java-pkg_dojavadoc nbbuild/build/javadoc
-}
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171214.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171214.ebuild
deleted file mode 100644
index 9707f8ba7..000000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-9999_p20171214.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 69776c029..04e1030e9 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -5,8 +5,6 @@ DIST C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar 206016 SHA256 805
 DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 SHA256 8c6fa603283582893aed25c247a4748eab38f3e6ce9c59f31b2bb8f3f217a317 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359 WHIRLPOOL c4df551c83984a2b5cfbe60363ff4d9de2b88f87ed4dcf9b8b91615c62cfe04274736ca29186b8541bc11b1cda8c79ddfd07f3ebcfd146664d9f1c46954696ea
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 SHA256 5ed65a118b90400886ff4debb29a6e2f82a440bd18e7045c8653d5cb3178616b SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065 WHIRLPOOL 50d3a6534a31b6d8c6c62d580f4fc56f4df52e79f3acf7297ab7deff87f0b7d4a436cd97706ff9fba24aea797a3efb60d501f4f734f7c607b0cbff4c7e9899bc
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -15,8 +13,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-javafx-9999_p20171213.ebuild 4397 SHA256 d9daa421ca9eae506f27d7c2ae95a3061b11a4d2b94ed9f6c6d1157c96e394cd SHA512 9588e82e5a11811bad9d58364a9070c4306f099b37afcbc62b88a224291066e3aa995c9a0c7369b1a7664c1f555b39a408efdf4466441691bb19fbb684aaeb23 WHIRLPOOL d469f193b74a030c2675bedae70549d82fd862dee7769e7888d4b3aeba36059776acea7cf99a2a5f7a68e009b72593384b928fe74e79dc0249a0ad535ed3d3d7
-EBUILD netbeans-javafx-9999_p20171214.ebuild 4397 SHA256 900ec444ead100a779c3d3d34d930b32a6b23b6613d610376955f857e20c7d35 SHA512 34e78d813867fe28b83638d3267b45b8f9868e11c42fcae7bdc0677ab1c0b39673492297222cac182dd1e173ee6c5d46ab761f312d66bcae1aeb92dcab63dd84 WHIRLPOOL 210c0de59993ee990f4200caea2f18e951a589674017c271bf991175162176fcd0417f81a982a55de9daca29bd7861dbb367452064d345acc182999111800cda
 EBUILD netbeans-javafx-9999_p20171215.ebuild 4397 SHA256 74637d64c30df19ce8f974b0ef8e6492ad0de85aaf02e572a674bf8cd08a490f SHA512 60f628177fd69dedb2339e5df5063b9d13acaa55217d66f29a4d9c95d06a377eeed646d9ecda605d97e1300084e78b5d8de0254b07f8aac1b6b3cb99b163189f WHIRLPOOL 0b1d12aabfc0fdf72d4c2acf317507b67dce9e506f42e6c5f92a64bf386639f5b8e5930ef9dd764d894d699a9721491e4d029224ed741d2559d56495ceac4bb9
 EBUILD netbeans-javafx-9999_p20180102.ebuild 4397 SHA256 72824059586209befddbebac0ec9059a1eb412b211dba9f4e83ed9db9ca49277 SHA512 923d16e4523a0cb61deb6cce14ca27f40c5d1853397206c1888eaa63ebd05c45c7507d8b949da115cb30394aa26ccd8dafa0bee386bbba46ea66b0a16d84b854 WHIRLPOOL f9496473bca6faab168528d2cc1aa2c5ceb5139a2ecaca510dacc6f29d955581269449af19ce3fc57d0b956862c9d5b3519835cde777e854f4aa7633d166e415
 EBUILD netbeans-javafx-9999_p20180104.ebuild 4397 SHA256 55fc56102c137163aaec68650ac96a22e26b8da67630e88c93e8e2ecb6c10a02 SHA512 79f9efa02c7e8eee61f7cb24208264c417a37007162428dcf254559db0448f256a70969ee040385653c373b29df183958a5a26e10483c3cb51d93f4ea1a7df4d WHIRLPOOL 923b5496e5d3957f273dfcc290c871bbad030f8ab9d37c8b3ee095d5ac9133b8f5c029c164afd90ca25df2ea9884ebf3d18448e1e652f224f3bf6136e54ea6e6
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171213.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171213.ebuild
deleted file mode 100644
index ebfb8c2b7..000000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171213.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	https://hg.netbeans.org/binaries/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/junit:4"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.javafx -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar apisupport.harness/external/bindex-2.2.jar || die
-	ln -s "${DISTDIR}"/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar apisupport.harness/external/jnlp-servlet.jar || die
-	ln -s "${DISTDIR}"/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar jemmy/external/jemmy-2.3.1.1.jar || die
-	ln -s "${DISTDIR}"/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip jemmy/external/jemmy-2.3.1.1-doc.zip || die
-	ln -s "${DISTDIR}"/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip jemmy/external/jemmy-2.3.1.1-src.zip || die
-	ln -s "${DISTDIR}"/C6E5101D6A096D90AD8CF9E0F21C30F1D6DA74D4-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into apisupport.harness/external javahelp jsearch.jar jsearch-2.0_05.jar
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/javafx >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/javafx$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/javafx
-}
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171214.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171214.ebuild
deleted file mode 100644
index 8361fbebe..000000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-9999_p20171214.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 d87a44e5d..e0b4925dd 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -1,6 +1,4 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -9,8 +7,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-mobility-9999_p20171213.ebuild 4086 SHA256 ecff152b573860672a672dd01dbc24e694106036e5553a6b5e565466e22a22ad SHA512 19aceccc0ba4761b2d737482d124278d5a79fe601a066aa5dfdce5140a20228bef02531604212cd0b2e7cd59968df89f69d659a66d2e78b4d340d65d2a72b03e WHIRLPOOL fe7d5b4941830b66f1b048d976221e2524825157c7539331bcdf258f97e570d8db38884f175df43fdadb5e65375fbfdf9c160558a01e013f2be8c94fe94ed770
-EBUILD netbeans-mobility-9999_p20171214.ebuild 4086 SHA256 29e1e37f6446fa1c5b13e606c6676df0d43bc99cdbf0bc585e4d5da7b9934f36 SHA512 fee5db018594509b67fb8b7990d7fc2c14f80b709ecb838e4f33c3cbc5fa6d9eff91a911a07e76b2c649909e9fcbbf5cf7d2488bdb5dfdb3c9163d7a474067ec WHIRLPOOL f32207e8f9aec143fdd531ea93346a65084a7b06022991018ec5292df3c20435a257328d7775b0c0feedf9c3996e84ccc873e5200e462bf2b4a6bc299f0e2a02
 EBUILD netbeans-mobility-9999_p20171215.ebuild 4086 SHA256 a3e039972baf1fde3fa9de7cfc3cf1c9be075a4ee556eadd795a8c2cbcd9fcb6 SHA512 560770338056b0f56c924fb9b08c855d5b7cb5b8c0080635c0313e0e44f70966726c1a7eda9607274ff19c2b082992235d36977d2787fb240a4f18167a6e51d2 WHIRLPOOL 007534c294a550ea6827d09b634ca16be31b71284ccc883c1cad7e37252d997a97af3d834d23e0318e27d1b109d5f8df2e44989efb0036e5b8a1b38f5a02f55a
 EBUILD netbeans-mobility-9999_p20180102.ebuild 4086 SHA256 0937bded880b2541128934abe382d12a09770bb75df742b5a4976973f0d395f2 SHA512 ef547f9229be13d342560b1bb7da6a57fa030f0413f904acb5c30ed61defe77132dfefcc31a0de212f406243a616d4cc7d7d0e25315aa2c0d9add7e3987904f6 WHIRLPOOL 9a18df2fa73adf0ae7cf082ba2af2b712ef71d4a9b99231b743add5a2ae26ebc69aa6dafa08394a9de46b93648f36c1de9796b65a89809048744843cff3c2557
 EBUILD netbeans-mobility-9999_p20180104.ebuild 4086 SHA256 ad3d69809cf57060bdc4f72a4f587e5db889b68a0b273b0ec69d4bb8513cb26c SHA512 73cd371ac85d5b2899f8e359d6d9dbae516e2009b146d5a2dfd344f7ec385dfcd46ba325d65f760b5beda79411dd761c4ad3bd06fb62c75659a0865077616777 WHIRLPOOL 21821b0d907fc785a88974f90b9db114f3ee106d4c076b3889fee7cc08744991008123436979315c194db496d58c0c784ed243e7597e21deab94a9ce3b1ef401
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171213.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171213.ebuild
deleted file mode 100644
index 2152dfd98..000000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171213.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-apisupport-${PV}
-	~dev-java/netbeans-enterprise-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-websvccommon-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.mobility -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f | grep -vE "mobility.databindingme/lib/netbeans_databindingme.*\.jar" \
-		| grep -v "vmd.components.midp/netbeans_midp_components_basic/dist/netbeans_midp_components_basic.jar" \
-		| grep -v "vmd.components.midp.pda/netbeans_midp_components_pda/dist/netbeans_midp_components_pda.jar" \
-		| grep -v "vmd.components.midp.wma/netbeans_midp_components_wma/dist/netbeans_midp_components_wma.jar" \
-		| grep -v "vmd.components.svg/nb_svg_midp_components/dist/nb_svg_midp_components.jar" | xargs rm
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-apisupport-${SLOT} apisupport || die
-	cat /usr/share/netbeans-apisupport-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.apisupport.built
-
-	ln -s /usr/share/netbeans-enterprise-${SLOT} enterprise || die
-	cat /usr/share/netbeans-enterprise-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.enterprise.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/mobility >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/mobility$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-	rm -rf "${D}"/${INSTALL_DIR}/modules/lib || die
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/mobility
-}
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171214.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171214.ebuild
deleted file mode 100644
index cd735018e..000000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-9999_p20171214.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 f7621e0e1..6d5a500f9 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -2,8 +2,6 @@ AUX 8.0/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e
 AUX 9999/keychain-support.patch 872 SHA256 75ca94102e72f7d2b7dd16729dd84ee781b04e80430f841a9546aebaa51662c6 SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94 WHIRLPOOL bf9a183d7d42af9b5270151e6e6d44ff9079d2c8f0b80f9e9ac4018c8e8002e27de9afca1c57ba91d588aaaab60c194b059599f76a9d2e8b4ccf3b55022cc44f
 DIST netbeans-7.0.png 20011 SHA256 1d519f018ebeff6e29436c8492dbb266446bd0144fb5519b2ef6637664de6f4a SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113 WHIRLPOOL ef41b010f5c5b2023152c9eb4390c40716025f1162dae68f6c65fc642f1732494f70b086a032599c696d053b963e4edc1220a3c1212ede6209c27fecb1ffe5fa
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -12,8 +10,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-nb-9999_p20171213.ebuild 3786 SHA256 19916036e7b5ffaa3aa7070be2d1264994f3178988c9863c709c4822b95e2d45 SHA512 e468357039c45f194746a3b0b3f60f6e36cde033cf525c8149276af765416ce1e70a7d1a8100e733176a82e76984cc296322a7e9eb67448c384a8a3e6d2514d1 WHIRLPOOL 3a4c7d8fa4726dcb37315b6ebc59de9573e7a8cfede4bfeebc1aa1d7d10c2554f4b4b738017feaf8dfa7da9a6aca423c3d85812c34a809e44ef7afb1b6b05be7
-EBUILD netbeans-nb-9999_p20171214.ebuild 3786 SHA256 8e3c2c9f7fba984ff9c88d4f54ec24618a57aa22a67355f12cb651713ff5d779 SHA512 760ba7f04528979363ad8e3e3b8c06ae9b8df05a1eef58c79556ce8616038d3cd349753f5b86a3668ef6c6bfd11bd8e9d2c67797f1ce7318132e8765c2ac3fb8 WHIRLPOOL dd844f19517d5efcc02aa904735dd489770968d8477c11eb980c72ebfc7df95eea8dd792bdd5b68a6531e6e1defa2917899d362e6908cd9ca018f60b95ce1285
 EBUILD netbeans-nb-9999_p20171215.ebuild 3786 SHA256 4d27286f6948799ffec09f32259395996543fd924d10046c770068c0afdfee5f SHA512 b2ef6185635f49e1027c50c30535e460b8dc42b8ba2493e5d7c5025e91e0c311f9d932261e3101c68e2847a448f6fa8af78622d1150ce29cc9239e782f45c3b1 WHIRLPOOL 3f0677d0a2e526e951ecd5145d94b5f3fbac6354e2a28210ec97b6ac5db3ebf331dbf1edbf6330729c162b46e21d3f97ed8ed94ae9e232a40e0f21265a1b88ad
 EBUILD netbeans-nb-9999_p20180102.ebuild 3786 SHA256 65a1d421d4283ef249f6f1b2e49c8d878f1c3d0a2b3d3d60834aa1ff2981e1fe SHA512 661b12deee4b3b75a1f3bdd53614b648ee5cb3e6b17f3c0b63c75478208b9336f3e0c068e3daa6e3f4c4d0b435c35fd3bb6333e7ef9f84c391d70d06db1447fe WHIRLPOOL 29e87c18884f0b1868820d46191b8391c932b8eb6b7de1671c7f2046c956c53f07ff8607aec92b217530054f8f349b31dd81a527fafe0834ea927232ccdbacf6
 EBUILD netbeans-nb-9999_p20180104.ebuild 3786 SHA256 3cb8e207d2bd05e380601d9fdb6bad3fc089ad399f561eb1e92fb5259f6ae55d SHA512 301308f59605dd83374a69f94cfe27fc21c72ad49f744095120cc59e67b3a48f244939c59b0c22c9be1b91a307a480eda3250dc1b0d08cce4c015ea7d7cc80df WHIRLPOOL fe3dc34cbf91f034b56994bd112da0d508acce83d7ef2687bee2696e35ee80dc86147028ac7c484f4c68f292919618fe9af1686d5acc3e90068b81ce47b2111f
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20171213.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20171213.ebuild
deleted file mode 100644
index 7b2b9d094..000000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20171213.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster create-netbeans-import finish-build"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.nb -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-harness-${SLOT} harness || die
-	cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.harness.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans >/dev/null || die
-
-	insinto ${INSTALL_DIR}/nb
-
-	grep -E "/nb$" moduleCluster.properties > "${D}"/${INSTALL_DIR}/nb/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r nb
-	dodoc *.txt
-	dohtml *.html *.css
-
-	insinto ${INSTALL_DIR}/bin
-	doins bin/netbeans
-	dosym ${INSTALL_DIR}/bin/netbeans /usr/bin/netbeans-${SLOT}
-	fperms 755 ${INSTALL_DIR}/bin/netbeans
-
-	insinto /etc/netbeans-${SLOT}
-	doins etc/*
-	dosym /etc/netbeans-${SLOT} ${INSTALL_DIR}/etc
-
-	# fix paths per bug# 163483
-	if [[ -e "${D}"/${INSTALL_DIR}/bin/netbeans ]]; then
-		sed -i -e "s:\"\$progdir\"/../etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-		sed -i -e "s:\"\${userdir}\"/etc/:/etc/netbeans-${SLOT}/:" "${D}"/${INSTALL_DIR}/bin/netbeans
-	fi
-
-	dodir /usr/share/icons/hicolor/32x32/apps
-	dosym ${INSTALL_DIR}/nb/netbeans.png /usr/share/icons/hicolor/32x32/apps/netbeans-${SLOT}.png
-	dodir /usr/share/icons/hicolor/128x128/apps
-	cp "${DISTDIR}"/netbeans-7.0.png "${D}"/usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png || die
-	dosym /usr/share/icons/hicolor/128x128/apps/netbeans-${SLOT}.png /usr/share/pixmaps/netbeans-${SLOT}.png
-
-	popd >/dev/null || die
-
-	make_desktop_entry netbeans-${SLOT} "Netbeans ${PV}" netbeans-${SLOT} Development
-
-	mkdir -p  "${D}"/${INSTALL_DIR}/nb/config || die
-	echo "NBGNT" > "${D}"/${INSTALL_DIR}/nb/config/productid || die
-}
diff --git a/dev-java/netbeans-nb/netbeans-nb-9999_p20171214.ebuild b/dev-java/netbeans-nb/netbeans-nb-9999_p20171214.ebuild
deleted file mode 100644
index 9128c2c9a..000000000
--- a/dev-java/netbeans-nb/netbeans-nb-9999_p20171214.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 e69f1f6e9..1b346340d 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -2,8 +2,6 @@ DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 SHA256 b49d66
 DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 SHA256 156a35bf95b0353f05e91f1f8f591b5f8124d99cbdf380e32d03f07f889f2146 SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01 WHIRLPOOL 70e28e715335b3119c2c18f3b8736869d7aba4c08555ef5b20a5151eeaf79a8d4c4d94a20a283fa219a7d336c91fed84c86a7424b7a571d152e1fa2e59b37a86
 DIST 537814919B9074FE0FE2B73579B38F691ED23732-phpsigfiles.zip 535939 SHA256 69c2fcbd51b2db0d47613d69f44f332cf60d84486f1961d846485ece3a56e682 SHA512 672d2f08a93c9b42ff66f4f160383a772a692a053ba1d1c2b56ac6e3a6b26684526e3dd1b96f360ab0be4afe4cd2cae9b41901f77ad7ed74cb540803e76ed9a9 WHIRLPOOL 419307b45c4c664a7c3cd9b52303d211fed88b25c66ef7bf653ad11f75bb30fec5053f99295707a31a9428f7622fed0128e8cd78007139c0d3459342016968fd
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -12,8 +10,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-php-9999_p20171213.ebuild 4095 SHA256 84629d3013f7ba222fe5bf5e5b6ef6d1afe3e358c0f6c6addbff489dfc6d4280 SHA512 ada5c10a9487755f5ae9a2c264acdcf1f660b532e2fea36d109ec62dd98992e4cce73f4057c617f6a232c4c61bdd7cead74b940100f3fa18e308393bc95ba2ae WHIRLPOOL 7e9a216bba712935f9139d8b9650a4bb46cc32f680982cba41749d7bc6080d9aa1f44c9a2ae5ce3f33ecb73ba0e15e1513c4371cc520dd809179f1ccbb12e628
-EBUILD netbeans-php-9999_p20171214.ebuild 4095 SHA256 0a5871b98a6f7b18bfb0e9ee36e87b6fd766d9282a4773cf2f7f8c506d224391 SHA512 a6888d208a1706ffebe9e46cccf7eebd06ff49c364a969536cf6392e014d6d81dec4f182cf76063eee0c5e73942914fbf1c50c78ddaffeab2b7f9bcef5e77c16 WHIRLPOOL 9ed1d5ba5b4a64afd6fcf60d48db3175233f3e478d1219b72b6c646a5e4315c265b9cef732ab31a23779c58ed40be7afeafb7ed4fd119d6e40a244108bb2715d
 EBUILD netbeans-php-9999_p20171215.ebuild 4095 SHA256 07facee25be9050b54fb3582669cc9e25f1f91e0d4ecc06802ee3e9de496b6aa SHA512 6f17481dfbb9bf65bba5979f82b0873e736070faec1a761a724e29498da057979f80f384b5ce6f727e07ed568d2e7aa08420b86fe2355b9b2144177d0f322db5 WHIRLPOOL 7931ba71255bbd358f88e3135af5b2eba67689726255f35ad766e79006a40ab0d96f5ec93154297ede1f2d7a1db2cfd3492fdc79812d5b4bbdc332d5870ed3fb
 EBUILD netbeans-php-9999_p20180102.ebuild 4095 SHA256 c57746aa7d1f1bd67afad3c29e1504d0adfec986fea46dfe8f5662127c99e06b SHA512 cba131a8d6be62562bf2a1b0c7c6f517ca4b4d04613028d1cfdecde8cc3bbbd6087c650289d10d7ef3f52ede45b2b2311e2eed1df020b3cf4f511923c14c5517 WHIRLPOOL a98a9f26d2dfc8815a51f1c038bf554284e688df3e33698293840832c7cc75df4b1b0bef898244a48089a6699b0634242883602770e98efca4151205d7f3f369
 EBUILD netbeans-php-9999_p20180104.ebuild 4095 SHA256 f037509cb129547aab4c4abae99ecda2804788696554a9483273daa28ef25775 SHA512 477f19521e866d73dfebcd1dae970e1bbffe3bda8b5378026639f8692dc74c54e79d2a5bf2293920fc91ea4c4c38d540261860e325f0fbfc9a6fefe0476e2485 WHIRLPOOL d5799d91fc686f66503baa09eee2ebc1b58cbe1f922a1f0a2bdb9b80b7b144772e2bb65ffe43abd631590aa16c1b751027d7c6e6d05402696551ea58651f578a
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20171213.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20171213.ebuild
deleted file mode 100644
index 4a655fc3f..000000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20171213.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	https://hg.netbeans.org/binaries/537814919B9074FE0FE2B73579B38F691ED23732-phpsigfiles.zip
-	https://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-webcommon-${PV}
-	~dev-java/netbeans-websvccommon-${PV}
-	dev-java/javacup:0"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.php -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip php.phpdoc.documentation/external/phpdocdesc.zip || die
-	ln -s "${DISTDIR}"/537814919B9074FE0FE2B73579B38F691ED23732-phpsigfiles.zip php.project/external/phpsigfiles.zip || die
-	ln -s "${DISTDIR}"/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip php.editor/external/predefined_vars.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.javacup/external javacup javacup.jar java-cup-11a.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-webcommon-${SLOT} webcommon || die
-	cat /usr/share/netbeans-webcommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.webcommon.built
-
-	ln -s /usr/share/netbeans-websvccommon-${SLOT} websvccommon || die
-	cat /usr/share/netbeans-websvccommon-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.websvccommon.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/php >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/php$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	popd >/dev/null || die
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm java-cup-11a.jar && java-pkg_jar-from --into "${instdir}" javacup javacup.jar java-cup-11a.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/php
-}
diff --git a/dev-java/netbeans-php/netbeans-php-9999_p20171214.ebuild b/dev-java/netbeans-php/netbeans-php-9999_p20171214.ebuild
deleted file mode 100644
index 6c0951f24..000000000
--- a/dev-java/netbeans-php/netbeans-php-9999_p20171214.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 d3ab84323..fb629f1b8 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -14,8 +14,6 @@ DIST DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar 60588 S
 DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 SHA256 7da1f152b349a9167c7ac8d7e6adbb0ea2f5fe319be2e82c80d18b33265a0fc4 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef WHIRLPOOL 90f19b85218cfe869028be95b90e2394541a5d761186599ed6ec4a62b207b4e32b9ef292a992b894359b318bff10b764cc481b2e1652df7548dd6fa451c8cd65
 DIST F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar 15873 SHA256 008e99d51987c44e74ca50d0cad3d8738e2e6e7f85b8342f6d7aad78ee1545ca SHA512 3463c1b94956b86ccceebfab4ae943f0c0a80e5529e360ae5aa2e47efde234f32ddd0e3e25c0e904188de0e78d7788e1055b1519991ab6e32f4bc084d8a02f67 WHIRLPOOL 3a4922ed45965efff0a9b99ff96f8597d2fb3138abe8bf57be3a36175f6c7b377a4f470f8dbccf0a8738b09bae28a98a5e4031a2c8b1941b3ee2d3c55c72110f
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -24,8 +22,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-platform-9999_p20171213.ebuild 9238 SHA256 32b86859fb40da59c0c9a3f9945e1f52aacf2f39bf908b21c9c151c67395e24a SHA512 dc6f51f35e60490a76757d1dc7311b5e4c50e9288b9254be1ab1e28a13480be33b29a49cedf70e1baed63dd638bf6233957d9c00914547cfc5ffec3b4921a7c9 WHIRLPOOL ea2ca0f56baa0539a816f0cf6e3793dd66846a61a0675215391c1321f7c5313059c129523c46db77968958a8b9fed6e434d45ba83268bd7a208acfc6bc8ab2e1
-EBUILD netbeans-platform-9999_p20171214.ebuild 9238 SHA256 7a98fe32c61fd2830a4cfebd2a835a54c68f440ed5b7345ace52d1bb8b150e64 SHA512 24091ab8ca63548010fc92f5e2314d9bef35ddd1cc7b8aa9158ca04206acef300949fee7f7a09273aac3f5ad85844c6529331a7bbc9ccddf1c80fc1b96460ea4 WHIRLPOOL 65fa10daddeecd8b25cbb5fa38fbf51b2a07df5168c20e1668206bd338e73aeb3d135ae3c9e274ba6b28893265db09c6000ab74418589f79432e5e7d5d2da91b
 EBUILD netbeans-platform-9999_p20171215.ebuild 9238 SHA256 bdc8cc951b596385617e82a32f508d3f2cdbc17402e62aa1784a79dec0b69f19 SHA512 64f5671467cbb27a9e906675392e8cc90475a1db2fbdf916b7d22de69872639b1761a0938754b2551c1a77df35ab536d1e3e76d118765ededb72fb0074163fcd WHIRLPOOL efcafb4dc2322ab50f58754d60f750314ccbe70153c8813ce71237ae2633be256768cb309a2a9cb7bdd7aa245767d01f077ae37dd8348d85f921cf222c81d6cb
 EBUILD netbeans-platform-9999_p20180102.ebuild 9238 SHA256 8a21915022264b0a9aaa4e25f2f6d9aa23a7ba3f022261ec71f97ee872027bb6 SHA512 1b868df74190e8459ab71b496853705d5943ba9e516dcbaf6450e5c9f37d52d6dffe4b7b7611622303a605f8f817ab02d3c5346b96724cb1f2bca7cfdd4c254e WHIRLPOOL 6011700fc96993c1e66ea69c636e4d78d3885600a1e22bf5fecfcd27565ee88483129587e07f221f63fd8be7d345d45561b61f2d973e446515cac191250ea858
 EBUILD netbeans-platform-9999_p20180104.ebuild 9238 SHA256 9d25c22515df712e139a6c0636e55e17b654a376fd8931457d522aa51b2abc1c SHA512 c2248ffb073b76f5e022527f3e7f1a07cc67ec6d118379bc7c8e1b83f25fff29dea0053b4a0e0b7ac95bdda06e7b730935901e8e8993ca14b2c7b4fc0387d554 WHIRLPOOL ac33a32c3fc9c0f27fd2e80c0d62f28a5af944954fa505a25c44dbd5af31a35b69ac28ad0cb310f806627932e96e4f6cfca217b9ac6bad20861d3d7f813f0cec
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20171213.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20171213.ebuild
deleted file mode 100644
index 639545cc5..000000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20171213.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	https://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	https://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	https://hg.netbeans.org/binaries/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar
-	https://hg.netbeans.org/binaries/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar
-	https://hg.netbeans.org/binaries/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar
-	https://hg.netbeans.org/binaries/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar
-	https://hg.netbeans.org/binaries/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar
-	https://hg.netbeans.org/binaries/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar
-	https://hg.netbeans.org/binaries/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar
-	https://hg.netbeans.org/binaries/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar
-	https://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	https://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	https://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	https://hg.netbeans.org/binaries/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# oracle-jdk-bin is needed for now because of javafx which is not packaged separately yet
-# [parseprojectxml] Distilling /var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar from [/var/tmp/portage/dev-java/netbeans-platform-9999_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar, /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
-# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.htmlui
-
-CDEPEND="dev-java/hamcrest-core:1.3
-	dev-java/javahelp:0
-	dev-java/jna:4
-	dev-java/junit:4[source]
-	>=dev-java/osgi-core-api-5:0
-	dev-java/osgi-compendium:0
-	dev-java/swing-layout:1[source]
-	dev-java/testng:0"
-DEPEND="${CDEPEND}
-	dev-java/oracle-jdk-bin:1.8[javafx]
-	app-arch/unzip"
-RDEPEND="${CDEPEND}
-	virtual/jdk:1.8"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
-JAVA_PKG_WANT_SOURCE="1.7"
-JAVA_PKG_WANT_TARGET="1.7"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar libs.asm/external/asm-all-5.0.1.jar || die
-	ln -s "${DISTDIR}"/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar libs.felix/external/felix-4.2.1.jar || die
-	ln -s "${DISTDIR}"/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar junitlib/external/junit-4.12-javadoc.jar || die
-	ln -s "${DISTDIR}"/03800C0C31FD6828EA7D3F245B3A7C00E221AA22-ko4j-1.4.jar o.n.html.ko4j/external/ko4j-1.4.jar || die
-	ln -s "${DISTDIR}"/F752490EC8F6CEC5B7E07947A1407CE8A8E63518-net.java.html-1.4.jar net.java.html/external/net.java.html-1.4.jar || die
-	ln -s "${DISTDIR}"/DEABE58D6CDDD124BEA30E9B6E6BD48E90CD7AA1-net.java.html.boot-1.4.jar net.java.html.boot/external/net.java.html.boot-1.4.jar || die
-	ln -s "${DISTDIR}"/A5ECB6F58BB276CF77FD0E18A07656508E7099B6-net.java.html.boot.fx-1.4.jar net.java.html.boot.fx/external/net.java.html.boot.fx-1.4.jar || die
-	ln -s "${DISTDIR}"/5CC4FD2D576DEEC4F64E46BAA9097525BA4DF8D8-net.java.html.boot.script-1.4.jar net.java.html.boot.script/external/net.java.html.boot.script-1.4.jar || die
-	ln -s "${DISTDIR}"/0C735D28C3C2F22A9EB86A1F682AAC38920A6356-net.java.html.geo-1.4.jar net.java.html.geo/external/net.java.html.geo-1.4.jar || die
-	ln -s "${DISTDIR}"/CD15F35E44B6EC1CF8D7CC216870B70A71D88A1B-net.java.html.json-1.4.jar net.java.html.json/external/net.java.html.json-1.4.jar || die
-	ln -s "${DISTDIR}"/D7902EF2C6C94BE1F8804B5DDF2084A07DE87EFE-net.java.html.sound-1.4.jar net.java.html.sound/external/net.java.html.sound-1.4.jar || die
-	ln -s "${DISTDIR}"/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar netbinox/external/org.eclipse.osgi_3.9.1.v20140110-1610.jar || die
-	ln -s "${DISTDIR}"/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip o.jdesktop.layout/external/swing-layout-1.0.4-doc.zip || die
-	ln -s "${DISTDIR}"/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip libs.testng/external/testng-6.8.1-javadoc.zip || die
-	ln -s "${DISTDIR}"/BB25868BD6C724018FB0350688975EC3B53230EA-xhr4j-1.4.jar o.n.html.xhr4j/external/xhr4j-1.4.jar || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	# upstream jna jar contains bundled binary libraries so we disable that feature
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into libs.junit4/external hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	java-pkg_jar-from --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --into libs.jna/external jna-4 jna.jar jna-4.4.0.jar
-	java-pkg_jar-from --into libs.jna.platform/external jna-4 jna-platform.jar jna-platform-4.4.0.jar
-	java-pkg_jar-from --into libs.junit4/external junit-4 junit.jar junit-4.12.jar
-	ln -s /usr/share/junit-4/sources/junit-src.zip junitlib/external/junit-4.12-sources.jar || die
-	java-pkg_jar-from --into libs.osgi/external osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	java-pkg_jar-from --into libs.osgi/external osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	java-pkg_jar-from --into o.jdesktop.layout/external swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	ln -s /usr/share/swing-layout-1/sources/swing-layout-src.zip o.jdesktop.layout/external/swing-layout-1.0.4-src.zip || die
-	java-pkg_jar-from --into libs.testng/external testng testng.jar testng-6.8.1-dist.jar
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	unset DISPLAY
-	eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
-}
-
-src_install() {
-	pushd nbbuild/netbeans/platform >/dev/null || die
-
-	java-pkg_dojar lib/*.jar
-	grep -E "/platform$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	insinto ${INSTALL_DIR}
-	doins -r *
-	rm "${D}"/${INSTALL_DIR}/docs/junit-4.12-sources.jar || die
-	dosym /usr/share/junit-4/sources/junit-src.zip ${INSTALL_DIR}/docs/junit-4.12-sources.jar
-	rm "${D}"/${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip || die
-	dosym /usr/share/swing-layout-1/sources/swing-layout-src.zip ${INSTALL_DIR}/docs/swing-layout-1.0.4-src.zip
-	find "${D}"/${INSTALL_DIR} -name "*.exe" -delete
-	find "${D}"/${INSTALL_DIR} -name "*.dll" -delete
-	rm -fr "${D}"/modules/lib || die
-
-	popd >/dev/null || die
-
-	fperms 775 ${INSTALL_DIR}/lib/nbexec
-	dosym ${INSTALL_DIR}/lib/nbexec /usr/bin/nbexec-${SLOT}
-
-	local instdir="${D}"/${INSTALL_DIR}/modules/ext
-	pushd "${instdir}" >/dev/null || die
-	rm hamcrest-core-1.3.jar && java-pkg_jar-from --into "${instdir}" hamcrest-core-1.3 hamcrest-core.jar hamcrest-core-1.3.jar
-	rm jhall-2.0_05.jar && java-pkg_jar-from --into "${instdir}" javahelp jhall.jar jhall-2.0_05.jar
-	rm jna-4.4.0.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna.jar jna-4.4.0.jar
-	rm jna-platform-4.4.0.jar && java-pkg_jar-from --into "${instdir}" jna-4 jna-platform.jar jna-platform-4.4.0.jar
-	rm junit-4.12.jar && java-pkg_jar-from --into "${instdir}" junit-4 junit.jar junit-4.12.jar
-	rm osgi.cmpn-4.2.jar && java-pkg_jar-from --into "${instdir}" osgi-compendium osgi-compendium.jar osgi.cmpn-4.2.jar
-	rm osgi.core-5.0.0.jar && java-pkg_jar-from --into "${instdir}" osgi-core-api osgi-core-api.jar osgi.core-5.0.0.jar
-	rm swing-layout-1.0.4.jar && java-pkg_jar-from --into "${instdir}" swing-layout-1 swing-layout.jar swing-layout-1.0.4.jar
-	rm testng-6.8.1-dist.jar && java-pkg_jar-from --into "${instdir}" testng testng.jar testng-6.8.1-dist.jar
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/platform
-}
diff --git a/dev-java/netbeans-platform/netbeans-platform-9999_p20171214.ebuild b/dev-java/netbeans-platform/netbeans-platform-9999_p20171214.ebuild
deleted file mode 100644
index 2821cd828..000000000
--- a/dev-java/netbeans-platform/netbeans-platform-9999_p20171214.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 aae265d33..367bae4b2 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,6 +1,4 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -9,8 +7,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-profiler-9999_p20171213.ebuild 3146 SHA256 4b7a5f4a0d8fb58321e70491d90e9c65d65ce6b95712880adb90990c467bf315 SHA512 fdd0eb54161d72f03badc7043a10985f7745f9e28d459c537a0897e0e52512e2c1bc183cd015779ddfc350a8589b7be78ad6a40b8d399627350d7f21f3b310aa WHIRLPOOL 138b7da29c1f8304045e19000b8ab57ae5e5825467cb4576197682f90bcff82048f6d4aa906df996d5bfbaa20c33b0493747c287a95ab3b466ade7cb431ce64e
-EBUILD netbeans-profiler-9999_p20171214.ebuild 3146 SHA256 26be5cb921c5373c1adc1192f3818fd04bc6ac03e67ee0b3191539b1396c78ce SHA512 beaf917ccf5cc00072c7bbcf24c0cd721962220bd51845e80a5ff9ee12e2f186eeaf322e7380813031ba34706ba14fc19c6db172786eb84fb1bb47355bc3ad30 WHIRLPOOL 59c2d9591ac17b044621914f74130eeb3afee66880fde55ff20a51a498ef7b6f551afe4593bb0d517fb62f3514a599819637d31a458a1a6f56f506d174f34c75
 EBUILD netbeans-profiler-9999_p20171215.ebuild 3146 SHA256 82f5ae1205f2946cee85a3edc6e9d9c87fd5e2262382cb199f8697b1ff99b4a2 SHA512 01564d1e6a66a756c09528ab3b516b2292855f78dbb587697f0ca30c85acfce8b69e1e57015d9d387c2016fd13f52ed30f4e09500f10d92fa502f5aac4db9029 WHIRLPOOL b7b255e50775e1939c45735872d675656819a5bb1667f3a082f05f56c0aa2fc3ed6c3bb132865ca23d11f0e9fa30bba95ac6508f3179f1f2f9f07eb10e7f89d4
 EBUILD netbeans-profiler-9999_p20180102.ebuild 3146 SHA256 237c6dee9203546d38b88b6c29a7787fabd3bcdfc8d45545c4d18419451317a1 SHA512 27561356318931885c22abc879dcbd6c917a2270ed736a8e5cb67e1e87afe3dee0c6c80f908db41a237fca468251c34f8a344f6788eb28b26ca5c008090c248b WHIRLPOOL aa03ee79526c0625a64f5b6e0287c62acaa210b9e69a9ad0c06320ff6f170014985f190f424dca75e4a0bc4fd92825a87399216159357411cd48e4af8a58b529
 EBUILD netbeans-profiler-9999_p20180104.ebuild 3146 SHA256 d842f93363c67c381815b7d1ced2e4d1307745f268a2ac6072e7ff547b8e27e2 SHA512 6dd91722ce75a601358782989e048e1195eacb65940d18acab9931b9e4cac890fa06f843ae34863896f2623b4b2c4dec8305d71e3a4f339bc3b96169165ca23b WHIRLPOOL 10129f7d8d781c64831824691131a4866df321b0ab8422a74a333d27e3e76045cc2be9d55ac7eb192420670c45839487f3816c869f247ef1542515d1ed8fbd9a
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171213.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171213.ebuild
deleted file mode 100644
index a897a6374..000000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171213.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-# Binary files needed for remote profiling
-QA_PREBUILT="usr/share/netbeans-profiler-${SLOT}/lib/deployed/*"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-java-${PV}
-	~dev-java/netbeans-platform-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.profiler -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	ln -s /usr/share/netbeans-java-${SLOT} java || die
-	cat /usr/share/netbeans-java-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.java.built
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/profiler >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-
-	grep -E "/profiler$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-
-	doins -r *
-
-	for file in lib/deployed/cvm/linux/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in lib/deployed/jdk*/linux*/*.so ; do
-		fperms 755 ${file}
-	done
-
-	for file in remote-pack-defs/*.sh ; do
-		fperms 755 ${file}
-	done
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/profiler
-}
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171214.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171214.ebuild
deleted file mode 100644
index 63df49968..000000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-9999_p20171214.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 ac282e906..2191e9fb2 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -13,8 +13,6 @@ DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 SHA256 9744
 DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 SHA256 9e60b24c8cd7930d04517872e5926dffd761f06501b14caabd9456eba5f882c0 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6 WHIRLPOOL 4a05b2eabf3688729d4a7f77c4b18fb6de4d2c88a1f206ec6a49094826a3fcfb9c5eae5947b9d8461e284c10743c7bd35c909caeba896b4f7bb1d1aaeb3c7d91
 DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 SHA256 2fd1ecfc79700868afbf5915bc6196185eb66dae30c721b131bf41d732391f9c SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce WHIRLPOOL 611461579d65306a303a58dcfde5a547a544750a7f77a82983dce741fff8fcf7ff259f2c201966cf1f9e1fb2e7ded4afe551ec9b04d707c0c92314074b0f378f
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -23,8 +21,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-webcommon-9999_p20171213.ebuild 5932 SHA256 2c34c57b82311e0048b2c4e42acfc55770497b66392e851b2af1be6fd8c58fe4 SHA512 dc0072bb4d5ec265717d052ce560c58e0b06987a5cfd62ed1ea7a5318c79106ab40e41b0bdbe4faa5157ab982a75ef9592e0a650a01f405727430a653996355f WHIRLPOOL 10e64c06f3c0c240a51cd7a7e56becdfc3dee19aba7eebdc654fa2c9a52a9bd8b55794f8dd81ae9ddc855e389d74e74ddde2d7b02202c51a7ea044a077361a0f
-EBUILD netbeans-webcommon-9999_p20171214.ebuild 5932 SHA256 39029103994fdb989ad0c818f005a2f1d3b132b05054b22223e68ba56389d3fd SHA512 07a51b2c95ae4abda366db904cacf1df0ba6ae0ed142d0e1bb73f840193440959ee44e4edddbe88928482bce98d38c394ff7776ae839746b228bab32acf48428 WHIRLPOOL a762475c41ef9ffc65b76b113e5e563a7801c963c48248c570bf067bd6aaf33b6a74f0bddf94a526625596a76989293eabfa92be8ca2b55aae84a6b2ed267042
 EBUILD netbeans-webcommon-9999_p20171215.ebuild 5932 SHA256 ff7a0278a260c0e7b1af64301c6fd556777751873e39e539e167fc4829f93db3 SHA512 58aeeb0c1dbfb903616f867ec70643ffa84652e20dc38d8f4180ba0a26b9351b0a51143de97adc33c1274214bc66845a67cd463f4b1da4bea9926fd47328cc10 WHIRLPOOL 1c87132758ea5a1510eef95679feeb3867498ae29e8153729656f1134a781a532ac695c2bb23e35e6848563057b7fd8f704edec8554d3f367bf342eb67677d6f
 EBUILD netbeans-webcommon-9999_p20180102.ebuild 5932 SHA256 c2071471e5879366dfcf401946b8fc072d4ae1133693d73fe866dd301b89d947 SHA512 aa817c40d3fae2e6bbadcac69eefee3784f04a5da771d76297102e54f6726808d677bfa8455577589f9b8b2176fa29d13e2b61865b075b6c284200e15431538b WHIRLPOOL 6c8f15a7eb3e91e187e8d0126b447c5b21e5a530ca4d2a0f3bc5454fbc6c94719fe3a652220916d047c745a878adb7bcf4aa4cba00a608d3cb3f4b69a15c41dc
 EBUILD netbeans-webcommon-9999_p20180104.ebuild 5932 SHA256 118477a833bbdda5412ba3be3a74805484fb2a9df1f776e10c61b2ff36a6d47d SHA512 e1149ec0c9e6312718ff58aeda9d78e7ae4df389ea3d15d4b10fd9bcc5a03d42abcaff7303fd2afa82ba6178f0b751f76080adc594374a788054c8b587b21dfb WHIRLPOOL 2dd0453919db0ea3d648992a8df12e9bd30e69d30ed5d12aa7c9e07f4b6c24cd586544098d6fe2196c6f203346d7deb894fee6c2c802b7c92118d17e5c8fd133
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171213.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171213.ebuild
deleted file mode 100644
index 680e3c4ef..000000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171213.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
-	https://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	https://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	https://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
-	https://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	https://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	https://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	https://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	https://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	https://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	https://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	https://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	https://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	https://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-extide-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0
-	dev-java/jna:4"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.webcommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar libs.nashorn/external/com.oracle.js.parser.jar || die
-	ln -s "${DISTDIR}"/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar libs.plist/external/dd-plist.jar || die
-	ln -s "${DISTDIR}"/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim cordova.platforms.ios/external/ios-sim || die
-	ln -s "${DISTDIR}"/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
-	ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
-	ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
-	ln -s "${DISTDIR}"/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib cordova.platforms.ios/external/libiDeviceNativeBinding.dylib || die
-	ln -s "${DISTDIR}"/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib cordova.platforms.ios/external/libimobiledevice.4.dylib || die
-	ln -s "${DISTDIR}"/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib cordova.platforms.ios/external/libplist.1.dylib || die
-	ln -s "${DISTDIR}"/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar libs.jstestdriver/external/libs.jstestdriver-ext.jar || die
-	ln -s "${DISTDIR}"/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib cordova.platforms.ios/external/libusbmuxd.2.dylib || die
-	ln -s "${DISTDIR}"/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip html.ojet/external/ojetdocs-1_0_0.zip || die
-	ln -s "${DISTDIR}"/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip html.ojet/external/ojetdocs-1_1_2.zip || die
-	ln -s "${DISTDIR}"/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip html.ojet/external/ojetdocs-2_0_0.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	java-pkg_jar-from --build-only --into libs.jna/external jna-4 jna.jar jna-4.4.0.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-extide-${SLOT} extide || die
-	cat /usr/share/netbeans-extide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.extide.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/webcommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/webcommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/webcommon
-}
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171214.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171214.ebuild
deleted file mode 100644
index 572216f0e..000000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-9999_p20171214.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-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 f5d159882..0d174507f 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,6 +1,4 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 SHA256 de05f6e9f75d0ebf775df5ed99c46ef67224f2c80d289a9c0b663d30e20df0a4 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a WHIRLPOOL 7617b44647ee6490f3f5277b0a3761aa8a99ad410a7b3358d6321b3a7ee3060ef2524ac45d1f6016737dd2f4a32e82247968980abde052eeca3d0015cf6d47d9
-DIST netbeans-trunk-nightly-201712130002-src.zip 221062529 SHA256 eb97d873b040d66884fa27b1c5a3a063a00e611c4e9c799d46ea1a4619eedbab SHA512 577fcac1fef0e6197e640fca9eed3f8c9bb8ae29a676610631570e84f055aa97252db817ab258d3cf8d89f7c92636379edae12fcad0bc8dfcc8c928b841b72cd WHIRLPOOL c7d90c6bf010366917e76c99802b434112feab54ad64b98491d7ceb13f97c04a5835515c52472a0c5a1686a8bb98bf7c7d7669c34ce8476c5a9ec418b83b1d56
-DIST netbeans-trunk-nightly-201712140002-src.zip 221062529 SHA256 6cd8ec77bcbbf71b49633058c99f218febdd314e2d1ecd9d6d521a108b7d3ad0 SHA512 ab35c3ff4e9c82d2b005cdf94df22c7f6490c9b8e52554af2dfc46986bb538b197407fea768f425f793cca4020503f40ed52307dc46ba4c4ecf10bd1ae70230b WHIRLPOOL 296adeeb223f78b80177815d1a7229fa703539e454038b2dc850f2d7923fc8f09f8f1274bd13495eb136d6b813174efb46bb4fd9c563d1779f9030270b2ee859
 DIST netbeans-trunk-nightly-201712150002-src.zip 221062529 SHA256 7e49ce9cdfb4a820e76896f52c96aa384f08f74b678b1ceb01cb2e8bfb7fc8e0 SHA512 7cfc561beee5bd485f180ff5a1741f5b33ecd02648e87fcd465d57805f16f7c2bfb6c383a16dbfd81d060355ff4ef770cfae24eca18e3c4713dc94c72a1f412f WHIRLPOOL 64144719fcab72e61a64273d9bf125ab4975bde3a780a43a45c9cd791e834575d2c48b665dcfea19311c1f10357e013927ed0b47bd16552aa5e1f6b1e2e82a09
 DIST netbeans-trunk-nightly-201801020002-src.zip 221062529 SHA256 d4996bf1c18c00b8ae3f79287d4569f51b15929dc7711ec640e629c9d9359c4a SHA512 d91f8b2e51b75f6e4601470d53771596c809790b43ceb0ef237fd36e7fbb1a24e4b3f88953e48d2f62681fb227e31c058b0ee694eaffe9f26d044551637a77a9 WHIRLPOOL a1f2f2777bdd549a0369a3789831f47a008822931fcb21f46bcb3cd968bf9c704b83bf9fca497f6b6f5d4835dc29ce6b6f2f7e3590448825d5b16b0fe703f0c1
 DIST netbeans-trunk-nightly-201801040002-src.zip 221062529 SHA256 87de89f5a4cca45c1a4c9ca8d0b140fe1cba308c5360ba4901935fb620758334 SHA512 fcf9b91229193c5589c96ec84d7f556c3e16121b0f5227e152e898d256235e97884f92ed7935363075ee7609e25242668d1080d47bf637ced5cfcfc0828cab08 WHIRLPOOL f82ec9a3eb7604e27c9e44c14e7759c970fc0e25e6e2a796502e8767f250d0c71b38230f748f1b0743cd3b423e0968771a0c716b363bd52432b94defd57d8ec5
@@ -9,8 +7,6 @@ DIST netbeans-trunk-nightly-201801080002-src.zip 221062529 SHA256 108544c0eafd9a
 DIST netbeans-trunk-nightly-201801090002-src.zip 221062529 SHA256 77c04b2f703e2106bbcfcb17bdb8bef02083bc4b8b1a5285adf1adc8cf212b14 SHA512 59201c784a48deb4c7c10f0d24679b4f3e556222130df9b18c6e0b7556e5d65e0c9aa8f4fdd9d156b2cd27e94fcdfeeccf885d7ab185e46bffb3351aeeb9dd26 WHIRLPOOL 31fdde931b05afcc4505f13aa2d4054d0c5a9280e79a10f0b538f3d38f6e5193e863fe2007a63e25c4e855a8663e57bf99c9ca0460d7e6fa7df1ccffa84cb627
 DIST netbeans-trunk-nightly-201801100002-src.zip 221062529 SHA256 d011b554fb8e7735c504a8b1621a52e839efab06462a6e1ca03e5c463a6f5c58 SHA512 e7e522cc18b2de4453ad03895246f9847a91b198be6152e6f3155eeebfde30c0359a5b54b32c4dfb014f8d6d0a5148e3acd69aaab63a7914683490039002f769 WHIRLPOOL 8d2ecf85dffcd786487d41d0b9dfb93b65c781249b38ec8ca4204c5ad9e494d0dfb9ff34d3d7cad896dfe688fa5d201ea67c386c1b2175b6709e828b56634907
 DIST netbeans-trunk-nightly-201801130002-src.zip 221062529 SHA256 4120d479325c9dc57a04d127ab4b260c3cd281844f0aa63f1003a99e79b27fec SHA512 21ec773d80e7f4056ebd981e066ef00912fe111623dc65b6b4f120c9cde8474b66b767932d97166a1c53b253e5babb65f8e4f9e1ad3a456e819ec6aabdf8fbdf WHIRLPOOL 891b5deeeb762a812a624ec8607269760afaa143ce25b229aab2369b7be4fbc90d8da7b4ac00968885fe840e123fbd4f2ce60a2e06639743ff616fb64045cd5e
-EBUILD netbeans-websvccommon-9999_p20171213.ebuild 2395 SHA256 01a60ecedfb45590fa8f5cd7b859c093c2c4921694c9173e2e7fa2611d4a7d14 SHA512 2a33a8c37a92c50ccb8c30a63728eb9a344610dd7e2418e526bbac027f8ea83ca3a67fec6328e9ced602fc0fdaaf3f1b746e10a28f5d6ecde0ff4bcac7ddb205 WHIRLPOOL ed0bbd12a9d429c5da7c90eac341d59628caa1ff868e8b525caad17fbf19f8fe212ddacbe371556a72c18aaef922f482d4f14298f0775181917af5c57aa5c6e7
-EBUILD netbeans-websvccommon-9999_p20171214.ebuild 2395 SHA256 23e2b6484025fc05c24f42e4065ca5ff149acf0a4ba7301e8be0415fdd04bb44 SHA512 2def6621e1c30788e6def04b49097d109fd7257a4765e5c590fc9df8128ef40eb8ea103336eb0b10e45b19c8d6f44b01643c484abdfa342a16175144d81c0175 WHIRLPOOL 7a4a32702366f1c2e30b81fa9889fb194908c41eb8bf9e8d418f5259e905e7824406bc50f8fb4f8e9d37f665b3c909da8ca8d5c43cf2ac77f4d1eef46c743795
 EBUILD netbeans-websvccommon-9999_p20171215.ebuild 2395 SHA256 c32662c5fc5f8f3ed85d4c91c79aa75b470e159ae393df15a04daff58325fcce SHA512 9ae3798bf1fb9ff6cda90727a39877ce9129e9361000f4f2397a56313803fe5884de67a52d256cfbc552d20c113122f55eaee175b118d69dafe18f83a9a09bcf WHIRLPOOL b3baf2f3beaba56f6b0d2a0db0f9d92bd0f5458fd0b10ecc50f8e4ee1ae2b7dd2891e6b1b0f7faa92a1b2794de202ebe871c9be1fe0a1b894e0752b94061c17e
 EBUILD netbeans-websvccommon-9999_p20180102.ebuild 2395 SHA256 f215991a945a89b2bca3d881e1c72cf0f9b0a6a1d3fcc9cbc8df898428c16992 SHA512 267c002fdad5e926f0f40611beb7b4c60334f583242d4211ed33cf8490099c9e60bd013748dcccddf5aa4b08b482df41db8d3afd5fcfb05ceb4575cd53c6ffd6 WHIRLPOOL e5d3b4024607b3187eda60cb2a67b5b97a63ea092cc36348f1b1463a7bae33b694166f3a45e88347999e7758d3f7aeb8b84eee19d452cf6122727bf9fd3bca92
 EBUILD netbeans-websvccommon-9999_p20180104.ebuild 2395 SHA256 5f7d6b8660b33e00152c3f46030a902d0b09c0f08088168cf398755bdc9b95b5 SHA512 5c62c41b7d80e77b6512791bc4f56d9bdea6314139eb2d22652e0d503abff46145f44bf72399336b751542027ad187b7ec6c9c92e3c984725bd515f57e23db70 WHIRLPOOL 9de8718732fb264ae2482015b62af029e9cf2aa71db9686d74562a6353f559630837e941598787ef015673402b8d8ec99dd278cf9e80bca2ff6da8593b94e108
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171213.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171213.ebuild
deleted file mode 100644
index e178dd333..000000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171213.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-13_00-02-15/zip/netbeans-trunk-nightly-201712130002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171214.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171214.ebuild
deleted file mode 100644
index 303a669d8..000000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-9999_p20171214.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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-14_00-02-15/zip/netbeans-trunk-nightly-201712140002-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8
-	~dev-java/netbeans-platform-${PV}
-	~dev-java/netbeans-ide-${PV}"
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}"
-
-INSTALL_DIR="/usr/share/${PN}-${SLOT}"
-
-EANT_BUILD_XML="nbbuild/build.xml"
-EANT_BUILD_TARGET="rebuild-cluster"
-EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.websvccommon -Dext.binaries.downloaded=true -Dpermit.jdk8.builds=true"
-EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack $(basename ${SOURCE_URL})
-
-	einfo "Deleting bundled jars..."
-	find -name "*.jar" -type f -delete
-
-	unpack netbeans-9999-r21-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-9999-r21-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-
-	einfo "Linking in other clusters..."
-	mkdir "${S}"/nbbuild/netbeans || die
-	pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-	ln -s /usr/share/netbeans-platform-${SLOT} platform || die
-	cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.platform.built
-
-	ln -s /usr/share/netbeans-ide-${SLOT} ide || die
-	cat /usr/share/netbeans-ide-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
-	touch nb.cluster.ide.built
-
-	popd >/dev/null || die
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_install() {
-	pushd nbbuild/netbeans/websvccommon >/dev/null || die
-
-	insinto ${INSTALL_DIR}
-	grep -E "/websvccommon$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
-	doins -r *
-
-	popd >/dev/null || die
-
-	dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/websvccommon
-}
author	Miroslav Šulc <fordfrog@gentoo.org>	2018-01-15 09:12:32 +0100
committer	Miroslav Šulc <fordfrog@gentoo.org>	2018-01-15 09:12:32 +0100
commit	d539a4b7bf00051627ab03ca156b8bac668ac3c8 (patch)
tree	b4587942074c49a5c3ef4228aab333e46100c34a /dev-java
parent	netbeans: bumped to the latest nightly sources (diff)
download	fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.tar.gz fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.tar.bz2 fordfrog-d539a4b7bf00051627ab03ca156b8bac668ac3c8.zip