94 files changed, 0 insertions, 4741 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e722aee19e8f..b094b88a5b48 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/flyingsaucer/Manifest b/dev-java/flyingsaucer/Manifest
deleted file mode 100644
index 3889a0825711..000000000000
--- a/dev-java/flyingsaucer/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 7-itext-2.0.8.patch 3109 BLAKE2B 721293a5adf776ae0a7be6396b758c174fafa22f3d87fd64bf8b5be3188806f076ddb6fd9164bd0db3cf2c1d145485c511949223025f789766dd8a3bf875440b SHA512 8ee0d072224a24861d8e28caced9224c0390271589b1e07ae88cc4cf4a8fe97f799142140cecd28eab2c641feb0d4d84b18a89674d512069a746561e5ff0ac0f
-DIST flyingsaucer-R7final-src.zip 7058444 BLAKE2B 30c9b13cc376a5ef3c215908cc09a77a00f8d7c3d4217b46591e112dc1803ff3497ce30e1747bf8c97c691162a41276d581138797f862a29243080e8ece9d3f8 SHA512 14c26a10f3493f3b9fc1fe5d3d11591cf4c09d781d1d2cccf5de15d4b5a0108f8780e168c32968338b82c7929cb083cc47aab539c53d140860505ff0e05f9135
-EBUILD flyingsaucer-7-r2.ebuild 1658 BLAKE2B e6632ebeaac32f66c08b12b3cd5e51703a043331783b616d52d7dc4bf497e111358536726220318f2bc1f3f0de73788015bb36c2e7669584ef41e69c546f42b8 SHA512 7db361e7e3da813782c68359d2a16d97718da74202ac30226273e82940246e9608e40a5f5d73735efc2b326fe623633e2df93e1f1b52656bd35d13d864a108e6
-MISC metadata.xml 436 BLAKE2B e403d5f0c18732526da288f0924debc454ef34d4e8164c531fcae4d9f7228962408e4f924b74782e8f36a80e8b1c835c1b6b5971aad448d0645a8b4db710b8f5 SHA512 32df0b15ff43741e3ba4c1af628c46084baed7cfe0d69dc2fb392b60d9e16cb871c2b366d97857dd5f3eb9cbeaa966f0610e6c9f73e3f5ffdc533d71f9c5e842
diff --git a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch b/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
deleted file mode 100644
index 33b4ea37b994..000000000000
--- a/dev-java/flyingsaucer/files/7-itext-2.0.8.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java src/java/org/xhtmlrenderer/pdf/ITextFSImage.java
---- src.old/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:46:53.000000000 +0300
-+++ src/java/org/xhtmlrenderer/pdf/ITextFSImage.java	2008-10-23 19:48:05.000000000 +0300
-@@ -31,11 +31,11 @@
-     }
- 
-     public int getWidth() {
--        return (int)_image.plainWidth();
-+        return (int)_image.getPlainWidth();
-     }
- 
-     public int getHeight() {
--        return (int)_image.plainHeight();
-+        return (int)_image.getPlainHeight();
-     }
- 
-     public void scale(int width, int height) {
-diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java src/java/org/xhtmlrenderer/pdf/ITextRenderer.java
---- src.old/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:46:53.000000000 +0300
-+++ src/java/org/xhtmlrenderer/pdf/ITextRenderer.java	2008-10-23 19:48:56.000000000 +0300
-@@ -234,7 +234,7 @@
-         
-         _outputDevice.start(_doc);
-         _outputDevice.setWriter(writer);
--        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.height());
-+        _outputDevice.initializePage(writer.getDirectContent(), firstPageSize.getHeight());
-         
-         _root.getLayer().assignPagePaintingPositions(c, Layer.PAGED_MODE_PRINT);
-         
-@@ -254,7 +254,7 @@
-                 doc.setPageSize(nextPageSize);
-                 doc.newPage();
-                 _outputDevice.initializePage(
--                        writer.getDirectContent(), nextPageSize.height());
-+                        writer.getDirectContent(), nextPageSize.getHeight());
-             }
-         }
-         
-diff -u -r src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java
---- src.old/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:46:53.000000000 +0300
-+++ src/java/org/xhtmlrenderer/pdf/ITextUserAgent.java	2008-10-23 19:50:00.000000000 +0300
-@@ -60,8 +60,8 @@
-                         PdfReader reader = _outputDevice.getReader(url);
-                         PDFAsImage image = new PDFAsImage(url);
-                         Rectangle rect = reader.getPageSizeWithRotation(1);
--                        image.setInitialWidth(rect.width()*_outputDevice.getDotsPerPoint());
--                        image.setInitialHeight(rect.height()*_outputDevice.getDotsPerPoint());
-+                        image.setInitialWidth(rect.getWidth()*_outputDevice.getDotsPerPoint());
-+                        image.setInitialHeight(rect.getHeight()*_outputDevice.getDotsPerPoint());
-                         resource = new ImageResource(image);
-                     } else {
- 	                    Image image = Image.getInstance(url);
-@@ -84,7 +84,7 @@
-     
-     private void scaleToOutputResolution(Image image) {
-         float factor = _sharedContext.getDotsPerPixel();
--        image.scaleAbsolute(image.plainWidth() * factor, image.plainHeight() * factor);
-+        image.scaleAbsolute(image.getPlainWidth() * factor, image.getPlainHeight() * factor);
-     }
- 
-     public SharedContext getSharedContext() {
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
deleted file mode 100644
index f12bb7a33986..000000000000
--- a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="100% Java XHTML+CSS renderer"
-HOMEPAGE="https://xhtmlrenderer.dev.java.net/"
-SRC_URI="http://www.pdoubleya.com/projects/${PN}/downloads/r${PV}/${PN}-R${PV}final-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="minimal svg ${JAVA_PKG_IUSE}"
-
-COMMON_DEP="
-	>=dev-java/itext-2.0.8:0
-	svg? ( dev-java/svgsalamander:0 )"
-
-# 1.5 because svgsalamander is 1.5
-RDEPEND="
-	svg? ( >=virtual/jre-1.5 )
-	!svg? ( >=virtual/jre-1.4 )
-	${COMMON_DEP}"
-
-DEPEND="
-	svg? ( >=virtual/jdk-1.5 )
-	!svg? ( >=virtual/jdk-1.4 )
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}"
-
-java_prepare() {
-	epatch "${FILESDIR}"/7-itext-2.0.8.patch
-
-	# Save lib/minium.jar because it's not publicly available although it's in
-	# public domain, will separate if something else needs it
-	rm -v lib/itext*.jar lib/dev/*.jar lib/dev/*/*.jar || die
-
-	cd lib || die
-	java-pkg_jar-from itext
-
-	if use svg; then
-		java-pkg_jar-from svgsalamander
-		EANT_BUILD_TARGET+=" jar.svg"
-	fi
-
-	use minimal || EANT_BUILD_TARGET=" jar.docbook jar.about jar.browser"
-}
-
-# Investigate building demos/photogallery demos/filebrowser because
-# the files seem to be missing for jar.photogaller jar.filebrowser
-EANT_BUILD_TARGET="jar.core"
-EANT_DOC_TARGET="docs"
-
-RESTRICT="test"
-
-# Needs X11.
-src_test() {
-	eant test -Djava.awt.headless=true
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar lib/minium.jar
-
-	dodoc README || die
-
-	use doc && java-pkg_dojavadoc doc/user/api
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/flyingsaucer/metadata.xml b/dev-java/flyingsaucer/metadata.xml
deleted file mode 100644
index 41a479ba55e2..000000000000
--- a/dev-java/flyingsaucer/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-
-	<longdescription lang="en">
-		Flying Saucer is a 100% Java XHTML+CSS renderer, including support
-		for table pagination, margin boxes, running elements, named pages,
-		and more.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/groovy/Manifest b/dev-java/groovy/Manifest
deleted file mode 100644
index 1ba81e219df2..000000000000
--- a/dev-java/groovy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX groovy-2.4.5-utils.gradle.patch 4345 BLAKE2B ad511b7dacdc57f01b716c8f164b4f3da8d59cc8c211e426f419c8e6448cf6376f9591401f8740c906ad021ee857b6085454302bec225880af09a474026b955d SHA512 81d39c1f7b537260721740cc807b9ffcf16b86b170fbc2bd9697f30ed3d77e995cb8beb35d67476137246882ba6f2962051878f032fe173f56c4db1e370aa6c1
-DIST groovy-2.4.5.zip 10214173 BLAKE2B 3402b93fc151beda7d1f397dcd522a71e3d2daaece12d96a02712ea18050c179ead1af0a4c42d7beb0b09a2db611a5b822220c3f4f103bf54b262bf7f83970a2 SHA512 055b664d2bc9966f9dd5933ec89f22c28c18323b57db66eeec524c88bdc6ea1090f6f1dd866433d7232d837ca31ca83164d8894c0db1d69e72c7d41f20a8382d
-EBUILD groovy-2.4.5.ebuild 3508 BLAKE2B b06e9b0087e75a16ced0a049f4044f8fd657e74688e7a07a07ad116e6ce3cd76eb0d8bfb22450404f1e5ec848da4a2ced9d9f712c8d724404399e072737261fc SHA512 2150e3f9ca4653e60188fa6dcebabbcc7e6f36564490940279be66d00e536de815c040192df963409943200a5322b045a34575e2227e71897b66c51f769ae1bb
-MISC metadata.xml 419 BLAKE2B 66f2e1884aa729905a50cdd56d68cfbadf12bf6c3bd8394e9478b6d43cb995d7322a40b169fdcbcebdb6b598f65601492a348163c2f890573b3514f33faafd78 SHA512 c1f92fe6cd6b5d539f8fe67d0143971ae9c1a228b7b8985fac6b4723482d2770e0b3d89d71b836b487995edb2c0326cc2ca8401bd94d3462c1ea76025150f762
diff --git a/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch b/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
deleted file mode 100644
index 6f4638a1bf1d..000000000000
--- a/dev-java/groovy/files/groovy-2.4.5-utils.gradle.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- gradle/utils.gradle.orig	2015-11-01 21:06:26.246486000 +0000
-+++ gradle/utils.gradle	2015-11-01 21:06:57.719486000 +0000
-@@ -16,57 +16,47 @@
-  *  specific language governing permissions and limitations
-  *  under the License.
-  */
--import org.codehaus.groovy.classgen.AnnotationVisitor
--import org.objectweb.asm.ClassWriter
--import org.objectweb.asm.FieldVisitor
--import org.objectweb.asm.Label
--import org.objectweb.asm.MethodVisitor
--
--import static org.objectweb.asm.Opcodes.*
--
--buildscript {
--    repositories {
--        mavenCentral()
--    }
--    dependencies {
--        classpath "org.ow2.asm:asm:$asmVersion"
--    }
--}
-+import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
-+import static org.objectweb.asm.Opcodes.ACC_STATIC;
-+import static org.objectweb.asm.Opcodes.ACC_SUPER;
-+import static org.objectweb.asm.Opcodes.ALOAD;
-+import static org.objectweb.asm.Opcodes.ATHROW;
-+import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
-+import static org.objectweb.asm.Opcodes.RETURN;
-+import static org.objectweb.asm.Opcodes.V1_5;
-+
-+import java.io.File;
-+import java.io.FileOutputStream;
-+
-+import org.objectweb.asm.ClassWriter;
-+import org.objectweb.asm.Label;
-+import org.objectweb.asm.MethodVisitor;
- 
--/**
-- * This tasks generates an utility class which allows sneaky throwing.
-- */
--task exceptionUtils {
--    ext.classFiles = [
--            "${buildDir}/generated-classes/org/codehaus/groovy/runtime/ExceptionUtils.class",
--            "${compileJava.destinationDir}/org/codehaus/groovy/runtime/ExceptionUtils.class"]
--    outputs.files classFiles
-+public class ExceptionUtils {
-+	private final static String gentooClassDestination = "target/classes/org/codehaus/groovy/runtime/ExceptionUtils.class";
- 
--    doLast {
-+	public static void main(String[] args) {
-         ClassWriter cw = new ClassWriter(0);
--        FieldVisitor fv;
-         MethodVisitor mv;
--        AnnotationVisitor av0;
--
--        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, 'org/codehaus/groovy/runtime/ExceptionUtils', null, 'java/lang/Object', null);
- 
--        cw.visitSource('ExceptionUtils.java', null);
-+        cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "org/codehaus/groovy/runtime/ExceptionUtils", null, "java/lang/Object", null);
-+        cw.visitSource("ExceptionUtils.java", null);	
- 
--        mv = cw.visitMethod(ACC_PUBLIC, '<init>', '()V', null, null);
-+        mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
-         mv.visitCode();
-         Label l0 = new Label();
-         mv.visitLabel(l0);
-         mv.visitLineNumber(18, l0);
-         mv.visitVarInsn(ALOAD, 0);
--        mv.visitMethodInsn(INVOKESPECIAL, 'java/lang/Object', '<init>', '()V', false);
-+        mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
-         mv.visitInsn(RETURN);
-         Label l1 = new Label();
-         mv.visitLabel(l1);
--        mv.visitLocalVariable('this', 'Lorg/codehaus/groovy/runtime/ExceptionUtils;', null, l0, l1, 0);
-+        mv.visitLocalVariable("this", "Lorg/codehaus/groovy/runtime/ExceptionUtils;", null, l0, l1, 0);
-         mv.visitMaxs(1, 1);
-         mv.visitEnd();
- 
--        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, 'sneakyThrow', '(Ljava/lang/Throwable;)V', null, null);
-+        mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "sneakyThrow", "(Ljava/lang/Throwable;)V", null, null);
-         mv.visitCode();
-         Label l2 = new Label();
-         mv.visitLabel(l2);
-@@ -75,19 +65,21 @@
-         mv.visitInsn(ATHROW);
-         Label l3 = new Label();
-         mv.visitLabel(l3);
--        mv.visitLocalVariable('e', 'Ljava/lang/Throwable;', null, l2, l3, 0);
-+        mv.visitLocalVariable("e", "Ljava/lang/Throwable;", null, l2, l3, 0);
-         mv.visitMaxs(1, 1);
-         mv.visitEnd();
- 
-         cw.visitEnd();
-+        FileOutputStream fos = null;
- 
--        logger.lifecycle('Generating ExceptionUtils')
--        classFiles.each { classFile ->
--            def output = file(classFile)
--            output.parentFile.mkdirs()
--            output.withOutputStream {
--                it << cw.toByteArray()
--            }
--        }
--    }
-+        File f = new File(gentooClassDestination);
-+        f.getParentFile().mkdirs();
-+        try {
-+			fos = new FileOutputStream(f);
-+			fos.write(cw.toByteArray());
-+			fos.close();
-+		} catch (Exception e) {
-+			e.printStackTrace();
-+		}
-+	}
- }
diff --git a/dev-java/groovy/groovy-2.4.5.ebuild b/dev-java/groovy/groovy-2.4.5.ebuild
deleted file mode 100644
index 1f2ee906e067..000000000000
--- a/dev-java/groovy/groovy-2.4.5.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple versionator
-
-# Switch to ^^ when we switch to EAPI=6.
-#MY_PN="${PN^^}"
-MY_PN="GROOVY"
-MY_PV="$(replace_all_version_separators _ ${PV})"
-MY_P="${MY_PN}_${MY_PV}"
-
-DESCRIPTION="A multi-faceted language for the Java platform"
-HOMEPAGE="http://www.groovy-lang.org/"
-SRC_URI="https://github.com/apache/incubator-${PN}/archive/${MY_P}.zip -> ${P}.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/jansi:0
-	dev-java/xstream:0
-	dev-java/commons-cli:1
-	>=dev-java/asm-5.0.3:4
-	>=dev-java/antlr-2.7.7-r7:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-JAVA_GENTOO_CLASSPATH="
-	asm-4
-	antlr
-	jansi
-	xstream
-	commons-cli-1
-"
-
-S="${WORKDIR}/incubator-${PN}-${MY_P}"
-
-# ExceptionUtil filename.
-EU="ExceptionUtils.java"
-
-# List of antlr grammar files.
-ANTLR_GRAMMAR_FILES=(
-	org/codehaus/groovy/antlr/groovy.g
-	org/codehaus/groovy/antlr/java/java.g
-)
-
-# Patches utils.gradle. It basically rewrites ExceptionUtils.
-PATCHES=(
-	"${FILESDIR}"/"${P}-utils.gradle.patch"
-)
-
-# Add target/classes to the CP as we're generating an extra class there.
-JAVA_GENTOO_CLASSPATH_EXTRA="target/classes"
-
-# This function cleans up the source directory.
-# We're ONLY interested in the "src/main" directory content and nothing else.
-# (for the time being).
-groovy_cleanup_source_files() {
-	ebegin "Cleaning up useless files"
-	mv src/main "${T}" || die
-	mv gradle/utils.gradle "${T}" || die
-	rm -rf * || die
-	mv "${T}"/main/* . || die
-	rm -rf "${T}"/main || die
-	eend $?
-}
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-	groovy_cleanup_source_files
-}
-
-# This function generates the ANTLR grammar files.
-generate_antlr_grammar() {
-	for grammar_file in "${@}"; do
-		local my_grammar_file=$(basename ${grammar_file})
-
-		einfo "Generating \"${my_grammar_file}\" grammar file"
-		local my_grammar_dir=$(dirname ${grammar_file})
-
-		cd "${S}/${my_grammar_dir}" || die
-		antlr ${my_grammar_file} || die
-
-		cd "${S}" || die
-	done
-}
-
-# This function generates ExceptionUtils.class.
-# ExceptionUtils is a helper class needed when compiling Groovy 2.x.
-# Normally, this class is generated via a Gradle task at compile time. Since we
-# don't use Gradle here.. we've translated it into a plain Java file and have
-# it generate the same data.
-generate_exceptionutils() {
-	ebegin "Copying ${EU}"
-	mv "${T}/utils.gradle" "${EU}" || die
-	eend $?
-
-	ejavac -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar)" ${EU}
-
-	ebegin "Running ${EU%.java}"
-	$(java-config -J) -classpath "$(java-pkg_getjar --build-only asm-4 asm.jar):." ${EU%.java} || die
-	eend $?
-}
-
-src_compile() {
-	generate_antlr_grammar "${ANTLR_GRAMMAR_FILES[@]}"
-	generate_exceptionutils
-	java-pkg-simple_src_compile
-}
-
-src_install() {
-	java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
-	java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
-	java-pkg-simple_src_install
-
-	# TODO: groovy console and groovy shell are parts of the "subprojects"
-	# directory. figure out a way to compile them. :\
-	# java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
-	# java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
-
-	# TODO: grape is written in groovy and to compile it, you need .. groovy.
-	# java-pkg_dolauncher "grape" --main org.codehaus.groovy.tools.GrapeMain
-}
diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml
deleted file mode 100644
index b54150fc69c0..000000000000
--- a/dev-java/groovy/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">apache/incubator-groovy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
deleted file mode 100644
index f6215a288159..000000000000
--- a/dev-java/itext/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX itext-5.5.4-OcspClientBouncyCastle.java.patch 1012 BLAKE2B e830632c0cfa5452afdc6d0fdd2b15c2cb53ca20c99770c120acb21a310ee88a57cc4e4fd067b23694e1c32035fa8296fcff70e02067762ae6048d1800f435c2 SHA512 721d4c4917928ce38da2d3f83d19021423dcf6c13ed002c52242e9c22d5289ffa79dcc84421b38c0bb1450a4239496f9f3321ce47fdef45692d14f97ebe249d2
-DIST iText-src-2.1.5.tar.gz 1301652 BLAKE2B f093b505e249373e81587501dcd60e09778b36c6d317e834f902bfcd0fbab015a6e66f346788926a9dfaece83b5b5bd3023316be10015d41ab93ef0fb600455c SHA512 ca6bc9807379923b25e45cf06976c7ddea7ebce5bd418204ca4a6f668cb55fb06ddda2b55d34e78aebd2ae307fc8040bcd702369b5c9da849286dab7f8d474ea
-DIST iTextAsian.jar 329741 BLAKE2B b917a35cc8ba71ff05d9428ea4f586eea4830eac47807fccb5624fcc03b4e5f15d2155cf34e4f44a314990b53ff190a56a2dd4a5468d066111c23687a6a8dee8 SHA512 fad669829efb9b6d3e5de8b8b6b175058e4aedaf310c1f6991487f3ebea15f2979e401b7969e6388bfc8ba456382d452986505abfc431fca714f471faa70933e
-DIST iTextAsianCmaps.jar 1696864 BLAKE2B b2ff3eb843b005decc09e980411210dc315b4969edec758b48959c8bdba417e93c80583a2f16a037fc52d0227e8aa4adffd68a6cc31c031d530823066a567922 SHA512 bc5d9b06f405488075d2027fadee72127fdd81f1f362ec1f59ebbd70da61ea62a8a9f1122eec4a3f030fdc72f0f440bed049ca4c3f91206321ca5cfec79a4a85
-DIST itext-5.5.4.zip 9765296 BLAKE2B a3b99210d8f6b25eafe327c67c33579a5536b0425739d1ffd43fddcb306921f057c648ccd957078e157eae82046666b8ca1622404a84ed4c93ff33884cec1d23 SHA512 bfcbc1de97a94451ac5b486bd02a764ed60d28455aeeecab4e93c6004accd015e61cce2019dc4979e46ef220547e7dfdbbc5d3aaad182f88280cc0053b4681d2
-EBUILD itext-2.1.5-r2.ebuild 1863 BLAKE2B ea0e3ad2de21a0d8aa96082cc99c543c6b9cd24f753ce7e5b42c9e405a69a0d92c76db8b2075424bcc08018a277bf7b78a4b48cd1b5b7f0a010fe237f168fe14 SHA512 9485e0a9ecb84b6ac50e3bae04919dff421d43091ab78a51b821c35f354495d9254e6e17f171329a971a09263262ae3e27493c496571b5134e225c642b51c19d
-EBUILD itext-5.5.4-r2.ebuild 1250 BLAKE2B 74b70db5da873bfae9db37c626151ebef2d104ec8847bd01b7494f2681015122f45abe8d733c6e018426ce7dbb33f5be8d57cf6b35fc3bf8cf19a5b4620da714 SHA512 55cfd50b8119f10b33359005c26a6ce83635248601a85f26f535363c30d102f8f48e6e869d17c3fcb19105a218f9953a0ed51aaee4e2e82489e3968b5add3626
-MISC metadata.xml 974 BLAKE2B 77ceac3f287ac0f776b14b645a74239838e7804c543cf688188a58a39d40e389fe996bfdfc222f6497665e1d9b626ee945fbbcc66f36a07d9b54adbf0117b631 SHA512 b7a686fa65db66466457ad47734c34c7f5bd91f018d13d10385c01a3afd77a3c3fd6384d6e75ff6b68df1a3945742bb8c6ee40e5874eedca33e14a0bdeff5be9
diff --git a/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch b/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
deleted file mode 100644
index 409ea87aa2bd..000000000000
--- a/dev-java/itext/files/itext-5.5.4-OcspClientBouncyCastle.java.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java.orig	2015-08-11 10:52:11.031000000 +0000
-+++ source/com/itextpdf/text/pdf/security/OcspClientBouncyCastle.java	2015-08-11 10:52:39.070000000 +0000
-@@ -183,9 +183,9 @@
-                     if (status == CertificateStatus.GOOD) {

-                         return basicResponse.getEncoded();

-                     }

--                    else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {

--                        throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));

--                    }

-+                    //else if (status instanceof org.bouncycastle.ocsp.RevokedStatus) {

-+                    //    throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.revoked"));

-+                    //}

-                     else {

-                         throw new IOException(MessageLocalization.getComposedMessage("ocsp.status.is.unknown"));

-                     }

diff --git a/dev-java/itext/itext-2.1.5-r2.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
deleted file mode 100644
index ac7d777b6210..000000000000
--- a/dev-java/itext/itext-2.1.5-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
-ASIANJAR="iTextAsian.jar"
-ASIANCMAPSJAR="iTextAsianCmaps.jar"
-
-DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
-HOMEPAGE="https://itextpdf.com"
-SRC_URI="mirror://sourceforge/itext/${DISTFILE}
-	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
-		mirror://sourceforge/itext/${ASIANCMAPSJAR} )"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cjk rtf rups"
-
-BCV="1.45"
-
-COMMON_DEPEND="
-	dev-java/bcmail:${BCV}
-	dev-java/bcprov:${BCV}
-	rups? (
-		dev-java/dom4j:1
-		dev-java/pdf-renderer:0
-	)"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.5"
-DEPEND="${COMMON_DEPEND}
-	>=virtual/jdk-1.5
-	cjk? ( app-arch/unzip )"
-
-S="${WORKDIR}/src"
-
-src_unpack() {
-	unpack ${DISTFILE}
-}
-
-java_prepare() {
-	sed -i -e 's|<link href="http://java.sun.com/j2se/1.4/docs/api/" />||' \
-		-e 's|<link href="http://www.bouncycastle.org/docs/docs1.4/" />||' \
-		"${S}/ant/site.xml"
-
-	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_ENCODING="utf8"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH="bcmail-${BCV},bcprov-${BCV}"
-	use rups && EANT_GENTOO_CLASSPATH+=",dom4j-1,pdf-renderer"
-
-	java-pkg-2_src_compile \
-		$(use rtf && echo "jar.rtf") \
-		$(use rups && echo "jar.rups")
-}
-
-src_install() {
-	cd "${WORKDIR}"
-	java-pkg_dojar lib/iText.jar
-	use rtf && java-pkg_dojar lib/iText-rtf.jar
-	use rups && java-pkg_dojar lib/iText-rups.jar
-	if use cjk; then
-		java-pkg_dojar "${DISTDIR}/${ASIANJAR}"
-		java-pkg_dojar "${DISTDIR}/${ASIANCMAPSJAR}"
-	fi
-
-	use source && java-pkg_dosrc src/core/com src/rups/com
-	use doc && java-pkg_dojavadoc build/docs
-}
diff --git a/dev-java/itext/itext-5.5.4-r2.ebuild b/dev-java/itext/itext-5.5.4-r2.ebuild
deleted file mode 100644
index 55b8d3c8fa1d..000000000000
--- a/dev-java/itext/itext-5.5.4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
-HOMEPAGE="https://itextpdf.com"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-
-LICENSE="AGPL-3"
-SLOT="5"
-KEYWORDS="amd64 x86"
-
-BC_SLOT="1.52"
-
-CDEPEND="dev-java/bcmail:${BC_SLOT}
-	dev-java/bcpkix:${BC_SLOT}
-	dev-java/bcprov:${BC_SLOT}
-	dev-java/xml-security:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="
-	bcmail-${BC_SLOT}
-	bcpkix-${BC_SLOT}
-	bcprov-${BC_SLOT}
-	xml-security"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-OcspClientBouncyCastle.java.patch
-)
-
-java_prepare() {
-	mkdir source || die
-
-	for x in *-sources.jar; do
-		unzip -n ${x} -d source || die
-	done
-
-	rm -v *.jar || die
-
-	mkdir target/classes/com/itextpdf/text/pdf/fonts -p || die
-	cp source/com/itextpdf/text/pdf/fonts/*{afm,html,txt} target/classes/com/itextpdf/text/pdf/fonts/ || die
-	mkdir target/classes/com/itextpdf/text/l10n/ -p || die
-	cp -r source/com/itextpdf/text/l10n/* target/classes/com/itextpdf/text/l10n/ || die
-
-	epatch "${PATCHES[@]}"
-}
diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
deleted file mode 100644
index b907b9d84d18..000000000000
--- a/dev-java/itext/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		iText is a library that allows you to generate PDF files on
-		the fly. The iText classes are very useful for people who need
-		to generate read-only, platform independent documents
-		containing text, lists, tables and images. The library is
-		especially useful in combination with Java(TM) technology-based
-		Servlets: The look and feel of HTML is browser dependent; with
-		iText and PDF you can control exactly how your servlet's output
-		will look.
-	</longdescription>
-	<use>
-		<flag name="rtf">Build and provide libraries for rich text format</flag>
-		<flag name="rups">Build and provide GUI for Reading/Updating PDF Syntax</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">itext</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jlayer/Manifest b/dev-java/jlayer/Manifest
deleted file mode 100644
index c3aa921571ff..000000000000
--- a/dev-java/jlayer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jlayer1.0.1.tar.gz 370583 BLAKE2B cf7fb72ef80cd4d94ff7b61f720c0d519afd478d3b4c380d16a1876f77bf7279796d487c5ff8f1ad8e57926d55ab448b0a7a760eb0820ce1650b2bd684571453 SHA512 904c3aa049d9be4c5569a233abd8c933fe85c58b26cf9e467d01e09a4245fe9933f8e7d8e3b2abf328e6f7a197f69acdcbde494b99c97056eab2e4936060ee08
-EBUILD jlayer-1.0.1.ebuild 1182 BLAKE2B b5fc0ef0cd1c76c59f1024a0fd8dc3451f349018bf75ae3efd78fac3ea2de776fbb860a7118e9f660a3d1aee340e9b0e6bcdce3ecd64555c2bea533786b3c964 SHA512 8e6972c19043aefe583fc0856f23e4dc198edbb2f167b7035e54aa80f4bfd285ad6ef2b2692f24e8c28bbeae451eea1c145b33f062a23873c2f228833fb5c0fa
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jlayer/jlayer-1.0.1.ebuild b/dev-java/jlayer/jlayer-1.0.1.ebuild
deleted file mode 100644
index a7607de7fe23..000000000000
--- a/dev-java/jlayer/jlayer-1.0.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="MP3 decoder/player/converter library for Java"
-HOMEPAGE="http://www.javazoom.net/javalayer/javalayer.html"
-
-SRC_URI="http://www.javazoom.net/javalayer/sources/${PN}${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${RDEPEND}"
-
-S=${WORKDIR}/JLayer${PV}
-EANT_BUILD_TARGET="dist"
-EANT_DOC_TARGET="all"
-
-src_prepare() {
-	rm -v *.jar || die
-	# build expects classes to exist
-	rm -vr classes/* || die
-}
-
-src_install(){
-	java-pkg_newjar jl${PV}.jar
-	dodoc README.txt CHANGES.txt || die
-	dohtml playerapplet.html || die
-	use doc && java-pkg_dojavadoc doc
-	use source && java-pkg_dosrc src/*
-
-	# the MP3TOWAV converter
-	java-pkg_dolauncher jl-converter \
-		--main javazoom.jl.converter.jlc
-
-	# the simple MP3 player
-	java-pkg_dolauncher jl-player \
-		--main javazoom.jl.player.jlp
-
-	# the advanced (threaded) MP3 player
-	java-pkg_dolauncher jl-advanced-player \
-		--main javazoom.jl.player.advanced.jlap
-}
diff --git a/dev-java/jlayer/metadata.xml b/dev-java/jlayer/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/jlayer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jsap/Manifest b/dev-java/jsap/Manifest
deleted file mode 100644
index 685b7b615147..000000000000
--- a/dev-java/jsap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jsap-2.1.tar.gz 1281840 BLAKE2B aa7057ebff3dd9f7a9df9983165e64bc9785184d5505fe9d81527883e64eb350accb52372b78c5738c8124c1f2063a767aea0c95cfba802787a96eabc9b8963f SHA512 5509d67b8af11cfbf94ca1a4d2b055b84c6c025ca26cd70390f63394d112a842fd39271181dfad0a88856964acd66f8abe49c72c58cc0086445d810837ba3352
-EBUILD jsap-2.1-r2.ebuild 768 BLAKE2B 84d389450573b259512b179e7c37de794a640168e4404773292082d96f7970d4210f46f6957d46c3289c21db4c88c69d9d518d3964cf8052620065cd7e916be6 SHA512 fa8a2d6f571391b8ad941e5e190a6b9b9deeac045d846f1f4555098ef1670edf27252224c67aec96f52387179a9686548ddc56f1a6496894fcb08820fc3ea17c
-MISC metadata.xml 310 BLAKE2B 3eca6271304a97cce7ef6c23c5eb98add37ed09d286daf07a01c6d991ed7aea5c3d365555e0927298991c26bd92d91aff43ca82abf66bfcf00839bdd3151c4a5 SHA512 ef2fd9df3da998fc5b0add86af9e5d6d2829c3cfc566152d3caaf9957e55ee15da76d8af6e97bde9e616f0c1ac684f11d7f72bd6c67b43b281c795d459c73f5a
diff --git a/dev-java/jsap/jsap-2.1-r2.ebuild b/dev-java/jsap/jsap-2.1-r2.ebuild
deleted file mode 100644
index c354393345de..000000000000
--- a/dev-java/jsap/jsap-2.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="JSAP"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Java Simple Arguments Parser (JSAP)"
-HOMEPAGE="https://sourceforge.net/projects/jsap"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-java/xstream:0
-	dev-java/ant-core:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_GENTOO_CLASSPATH="
-	xstream
-	ant-core
-"
-
-java_prepare() {
-	java-pkg_clean
-	find . -type f -name "Test*.java" -delete || die
-}
diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
deleted file mode 100644
index 9827e6d8a40d..000000000000
--- a/dev-java/jsap/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jsap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/kryo/Manifest b/dev-java/kryo/Manifest
deleted file mode 100644
index 7d65ed163176..000000000000
--- a/dev-java/kryo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kryo-2.24.0.zip 1203526 BLAKE2B a5a7f0376ee71bbd479f8d51b0d35a6445cf9b92ebc42e7af16cd57d0ba61eb45d23f88172e489ec08fbd45d1229f86f1e6babf2590a0f718eb9b82b413201f1 SHA512 0c804e7986678339865cb0dd000bce063e5a91d1f3ae56eba1ca1b1bcca5e917a5d69fe14ff0c986e36c49f115336efb6221d771dd19b4dda91a9a7a6daf1463
-EBUILD kryo-2.24.0.ebuild 1239 BLAKE2B b73a8b5e6510c412b0efcb65b2d88403e21b345d8129a3d4cae82fa50f13a9b4d78e242843f5867e6897e612beb8daef7116ccb78b7fbfd7d500ddbb9a3ae0cc SHA512 311f2771735a18480c79dd8e2246ec131bdad70dff3764a2df942a27208a55e2d6fa857fea9214bade1259f4e6545929e7c51d14b855ed91d4d01a7724ad0575
-MISC metadata.xml 770 BLAKE2B 599e02a9d8f95fc1091ee8ceee1f731ffa91cda749da008b541cef05f5d77a08de3077021c5a4bbf0ecfa99c48cd1bc8f31677cabce278688ef3cf0cf5d206c5 SHA512 0874395033c8921e6caeddebcab9bdbfacaa4e57e0e7900cd8baa36717db48edd4e0c6e05d152e93ffe8e62477f4d733cf61536fee8c2f96aba75884f629a6e4
diff --git a/dev-java/kryo/kryo-2.24.0.ebuild b/dev-java/kryo/kryo-2.24.0.ebuild
deleted file mode 100644
index e2179fff8899..000000000000
--- a/dev-java/kryo/kryo-2.24.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source doc test"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Fast, efficient Java serialization and cloning"
-HOMEPAGE="https://github.com/EsotericSoftware/kryo"
-SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${P}.zip"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/objenesis:0
-	dev-java/reflectasm:0
-	dev-java/minlog:0"
-
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-java/junit:4
-	)
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="objenesis,reflectasm,minlog"
-
-src_prepare() {
-	rm "${S}"/pom.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_test() {
-	mkdir target/tests || die
-	local testcp="${S}/${PN}.jar:target/tests:$(java-pkg_getjars junit-4)"
-	testcp+=":$(java-pkg_getjars --with-dependencies ${JAVA_GENTOO_CLASSPATH})"
-
-	ejavac -cp "${testcp}" -d target/tests $(find test/ -name "*.java")
-	tests=$(find target/tests -name "*Test.class" \
-			| sed -e 's/target\/tests\///g' -e "s/\.class//" -e "s/\//./g" \
-			| grep -vP '\$');
-	ejunit4 -cp "${testcp}" ${tests}
-}
diff --git a/dev-java/kryo/metadata.xml b/dev-java/kryo/metadata.xml
deleted file mode 100644
index b89ab26977a5..000000000000
--- a/dev-java/kryo/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-	Kryo is a fast and efficient object graph serialization framework for Java.
-	The goals of the project are speed, efficiency, and an easy to use API. The project
-	is useful any time objects need to be persisted, whether to a file, database, or over
-	the network. Kryo can also perform automatic deep and shallow copying/cloning. This is direct copying
-	from object to object, not object-&gt;bytes-&gt;object.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">EsotericSoftware/kryo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest
deleted file mode 100644
index 5712c187c4d6..000000000000
--- a/dev-java/logback/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST logback-1.0.13-build.tar.bz2 2079 BLAKE2B 5c18656eaaadc1b066a006c3ea6e8a11d637aa6fbf7f2a9763176f30ac4138a2ee6a53baa6d9d64149efd4ef943697b2dbdb578d6c9039210fee2ede0eeb8638 SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e
-DIST logback-1.0.13.tar.gz 6989078 BLAKE2B 3576f7739e90026a9f32bb576f7e692921fde9831b7ce7cb004e36f56650ef8ba63b7d15bf4835b64ea30787586d31a419763d34fcfdcc401d1e4f0b0ca8e7dd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814
-EBUILD logback-1.0.13-r1.ebuild 1668 BLAKE2B 43a5307cc78e90009759d654f7abc51047c8ed5a73df8c4e82652e841ff10cae3cef2528fc663e627abe60f5dfd675c4c5d6f91017c4966605a8c05688089651 SHA512 884ccd358edfaff06d3ee871998a8e7529c1b125fd14c03ed6627388c8ec7092d84a119c7cb5de70e296b5e89af3b3e1c5a4a14f11840b1db65ef6792ea46431
-MISC metadata.xml 309 BLAKE2B a4ce901e26e5cf7d0ecece2a68841108adffe61355914c2301ea6ef69722d5174b6f05ddabf0adf9978798b2f1ed981e44b0b738c603c75b21965336445d00e4 SHA512 f14e640a615329341196a8b003f1b12de45594ca6a5b2f1927f210ee94c619b586594227fc43a737c889b2036bfc80a6a11467775b657be853087339742d181a
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild
deleted file mode 100644
index c69c601b1d1b..000000000000
--- a/dev-java/logback/logback-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java"
-HOMEPAGE="http://logback.qos.ch/"
-SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz
-		https://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"
-
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="tomcat"
-
-CDEPEND="
-	dev-java/jansi:0
-	dev-java/janino:0
-	dev-java/slf4j-api:0
-	dev-java/oracle-javamail:0
-	java-virtuals/servlet-api:3.0
-	tomcat? ( www-servers/tomcat:7 )
-"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	jansi
-	janino
-	slf4j-api
-	oracle-javamail
-	servlet-api-3.0
-"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar"
-
-java_prepare() {
-	find "${S}" -name "*.jar" -delete || die
-
-	use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die
-	# remove the next line when we have jetty in the tree
-	rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die
-
-	use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7"
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar
-	java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar
-
-	use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java
-	use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs
-	use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/*
-}
diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml
deleted file mode 100644
index 22f9cc83879f..000000000000
--- a/dev-java/logback/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="tomcat">Builds Apache Tomcat support</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
deleted file mode 100644
index 04676fb74500..000000000000
--- a/dev-java/netbeans-apisupport/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-apisupport-8.2.ebuild 3009 BLAKE2B 016d62c7feddeb56662d8f6cc0c882a5e8c604eb92bc8907a1da6a7312403bdc88d2369315fdf609654d7e0481e3308433f91bb127eba7fa0b14b1d667da3f70 SHA512 ea6b05cf4c93f7d4c575e74a4db0f443ee08ca62d3eeb53b9bf1d9183ad230c4252bfc823ecee6656400e278e4d744c6b3b8cf59705e672a598387e914e0e6ce
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-apisupport/metadata.xml b/dev-java/netbeans-apisupport/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-apisupport/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
deleted file mode 100644
index b257afbdc47a..000000000000
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 84e528d3dbc4..000000000000
--- a/dev-java/netbeans-cnd/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST 43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip 38904 BLAKE2B 38fc919e95a8c030bb587aa9cdb1fe65778dc976dfea0fb392c5aad3137c4cce4d79ce4617e65c4a20e0f57227c3d70336818579d2cf4a33226feda1b2cf4d47 SHA512 ae3b1865e32403c09354fe9bda5092f88bdfc9bf36c18f21dbf4cccbbb2874881aee3cadea039860a3ddc5770b9ba95201faeb13ebcdfe5a403fee12e8935852
-DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 BLAKE2B ab01480df198884932dbd84abbf17e963488a80dda9f67ff654b2e6e3a234e87f038849faba6c5fa33aec6378fbcf6951e840eb61e525ad728ee337d14ab0586 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc
-DIST 5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar 2388361 BLAKE2B 561c1dffe464bbc387075df6d95bbdcab27315ba5679cfa10f85d6449baad3d05f4daa45af93d9b127d9fedb8c7e44c45537f1a84b4c4d877c40b9812620f669 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2
-DIST C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip 92177 BLAKE2B 28d53e1ce0a429d436a9209cd152517232138a45638ef0e20bcf3c8393aa15ed1fd9f4e14de021a80ccac97b32009c1c17892fdc6f4b1c3fe3a35d28b1081d0e SHA512 64b15aa898a45c1dce0d9c58ec4ef8c3dc1a32e1213543d98002cbf5419d67b3caf4357c8a252e36951197f3edd70e34a226c989e5479ce3b2d1405783d3d530
-DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 BLAKE2B 5639f113da1354fe0ca9c1e9ab172fde253221c9dcaf0a745d13fb1a51b948f51bec3a05adb936efd583aa998fc51b0120eb7d487cb74b51ccb7effa3f48e5ca SHA512 748979d810751d570087dc60bc02cb5969c6f713cba87d32004c505b9a92150d518c6dcf66caca61841ca8f28c16cf3cd2a5a40b370f5dec5c9482b57bd051d8
-DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 BLAKE2B a3cc474e94c650abf257e62979373a7909d1a8759c2536e2547fb609c05c0c545f23d8f5b541a5658257d907c55df2260ba1de9e9c435ddf79de805185529de8 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-cnd-8.2.ebuild 4421 BLAKE2B 55614009622d45fe00fabaa13fec66a93bf3456517bb0fc130ccda8387dc755de47314b6785921cf8496bef11eea967ec8cbc6a619b21de8f428476be3a1991a SHA512 8248374751b3871cedd0f71b275e85eb76c3e8f269c69ad00f87d47904e43915630bd8a9cc8b9cd38f011a338dcea3560d778fc0c92842c046403f95bf70106d
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-cnd/metadata.xml b/dev-java/netbeans-cnd/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-cnd/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
deleted file mode 100644
index 7c72b9d8b37b..000000000000
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip
-	https://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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"
-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-3.4.0
-	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-8.2-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}"/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip libs.clank/external/clank_0.3.9.zip || die
-	ln -s "${DISTDIR}"/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-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
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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 jna.jar jna-4.2.2.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
deleted file mode 100644
index 7541648171e6..000000000000
--- a/dev-java/netbeans-dlight/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST 18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip 474820 BLAKE2B 0bcb5b01505060627921411b695d873c21b1529ef120078f598458978f61b24778bfe4a959e1d835640888628c49cf0e02c87482d7971ee00d83ae2dc16d563d SHA512 5bc28a6ebe734279ce4999f4657c34885f91f2f44b157dbf65b3690986189961fec138631fe39274ff43762ed74860f3adc1db605f79352dfdc362d2239677a8
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B c746a61f680978e28f2b1011166794fd37117fa554da37df948fb7367720d5114a1eee930970a799826a62a16d688bead70aab522bfb1d3f54b56808acb29808 SHA512 b235c1f64b3f34ea1afc412666f63befb32646585e41d35501dadba21c94224e42e0056f0d10998f3ae30d3c2171e0ea8966d3bda40c744c5c3ae0b737f30c34
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-dlight/metadata.xml b/dev-java/netbeans-dlight/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-dlight/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
deleted file mode 100644
index 51ca2a29cb91..000000000000
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-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-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/18E39A0D10357B72EDB76F2070E27019317792F1-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
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 1edbf9ee6043..000000000000
--- a/dev-java/netbeans-enterprise/Manifest
+++ /dev/null
@@ -1,35 +0,0 @@
-DIST 065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar 2650526 BLAKE2B 09aacefccf349a483807d8b7830a85a2479a43c7ec0e63d09f8e4c2a82415dd4a4f872f34f93df096b68423112452c8065a748835e13f322dc3b0771bc68cc72 SHA512 070773502d8020e17b9b3ecf881a746f0a19f2781d00ba49e8869ec3dbf4166a86d5e52fc016f4c23a88a10640df7924c783def4c88cf959e4eac9eebd7a39a8
-DIST 1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar 26124 BLAKE2B 0a1092c9e90ad99a3b89e2109ea8a9efa27ffa5c03e223ac0257d0094700efe1649805d84bfeb87c6dd1322cd343004d3952b66e42c8b4f9bc670e66394496e2 SHA512 78a2eeed3262e4105288bef7ae8653a0c669ca04d70d4064b3b73ffd2bb22a0448d9750c4081261cab17dc3a821cef7af0b06bcc29354972d306ace9e07228f7
-DIST 27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar 13112852 BLAKE2B ff59ddd92f82450e2aca1f434125bfb918ad90316902be460b83dc1fdfb9f01d20d422030d85e1b5002508983e7d7a2c0471fbb1a74275000dbb9dad9d80be7b SHA512 07697423321a9726eac7e0640befcac0de76cc88dcf4245612702fd9370c2df4256552afb47f25b3b75bf9ea70c2dc0134e3cd7caaee13f510336351f7dc7c38
-DIST 33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar 699557 BLAKE2B 83719dc3b43792867261b44e1b343331345bd378df78b2dfccad0bb1301da57204d5e94ec9eeff36e327cbd710011f6cb47a7edb36363dee1c072f8bf469e837 SHA512 9c1e79976794e71aedf598c53ab999c56c52f63c5d0dd2ba8c8f17166bb6b9642380ff5043299f5c22f9c74dfc833d222e6a17de8ddff7f00604e5ad1c1e6833
-DIST 33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar 181041 BLAKE2B 52c53d097187331c48462976943a82feefdcc650da545fec00407d691cadd383952359c1f6a731626fbf2ed33b5cee5ee72e937429e519def737c6432ff00172 SHA512 b463ec2e3fc27ccaa69b50e6eb35e89d2df9bc0e6b50e2bd4419a70c4058af3f456d25bde6e625915ebc5a010824dd8efd1176f3854a5d8bbb261b6a49c38429
-DIST 3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar 351132 BLAKE2B cf6e8f76569e4fdb40b585ff1ce74da0ad1180bbce8f4959b5690220c524c200fe16cc94700dd54826bdddb799c18beeca866c3f9b5edd42a2e70efe139adbfa SHA512 104c7c13e38281aa9d725d64f3363eaa32ae946bc4896a2595973b342574eaaf21166373c300808a4970e89edd38f58724a32cb1abd212fa63b227edaf060b1a
-DIST 45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar 113208 BLAKE2B 058cf21898c7b68e1fd7e18755aa30c085ae09c747c42dc18b873bca8910fd2bea9e1167215a3b52e91171466b488c5242af0590244d31e853049e2a3f88d286 SHA512 3341353caa0a1f0eeb8d15d686f86812784153f83552461396827bb1b87b0199f22a7eecb1eeb70b1bea4fefccb564a7770a1b56896186f4498ebd9b7f3cf3bc
-DIST 51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar 1930692 BLAKE2B dd91048046d97b48261660617203950be55f0bd4338c5a3a1b88ad26ba361087a6feb68d68abd41255b34f17279616ee761b4534daebc6b4ea8f61bc78e51387 SHA512 e1e20ee7559cbbf83707829409c3f6385660db68aa5706a985dc47b2fd180edf34a4ef4b3aa429d3b5888fba70843b991129303dbe4d7f6afce67c6b32e5cdcd
-DIST 5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar 405951 BLAKE2B bfacb33986ebfb3b8cc4432c9b3fbd66404b1bd5f26ae9ff7e7ea9b6e41731863091dc82a58be58a17b1693f741e9232182fe42599af05f214b09d31664c7b31 SHA512 6b9e6626805d230ea944e79adffde23dc809ed2a7dea7ae2858426bea9239fe86e398fb0f76ba09f4f548857a092e58457e41d26b93bf09850b68dc5ecfafb4c
-DIST 68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar 368265 BLAKE2B c1498a3bc62a43a8a7a84b40743a9198fa58ac3e6ef3f160dbb6ec36cb4e8ad8865a282e3c92a4738f23de1354e6acd601b358f3733ce56d146099314303bc82 SHA512 fb66409b1ef68e7e29287b0390b9e1411e9ebf88a2acc4be29c3c2d01ef49b23f961fbe238dbfbd81d16dfb007cc7326c9f1a64a65442a34fb54bbbe3a4faa9a
-DIST 8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar 2866088 BLAKE2B 94204256bbf16e82674a88e35071a4e2420d8c5adc1eb9392334976252f3277514c4302b391f09f64f9ed21e35819515e3655c14fd5746342619b0171ba0a98b SHA512 cf9e29e147605438666f0e63be9297e7a5ab8c4e7af3a2dd8f363f1a6b2b360deb1445452810d2a4e2121635a71d9939c36e66a68a6d971501ee3d6e275b782f
-DIST 9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip 4151472 BLAKE2B 59dba119847cdd2d0716a62573d94982fc2c5004ef7a93e3bae35ac90b62c5a1dd119a1ca5bb139e4ea907ce9bdcc4ddd487962161fe5cab57d5de9eac3f0076 SHA512 c83f67fd0e5f9610a7d758f0bb6a0108d90909d3f91034602a44cb7c573665d2c61154872f798c94ccfa6c568f5e692b9678aa6f6807f8591e94a09791acb2b0
-DIST 93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip 1699050 BLAKE2B 9bda89183e47a09503eefe5df43d6d062d31b93279a639f51868e6142dee0e8b76876fe5c57a994850ea2a9d665d9e67ce1153d32b6c25557c9555f20d82b70c SHA512 ad472325f86ebc85fbcd8c891ec7ac726046365110318d4b9cd6922935e326d98814ed10112054ead847f354f3f98f3bcb69044c4c0507e1da5d866b661fce07
-DIST 99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip 2910708 BLAKE2B 3b44d434d438f13017070c2f84d10b15dcbd245d5a9444527befba75fccb9c32fbd34975454b3a64c3d3e090aa86c0e44dd1be17d5a063ce76c8e6c533b7b9af SHA512 e192763e7b10921747f5a1ea6c1f8ed176302dbb72acd4ed1d473d0edc93766104fa3f2a0f0d31de3f8aa9f032fef1f10af6f1d12b00902bcf090af61a5484b0
-DIST 9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip 2728179 BLAKE2B 987c2222305a4021e011581a8229d57f8713819ae0a8738e16da22402f63a8743ae1480b7481f745766bd2f9a744fc423eecaaa76783a61c55e6a00b919766eb SHA512 3e4f84a20cb76697e96e54b2c36d29e5696f674a9810ca1e4112b792318b9a54f928b7c22aa5ff07acc08879556faa950d147955576f30320b485405bb340cca
-DIST A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar 52314 BLAKE2B b32314d3e7a21638394184a49e62784e870cf54378f2961cc56d8387ef316004ff782c19c6534c96d9a29c8c6d5ed0c475cf6f73d9df11e01235a0477bf65c63 SHA512 ff726c7bfc9d855613b6773e78d220078855cff2c8b96f063d546301cae9ec0e21251631d2ffd84b52ae532614f13df10fc1da2d13264e0bae8818f4f69ec996
-DIST B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar 1315115 BLAKE2B 118ff3ed9d9e5f1f4884624a366fc18a0dce64d72e8eee14182e8cfb4c3dddb4fb0a656b085df6d9dfa335f20616c33476c4905a8ef35d4d25c739152c53844b SHA512 5f3fd68121c7080dbd932110a6ad695cb0a860aac23a585707f23bb48727f341dee82732f279d3b580a7969b1ca255ed48d40965e29eef488154965d253c114a
-DIST B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar 22020 BLAKE2B 003277a2f13394c65a07b5fa6e250312001ce8d372d67097ad6c4862f5f9c584728475b09f87171e25cdd1a48824b3390b74b0c875b96006396550f0e2c06128 SHA512 89076160994f4bfa8e270eae1e6b5745ebafb98aae945e2ed8be6ff2a717002bc7879b4ed77f3ff28e9611476eb1ec5dc58e378da1cee87bbc363f32eb9ea6c5
-DIST B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip 1801252 BLAKE2B 5f7ef249821508be3223b9757f70523d3c447e62ee1936f8e6fc2f500a32f954358ed21d70b33d9639884019cd23997ba2e7ab185757d78b2cad1359307c0067 SHA512 d02b4d2ff052de35f957e8093f31f55d27dd6f00d0fca035fe6f2f9c0990ce4a03709ec3273878a326937c44d4d580ead666f94a0649e1dc9e00133b5f001ca1
-DIST BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar 169152 BLAKE2B 6f124de6419c93eb898e913813632c27db052a94662e39b2a51188129957fb03b9cde1e38ca2e78cd35073bb92b1fefd6fdb9c7b46838e29418dce5325f20f81 SHA512 9d9b00cb1c1ae0effea11d17b941987d222c0a5f9b54a9f8a60bae1b4e0ce5edfeb57305207d315609c9788454fe32614463a4fce3a0d8c9cbf1c86866496a78
-DIST C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip 5700763 BLAKE2B 254c5e4eddbc38dda484f07b18edc4fc736ad7784a5da7a248eb59a6de2d56ab25610549c5b726075159d8796816f9578ced8dc2ade9d32aa904a3b48e053f9d SHA512 c4bfe64dca6c5d12ba76fc67b01748bc0d44d31c4954cde9b3150d2b0693bd4c6a01e2bc12186b310590f4fd9921bef42b103c9292273de32731b76744025c0e
-DIST D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar 46337 BLAKE2B fb45139f5c7ab83639fb58264fdb8efdbf242f601463557bbb7ba0601a3ac6dd441cc8f2104b7ac11023d8bf43f0f318974c947ebf374f8ab58dc9c0f2293b5a SHA512 be846932b4942a69acf0f4bed41a02c98f05c9247103518366a4c69ba051e6513c4142b831430dfdf3b3c5178aed981e4924e5ce765bd459670889942b544d1c
-DIST D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar 979616 BLAKE2B ca9650e87569ce8f2c14cd088a4d8f6f2b4fdfaacf8c553340b7371fefa779035a0498209b60f995d7b149734c8e9a0d36f6db0585c18a31f0e9eca917e41ed6 SHA512 3f69f0a8827cd58cb53e9a1e25fb816760b91d441286f0534a0cb2f7a07f83d8ec1a50f8bdf6fe3b489bf66bdb8ac363d9f5c6fecb6fae8ff704f1a42b0aeab6
-DIST D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar 21631 BLAKE2B e6ac15c47f0d1bad48137acb7741e9d418b9f3893c522065d274a63a4cc26027bed9dc5affde5e0cb904e74fe1f218f1e3f1d008958f400b1fb8974c635767ed SHA512 6c2e3cfbe53a2888b962cc17811afd0aac285591bba94b9850c6733ae841cd5ceff5588e33d1ae3f292e314050bac5576366c0d78a2260dd30738d1ae68b035b
-DIST E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar 40812 BLAKE2B 5af0e672b38bc16a3d8bd5634a51a16f6ef70ad5c043112e4cdd22e1500f576238f0b59985947a35421b13df1c418f4aa34a196eb27f1ceb0cd98721ff865793 SHA512 97856b5ef08a1b0f2bbd2a25421f364a35c005b0bd9270058b38c19fde1baf311af5bdf8c9c472f2d8e0ed2c4096e493319b3b1d2479f9a9fed7a86c69213869
-DIST EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar 105613 BLAKE2B cc5953de31ba6dc2e5aa43805fad44fa9f47b6df9ba290eab583927cad3d637b83f9740e7513a14c962c6305af04bd0f848d7bfd272ae29558597bf15ae99a57 SHA512 291358cfe1ea240e70ec190f7dbe9541bf5e0c3d11c774948eb4f45d6ceb1c11f7fee366152bcccd1c60747a6edf8049be5f09e40cc43f0ee0a22f5fbf02e9ac
-DIST EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar 930427 BLAKE2B 76c7fc1414efc12b0bce423cc70cd92190b9615bf3c86bd1edd431ee9b75942ea8f089fc8785bb305339bc1f54bf51e6e4bf6138b714ac80d7a18d8a8d597d55 SHA512 178efcf9dd9cfdc6185128b62ffb3fffac7cb5755127e9af9b8c70a3932fbae06404cb281b0b768dbf43c552aeea78d7b6532f02278eebc1a213707ce0f192a4
-DIST F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip 14764137 BLAKE2B b4df37793b00021dc507e34e7832412a553c7e344adb2e56aa07eb834843810769a8bbb855ed9cd0909188d7a1fced4e498e6b5df03d6805bbdcd79c51705439 SHA512 a6a1ac748e3b419e414b34b5014cdbc1ff3d53fd02160484e683f7237042d73d87c524c3d1293f311282997ddb688b5dca534abb594232ef16d9af758aec1415
-DIST F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar 32522 BLAKE2B c0c0faf09fe833d14803f629051df527ccebfdfc23b4c7e22514d0b6643deb6858673b87d6580e583979d3245f38ffd5fedb8e115ee2f126e5ee2a88fe2e9048 SHA512 c78db8068fc7e6aa67f747bd474372f4c2133099f732ff0c1d7a7f17661968f2f4f3ead43301e74a1c9e892861cf485df35246b40aa6810afbe908ed5a7639a6
-DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 BLAKE2B 3e4497acec45040fdf5a799f4b79329fa34bd9888bfe5855a569a0f1b29c334d5fd3b4a0660864627259ee6bb076816352bfa71ab096a6ca756ad3bd603f0640 SHA512 e5aeeb3c41904ae293bf9186c68b6ad2033a39e48c0f2de4e3dfc3c89a6d3ffada54cd98576b0759cd8a104ddb57180b5860ec52a36d81d5f0cb3f04338abf83
-DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 BLAKE2B 0fd7e1d26d9bf61afaf51234d40a38b181022ba47ef5c365bb68c7be3cf72e8d3ac3bdfa44ad7e838db9d5dabbbc9962cc3d3387fd6c1eca6d29fc2ad2d77acd SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-enterprise-8.2-r1.ebuild 15481 BLAKE2B 4c4f2cc172704b0955ec0677fce7ac2ff81ab384f9ff8c3e71c1f7ddbb112d90f510d2759059c0c4625c2ee3198dc24128a1a6c50baffa7d47df3e8101276759 SHA512 95382073f3f505c5e987d126e6c618f4be49bd76a399f71b1e284cf4e4e10a5a2a6a34eaf31eb4e470f3a16b2de0159448d0c7e4ce605a709efa620a67e1df46
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-enterprise/metadata.xml b/dev-java/netbeans-enterprise/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-enterprise/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
deleted file mode 100644
index bce938500a22..000000000000
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-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
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 37cbb44c024a..000000000000
--- a/dev-java/netbeans-ergonomics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ergonomics-8.2.ebuild 2538 BLAKE2B 27a8ca484e9903d47a59f5629937f7fbb77c9824e02a31c4b69c30aa11535fcd0df988217ba86236ee2a8d9ac25eb8e59f00cecd8156909bbd68b5e70796f38d SHA512 89f16420c97f09916b224a073ad7c9c69c4c9cbca9b48aa5b30162d9a4185706c41f70743344b9575b1c162c156660d5cf0bec9fe221e18dcefd5d7233589017
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ergonomics/metadata.xml b/dev-java/netbeans-ergonomics/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-ergonomics/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
deleted file mode 100644
index bafd95c62e8d..000000000000
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 6d4011727b2b..000000000000
--- a/dev-java/netbeans-extide/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 BLAKE2B b2935b4eda55c23202e2a98892bc4f524ab7045ceb9fddc2e551ae2c88e5e0076135ae22b36f0843d03ebc077fac432f7a90a701e56d1e13efd11e612f83e4be SHA512 045d0bf82a498b7b222fca4cdf826443f2507f2594d857296b57e16f1475e6b892bfd8d21720a5d25a65d09e6b7bf8f051abca9ce55f030c748d0ad46cbfd7f7
-DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-extide-8.2.ebuild 3004 BLAKE2B a7692c8a5551b7a9d235ded28f17067aee191bc53b3a7d2202b54c7fdbb731ae2dd2bcea237e2a6b797792c9efbf65acdd8b6a5083eb582e3e4973167a5cd709 SHA512 7bd4d5d54db009e2327971ca6249aa073d352a664834c7efb0a17a8fd8dd23fd5910914f5570268a9aa2e037f99f8cb0e47c346b040058f2e98fed75f92fbeb0
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-extide/metadata.xml b/dev-java/netbeans-extide/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-extide/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
deleted file mode 100644
index ffa1dfbbeaa9..000000000000
--- a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	https://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.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-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	ln -s "${DISTDIR}"/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip o.apache.tools.ant.module/external/ant-misc-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 50176f2af71d..000000000000
--- a/dev-java/netbeans-groovy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 BLAKE2B e7be2e27e2f1880071302f385e86b4ad7cb41e19004036c94bcbb76037b287a2ab264881eeac1d965a3cd42aaecc8222aba2cb4ee81226e0e3498a05f4a734e8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B 7172cf2e3b31eaced1fc42f1d7365baeacb0b2c7847a621b824dd055e9a252b51600f8c6291b047b35fb02b38dc7ddc6d401b09d36bcc81ecb71165106f02200 SHA512 a3652af500d53cec39ff329007591943e348ac1ba2d9c066231ef94afc39c15b2476cc37b4403ecc16e57eb70b3bae716086e50529e1b7743066b48da1376745
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-groovy/metadata.xml b/dev-java/netbeans-groovy/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-groovy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
deleted file mode 100644
index 5dae5c30facb..000000000000
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-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
-
-	eapply netbeans-8.2-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-ide/Manifest b/dev-java/netbeans-ide/Manifest
deleted file mode 100644
index f3669fec76ba..000000000000
--- a/dev-java/netbeans-ide/Manifest
+++ /dev/null
@@ -1,76 +0,0 @@
-DIST 036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar 9592 BLAKE2B 04f0e8962c3a6e53abb0a8d120a74acb578fab369add55af39bfa6c5f8e9bf5d542555b1f1502eb370cafc014ca6f9a132fbb3974f0ec5c19ea73363ef65d496 SHA512 5c1b54d5b0f5f146895a35e7cae50fa41f63b19ed0a5e68b80c2a47b14b380286c8382a56d6729f0f50e0db82eb7db92a449a9bfc46b5cda83b0d4c9f9b86057
-DIST 0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar 284220 BLAKE2B 4a5db0451ca79c5b038592d41cbf774ea80bb2da0afbf5212cffa8b3904d84ccd2cbe02d29143d0565fde828d011dbc25f5a8b780f6ffea1b0a1290485118671 SHA512 4a5a3dbe4941c645e2cca068cca5c1882cfe988b02e7cd981d1e51784900767d1deab0e0e0566f559c9fcabb4a180e436d5bb948902d4f4106f37360466afb42
-DIST 0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar 150954 BLAKE2B f7c460e9c224f86b0e29a7e8ba1812192406424770553c43802d803ce70b0bb8f1316a71822849bfd0a18371444d9eebe7b62ff8d8664ab33c74de6e6a990781 SHA512 8d75e496200fffd6847c5e2cd0ff9f05cda8f32e9973c13b177d3c102c87a6ac0d430f45ac3a4cd3c0804ffd0968c8edfcbcabd37c2df630ae79e39b0a918dfa
-DIST 11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar 82072 BLAKE2B a7e8c5ea92c2b511d36e117d0f86bbc3a5e39cd2d751f87286af815ed7d3177b2549a92c7f5cd7a9274233d7a983f9e58d09c39ce6a07103c9c97e4d41622f98 SHA512 b213dff423d636429fceec190664d4493c94ea828361d4b6296c5bfd796bc33662d56a3b36423ca7c3c712e21c69bcdcc42dab33a9c88de29651f07539b8c645
-DIST 15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar 2280092 BLAKE2B 70cb124bae32a54e14b9e134e1e2e031672f9c706ce2c655b5ea0a410e5f67d33f5748f756658006a41ef59fc5d79cf2b1401c8e9c9670e5e49e9573feb04744 SHA512 ee03fe59cc16815012bc84e79b18be571ffc0700419c33824682bf4e5ad708addb58bd401469452c526faf6a3e025213bfb9e57e961761fb635241bc7e1e8c9c
-DIST 1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar 82875 BLAKE2B 242f9a8308df636981c3aec5ea477ce961e4b5d4fccf58c82cb321bab1fc58340c7a31178f3c3a681fce0a49a03187c86d99043af3bfc7916c341211a747e6ff SHA512 093aef080bdb72a6c5b38d4d6906ad1d51fdc5454ec99989205cd47fa011caaf469a58a8d9f3e3ae3c8bbf4389bca55a6a2e09998846084e5261abce6913e430
-DIST 16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar 17771 BLAKE2B 0e8dcd1bbc66f63837c109625824e21e5db7aaf0034d673cf01baf8387476a5a64aee8c1dcc6f433b89d5789bb177e1bae48e1c9ef1a117e33bc6b8fee443b51 SHA512 fe7d7855893db867d75ab75f15c128ecba54fab48b15ad541dc042588a96dd965b1278331f114e55b853e0764c0291823acb73f5e2a48eeeaf2f8a985222d82e
-DIST 17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar 6106359 BLAKE2B 3e392928023f32f7b2e578f77e814c6fb895a88d3692c5b56782c6340bc9c68e266077aab2354be619bde66dda82bf73db3177680690cfbd4b6688166bdc7d45 SHA512 c2bd8b7369e627a32300800ccff909698fb98a1dc6e97b722cae40ed7ac8f9ad806a1a5c46d243d9c4123c5309ccc3ec5ccbf942e237b5dcac09750400f1ba50
-DIST 20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar 62050 BLAKE2B 81d4851d36d4ba2664b05e82c53777a14fa2f5ee52852effec77f4345140d87a2a0a284de4e664d0d53664ecd44127a6e337128568f660662919c694b0cc6ede SHA512 d38d8675481e3881490f825bfa02da4ca64bed62d06ec75e8ae386d40f4827f8a65c0442edad990069303a03667e8aba9143cea877774458c791d2561a66977c
-DIST 23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip 401328 BLAKE2B 2e6d5045cf0bd31c4b23165ba1e49fa8d2c5d7e51b59c1d01960b9ef81f52c15604588ae1753aea8acc8459a2824291034fc1cf39cbdf061e9602c5ac3bf71bb SHA512 e76ae7f1cb6679bc69534ca9d24dc72f545f8e8fd849f57f746cbc73762729bd872f79c524e2dfd3f481d9d9cbe60a08bd85f383e843ccd39bcbf777db786e9f
-DIST 244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar 17184 BLAKE2B 0b8e0158531e5b39f3ea254dbec0003b5f843ff7d784a3e2df997c706d36da285ffe94a232c00c7f7eb60dff8af44326dbed7a472821dc6b9c8ead90a5d121a4 SHA512 a441cb77ac764769695e819a4a10c3ec58491a380489897e5589eed94839c15f9c793a23e35bfe2d9e7bde40e4cb104bbf633a7142b54b3fe1870a246c848173
-DIST 2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip 1530055 BLAKE2B 14521128376f4289efc60d11f55dcb3893a3e2918070c4ca03f6dc51dc992e712733d202a7c7eb3ec7fc05cb07d0d142fd40d6033b51751fbe2d06b32779429d SHA512 86f6254f45f7cd4cf90fe94f5fdea0bdabe7b547e4e4cff91f27e58ada0fdd17a4ee2f9dcf1983be468da5fd452664e09d0fc759507344f7861b28a317d95792
-DIST 27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip 428971 BLAKE2B 5a0711f9a82905a6d65a61c7c40617d384defa392eae3715ce77395a6487560feb854677ae68ccababaf22257768e9efca23acd64c1d0aa89f518ce07704a8ed SHA512 02b724efadfa66260780e641396f2cf96347769b328b291cbf914ae1363e26324a1a887a583f5ed6b3f23f1d704283e5142e3fa46987b6978af06ccd6880a265
-DIST 2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar 12471 BLAKE2B 4d18fb2317d990b66d3a0863981e260529f692812e167d035f9f2b0f9908d1d6b3d2359cec449bf480e45ddf8bb626596a778705de77ca16f483405f669c30bf SHA512 493939ed187c114ad7607160a9d460304fbb760a8c5fd80016f0454bbb6c9022734f1f433843a6de1181a839e2e08f7a79df78e1945262929a5d05339f91d7a9
-DIST 3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip 270250 BLAKE2B d960966870082f51480053eeff58538e5025660f1e9530f91f43bef6af1f708e012671b28537cafd9dee0f887b3cc6385b877d48366da42f33d57d66a3b280cf SHA512 963422b8f498824b880b3f61aaed3aca41e3b3ee81e2710564293c4a694907d187722bdae4b7ab9d7bb98e69cfac99726e269c2fab1f96d56c96f3a097d23ecf
-DIST 387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar 1106410 BLAKE2B c6bcfbf9c53a7c7a76b5a69059cbd37659c63a8905e9e3e33aa35bdba768c7241725d5d510e7ee9b5ff0c798299645d10d08e591781c466be6c3ddcbecba78de SHA512 51076f5933ba9923d7004b2b205e68f88a564b77c168935a1e96ad9deffb19b9182685bd368d0e0ebb3ec28f0e45a61fb555ff7eaf2acc748f8786136a91ed28
-DIST 3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar 7847 BLAKE2B d1d3e5e299c325ae9f9f670527a7a7e52e232f6aed3743bffe6a1cdaeb1c43a7fa88b0b3a0d9b68ca4b021814eff2f6df484bf8b4b408d30efc08b273d4ac80c SHA512 d1dab33fdf498628fedfafdbe008988df3c079b4de40c4895e9a9aee4f74019d43f8fef85d397c7a48e9db67f7a7bf365b83447a9a674a6aa123c5daad792252
-DIST 483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar 594732 BLAKE2B b4ed44757ecaf356842ff8ca592d63a141bea3e0fa5f98962ce5de97a0e568940e58cec83e7006f67798e62c50e5ac8a3cb9716d2cebe6d779d257d5741d0d13 SHA512 84a110da6cbbafc38bd1d15c88fcf28793175c906d8a273fe9bab014348bcfa68eab01d8d821c27275278d4b4f4c083356032eaf779e8d9fd537f39d30e03069
-DIST 4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar 84793 BLAKE2B 6ffb1380aed050dea9597c63d2c222a20911e618b24dafa1399f96aa890cd6f037aba857d8195acff7c27183d6e597a1d99b76de699f967f0081eb3eda499ebd SHA512 193fa461f0bf438ee472a738aa29411af5ebeb8f757a3533db8553318ada5770a21b831696ac32dd1576f38d1f83b01ee8b6d1e0f4f23a52d27cd097b1a02a70
-DIST 4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar 164365 BLAKE2B ab01480df198884932dbd84abbf17e963488a80dda9f67ff654b2e6e3a234e87f038849faba6c5fa33aec6378fbcf6951e840eb61e525ad728ee337d14ab0586 SHA512 f1300e2d1e47659f6113a0a3dcc953766b5a8ab32f13bedf4d6ac652ffcf828c17474d47edec08d7ad9039d7abb8570770b48fa53b8ff6b47a028836490777bc
-DIST 4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar 96271 BLAKE2B f029a84a38b15eb0c325a910f12d9a894be64684f29a4a46d94dbf90b57fcbb9353fa2e49c55485e4b46901f5c3f9833efa09cdba26aaaa466758b19d85e850a SHA512 ce5cef3b016e6a4353f6eda2f1b672f4f9369d1b2674bef01710c9a285dfab476c1a9d3a9a48023c54e88dcada40049f02fe7c16f5e9fe3e7ad90763c504bae2
-DIST 4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar 454045 BLAKE2B fb4cf247aa60395fdf24db366521808e04ee7d13da3176b34f9011bdf2f81a9c9de05a39ba700eca29bc0ea4d34fecfcd051ac760ae70a18bf974f4595a54d0b SHA512 dc990c8ccc65825f69244cca1cb37bbd947026da1f5e28229be28c58d82326a37d411e26691d7818a0024aaf8a957311229e72cc6afc3c700559756f067fa7ee
-DIST 4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar 3778995 BLAKE2B 946bb73d0a8a9f0d93e0b1e74ca222f7964aa5782c98277800ec9e2875a6e21c861dc21e2d126f7101147ed45d4e7743ed1d7816e5738c5f4a658ed07428b571 SHA512 3d9f273fbf1187c69f88a8d5741841f9b6ac0edeb8dd9df0610390bc4f7bbafc63d872621e26c5093dcb792986657ae2d0f691caedd249f7b861d0a552134d58
-DIST 50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar 37606 BLAKE2B 5c7bafdc096747c9a5bd97a348cfe90b24d9c8154a5333cb47f76f0ddcce12f9e924c91313f214b02c10b3b768ffcefd51285704574994a59be75ccbca83cec7 SHA512 3cc7744b9a99a3ac9930ea9bd4f8c319bd05838624384dadc22a16ae49490b16fa55b7e18079d5bf845cf45fae4b0144403ec210b71f9c9afc5391bf27825c50
-DIST 5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar 262880 BLAKE2B 500e278c051d70feb16bb868f722e90f9cd1a0d1c67cf3df54d67de9e39c0ca190c682837d0845caa972191d966c21bdb0b8c11840dcbae272f63d112df3eb46 SHA512 b464f7ab0b40e2d8b74faea161fea7d164ce07e66f63fc9e52d9394b0662e392f1b45d11e4c5fcc9378dbb4f06230d4e1dfb64ac153a00803b7c02408dfeaf92
-DIST 5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar 14867985 BLAKE2B b3c21684b14e9336694ad51b9107f2c9d4d4616f7abcb023296e2f6ef58decbc164a872b33612478291e0c1ec613cf3bf8154f89ebd9f9db09d905e15c626a7a SHA512 f753f748564abec974d236190511222523957fc0ec91b18155d926844eaa5c9aa63053cb155c85f562b9558e164214aef11c74c30aca123a352a02e2cb4e5a31
-DIST 5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar 674877 BLAKE2B 508cbbe8a64b1a06ed4170dcc1c9f74c2eac5f5f2ab17e2f1af0e326fb2466b678dc218380be07a20f503e7e07f7af0963639088c5caf12e6eee09e229fb8575 SHA512 61c24ff2c2286339b08cb5d749482d45bcc8e51b6821adccc715a9ebbd86a9810726d5889ff8e5ac2a7b0136fe23e7476483f593b54786c1799ecf623e904824
-DIST 64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar 43312 BLAKE2B 922ff1e010437bf2076a582d4387e0d8ebd9dda5de17c3cbed4b59c3b90c8d1a7a12ee9f4d730002170cfe3faaf2d38f4140495e94694a6673d08bac46eda6f0 SHA512 89827a65cb27ec3cbd66892028eb4d1d3422cb5ba059bb26e288e75504c5445db21c6ac6725a18903a0beb3191824f96caf284515aee7381908d8074732b7bc0
-DIST 6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar 33833 BLAKE2B f057b6bb946fff13c23b8788e70e4839b1c80d36695962ada5f46f8a0ccaa26879f162703ad3186138632d1016ff0376c7e5bbcf774c13b032d4c958e28c3866 SHA512 fa1a9fefc90f4050d70ab79c6fc80cb7611835803fa5fc95d8bf1ec9de7b47f0cb620ab18387f239cf22ef97df08c4749eacaec336021b5f5250668b6d51211e
-DIST 71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar 99570 BLAKE2B 8a36cbeabdaaba9e9df3d3026dd040810c9ccf8fe80bca0cc00036cb2088dc5bd1b946b04309f87c98856f91c6f621c18dd7d77e3e8c0a828c7217fc2440b533 SHA512 5056a55f5ad60e14d7f585288e70da9db87676520a4d81996f7b3deb34b5214cdf519b448a2202193b3b8672a7b2e86345ac28a451723d50678560439c4a8127
-DIST 825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar 74937 BLAKE2B aa9352b76c597dc0852c196ce544fa6960ffaa0d8c4a9750801ab6c93ccc86a9e5bb1940a7ca90d652e42d0135a5bf34eba06568091ff83d5ef3c1d291928eef SHA512 7530f6f9b5d0b6ef5948aaee7864bb9a562de361a6c6473428d994c364a82107e3fe2b1bb7e25da25124c2003b2f0d2d650ae481680a7dc4c3e7497499bd1690
-DIST 83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip 7658677 BLAKE2B 5a21e223eba6322faaf758358b6e73304755c1c4c783ecca0e3637d39fb6a25ff7cefce7e4dd2ec402ceaff0d610be3a729f08fb7f1655597b07e6fed5d0a28a SHA512 c3498a99f46fe79c78382840d6f6ae07a2a7aef469fa39ad39f2d3c7083045d1e85d72700de8f35a2f35fc74022f6a28f77ea2553b41cca11995d8a28e50966c
-DIST 886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar 8266 BLAKE2B e853e454696ce0a38995e6a756114ab5d2ac8558b2dce5b557aff30e8ffb469bfd92e67bad64311fdaa97476f76697183eed9c7d8e38cc637e05ab368bfc9755 SHA512 59241a6fece05560a88227b4d12e72cd573b721dfe6aa916f0f8db04c2f697ee7d1b8ade84f4163e5fe40a9b277ec5be9640b3c5a445c769e0668f06a97e4a96
-DIST 89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar 332198 BLAKE2B 016a2baf68ecdbe6f76de54968878d1c5570eeb1d7028ed414a536a50e9293d7707f1e34d911f5bc89911e590a11658d216906b6e2a949d77fbc1b9680ddb541 SHA512 8139337bafdae44804416fce5fa6d2f981ac6cea41888866b5447163e6492f39f0a8892edd018360122ccafbb7d199bb65ab70ab3f1d6a7a643d9c279a772287
-DIST 8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar 275808 BLAKE2B 67c75a97eeab9cf24a01a4ca6e66bdf18b1ffa3cd22fdbe8f96abeec8bdf947a9623156662e038d3abe9a760cc18fd74b338bc08b217f3e3c9538e91ccac0830 SHA512 71d1c245e2833440e9df20ee0d15d64fdeb5e5fa8eb832afa5813ee3528575178d9b851b65520806863d9aea9623b172198c040823aaa5fb73ec56f4d8ff0045
-DIST 8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar 48913 BLAKE2B fffd498f11dc7960e650fa653287778f918e8944429fe48e68b06d0da62096788e8d1b20c61d9d07e8ce16d0f1d0c4d2fb3456652f85ddd7c9e011f54ea0f578 SHA512 602514630ed327d834302071bef8286721e174c970e9f9db83f358ee8c75ffd3f713ab1555c87d437ba7100d57d9d12d1eae3efb7f4f6d726d00812dd86cd3ab
-DIST 8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar 96879 BLAKE2B 42a07e5e3e777fc961afff973a253ffade12bb41db177959d04cc6ee38d55bc49dcb3447640bd733608f08dbdfd8e1d30400e85b0877086607c54b8a731cbe43 SHA512 4ffe3dec5c140d15ecdcc5473659889c4f830ca5847ff301078fdfca8b724c29537680c9685da4109efc6d8561ce2f9d9deeb58536a5fa33f7049646f17c7716
-DIST 8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar 98051 BLAKE2B 0b3d714a180cc26096afecec52cc67210ac03408372c493499c5f05a1af663acdbbd476a347cac6d95bfb5463cd40a000ab19ace7158272089b845b88abeab43 SHA512 d5af6d069e31c4e207c342d4808ff7ae83a8bb5a1b51dd5aa3382c11a5268c4705ba27b479e4e1ac0a977eb30ea942c2b1477586374e4b10d909473591f50557
-DIST 901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip 912288 BLAKE2B fd2bcd5c6bb6156ecda1abf20d7ed1291a6e7ffc77f41c67f066e86f20393c0b652a6da54547f774c26c22388abb6f1440f90d96d46f559a84e921ee7da417e4 SHA512 d4dc458485065a1a66b2453d54e2229e3d65fcdfc4b1ce1735e1c1528883c45bf570fb7cd07f0bfed40967ca696542113164f92f7316c81e387979f13e8e170d
-DIST 9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar 96151 BLAKE2B d86bb10438c9d8e9ae56504ee6f06395224d149b6f93faf56e3a529d998d5897848df35c43e848c18e2179887aad408b2df8ddee45e126e3c4521285019079d1 SHA512 76bdf219668cc82fabfb2fcd8ae91bccdcb86a97328b7aec1a461bd325813ea5d721b645f5baba062fc8a100a4c0711dc2afb4989d0b3acf041d1e119e7d0435
-DIST 9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar 4173 BLAKE2B 0248e77084ab83b39e65a001deab2c8f29680c06765693a5a4d8c5c77d8fc62daf94cf37916df03320132b31d5e16ec103ac063118679df59870fd5512d29faa SHA512 8955e24831394afa5dce25485d25b0bf06d53b50b7ae1e7e347ca7c3844aa3768854551b7ca0da3fe08d68a08386579cc013539dd53e69cb1407e19211b658a6
-DIST A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar 356070 BLAKE2B c1e55f13ef7f223a96b6c69dd9b1e70636920acf781c9f279958d45901e50ed31a3476ba5117510e11364f35134602f17ec0d508f908cc33352c0b2286b4e5ce SHA512 5496f339422490ee9e9072b54f37cebfaaf014b727c5e0ca4f17c6221159db12bdcd9b7c8c37e73141b9870496d5964a96e35de36e47245d09b811b7bb245ce3
-DIST A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar 109043 BLAKE2B e56b3245f9bb7a710772729d69b9119232042a4cb4e1819885a94e19ede692e39874158e814bc714b27748e40e0b66ceeb7e73fef3b1ccc46e9e29c5fa6fd8c5 SHA512 a1cc0feb2805e08d49229a20cc4423bb52d6800aab3f65723a28ed7d3429455a3f6ef80daaabad7aa89bfb70e4d3c362b268401e636505d1c89bfa7baf871d94
-DIST AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar 83249 BLAKE2B d5733a189d008b7e086db93bb90bea449023d02125f9f857a360fb518036f87538d6d7183a6280e4785fa0214f65b74c8e5cd768cdc5c6b53f84db6de3346886 SHA512 c2a498cd1e45e5bc815d24370cd3abb1c46a8165fa4b1d57493fe1e24c727c74570ac203fbf23a8ac8c25d121f52450d61d0386dd69a45597dba42736509b9a5
-DIST AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar 94946 BLAKE2B ccaa1e3bcaccedc1796e3702bfc2240bd209086e2805c28465783dded9be4ffb13a8723bd18c10d605feca58bd2231adfa8155c3d7864864f67404b0956652ca SHA512 b6f5e88c0414a5f3f2c03bfe93e694cb0274f1d6ea7a2d7e9a4cc6bacdf2379033b188d0ef6603790418d9f7a9469ac8056110f7036717deccf5dcbbb3c4e54c
-DIST B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar 90859 BLAKE2B b7febd6530b42727c81a396beaaa76b9dc6de6df56ecc88bf9c1622af1d9a1bab2d54971962a2c5da70a5c97f04b9f6160c40412da4b97929df6639aa6153e3d SHA512 8ad97ed698a2dc6a8fe94dcafa142a3794a1497b7c67497c9d7345fdbbc41fe58a7181e5e38be186a988c5b70cbaa97a16f79299982da414c176b1e07bddaa2d
-DIST B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar 1855307 BLAKE2B 6f7ad51e52788b72a87edae59ccc818c7119b60e1fcaa454f7f5e12a73f56471c940493e6f2205f27945710a00a556df1b9d43609022b34bfe48c94bd1668fde SHA512 6de9c15374c83625d08eecd7cc1a95bb8dcfeb1f144246709b955178461bb344ffe9a8abeda01c77ba4c9cd0fe8074bdbee5196087d5ea1d548f14fdb27941c7
-DIST B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar 103974 BLAKE2B 82a9bde252d69d92a3eebb095e1dc2c8704bacaae96681e83a9900f12928ef5746a3fe95f2a270959d5d157028164ab8430a54a0290ed027ff2b182906652c07 SHA512 7644f75ac0ea9b0caeeb0657e9d05624c61d86660c3a9b33bf04ffc58b8e7c21adf74443e52fecdf434458b32ceabcc0f9919ad5671b2f526a02d7160e2c6570
-DIST BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar 77903 BLAKE2B 5a7b1dc4de77ef1148daf6d41aa958685540a0bf9f3df4b8b3d4374e112e7588ae02925b89583c1f19942afc0ebada581581386915ee95420caae8ed355c932f SHA512 b1e2ac5dfce90d9d8c7a8ad0a9ab2a7e8d5d5e7c7dd64a565ed564f90243940e577fa1d2618301f12f9f69393339f6b9a4d3e93e16cad65f4a7103bc4c3e6929
-DIST C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar 1487304 BLAKE2B 794b854739f305be0cca848b95f5ce1e423d2f69d985278f83008e3384995c809a735d99bf90df57d0522fbad03ff1613eff283a4c5478b79a26e25d621995b3 SHA512 7c1bec8fc317a13a0353ae95320bf57afb81997e4bcf484b365ad12940c4eeed2e414ec01ded4d9b6bcb4239d59baaf78e2b51829fbd28dd034d768193d87a7d
-DIST C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar 90597 BLAKE2B 018b97caf00dff1e1c364ded70474b3c446464e372fdc4d318fca42822c2f7e943048bfd2df45f9d094465b325c30dfd9826f73aedbec94b09dd5e1c63f094c8 SHA512 f885dbab5f03508ca4d144558f8db5b855d643cf037e7c136b5a814826613204c7e22c8f77d3e696e1cec28fdef3b84230f132344829996c5a123716476d7bbd
-DIST C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar 3476101 BLAKE2B 08ec8b713ff61c6b68acd42399e49bb44528969336b34c64eb14105454630a060cc3f0c4078931ffd70a99a0e08becdcab8ac77a32fd62b497d36167a7c8bea4 SHA512 6b363137fd38afa1e860749ffbac3909ab921c45de657ea4eee8cdae58726a822be6d9beb15c3e8a4928e28ea1d52d2d53c39d85ef068547ca3dc669f2874fcf
-DIST C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar 72036 BLAKE2B 47b3ab937a4b52b87bdc68bf1f3230e5d336ac967aa5fc6d509f8f24d443a5798a70fdcbcdf94fb7a078c21011e07560a0a748896d4314d501a8f1ce86656ecb SHA512 4694642dfa9d4f993b928d653c509812f604bdcd721e690c3150e8c27b73a028c6cc5d63d92d21b9d61fc88672039e8b0cee3cce5f3f83b75d081bbc121d048f
-DIST C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar 170502 BLAKE2B 47e9736644b28237ede07acc29e3682400c8e134ac69ae5f81d0803107f3f8440d1cc74aca30fc75bff446b6c6763e4db40eb667845ec2d3e5405752bc08ad6c SHA512 9e08442c20537cd5ef788f623792e83429e9a534bf14d1c48c8031393f25c96fcbf2cd87ff9a37eac6908bd4fb2a4bc478fad95f38779d773e1ecd842d5807aa
-DIST C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar 18627 BLAKE2B ca0afc1394bb58f089bbdd666970215f9592ea4e5cce82ba76c5ac9c5e09fc9e41e63fbed292f00345e979e1d1ad2656c06a0a49f97e27598814b9dadd617eb3 SHA512 378028472842c9c8b029da44ae27b55dba7b3018ec15dff874798530792a03d4f4949ac644f6a172e7b47702b748fde0e652c9089f51a3f6a03c06ff2b356f8c
-DIST C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip 205743 BLAKE2B 81990ec684f8963d0d9c9536c254944956cec0860936bf0e753a9b2dce07178fdd5c7c4e6604032e30d21b47bfd8d5dded7dabe33cd79c518f016ba3e9638acf SHA512 17555962d99e880478083f2eedb65e5e07288d23f541971161e433768928b19f9864592bdd5a06c789cf35e7b1faa18296ae0832fc5d38f6e6531d754b12e816
-DIST CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar 280983 BLAKE2B 3de72da66bc1a1f356baa98e7f5dff99fdba4d6f40228909c15b4e6aaf821246727315febc887ba6c6545d0d1ed3dfbd090458d79604ca4087c00827b4fd88ef SHA512 680c2072b301cdf19bcb3525a5292874d4903dd1cd0fd83b9affb46354894cea4a2fe192414da5c82ed125063365b8a1f1a8f23849e8ed7e4a2378e8a9249ea9
-DIST CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar 406767 BLAKE2B b2256c06528e42be927682eeb790b2d0b475fc027f9d17eed715b09a623454544ccef4cca0f264349bd52790b489b6013bbc2aa714fa776b78c4cd11bab2e0b7 SHA512 1d8b502956520c98bf9084cc63dc1e926e8061b5fc01931d6fca67274edf1c4f7d8524e942a0f911baaa95a3cc285212a938a67fd92899630ecbcfaa10072321
-DIST D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar 63557 BLAKE2B 606d292b028837d70bde644ac3c5405658d1e464f3917e8aa73eef9f6a09e7c2e7cf97f69c026073d692cdb470604deb20a82ffbf5e68b815de2ed7b33054b00 SHA512 b1db7cfe17a592d49e3e751ab48533236f397ddb453f3d0232232d723d0ed0204d46dee7ced39d0611a18fdcb9b4531001142770cb2dcc1973588f3c845d866e
-DIST D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar 124303 BLAKE2B ddca47a8838fa55ba7ab574357b2db2759a52dd8c45fa2a855d4e0ca7acca77bdf9923705d0ff9e4fb2eb158358bae1eebd00fb514a14b07b5cff5c856a5ddfd SHA512 97af2b5023748d8ac63c0aafba06073cbac9a30919e53fe8fa628822de54bdc5602770736fd32fc1e8dccf0e1fef8d826a1322ba6e2eded6ca830115f1c0394b
-DIST D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar 290305 BLAKE2B b21517369b96c9383eb8c623316906a9e85a5e9ff1dd67369d2aca21afecc8a51a93ca731decb928ef805190ffdaadfd01d1595625455397abb4fbc8d93d8704 SHA512 ea583899ebb31f7f55ba5f4e53008bdf8a2e79d472741f288d6b26b259aad788e0c67b197dba5445cc5c269ef9872c6c11b023212482ac7b0a160c777e7be597
-DIST D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar 69186 BLAKE2B e464168fec1cbacc93b5b4388e5ab16250a8aca005a2b9b20c4d4bc19fb3df44d0386a130f51e55d83cde0dbfefd24436abb6d54fbb20123d189ceb3f84412cf SHA512 99fbe678c6f20ad52a59aca159d2eb89c3a670f80453f909c6c9f713a4624b70d0f95b2797596e9a7618d6f1b28e5fd10afb6ce6c02d30b1ef8f98d5fb47d50f
-DIST DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar 90677 BLAKE2B ec89850b5af27adf3c215a1b073402c2f8df6139df22ad88b1294d87b8a958b53ffad36dbba39c36882e6babe90e4f92a5cf935419795cd5790f355815e961ba SHA512 337cb1964ef9561261a8725592a3c279bab78ead882f87ede3be80f60ddcc3431f927e38a56ba2c14b008aaf00ac8b91316bfe6eafd34eb004fc3cc66b160eff
-DIST DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar 250816 BLAKE2B 6c5fbf89a5948d04f4718e39a081e5929f8cb4f131044715a9f691ccbdb38f9faf688b3b492d41fad249733de47ec25a09f03b0a951dba3802b2b3f2f2865a0c SHA512 dbbc4a0869013c48bf7e6243cd790b6f2b140fbe1cfdbd3c210d2df39db78cab1b350c5153125e0b1ee1ed37450e1b3077a1db975a3abf1154019447b64c6c9c
-DIST ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar 125146 BLAKE2B a508bffb5d2bebdaa9c672534323e311daf30308ea88cf683f82906bab3723230a503bde7c02d69525441969f40435dfebe3dd41eeef93130413a0e0b051468e SHA512 5b77ad69e116393560ff0e4514b514e0c0be5796a237458b09981a92b270a36892feb96293954e983221b2800a49ca693e30592ee69f391b67174cfc3ff107c2
-DIST ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar 2172168 BLAKE2B 6838ceaadecc53cd34a84f3c25bd8c88e6b25e293aac96e26a4e129ff2be20d79376994b08cdb666840db1ce660644b77cf04de2406af0d682a4999c11fb5844 SHA512 47d9a7526c3c039b3793750f537fee19b645b1293b574fd1939ee058d8fdeb8ad956e0e0aa36b5d4b527e9cace51b71aefa6c8fdf40acbf611606a162d878f58
-DIST EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar 761996 BLAKE2B 2ee389bc341aab1f0ca267617fd1a497a51e3ea3c4674b4a6be0b8b48298de70d3027b0b1811a7ed3ca25747df5b26f0141857d8ab7b1428bdc1a00b8cc99563 SHA512 4923bbfcd0531d6807debc9ac0d8a1e10576eb2ed8a224ccb3bbba7e4f172d97b1d41f708398943b1298db15335fdd8919f1c8d9ba0ceb2170f7bf935cb7e470
-DIST F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar 91110 BLAKE2B 55b388ec5e6eb7c12b37a2c7f03de59a67430be3bac21ba2329cfd4c3a9197f0e11797d98177d8b8f64987627df0eb8f93a094c366771d569cf2004c18791ca4 SHA512 bb91d3675c5a9fcf86631ef40c0c97bd14869d73864b46d82ba585208b17fc20ca9830ecc327ad3d3d55746015a297d3ef34de97edb381afdb790336438a202e
-DIST F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar 1077617 BLAKE2B 7ea8df70365cc3675ffed5bc9277fb0da34bd8374af3d7479554ee3a8d4c6cf06f663813cff8bd155c95311faaf782693dd272e04ca9c943ed2299cbf24c1a8c SHA512 c7faa01d25b323f63604f17602c62cdf3cec9fce542cf51c0666d6042db37efb9ac0296da0244a83ff4738ec44c2a67ba6a2550e0acbf621ad83a9b7db56ebe0
-DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar 6599 BLAKE2B bad0cf397525081c09545ff18bbf57074f9858dc581faab2ec37a0c371ae09a14c9220e3424c46b9849690b2c48ee03de2f53e3a6cb5814d163c6b1a3c458845 SHA512 862e3d9b2609df8888a2ab9569234f190583aed6bf553c8009921dd5a3c521f268c8cd91005371a5de6d1f561d6a22113c125d94fe78d18e6d4543246f0ef3d7
-DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 BLAKE2B 8d847c768f545b668838b7adce3f0eba4b3b7b4f56469b59e658da0089313748843d08a4f0df180824a3a5e516fb9f103e259c37b315b0352daf58e8ff711470 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ide-8.2-r1.ebuild 29561 BLAKE2B ecacd7c42a9105228f29983ff8146552e3f19c29709bead54ca62e13f8f68aa9879a6791558cfceb859770ec288d0c47232ac316749cc1a540a243fe2cd69c80 SHA512 d42998fd31854070bf33aa79c0673d5ab40a7f1748e9120ea11b959be4361fc1e1c7134cfee2cd72af08fd03b996a642226cfa0f6c8e803435007db0212c1815
-EBUILD netbeans-ide-8.2.ebuild 29551 BLAKE2B c7014ea2a420518bce5157c75e436ced3b19e3a6e6eb6fde22b860ec9802783ad96e9ca083ecb81d847919a54c99534baaa3fdbda820740e94c97d16c5fef762 SHA512 ee2ded187d9892c554be3277cb9580369bb61fe81a5592c87bccf82b7daf7164015adc16b60fcea899c06d491d8c1b666d5b587dad1bcb9599ee3baed79ff7ef
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ide/metadata.xml b/dev-java/netbeans-ide/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-ide/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
deleted file mode 100644
index 159db85013e4..000000000000
--- a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.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/3502EB7D4A72C2C684D23AFC241CCF50797079D1-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.5: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.1.46: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: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.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-8.2-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}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.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}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-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
-
-	eapply netbeans-8.2-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.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 jna.jar jna-4.2.2.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-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
deleted file mode 100644
index 39fa17a14b66..000000000000
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.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/3502EB7D4A72C2C684D23AFC241CCF50797079D1-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.5: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.1.46: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: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.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-8.2-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}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.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}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-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
-
-	eapply netbeans-8.2-build.xml.patch
-
-	einfo "Symlinking external libraries..."
-	java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.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 jna.jar jna-4.2.2.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 activation.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 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
deleted file mode 100644
index 3813d49f4218..000000000000
--- a/dev-java/netbeans-java/Manifest
+++ /dev/null
@@ -1,31 +0,0 @@
-DIST 0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar 53529 BLAKE2B 982e25621a42bc6d7fe708984aeb1308f2a14037708f22e250e8d89749eb969221ee191c8a228136757ad6087adc1b545bc51ae21cceaf138171404d06e990ae SHA512 406fc500e6356cb6729b89026180331c8717921e22fd0627abb799e73cd0f82c64af654b64922175f7f5514af621bd83dacae123a6078966264cc3cc753a7b5e
-DIST 29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar 1366247 BLAKE2B 7303eee6b3583bf14d659ce47d1f93ff5bd83d9eb91adeb0bcaac82dfd23a45699a8424158f94731d08f04ae14f0633ea2b3b23deb220b831a80c57768227740 SHA512 06d887e5cd47b6bd86ea9e1a26c604b630285129dde43e6068d4b36f0e81c39cd91757e3323e77316e76b0fdf8c18a609bd216c7103ac8a4d947abd0ed6bab47
-DIST 3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar 11763 BLAKE2B 41aa6a8fe13341ceba288973c314b8f8d4ac53594d2ac3b0523ea6420542f86eb51f410b6367ca93e5695b49b152814ac08848c8b1cd1861c434f09a27606647 SHA512 c834126f83008d75320eb33c5a752787d6ed7e96b4223aed329aabb08aad93d13d64a8be03d28f989d5f558e9233ae221e4eb9fec326df01b6be101ebab38b35
-DIST 3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar 45718 BLAKE2B cfd1271501b7ac8763d21617af3e837575822bfda8f43f970120573613a08483839c672fafe23aa3684e97c518774b5dc02f6ec928349a6ecebee6dcc8f05978 SHA512 1abad0ebdb35d8fd4eec1350ac497cc6a372239aea9eb6c45a94265f46e4e5c2458fe5e4d0e1e067effc9ba8629451abf169bb4820274484f9c2404271b21727
-DIST 4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar 2259008 BLAKE2B a737c5a3b6e084569a7a9fe8b24d6ecf1137b04b037c502fda7581a125563670df218c496414b1ce0d715861a093bec9136abd4da183c998d4208560328486dd SHA512 058d88fad0522a9fdae80552eecfa743cd771c7325b630762d13c1456f5f51024c6e88111d3e92ed97c69cc1013cc3d2e81332b94063113fc025951f871bf881
-DIST 562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar 23838 BLAKE2B cffd29e50cf40e3ff5eef7f458bdb802fb7ae0c47b63780b290fb07762a09f3330e0773bd991ee323506f61ec550e963744981bd92f276f31437bfe29f43539f SHA512 a39da963b1e0c0111870bc3989e10c70dd136c0276099b48cadc70706f76b0b2ba1ece6df67c05bf8e26a4638b19b28b454df6c23ed5a9d4936d3cc5506ec4b1
-DIST 5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar 3046788 BLAKE2B ca8e7040d9ea5df8076649eda04c171828d6611c0f5d00561bebf3e2d80c73ff17396d2f2463b3c1aed4d59d4add4c7c55eaaedbb314516e5c52a4f44417e3e9 SHA512 600640efc8be0dba0081eb3969688936caf57c50dc1967e94471d8ec35d0361e62aa73d3d9546271a80fe3fa8e3bdda365616d2a6ed309dc6fa3ff84f31680ed
-DIST 5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar 162126 BLAKE2B cd778dc9e92f93e2d1f99ba69b1b8d5c4bf289454fd6d9c70f40f2a1daad994581e9b14928d02bdf712cb4541b12f8914217477c9bf8e48a5e876008d787877f SHA512 de26d1e19a625adb040b6aa870762ecf8f1ffdfb2c82f58cc7a82f1a029249862dcfd39b6a995f63f04d9b36ef23a8ba8518c9cff1b5e2242e6ad5268790b5ba
-DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 BLAKE2B 8b20b89514fec78b00ce9f8c5cd04105f23b7c5637d7f741ee9a95fd888a2394ea269166b5ca065c25ab13e4a0edeaba4adb20c834c20cb5417ea8518eab3c1a SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2
-DIST 694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip 5870668 BLAKE2B f7bab4a4d1315a315eb57182abbe8fb3136eb1e5da229a115ecbf2e9ac354da579b8b0a1957ac1635d6638961df8e58dadc4b7099b5c84f0c4e4f7425113849e SHA512 49a0854318678ec52641babca57bbf57ce8d67825dc9b0565df77b8fc6bc90a2b02a3ace7dce737de49de2eb7d1f2885ca901350e8826a63c4dd5381f03fcaa6
-DIST 7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip 5678488 BLAKE2B 3752ba72d5e59a6607f69e4110e94fc84f78341a3014258a7a66997a18e62e205b9f725fe9577ea79dc7a56c6891ea64004175737f0e5d68434deaf24ab995e7 SHA512 d49f22b3ce2bd49f3ddfc35f86c0c21accd45a07b710b0787560b9969e40700d408a25e8e02d10f0d937ce642cbcab222d4e8fa28bd442e34c768b63e5583b41
-DIST 839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar 136324 BLAKE2B 83d2acd77c4ce91cb888fccf04439f19c6c5e4b3ac518776e8430551edadaadcbb84131f9af493aa25f17aa19e62a60ba9b13935db282d68420f59797ac70829 SHA512 c75746a1b82ef2c7ae13a33f06ec82292934e4348ead4a57d0e6b356ba79903e4658d031dd347e1e2c627288de6585c125a70e0f1d47a696db1eb967cbc36da3
-DIST 84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip 4599034 BLAKE2B 56e8f574461a4f9f34422d16c9769a38bdb42dfae9328640b1c5c1178f01ccdcd57068c2447f271253baa6374332b26732efa37a898e720eb5b8b18ac4c5a64d SHA512 5058624cadecf56182afe021b94b4ef10375b217000155a30d6f16d24286e985d472deaf47271a8239c15b5941a412b58c918e5f0684f5045690be322e0acc5d
-DIST 8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip 266314 BLAKE2B 186585fafd7a33b39ab37fbf05d560e9c78960d80c8923420f126cf5f82ef5018dbbfffaf463bd5820b28bbf2306c70a2ee303d8bbceffe2cb15851b26eae406 SHA512 f08cf953e56966a239d3ff31adc1b3ad74aac76207c4f92d860b13a2ddfbc6cb9ebe8223959ebebbdc6eb8f358a170ff8de544e58bf72a7c12eb101c32b02f46
-DIST 91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip 6377019 BLAKE2B 12cb5718f2f3807a48cbc6bec17bdd79b2cf131d6b38d954f77869a69a7643f2c7f8acaf141805e6a9f6f67f9754ed82d2cfd60e1b6158f5f5f9566dd7c958c6 SHA512 b43fce0d1e39985395b3f161908d52a3c7eb4b1d70b9f0485cde5b782c2ef861594e1f49d71059cbab8fb71d5fbdeabbdb9c40866b9596bc8677359b79876c99
-DIST 9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar 1539086 BLAKE2B 941239dba58346bf80e7dd9537fc24d3779dd2a8f72d1d12a3cd022b6c10c3a5d70624c5cd5574d531d0650c45051c1e64e4423c4fb56a64f3bb598a47c3bd3f SHA512 cf8c1218f59a20e4bff22a1b179299e632258dbab92992b6600f1af3ddba1ffd10daa709e758deade56f37dc34245bff23a0789b0d57c97805767a1639602653
-DIST A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip 675425 BLAKE2B 976aaf823f1406b661bf23b1c8be1fa40340152590e0ed9644ac799af574a643d05f07ab0fe6aee44c3dd289d6cdec1ab589a623480e28d866c839bfcd2eb188 SHA512 bff8f89e96ae7b5cf22bbdbcbf95c1b6c789626a4f3f972a7216c3a545b3f85a67950c022f19c36edefb8e3fa605968b31e267166922dfb46fdd56bc16e4bd7e
-DIST A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar 89171 BLAKE2B d7e06cde7dd4dd9b518eeff0e690edc83f4bc629f28d88ac26a357ca4cdabac8514bd73f98f15ba74132f4b651d3dbb7388bd389220c20b7b19e97f283882ba7 SHA512 b66922bb86a5eb787a76714a6bf2c2adfd8469ea9c3031d9b5970373f71a2349b1e8156213397b9119cc9510e48905b181388744bf2189e04e18922023dacb12
-DIST A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip 19717645 BLAKE2B 2adb68820a13423b9a991df50eb52120189e4e691da1536138da1e74bcf207bf1b648b3ebcddfe180e0f6b37d1b81326dcdd23d405c5b032b5c13798657d0207 SHA512 160fa0353baa9b31090432053a2d602fdffa663fe1f83ad79de4788ed74d3e5938d0bba0ef28ff4a946e6bc99c3a629b3fc8ff7d44ada98348fee816cb39b42e
-DIST BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar 56032 BLAKE2B 33fec12990b539eb86ba3e2df8760130ff8465340797a610ac80e1ce9927340dea3dcb6e2fa329c3ae86a3d49cfdd11d04810ba3b1346e116ca50aa1a356bd14 SHA512 c84d4066b9519cf2c00d5d4f054865693cd1665e5db3b30f6e77b44a7c0d3055cc40a1641b805ea38d2294e2cab1a27fab85035950ff0d94960a4de185bcc76b
-DIST BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar 11429 BLAKE2B f394952ce980db5ee29eae5309a1891b021c49bdd86a60d1c0681b46f242ade272762a053b2e7dada569623946b6573ec38e6f707e513756c20b630706dc208b SHA512 f7a69e5622153a3f6568a7b28b753ab0d19adea6c34a265b5efeaf95a9961dd0af711d0719956e0859fa3c63a1c06237381c35f20fb14e1fc9d9894f09f3522a
-DIST CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar 8632395 BLAKE2B 1a29ac269c1561dae6d6255d8360dbbf630659f16bf1aca876be2c15f2e0b3027fc333dbf0e7721ce0454b0c1cf940a60f8267e60b065e9a96b2783a8cfb189c SHA512 56559a40532fa42775a92d82296a86033a587116870d8201dd42f07e29990a28de5b1547e3fb59ddedadfe6b4fc3dd109b108cc65cf7b253ac1b0fbb9cc03fcc
-DIST D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip 84706 BLAKE2B 6a793abd7cfa879ec9fa382fc2dd6b81a6c914cdfaec1d57194cab836a0a072672d794b1e848ec69b9b7ce8d86abc8dd9df9bcb4805e3dc93bf03232a76bfe6e SHA512 5dd4270d3514f448f2d1533b099dbe64aab97c21e89066c467a3332d354f0675e27f6ed5ca1b23c01a2222c8e1ad261c374ae6549b9323951763b7a542a386f5
-DIST D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar 120575 BLAKE2B e60c0c49c5e81a4490d9be7b4c774a2cfabcdb7cee5b8e78110437c9d67ac1145fff47e744bbb9b3554ba7b5b58883b21ee3f9680f47f3f3e60f793b3834a123 SHA512 788bb5e115a77e12e9329db70e0b6edca185ebd5e30a8178f451da3a8492acba8c89848873acff224868772f464f17bd9eccc9130638d49c95593edd697d3dd2
-DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227553 BLAKE2B 0d39bd0332636a8a9a906d926b9507a77ba03088e544ea360852dca1496e12aabfd3063b38e85a10f75043b1c292ebb114e837b45522733fbeb387c036547cf4 SHA512 5ff83f5925fa4250ecb46e08f7f064ccf5d637bff14edadf16abbcd0d6a6203cedd07a64cc5718656249d18b17a1016f7152094da3f8ed13fdbee9afbdfcd926
-DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 BLAKE2B 3dd14163ec38294b42974e54fa7bcfb551468294dc4e8ef00928ec13df9eb774ee938a58c06565cc621592457f0c9c96d4f352bbb53d63bca5f2526c6022d9ea SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-java-8.2-r1.ebuild 15329 BLAKE2B 2046618ec1d28671d10722ac2b1a3990e3ae17e4f42140a10880686c105e60803a046822da5f3e668dfc442567e363613c1edc6ee38bb867b417b34b5004e8b8 SHA512 0f83b2e369b4b1779951cd2c9892893bd900247280763294d2b35bdd937e73539aeb77a5cdf7df38db205ed47ffc65e4bf12f210237edb99371347430bf80b6d
-EBUILD netbeans-java-8.2.ebuild 15307 BLAKE2B ccee9b7b0b72fb3c3753ca8ed5ced05419872b08595bbe1b543613eaa2dc04178d5dfb34e24cc0891f569c91a4bf272e7c434b19d69390012d452dbf05898fec SHA512 2711ab459fc2759536bc132fa0da130db084c9334e7b3f828675c886e6dab02578240081bdc95dee0a3c03cbfa1f0da120258d83d5ebc59aae1396e9cf6bc736
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-java/metadata.xml b/dev-java/netbeans-java/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-java/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
deleted file mode 100644
index d876f1b61859..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	https://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-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/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	https://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.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/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	https://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	https://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-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
-	https://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	https://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	https://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	https://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.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/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-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-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}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.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}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/5968566A351B28623DE4720B0ACB1E40338074D0-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-8.2-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-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
deleted file mode 100644
index 76d2c3f2a687..000000000000
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-# jarjar-1.4 contains also asm libraries
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	https://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-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/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	https://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.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/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	https://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	https://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-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
-	https://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	https://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	https://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	https://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.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/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-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar maven/external/aether-api-1.0.2.v20150114.jar || die
-	ln -s "${DISTDIR}"/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip maven.embedder/external/apache-maven-3.0.5-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}"/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar maven.indexer/external/indexer-artifact-5.1.1.jar || die
-	ln -s "${DISTDIR}"/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar maven.indexer/external/indexer-core-5.1.1-patched.jar || die
-	ln -s "${DISTDIR}"/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar maven/external/jarjar-1.4.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}"/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar maven.indexer/external/lucene-core-3.6.2.jar || die
-	ln -s "${DISTDIR}"/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar maven.indexer/external/lucene-highlighter-3.6.2.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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar libs.javacapi/external/nb-javac-api.jar || die
-	ln -s "${DISTDIR}"/5968566A351B28623DE4720B0ACB1E40338074D0-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-8.2-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 jta.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
deleted file mode 100644
index 897a380fdd4c..000000000000
--- a/dev-java/netbeans-javacard/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST 33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar 60835 BLAKE2B e826ad6b908c476518086361384b498abb77703210c9702100c5e5ca87ef1038dbd448885ade5326878eb924298192714c76d07b30ac9080712ea20df53621e7 SHA512 119bfd0c03d8508251c1b70fb2ffaa2c096dbf12ee4558c689b81b33724d88ce03c7805dc473e806f49c0a400a9fd586e1d3c96a3362fa26a962144bc92e4abe
-DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 BLAKE2B 3eacce7db30ccc5f15ecf65bbcb24c24429646702e20d9a8983d4ac711bb62bde99999ef6f4e12118bf69e38716bbd96ec078f0129299538f93376ed0b74535a SHA512 4c61ac191ff528466d7112b7d162596ce6d636484bce84c1781f92e2c865592df8919ad410a1053a418710920815d7f04792b25275c5304a2b9107b5420bf792
-DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 BLAKE2B f5d82243a58e8dff86966d2d745ca2fd39654ba33d502cdd56ad4dcb88ca28bdf6e347dd48034bd2cb70318ff0cebc79c7b26887fcc5bad430c8ab13f9acc8f5 SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javacard-8.2.ebuild 4599 BLAKE2B 342d5e7600399827d02d468c62f975cedec800064d8c5e1f958e29cff5b5ac725a9683a74f14a22ce0a6987a970a602deb74db0564a670bc56132fb5b14446a3 SHA512 3d77dfca7a335e6c02924bec52169d057f708abc919b05ca79ab83f1e7ece1d3cb3a07fd69b24b60136f102c38ce2e09d0e16930dfa0afe6ee8b723ffe191c52
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javacard/metadata.xml b/dev-java/netbeans-javacard/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-javacard/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
deleted file mode 100644
index 4d45318832a0..000000000000
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-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
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index bbbebe3a15aa..000000000000
--- a/dev-java/netbeans-javadoc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javadoc-8.2.ebuild 5940 BLAKE2B f3a310b8fbe84b0015556102b1bbc7e1d9044207c7bebfe17ade8d7d17afbfe9f811628f526b9ed5f9a063d8efb52001afa9fea4c1017670e77093f0776a9b03 SHA512 21de0f01eb935aa3c2829b4f29ab9809744c20863969fb82c1b107bfde8697c8f206a1aa69d5d08a38328d106e705df33486a934d5123bfe42c70081a30bdc7d
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javadoc/metadata.xml b/dev-java/netbeans-javadoc/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-javadoc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
deleted file mode 100644
index 019d5fcbb5b8..000000000000
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.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-8.2-build.xml.patch.bz2
-
-	pushd "${S}" >/dev/null || die
-	ln -s "${DISTDIR}"/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip o.apache.tools.ant.module/external/ant-libs-1.9.7.zip || die
-	popd >/dev/null || die
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	epatch netbeans-8.2-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
deleted file mode 100644
index 5139a9724edc..000000000000
--- a/dev-java/netbeans-javafx/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST 20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar 61713 BLAKE2B 4b4c47851bca5a7cb4e81791ed186790167e5804a072f52a0ad75d6e133f7f37875ed20350f6d39b72da32aa659486e4d3334972f21ff27d8f0a400545bc3793 SHA512 2d06db5267ac5d8fd227819014177f0d5cc345583628f1ff2fff89f180a4269936a136af0b4649cf43603b0adab6ce3e3f525ef2033537c6f035b558c356d900
-DIST 49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip 579550 BLAKE2B e58aecad031e08a69d9f3f69be74960a9ed8049a94d8445bf5750c6b2907b4739f63d1f37ac6aa50a5fe96c02cba7d3ccfb836304b6956d3a21add3d8c83f32a SHA512 3de7720a392813cbbbc73a6ce2a745e10054c0888df61b1e623bf327f8a4584a9eaa07303fc41d01d2088fd6c868e7273c6355d23839dfaa9009d1f672520d58
-DIST 5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar 187846 BLAKE2B 8b20b89514fec78b00ce9f8c5cd04105f23b7c5637d7f741ee9a95fd888a2394ea269166b5ca065c25ab13e4a0edeaba4adb20c834c20cb5417ea8518eab3c1a SHA512 548dcb27bc8aa61f17573e0e9896c361466a5d226b8e6b0d5f9a0181d17ce61ad5d137caa268c33da17e8541978427c3faa34be99d96817d09f22277f99dfda2
-DIST A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar 109823 BLAKE2B ac04471f6fd5869d4fff8fe86749b599cd49d81d55319085c01f7fdd7ff30aebeffafa46dad254e7193fe3d035f3b4d0310a7e9242cb54daf82188510e4fcafb SHA512 5a0089c36c35ffa2c243cbaee376a246dbfd3dd3f170fa233946b6134f9c80dda610f2900e8bbd1553c3e8bdd3b5548145c881745acc720ec1e059d8252b8399
-DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAKE2B e06b4df3e96cdaf8150c74f2039a28251a55469449674cbb045a46d7866ddfa52f6e3ac4a01a7c7da4f40906038245574f1cb208aa3385bdc48f88ece3924519 SHA512 ffad7d45643015d178cdb1b5bb075f0232470f5f7b82acd87d3dbf88e2034aed04fa9fadadbf7831d3c57fe0c4bc9684d841aebaa8a99ba1d6c1f6cb13f80359
-DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javafx-8.2.ebuild 4348 BLAKE2B c9f605b6ae1c8b2986327ab391f45ad504fb797c28dc83264b42997b9c64f63bd135b98fc6d8054120eb11509777d52ce104a4055e3112abda6f146aee1729d3 SHA512 cd1a48b98600871ce4a247cd5bff9c62b2b876e3c8212de51541a485785a8642f5364424cd4e295bebcefa30dceb7930f9da75bc85c481c1375d074b1b47c4ac
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javafx/metadata.xml b/dev-java/netbeans-javafx/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-javafx/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
deleted file mode 100644
index 5e72a9f1475f..000000000000
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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-8.2-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}"/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-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
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index d4b608d98608..000000000000
--- a/dev-java/netbeans-mobility/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-mobility-8.2.ebuild 4037 BLAKE2B 56d7871931169f3e32b0ec3ab9b47b955612941e112f5457cedabc18ba75cfc28170f9559ec4afcb3e0824bbd430683fbe788be2499a7f5d911151a1d9c595e0 SHA512 262472493c7105ad1f8246290d27e05d975ff3c6e7df23938fe004338fc6d36af0d14f13573d9c99485896ff6c16b7b29262131de7d39e3f04acfe04c565d55f
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-mobility/metadata.xml b/dev-java/netbeans-mobility/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-mobility/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
deleted file mode 100644
index 598f7eabc11d..000000000000
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index b81714ad542e..000000000000
--- a/dev-java/netbeans-nb/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 7.2/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94
-AUX 8.0/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b393ecefd7a89747f1a5e4fef396d2a927cb64fb05512002ff2faa795d1055fb92cda969f5ec2041b07ca5ad9c5eb SHA512 a09864d4b6458e7b64bbf3a6514231d5073340f1899c892ff9c0335efb7e1ab2437d3a11c7b2c3ebeb34bffe670305416cd95e95fc45ca8afd473d7395f9fc94
-DIST netbeans-7.0.png 20011 BLAKE2B f502517c7495b888f4942ae0aa7ea5206205ecadf13ffb5abb7470abeaf27db84dd5a8ff39e540c3da701c3e56f6ba196933f00ba38aa13d022e5b4d0cc19eaf SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-nb-8.2.ebuild 3737 BLAKE2B cba1848299b81612bb48d1a987739036a65320f3755cf2cf7f23fa440f007ba467e937b1ca24f4c38b5942d5025340b23f41636b0408fd7ab5461fca1fe13131 SHA512 a36489369206af1a5a686c46fc7452cb33cf9490e563df6552c5f498e5e5318b0531f1ef2965a909598a9ee03f727e124c394421dd23026720d64ded6f16b3e7
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-nb/files/7.2/keychain-support.patch b/dev-java/netbeans-nb/files/7.2/keychain-support.patch
deleted file mode 100644
index 4e9c4878fbcc..000000000000
--- a/dev-java/netbeans-nb/files/7.2/keychain-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
-diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
---- a/ide/launcher/unix/netbeans	Tue Nov 09 13:44:15 2010 +0100
-+++ b/ide/launcher/unix/netbeans	Tue Nov 09 14:21:18 2010 +0100
-@@ -169,6 +169,20 @@
-     then
-         sh=/bin/bash
-     fi
-+    keychain=`which keychain`
-+    if [ -n "$keychain" ]; then
-+        $keychain -q
-+        . $HOME/.keychain/$HOSTNAME-sh
-+        if [ -e $userdir/keychain-keys.txt ]; then
-+            for key in `cat $userdir/keychain-keys.txt`; do
-+                SSH_ASKPASS=`which x11-ssh-askpass`
-+                export SSH_ASKPASS
-+                if [ -n "$key" ]; then
-+                    keychain $key
-+                fi
-+            done
-+        fi
-+    fi
-     if [ "${founduserdir}" = "yes" ]; then
-         exec $sh "$nbexec" "$@"
-     else
diff --git a/dev-java/netbeans-nb/files/8.0/keychain-support.patch b/dev-java/netbeans-nb/files/8.0/keychain-support.patch
deleted file mode 100644
index 4e9c4878fbcc..000000000000
--- a/dev-java/netbeans-nb/files/8.0/keychain-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# Parent cbf7b2d2851314077b9c1ecd6ec95ce51453daf8
-diff -r cbf7b2d28513 -r 0350861eeabf ide/launcher/unix/netbeans
---- a/ide/launcher/unix/netbeans	Tue Nov 09 13:44:15 2010 +0100
-+++ b/ide/launcher/unix/netbeans	Tue Nov 09 14:21:18 2010 +0100
-@@ -169,6 +169,20 @@
-     then
-         sh=/bin/bash
-     fi
-+    keychain=`which keychain`
-+    if [ -n "$keychain" ]; then
-+        $keychain -q
-+        . $HOME/.keychain/$HOSTNAME-sh
-+        if [ -e $userdir/keychain-keys.txt ]; then
-+            for key in `cat $userdir/keychain-keys.txt`; do
-+                SSH_ASKPASS=`which x11-ssh-askpass`
-+                export SSH_ASKPASS
-+                if [ -n "$key" ]; then
-+                    keychain $key
-+                fi
-+            done
-+        fi
-+    fi
-     if [ "${founduserdir}" = "yes" ]; then
-         exec $sh "$nbexec" "$@"
-     else
diff --git a/dev-java/netbeans-nb/metadata.xml b/dev-java/netbeans-nb/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-nb/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
deleted file mode 100644
index edeaf072c6cf..000000000000
--- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 0f1c2bbba242..000000000000
--- a/dev-java/netbeans-php/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST 0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip 38814 BLAKE2B ac7a248bd3431c2421474065fc1886f7861445c1ec29bfc48de91bffc7f1ebe9256dbd3413fab96276ff3fd26b46ac095cb86b15571dd8e75ac71da13868fda3 SHA512 75773b7067a0ec98263bdd2e9fdda77ae05e415b19b12e828ca92085266380f19980ffcdfdfac5a7f284fd2292b3af47ee93938b034f77397d8ade129fec6076
-DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 BLAKE2B b116ea4bdfa656e618ee850fa59b74cb1adbc79a263eabd6a87c0b49037308d40d187643de843bfd89a963d2b7e912a70b9e84ee5a3d43a109a046100aa474ae SHA512 66efd8c6f586c501e19d0b1f04ab212c955ffbd67bf489a9c60b37e0f93733c75b86b01462cf78ba8877b4baff723659d9753458aeb8a0150fbddd4d81ab1b01
-DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 BLAKE2B b66803089a422d55a9187a51e3381f6bae6eb80d602b4bbe51423fe46065c5b8ff23ed22f8b55e3743d851b6a6c603c09daf4233e244fb5ce87ba9943e460eef SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-php-8.2.ebuild 4046 BLAKE2B 6c16358a34ff8d373be1cad1dd876ab10f525f01378e0e5a4081124a19efcecafbda93dfe1a48f1d1982eab7466310964cd9c53087026f1c70a8020d142d85bc SHA512 4b76dae3bdd5c9f4109a89ec7e98a92918dc2de678759741d5a27e9fd7b4db1ad6da1330e1c1b7e233391d65ab3390a108f4e319cb3329666467b14a43288225
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-php/metadata.xml b/dev-java/netbeans-php/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-php/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
deleted file mode 100644
index 0b3de0e070d5..000000000000
--- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	https://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	https://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-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-8.2-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}"/472A52636BE09823B4E5F707071B31FB990A7375-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
-
-	eapply netbeans-8.2-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-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
deleted file mode 100644
index d29ccbb28925..000000000000
--- a/dev-java/netbeans-profiler/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-profiler-8.2.ebuild 3097 BLAKE2B 31705e6b37dc437c9ded4f216c1ca97c5d7627537455fab7f52e5ceeddbf7bebf602f8605f4935117fff27223d0d37d0dfdf649c982184a96cd9440dd9430964 SHA512 aa6e923137e4ffdb2c738cc5bf17fed4ccee67186c524d3f89efa4581fcbdda0f5b256ecc88b8c0fe88176abf56cc5ead5220e7bc2cfd0dfa3befafc78ee15d5
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-profiler/metadata.xml b/dev-java/netbeans-profiler/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-profiler/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
deleted file mode 100644
index cedcb8e3d60c..000000000000
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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
deleted file mode 100644
index 33f800d7b69a..000000000000
--- a/dev-java/netbeans-webcommon/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-DIST 08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar 15474 BLAKE2B eb201fbcdef415dbd033af120a65ffe78eda3639cb79bf5b703071cb900efa4c787f2b92f43e34339bc97ca3122e31c2db9178122f0508ba1a2f7772799a4032 SHA512 91ecd525f39d4e664269cb6886b1e5545561203da9631dce9efdc77a46cb9d442f88e90030c7ac9c1c9e3561b8a4ffc1d949239a50a689963a4370de8832090c
-DIST 0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib 10084 BLAKE2B 97ad8b20c28106dd977a1fc1f2f511faf957cd11391f8451a1ffca0105a4f2025c18ca49fbd637465e83aa4f37dc77e6dcceeaf3c98344b873d8ad914aade861 SHA512 dd6de26e2f5978449ec353ea32ad7239af89478a184d408159f60bade144c69ec1e741e53239b4122b586a26ff5751ba3b318d6ff4e30ebdab075d229ee24c73
-DIST 1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip 1972629 BLAKE2B 209d94e2e54c2756658c41cf329aeb442919b7209733e4738e830609f8b007d4e3439b9d9203497219387eb7ede61c58c21c0df80822dc4e7c78204fc13ec595 SHA512 d1a8f73cf7c2c5ec6f1501086a64b7b52148b485811a7557a49f1609ad15e9ba46c9c2545a1d3bd01e551406d97e374d9e88a6ef5ba5a89d51b006b4e6763df6
-DIST 2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib 159252 BLAKE2B 651e501ddef267d38513263b9ccda198bb19cd721b14ce2be83c23a38def92bd8bd415e66f8233f87e5f3e9cccb30663d9f5ee6585b51fc1fb63d09e9002511b SHA512 c6767db80e8003c9d533d2acdd60877497461944148d406da68aa18ebe5164c266883d223343f118240d7f48523ff21afc16d9b5959e7740174447add8c933d4
-DIST 2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip 133018 BLAKE2B f7ec7108b4a76eaf1ae210c03098fd2fdc451db1bb95ab68038eaf8ff503c81fff1816d68c97e159e0ae5e77654a557d26a94a7d7ac9c2e0fe4e5895094c71d3 SHA512 360f7f57e0472f6b53337408cbc068619f83aa286fc7a5a7a84c6a451d2ba1ecd7b516741263737e11295169abcd5f1911ae0e0a68b51be93b871ae252cd99de
-DIST 480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib 70604 BLAKE2B 65fb919bbaed365ca239b3c8ad2b68fc2fa77cecb5193f4bdb7b9914be15387f63e7974e3a745ba39053a649d72544a9110f4841b48a40d194dd8ce4e84005c4 SHA512 95fe392982d78bab0770f4b6dab48ca490d0b93de386835e87be8521cc2828bb9fc793aa3a7be3a786dedbd30523a65e3fab84b555d0aff2b7b952e73187e186
-DIST 59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar 60912 BLAKE2B c4e5d21030751de8b5c5884c8443308f93f157d630aa4daf5fbc1d7f375b114e5f02261d314c655e04621e4ebf1fecba4c69a5b06270309d6f18f3b288df35b7 SHA512 4fdab86bb7471b4ace1d41e68463a567d9b1c817961c9aa6b1462e02dbf0d4ff647d3a08a35c13929c79b2a189d4a646041c6c569a6f8bec88d668422a40a4a0
-DIST 7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip 10012 BLAKE2B a7ff601cf0a75d944b72494897abd2c1733f388a21b9e3c49bc586a7ab52df65971d1f939592438e6fa2e2392f55e7329e97f6a79c2d74e9af524d38222ae383 SHA512 5fec29796ac076b6df5b83736dc6384ac93349d36093e522266b2f6facd129fd9957989fd4619422743fe01860f00d818de00e6a66a23037ff27ce071b8862e4
-DIST 7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim 72664 BLAKE2B b25c8869aa2abb66dec248f39e56326a70eafa33c06e89aeb9d9a1cbedb214d6dd5dea850a33737e89b06820e84c04e59e3e4ece976eed0c2bb1b871ff21e78d SHA512 6dfa8f474073cf46c3a08ff3fe78d2bf2444e4ec6d17c779f3171d964bb0c5837ded5c8a4b16bbe08ac14508e335845f5e39d6a0d57679602482de8e30c3bcd3
-DIST 7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar 278471 BLAKE2B e691a277e8e420d3c02248a5b85b954d273f13d516227d407c4789580ea24f1ee8826064402b586b6715e783aa11282cc9f0d584a3c5448880882f3c373cdd15 SHA512 fe228b770fa390b8b470282c1ff09bfa80d006e78d555842bbd1cd1230fb80420b8ebc5ae8fc75a063dfceac5080ede0144f13c43048c95e540fec244672e2c0
-DIST C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib 29404 BLAKE2B 66c064df36fea23f0bf7ce9f04af217f2d90ed3702e469337c5bf8e88f023a83f1dc837900e4974f4d21784e7161a6bd0b78131b8da987341df5d99bb3b2177b SHA512 c7ffc8890d7c605a6815edb34fe9b5578fa42b9111d2b40ddb128917ae04066292303c3cd11223d2e79526bc4b2f25025e1eee1449e60dc90ca98ffb11cc70ba
-DIST C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip 32928 BLAKE2B 5d8aa26bc369aec5441cdefb35c82d98d9bd77cd2df08364835c6c87c6b42d330dc92b315dcb9f3a8e8f9b73845a7734b63388697b071f8591fd56413289054a SHA512 055810e141e29ef139bd6bcb0578d2f4790dc43ef6e4fd044f26a59c69ab6fe8af8ac9cb39b336e74bc3235d6a5de6aa7ca93b797c508ed8061c20b5d4588f6b
-DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 BLAKE2B cbfb9d69c6e9dc77e799e612bf7dc98cf907f57adc995fb6107ba7f57f39658da76bc4b946443f3d6737bb8e4365293c01374b68aa1bef076a890722d62442f7 SHA512 bafbf999c1e64da8a4b72896514d1b9e6dca2dc5fb4d66dbd62fb5a986348faa42834da7960db4cd1455104f0d0dd0eaf6e56edd47affefdbc903a2320110da6
-DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 BLAKE2B 8f128e9bf4fa6811d085316dd4f2ce38e309dda300b59e1fa614f2cdc75fd4b19cc46a6d91fc96f3e418dfc2008a585aaccb94a14b6a057090339a7ade8debab SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-webcommon-8.2.ebuild 5881 BLAKE2B 68de9c0af97bc8242cee0df002a43f7448486a30483366ea8c20c5ec4300c756f1ed9d61e6bd32087c9723dd1589a7338c5114b355f30cd5a605d1f472dd66d3 SHA512 872b36891ba69bc74abab86f42a0775ed4dcc2505436e37267dc58a6111e90c2b81a9752deaece635785698539e056ca46e35df5c8aaecf2dd3f6d5a3f8a1dfc
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-webcommon/metadata.xml b/dev-java/netbeans-webcommon/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-webcommon/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
deleted file mode 100644
index e292fd5fb9d1..000000000000
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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: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.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-8.2-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
-
-	eapply netbeans-8.2-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 jna.jar jna-4.2.2.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
deleted file mode 100644
index 9b245165b7f4..000000000000
--- a/dev-java/netbeans-websvccommon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
-DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-websvccommon-8.2.ebuild 2346 BLAKE2B b41f37524d0f822e85773c3cd26e252ef958330e66c9ce20fc70f109068bc723444757b305c6a20ecf8c91d0e4de6c16e3a094891308244b5954f69dfad95468 SHA512 bc433c3bedd51800e2d0f4489923873d7489c62fff8bd3e10438224c506e983098efdfcc6ddd2a9701acb4c7b0489dd63d12ce04cc45a14f787569dae8ede20a
-MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-websvccommon/metadata.xml b/dev-java/netbeans-websvccommon/metadata.xml
deleted file mode 100644
index 85f4d904aad0..000000000000
--- a/dev-java/netbeans-websvccommon/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>fordfrog@gentoo.org</email>
-  <name>Miroslav Šulc</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
deleted file mode 100644
index 933370ee9f53..000000000000
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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="8.2"
-SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
-SRC_URI="${SOURCE_URL}
-	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-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-8.2-build.xml.patch.bz2
-}
-
-src_prepare() {
-	einfo "Deleting bundled class files..."
-	find -name "*.class" -type f | xargs rm -vf
-
-	eapply netbeans-8.2-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/smack/Manifest b/dev-java/smack/Manifest
deleted file mode 100644
index 6875ba024950..000000000000
--- a/dev-java/smack/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST smack-3.2.1.jar 747528 BLAKE2B bc60a8775a3eed2fdbf7403abf18468d599b49b980a129f10f118cb2240478ba14da59cd1368ab752f5c613ade679e13d0015fe303d140006a86b72c67fa8e54 SHA512 374f1a18559ee65974574cfdb2a9d83a520bbed08c75a54385e42b206a610c1fa368443007ce7357d9ad9262df749bf6d956e35e01bb2b73a912a2b330197a46
-DIST smack-dev-2.2.1.tar.gz 4052596 BLAKE2B c8be42b444533557a6d2dbc363fb58349ec677898e03d8ffcace063bf98997c7bbff6a4b04dc88eb012660b8f03da80fd710b501724260ab8147ebd6014682b6 SHA512 a6f6f70a61dec69ec2f3c82544f83100bf4ef39aa657ed7a8ce635be8484d3ed2cb539961286482ccc9f607520e0646e14668a17b4004ae6bd157b3d894146f0
-EBUILD smack-2.2.1.ebuild 1083 BLAKE2B 630883ab51bc80e33fd723146207c935ea120fa7a142dc29b88c91a20cf519a6ef3eb014cb3d5540ac6f2059aaab33fd7086fa360f90fab241bb1dd670698d67 SHA512 cb0fb55f756a5ad7be9f37dab442cd05427272b29250067b6579aab6cc953495111207af975b8338101d8d914f9604ac9c7eeb6d4450def528b2321cdffc91ac
-EBUILD smack-3.2.1.ebuild 614 BLAKE2B e9dc223f35c159cf7bdbeafa0df0c735fc599b69a28793e0c2eabb5170fbd0c5db4708b3be986b35dc2d07a167ca77a4d065a23fb7fb98bc37afedb8dd1ba50b SHA512 ecb877b4d70bde593833c02de5c147ad0523917480af3bbb60c32ddf1247055ff5ff355f2315a3c00184361ddfad69390f007c94f49c1b70c1c4551470f1743d
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/smack/metadata.xml b/dev-java/smack/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/smack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/smack/smack-2.2.1.ebuild b/dev-java/smack/smack-2.2.1.ebuild
deleted file mode 100644
index 50eef5789a61..000000000000
--- a/dev-java/smack/smack-2.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN}-dev"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An Open Source XMPP (Jabber) client library for instant messaging and presence"
-HOMEPAGE="http://www.jivesoftware.org/smack/"
-SRC_URI="http://www.jivesoftware.org/builds/${PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="dev-java/xpp3"
-
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	rm -f *.jar build/lib/*.jar build/merge/*.jar build/*.jar
-
-	cd "${S}/build/lib/"
-	java-pkg_jar-from xpp3
-
-	sed -i -e '/zipfileset/d' "${S}/build/build.xml" || die
-
-}
-
-EANT_BUILD_XML="build/build.xml"
-EANT_EXTRA_ARGS="-Djavadoc.dest.dir=api"
-
-src_install() {
-
-	java-pkg_dojar *.jar
-
-	dohtml *.html
-
-	use doc && {
-		java-pkg_dohtml -r documentation/*
-		java-pkg_dojavadoc api
-	}
-	use source && java-pkg_dosrc source/*
-
-}
diff --git a/dev-java/smack/smack-3.2.1.ebuild b/dev-java/smack/smack-3.2.1.ebuild
deleted file mode 100644
index 139203ac8046..000000000000
--- a/dev-java/smack/smack-3.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XMPP client library for instant messaging and presence"
-HOMEPAGE="http://www.jivesoftware.org/smack"
-SRC_URI="https://repo1.maven.org/maven2/org/igniterealtime/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/xpp3:0"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_GENTOO_CLASSPATH="xpp3"
-
-JAVA_SRC_DIR="org"
diff --git a/dev-java/svgsalamander/Manifest b/dev-java/svgsalamander/Manifest
deleted file mode 100644
index 7919c2ff51ed..000000000000
--- a/dev-java/svgsalamander/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST svgsalamander-0.0.tar.bz2 2404011 BLAKE2B fd737a90c4988c4e9506223c4cc33bb7b6b5906e1ba3871f903362281e0c745468d909ec39c5e11860b5b200f784a3deb8bbcc20ffaf5454ccf6b2eec5b3dd55 SHA512 70b182d204bac88b33b1c7058c35ae8e83c4ca178829e8c136dee8e1edd9bc6e99dfbd82c8b4c8c556bea110f15dc9e38e7ee266a16cef0ef6792463bb6a8906
-EBUILD svgsalamander-0.0-r2.ebuild 1072 BLAKE2B d876d0adae564dce7f0d7041bd73615011fcdbf9468f9c731908355775c9e54db7e67dbf8496fa99f50eeb4895e0c8f4abf230b32c6957d48bf1a965c4e64101 SHA512 8bc0cd4a75e84ebb0323d33737ae2b5c13f7be3d7174060e9b8de1a730acee81bc6b773350d3296cbaa002f745fefdf80b08318ad4ec51940b734d77ffad6673
-MISC metadata.xml 641 BLAKE2B 03029ac2e398924f33584b3dfc22760eaa1c7fda2216a29b43b187c4d774ffafb10b67cec9e9b1e06db92de2f1d97493eacd47dcb6bccb9380325916a0d55b81 SHA512 d28f09d1bda1f31b10e69dda13cb6ce52de10e8f9df27f63273bcad31a016c8c133e31d97309f03022470957e9136c4de7c904dfa5683ef60a68c0985e9a4ed9
diff --git a/dev-java/svgsalamander/metadata.xml b/dev-java/svgsalamander/metadata.xml
deleted file mode 100644
index 7c1dfadbb140..000000000000
--- a/dev-java/svgsalamander/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-	SVG Salamander is an SVG engine for Java that's designed to be small,
-	fast, and allow programmers to use it with a minimum of fuss. It's in
-	particular targeted for making it easy to integrate SVG into Java games
-	and making it much easier for artists to design 2D game content - from
-	rich interactive menus to charts and graphcs to complex animations.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild b/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
deleted file mode 100644
index 0d406211e7fd..000000000000
--- a/dev-java/svgsalamander/svgsalamander-0.0-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="a SVG engine for Java"
-HOMEPAGE="https://svgsalamander.dev.java.net/"
-# Created from
-# https://svgsalamander.dev.java.net/svn/svgsalamander/tags/release-${PV}
-# with bundled jars removed.
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/javacc:0
-"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
-	# Delete these so that we don't need junit
-	# They run a dialog any way so not useful for us
-	rm -vr test/* || die
-
-	cd lib || die
-	java-pkg_jar-from --build-only javacc
-	java-pkg_jar-from ant-core
-}
-
-src_install() {
-	java-pkg_dojar build/jar/*.jar
-	java-pkg_register-ant-task
-
-	use doc && java-pkg_dojavadoc build/javadoc
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
deleted file mode 100644
index c2af957899b2..000000000000
--- a/dev-java/xstream/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xstream-1.4.8.jar 395464 BLAKE2B 0173f5165e32838853cf45da8244d4cc4892691644995c31e19fd24d73f9ec54a71bf899b3d2321e3294459bbac38db7f6ad284b5c6f2cac14da64739fca304a SHA512 9fb9ebc6facdc07aecbcee3fbf40ef560bdd42cd8f7c7a3a8e2401be5c4e05ed3370beec653ef06d2fd3aa1acabf8f4ada8dddea27f239d180d66aec0bd905e6
-EBUILD xstream-1.4.8-r2.ebuild 1253 BLAKE2B 6ccff68306aa37455061c824e68887c17fae7558d51bcf67011c7affde84b31aebb9cda11b3875e85e06ef8774d4b24dfc6e9ed76ebacec0ef5498c72998ab3e SHA512 155ff713dee0dfd2e2e035e5a75976d34f548356337b81a81d4a9747b93ae29cf7cb6e62e78d00acfcd212a798df1951aa2b672a01af61febe3bc5e532f79954
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xstream/metadata.xml b/dev-java/xstream/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/xstream/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/xstream/xstream-1.4.8-r2.ebuild b/dev-java/xstream/xstream-1.4.8-r2.ebuild
deleted file mode 100644
index c842bc2d914a..000000000000
--- a/dev-java/xstream/xstream-1.4.8-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A text-processing Java API that serialize objects to XML and back again"
-HOMEPAGE="http://x-stream.github.io"
-SRC_URI="http://central.maven.org/maven2/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="
-	dev-java/xom:0
-	dev-java/xpp3:0
-	dev-java/jdom:0
-	dev-java/jdom:2
-	dev-java/kxml:2
-	dev-java/cglib:3
-	dev-java/dom4j:1
-	dev-java/joda-time:0
-	dev-java/jettison:0"
-
-# This package does need Java 8. See bug 564616.
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8
-	app-arch/unzip"
-
-JAVA_GENTOO_CLASSPATH="
-	xom
-	xpp3
-	jdom
-	kxml-2
-	jdom-2
-	dom4j-1
-	cglib-3
-	jettison
-	joda-time"
-
-# Two drivers for two very old implementations of StAX.
-# StAX has been last-rited from Gentoo as it is now part of the Java 6 JDK.
-# See bug 561504. These drivers rely on ancient APIs that aren't maintained
-# upstream and may contain security holes.
-JAVA_RM_FILES=(
-	com/thoughtworks/xstream/io/xml/WstxDriver.java
-	com/thoughtworks/xstream/io/xml/BEAStaxDriver.java
-)