4 files changed, 0 insertions, 711 deletions
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 221c6d0ee..f97c32074 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,8 +1,5 @@
 DIST netbeans-9999-r21-build.xml.patch.bz2 2682 BLAKE2B e292625a28eca0a30ad0414ae18311a9ea21807940bca464915fb84ac8e2c952b0b40ca97351fd91748dda3520a879246cc6cbfb0f27a4960793a27ac6987cc5 SHA512 4a8791f31d540f25157d6feee9182180cc525047a88e8975931ce589e5823c086f04ed200d900d593aaef97379953de58ea68f8a6ba6705d5652202a4156671a
 DIST netbeans-l10n-9999-20160920.tar.bz2 12724225 BLAKE2B 2bb5d812cd250f1acd31868887b2c8b03b0560d779a8666d0a28215008368b4e41ee9f297469b55470f51234cc8b977df4201f554b7316eeecb556427d13d265 SHA512 777160e22f648cd4c6343b51212c1a1ab5de31e84a36b8581dc3742aec7933122edc5215292ddb43df69960b6baaa8670b1b204c4728772627347b2bdcfa6254
-DIST netbeans-trunk-nightly-201801230002-src.zip 221062529 BLAKE2B ef4529b6393ada651cbecfbf3c23f1a90a04d421b79aa4b8057a2103c8a563ebc4b81f7601438f36d11a7d7ac6b714cc81a89255ff41784569536ef926c00bae SHA512 80d284dffd195741b148482f11f17748e392f3a1b26d8598f96964dad6ce5b3e39dee215c4680496cf4c856776df4b5a449e02e42e8972d1b19700733a3cd904
-DIST netbeans-trunk-nightly-201801240002-src.zip 221062529 BLAKE2B aeaac36f7173c3fb8467808494b8d24bd97d55181a424edde12cc151ec2b428f0f6ccc1062d12baba892dc13426fdb9eb6d9fb4b104ec7256a7647be396336b0 SHA512 40ed7aa6490e352b13713bfdf9863bee4d9e4d0cebcc1c82850ac027b8b3ab2548735dc5d5b8a55da21b2c848852fe1cd792cc11969b14edf292a7cdce3167cf
-DIST netbeans-trunk-nightly-201801250002-src.zip 221062529 BLAKE2B af6bfc832d8014819d1c1ece3690f9e38d42745df3fe901a46914080dbbb7d549fb54d9cfffbed0ebebf2858c4d0b83f6b7dea8edc70aad220292b23d2b29130 SHA512 cdb71b39a7aeace5050f61209843e4e870ecf06b8a382ebe54bd8ee6d488ccdf793e0569211655b49db546adae50314b9ece026b4167daf3877813c9e07b1bd6
 DIST netbeans-trunk-nightly-201801260002-src.zip 221062529 BLAKE2B ebeae4936351a3508d2a3c031214d8d9d0e1065e08af92ac7ccafb2ba75f04634987b645cbf78ac20d61bd01290f0c5f444bb343fcffecaf84ad29f325a6daca SHA512 8355786ec3348aa8e6f2b18654a13768b3bcdfc3ee8003c903093713294f92346a8578f6fb2d7078c1476035f83daab2f7721f4c5588c0d032e0d7236023a140
 DIST netbeans-trunk-nightly-201801290002-src.zip 221062529 BLAKE2B c76d6d5d336a304edfef417fdefee0f11c6d0c202beb607e14df1c8935930db4635fcd3365c1492ca591985faaeb847196bceed6a9854e2c77f868cc17822331 SHA512 8da3854ed5352e7ab33fb29aef5ea1bdceb8499a25843412ac56d7449f57256d4fc4f792a461f25822cd752979ea20c497154968a5d46a01753c55ba04afd6d6
 DIST netbeans-trunk-nightly-201801300002-src.zip 221062529 BLAKE2B cc86f608c791fb033f7d80b08208497e9d796fcde958247daa14d0bdf7f9f7212f53937e35b707ba78b21473ea09007a55a56ac6ef0adbe87a12f9ded1955feb SHA512 bc35e1b4c88702fef64910824b9789b6b026f97736a8e545eeae34f6488337f4b7ef4777c922a53d784aa22c97f748628ae46497d54a919a155d3059023bef71
@@ -23,9 +20,6 @@ DIST netbeans-trunk-nightly-201802200002-src.zip 221062529 BLAKE2B 9ff46b1a0f845
 DIST netbeans-trunk-nightly-201802210002-src.zip 221062529 BLAKE2B dad63be2ff2cee16b000cce4c028a08d2d2c0edaae410dffe6bcfd8d68d1914b77fe97b1b877022e94651233dcf6f15d67202d94a6c9b5bcbfef8d2c775c6dca SHA512 11f768695919e05a0b893ece5c53ad5b48237646fa44d42418521597950110bb7d5d016360ac237370f6cf6310e0941fa83146a1964be01b2abaed95266407bf
 DIST netbeans-trunk-nightly-201802220002-src.zip 221062529 BLAKE2B 3f5893037f6630367521f69b5c1c85e005caa0bbe03dba192237cc87d1a869c478442a804fa01acb6dd68e48c552985d69bef3f77b05e04fcdbb67182762839a SHA512 f8e7a56dae4d94b237f0d09ef3d8d7096314070edefbbfc6afee22ab12a2693e0a37a0c2aea7170b0af320d242d2bbd73999de3ccc3b005595e4e07a2adb6401
 DIST netbeans-trunk-nightly-201802230002-src.zip 221062529 BLAKE2B c24b7ed83438d99b3a97f84ef0add2140689e236a9c8dce09d7f653a28440dc95cb5233e9d063a432339a084e4a0639c7d94ca0a24556a979a69df9a11f2a737 SHA512 dbffbb212d075a7b54f4940a322844b2e2204d947bd634b3c1b3c59ed93a8bd615f5c6b03f261c47ef1128a8ca6da38298370b5e06bd8c444a7e649299679326
-EBUILD netbeans-9999_p20180123.ebuild 6186 BLAKE2B 9c6ab5e0f8af16dec2476230a82a419ad66303990d5d16866b475b497f3f4c0595a02de4b814bcfd5ae0692f2c749286b07f50e7d2cc49c26570beb08a6469b1 SHA512 b21d0f30d43c6e49d0f5dfe8f30ad11576fd33ed7a2c9d9f65b24325ee2c642c99d8f73fc3a05770ff9ebe710c7180e7d261db145371663b901d53b372452bc0
-EBUILD netbeans-9999_p20180124.ebuild 6186 BLAKE2B 0f6ad062b82d72586a4096589d8c14fd7922882e457c8602aeb687ea37a49cd3f95ed04be44d985c3d85a0a68b5f8a9d78a6b66c831b9ad73769a4a20532b634 SHA512 2a5fb8bfec44f82e60ad3bfda9156c1b1ea2d69728225282ad82f7f19552941074396bd685f63ede990ed1994ee90d6850399c84c014d373df2c98a4069ec2de
-EBUILD netbeans-9999_p20180125.ebuild 6186 BLAKE2B 889f48c8a7a9f3bf38b9f94eccca83ccd05f02704c0cae686f1d26022cd4d90ef6c154216d8d90d12741b2004ca6bba426ef11af393cb51785eab8e84725ac02 SHA512 e1c528ebf6b666ab8fd5513046a5c25b6676623eaaf625da6a0150725fd68732d2a826273281709104ad3e03700107cc5583ea45b4ebf9213b0c6e443b98a892
 EBUILD netbeans-9999_p20180126.ebuild 6186 BLAKE2B 559dd47232ec9e197c00b3edd3889b185c000960fcc9674aa8390f71e974bd1be990f6a83fb4a7a792e34490337dd82589bfc0a3436bba5f6a79bcf369365010 SHA512 c8915d32859be20aefe4b455436767b2b0ef9f3f285cc7010f1c32acf29caa8feb2fb9500c6d7c258b35d12a3519ca0ba2dc03ed18309a9697e77da96fe8d4b1
 EBUILD netbeans-9999_p20180129.ebuild 6186 BLAKE2B a20459360b4ea79f0e93cd57a0fbefd73b4a61488ac2e621278b54ed3c7b51f5373f9234196b1024ecee80167eb3a73f6036099a645048eae17c579cf32ccb7f SHA512 566e3f211fb007ef42ec445e497436192104f20bd4f6a3d6fb637bf9098326de56d07b15a66f91e67bd668c473baf14ad127fc5c715ce04d489da26bfe864170
 EBUILD netbeans-9999_p20180130.ebuild 6186 BLAKE2B ba7c1918ff14b26be3b08cce295cfeb58c9c9586be492ec748331716d78f2e3ad55f83008f58a3ecab95294db3cfa347d6e4ddd4a39cda0426d8386cfd4ce39f SHA512 fd9e09041f7963db83ee68c236014f23b294dc7508eeff9c28ea3409746a0bec0178c2a7ecc5046324a81d0342fb0fb0bad4ecba6951963de95a2cdfc5e8fb33
diff --git a/dev-util/netbeans/netbeans-9999_p20180123.ebuild b/dev-util/netbeans/netbeans-9999_p20180123.ebuild
deleted file mode 100644
index 70fa031d6..000000000
--- a/dev-util/netbeans/netbeans-9999_p20180123.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="https://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-01-23_00-02-15/zip/netbeans-trunk-nightly-201801230002-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8"
-DEPEND="${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		if use ${lingua} ; then
-			local lang=${lingua/l10n_/}
-			lang=${lang/-/_}
-
-			case ${lang} in
-				ar)  lang="ar_EG,ar_SA" ;;
-				es)  lang="es,es_CO"    ;;
-				fil) lang="fil_PH"	;;
-				gl)  lang="gl_ES"	;;
-				hi)  lang="hi_IN"	;;
-				id)  lang="in_ID"	;;
-				nl)  lang="nl_BE,nl_NL" ;;
-				ta)  lang="ta_IN"	;;
-			esac
-
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r21-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r21-build.xml.patch
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-
-		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
-
-		for lingua in ${IUSE_L10N}; do
-			if use ${lingua} ; then
-				local locales=${lingua/l10n_/}
-				locales=${locales/-/:}
-
-				case ${locales} in
-					ar)  lang="ar:EG ar:SA" ;;
-					es)  lang="es es:CO"    ;;
-					fil) lang="fil:PH"	;;
-					gl)  lang="gl:ES"	;;
-					hi)  lang="hi:IN"	;;
-					id)  lang="in:ID"	;;
-					nl)  lang="nl:BE nl:NL" ;;
-					ta)  lang="ta:IN"	;;
-				esac
-
-				for locale in ${locales}; do
-					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
-				done
-			fi
-		done
-	fi
-}
diff --git a/dev-util/netbeans/netbeans-9999_p20180124.ebuild b/dev-util/netbeans/netbeans-9999_p20180124.ebuild
deleted file mode 100644
index df402b723..000000000
--- a/dev-util/netbeans/netbeans-9999_p20180124.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="https://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-01-24_00-02-15/zip/netbeans-trunk-nightly-201801240002-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8"
-DEPEND="${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		if use ${lingua} ; then
-			local lang=${lingua/l10n_/}
-			lang=${lang/-/_}
-
-			case ${lang} in
-				ar)  lang="ar_EG,ar_SA" ;;
-				es)  lang="es,es_CO"    ;;
-				fil) lang="fil_PH"	;;
-				gl)  lang="gl_ES"	;;
-				hi)  lang="hi_IN"	;;
-				id)  lang="in_ID"	;;
-				nl)  lang="nl_BE,nl_NL" ;;
-				ta)  lang="ta_IN"	;;
-			esac
-
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r21-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r21-build.xml.patch
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-
-		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
-
-		for lingua in ${IUSE_L10N}; do
-			if use ${lingua} ; then
-				local locales=${lingua/l10n_/}
-				locales=${locales/-/:}
-
-				case ${locales} in
-					ar)  lang="ar:EG ar:SA" ;;
-					es)  lang="es es:CO"    ;;
-					fil) lang="fil:PH"	;;
-					gl)  lang="gl:ES"	;;
-					hi)  lang="hi:IN"	;;
-					id)  lang="in:ID"	;;
-					nl)  lang="nl:BE nl:NL" ;;
-					ta)  lang="ta:IN"	;;
-				esac
-
-				for locale in ${locales}; do
-					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
-				done
-			fi
-		done
-	fi
-}
diff --git a/dev-util/netbeans/netbeans-9999_p20180125.ebuild b/dev-util/netbeans/netbeans-9999_p20180125.ebuild
deleted file mode 100644
index 9b1860b4e..000000000
--- a/dev-util/netbeans/netbeans-9999_p20180125.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Netbeans IDE"
-HOMEPAGE="https://netbeans.org/"
-SLOT="9999"
-SOURCE_URL="http://bits.netbeans.org/download/trunk/nightly/2018-01-25_00-02-15/zip/netbeans-trunk-nightly-201801250002-src.zip"
-PATCHES_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r21-build.xml.patch.bz2"
-L10N_URL="https://dev.gentoo.org/~fordfrog/distfiles/netbeans-l10n-9999-20160920.tar.bz2"
-ALL_URLS="${SOURCE_URL} ${PATCHES_URL} ${L10N_URL}"
-SRC_URI="l10n_af? ( ${ALL_URLS} )
-	l10n_ar? ( ${ALL_URLS} )
-	l10n_bg? ( ${ALL_URLS} )
-	l10n_ca? ( ${ALL_URLS} )
-	l10n_cs? ( ${ALL_URLS} )
-	l10n_de? ( ${ALL_URLS} )
-	l10n_el? ( ${ALL_URLS} )
-	l10n_es? ( ${ALL_URLS} )
-	l10n_fil? ( ${ALL_URLS} )
-	l10n_fr? ( ${ALL_URLS} )
-	l10n_gl? ( ${ALL_URLS} )
-	l10n_hi? ( ${ALL_URLS} )
-	l10n_id? ( ${ALL_URLS} )
-	l10n_it? ( ${ALL_URLS} )
-	l10n_ja? ( ${ALL_URLS} )
-	l10n_ko? ( ${ALL_URLS} )
-	l10n_lt? ( ${ALL_URLS} )
-	l10n_nl? ( ${ALL_URLS} )
-	l10n_pl? ( ${ALL_URLS} )
-	l10n_pt-BR? ( ${ALL_URLS} )
-	l10n_pt-PT? ( ${ALL_URLS} )
-	l10n_ro? ( ${ALL_URLS} )
-	l10n_ru? ( ${ALL_URLS} )
-	l10n_si? ( ${ALL_URLS} )
-	l10n_sq? ( ${ALL_URLS} )
-	l10n_sr? ( ${ALL_URLS} )
-	l10n_sv? ( ${ALL_URLS} )
-	l10n_ta? ( ${ALL_URLS} )
-	l10n_tr? ( ${ALL_URLS} )
-	l10n_vi? ( ${ALL_URLS} )
-	l10n_zh-CN? ( ${ALL_URLS} )
-	l10n_zh-TW? ( ${ALL_URLS} )
-"
-LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
-KEYWORDS="~amd64 ~x86"
-IUSE_NETBEANS_MODULES="
-	+netbeans_modules_apisupport
-	netbeans_modules_cnd
-	netbeans_modules_dlight
-	netbeans_modules_enterprise
-	netbeans_modules_ergonomics
-	netbeans_modules_extide
-	netbeans_modules_groovy
-	+netbeans_modules_java
-	netbeans_modules_javacard
-	+netbeans_modules_javafx
-	netbeans_modules_mobility
-	netbeans_modules_php
-	+netbeans_modules_profiler
-	netbeans_modules_webcommon
-	+netbeans_modules_websvccommon"
-IUSE_L10N="
-	l10n_af
-	l10n_ar
-	l10n_bg
-	l10n_ca
-	l10n_cs
-	l10n_de
-	l10n_el
-	l10n_es
-	l10n_fil
-	l10n_fr
-	l10n_gl
-	l10n_hi
-	l10n_id
-	l10n_it
-	l10n_ja
-	l10n_ko
-	l10n_lt
-	l10n_nl
-	l10n_pl
-	l10n_pt-BR
-	l10n_pt-PT
-	l10n_ro
-	l10n_ru
-	l10n_si
-	l10n_sq
-	l10n_sr
-	l10n_sv
-	l10n_ta
-	l10n_tr
-	l10n_vi
-	l10n_zh-CN
-	l10n_zh-TW"
-IUSE="doc ${IUSE_NETBEANS_MODULES} ${IUSE_L10N}"
-S="${WORKDIR}"
-
-CDEPEND="virtual/jdk:1.8"
-DEPEND="${CDEPEND}
-	dev-java/javahelp:0"
-RDEPEND="${CDEPEND}
-	~dev-java/netbeans-harness-${PV}
-	~dev-java/netbeans-ide-${PV}
-	~dev-java/netbeans-nb-${PV}
-	~dev-java/netbeans-platform-${PV}
-	netbeans_modules_apisupport? ( ~dev-java/netbeans-apisupport-${PV} )
-	netbeans_modules_cnd? ( ~dev-java/netbeans-cnd-${PV} )
-	netbeans_modules_dlight? ( ~dev-java/netbeans-dlight-${PV} )
-	netbeans_modules_enterprise? ( ~dev-java/netbeans-enterprise-${PV} )
-	netbeans_modules_ergonomics? ( ~dev-java/netbeans-ergonomics-${PV} )
-	netbeans_modules_extide? ( ~dev-java/netbeans-extide-${PV} )
-	netbeans_modules_groovy? ( ~dev-java/netbeans-groovy-${PV} )
-	netbeans_modules_java? ( ~dev-java/netbeans-java-${PV} )
-	netbeans_modules_javacard? ( ~dev-java/netbeans-javacard-${PV} )
-	netbeans_modules_javafx? ( ~dev-java/netbeans-javafx-${PV} )
-	netbeans_modules_mobility? ( ~dev-java/netbeans-mobility-${PV} )
-	netbeans_modules_php? ( ~dev-java/netbeans-php-${PV} )
-	netbeans_modules_profiler? ( ~dev-java/netbeans-profiler-${PV} )
-	netbeans_modules_webcommon? ( ~dev-java/netbeans-webcommon-${PV} )
-	netbeans_modules_websvccommon? ( ~dev-java/netbeans-websvccommon-${PV} )
-	doc? ( ~dev-java/netbeans-javadoc-${PV} )"
-
-JAVA_PKG_BSFIX="off"
-NBLOCALES=""
-
-pkg_setup() {
-	for lingua in ${IUSE_L10N} ; do
-		if use ${lingua} ; then
-			local lang=${lingua/l10n_/}
-			lang=${lang/-/_}
-
-			case ${lang} in
-				ar)  lang="ar_EG,ar_SA" ;;
-				es)  lang="es,es_CO"    ;;
-				fil) lang="fil_PH"	;;
-				gl)  lang="gl_ES"	;;
-				hi)  lang="hi_IN"	;;
-				id)  lang="in_ID"	;;
-				nl)  lang="nl_BE,nl_NL" ;;
-				ta)  lang="ta_IN"	;;
-			esac
-
-			if [ -z "${NBLOCALES}" ] ; then
-				NBLOCALES="${lang}"
-			else
-				NBLOCALES="${NBLOCALES},${lang}"
-			fi
-		fi
-	done
-
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	if [ -n "${NBLOCALES}" ] ; then
-		unpack $(basename ${SOURCE_URL})
-		unpack $(basename ${L10N_URL})
-
-		einfo "Deleting bundled jars..."
-		find -name "*.jar" -type f -delete
-
-		unpack netbeans-9999-r21-build.xml.patch.bz2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Deleting bundled class files..."
-		find -name "*.class" -type f | xargs rm -vf
-
-		epatch netbeans-9999-r21-build.xml.patch
-
-		einfo "Symlinking external libraries..."
-		java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
-	fi
-
-	java-pkg-2_src_prepare
-	default
-}
-
-src_compile() {
-	if [ -n "${NBLOCALES}" ] ; then
-		einfo "Compiling support for locales: ${NBLOCALES}"
-		eant -f nbbuild/build.xml bootstrap || die
-		eant -Dlocales=${NBLOCALES} -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" \
-			-Dpermit.jdk7.builds=true -f l10n/build.xml build || die
-	fi
-}
-
-src_install() {
-	if [ -n "${NBLOCALES}" ] ; then
-		pushd "${S}"/nbbuild/netbeans >/dev/null || die
-
-		for cluster in apisupport cnd dlight enterprise ergonomics groovy harness ide java javacard javafx mobility php platform profiler webcommon websvccommon ; do
-			if [ -d "${cluster}" ] ; then
-				insinto /usr/share/netbeans-${cluster}-${SLOT}
-				doins -r ${cluster}/*
-			fi
-		done
-
-		if [ -d nb ] ; then
-			insinto /usr/share/netbeans-nb-${SLOT}/nb
-			doins -r nb/*
-		fi
-
-		popd >/dev/null || die
-
-		make_desktop_entry "netbeans-${SLOT} --locale en" "Netbeans ${PV} en" netbeans-${SLOT} Development
-
-		for lingua in ${IUSE_L10N}; do
-			if use ${lingua} ; then
-				local locales=${lingua/l10n_/}
-				locales=${locales/-/:}
-
-				case ${locales} in
-					ar)  lang="ar:EG ar:SA" ;;
-					es)  lang="es es:CO"    ;;
-					fil) lang="fil:PH"	;;
-					gl)  lang="gl:ES"	;;
-					hi)  lang="hi:IN"	;;
-					id)  lang="in:ID"	;;
-					nl)  lang="nl:BE nl:NL" ;;
-					ta)  lang="ta:IN"	;;
-				esac
-
-				for locale in ${locales}; do
-					make_desktop_entry "netbeans-${SLOT} --locale ${locale}" "Netbeans ${PV} ${locale}" netbeans-${SLOT} Development
-				done
-			fi
-		done
-	fi
-}