diff --git a/app-text/epubcheck/Manifest b/app-text/epubcheck/Manifest
deleted file mode 100644
index 39f814b071cbc..0000000000000
--- a/app-text/epubcheck/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST epubcheck-src-1.1.zip 2442421 SHA256 f9db760358b34d9d98d243156e38f905e0f8735d26b8bf3550e3b108f2436be9 SHA512 4ba5fbb149a071c1dfed97ab00500afabb0690eb081967203e8ae6691b3ab9d676bf0a4cb29c5cf203db253a8e7a4c1bfccbd07b2ee377ec02656ba378a6d252 WHIRLPOOL 4e98ab1b4c2ef3412bc0109876d84ad4b9a212b7718d8ea60214ca8521571b6c068ca6bbb62e371e2558e199ebe8003b517413881e0a59574ab14e2e5452baee
diff --git a/app-text/epubcheck/epubcheck-1.1.ebuild b/app-text/epubcheck/epubcheck-1.1.ebuild
deleted file mode 100644
index cbec5745752da..0000000000000
--- a/app-text/epubcheck/epubcheck-1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Tool to validate IDPF EPUB files"
-HOMEPAGE="https://github.com/IDPF/epubcheck"
-SRC_URI="https://${PN}.googlecode.com/files/${PN}-src-${PV}.zip"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEP="dev-java/jigsaw:0
-	dev-java/saxon:6.5"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -f lib/*.jar
-
-	java-pkg_jar-from --into lib/ jigsaw
-	java-pkg_jar-from --into lib/ saxon-6.5
-
-	cd lib/
-	ln -s $(java-config --tools)
-}
-
-src_compile() {
-	eant buildJar
-}
-
-src_test() {
-	java -cp "$(java-pkg_getjars jigsaw,saxon-6.5):dist/${P}.jar" \
-		com.adobe.epubcheck.autotest.AutoTest testdocs/general/tests.xml testdocs/general/ \
-		|| die "tests failed"
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-
-	java-pkg_dolauncher ${PN} --main com.adobe.epubcheck.tool.Checker
-
-	dodoc README.txt
-}
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
deleted file mode 100644
index fc4e4eb003bf9..0000000000000
--- a/app-text/epubcheck/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>flameeyes@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">IDPF/epubcheck</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/css-validator/Manifest b/dev-java/css-validator/Manifest
deleted file mode 100644
index 7b915f8943af0..0000000000000
--- a/dev-java/css-validator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST css-validator-20120222.tar.bz2 27482733 SHA256 41c80ccc808c20e4f66d493ed365c9be9f77e787f5c0f5f3ba7060c520bac207 SHA512 a7f392028cdf5a8befa95b7c2b7bc4f832cc9212c9ec92d3021e357ca41f48464c6944ec0ecf7105d924dbb07c80c0c1b7b97191c7e9496ca30253e0329da02d WHIRLPOOL 291ed5f7f401f87d70e20d39f947038adbb9d0097023b8e30af14a3fd576d5981c5be35340294ca29e64721823de90436fb429ecf1d556ac7e57941d9a29d158
diff --git a/dev-java/css-validator/css-validator-20120222.ebuild b/dev-java/css-validator/css-validator-20120222.ebuild
deleted file mode 100644
index 7f4d8ac04703f..0000000000000
--- a/dev-java/css-validator/css-validator-20120222.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-# How to create the release tarball:
-# $ export CVSROOT=":pserver:anonymous@dev.w3.org:/sources/public"
-# $ cvs login
-# $ cvs get 2002/css-validator
-# $ cd 2002
-# $ tar jcf css-validator-$(date "+%Y%m%d") css-validator --exclude=CVS
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Check Cascading Style Sheets (CSS) and (X)HTML documents with style sheets"
-HOMEPAGE="http://jigsaw.w3.org/css-validator/DOWNLOAD.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="java-virtuals/servlet-api:2.5
-	dev-java/velocity
-	dev-java/commons-lang:2.1
-	dev-java/tagsoup
-	dev-java/jigsaw
-	dev-java/xerces:2
-	dev-java/htmlparser
-	"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-EANT_BUILD_TARGET="jar war"
-EANT_DOC_TARGET="javadoc"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	rm -f tmp/*.jar
-	mkdir -p "${S}/lib" || die "mkdir failed"
-
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-
-	java-pkg_jarfrom --into lib/ servlet-api-2.5
-	java-pkg_jarfrom --into lib/ velocity
-	java-pkg_jarfrom --into lib/ commons-lang-2.1
-	java-pkg_jarfrom --into lib/ tagsoup
-	java-pkg_jarfrom --into lib/ jigsaw
-	java-pkg_jarfrom --into lib/ xerces-2
-	java-pkg_jarfrom --into lib/ htmlparser
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-
-	use source && java-pkg_dosrc org
-	if use doc; then
-		java-pkg_dojavadoc javadoc
-
-		insinto "/usr/share/${PN}"
-		doins "${PN}.war"
-		einfo "Documentation for ${PN} has been installed as:"
-		einfo "    /usr/share/${PN}/${PN}.war"
-		einfo "You need to deploy this file using one of:"
-		einfo "  * www-servers/tomcat"
-		einfo "  * www-servers/resin"
-	fi
-}
diff --git a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch b/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
deleted file mode 100644
index faedcd04396ce..0000000000000
--- a/dev-java/css-validator/files/css-validator-20120222-build.xml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: build.xml
-===================================================================
-RCS file: /sources/public/2002/css-validator/build.xml,v
-retrieving revision 1.23
-diff -u -r1.23 build.xml
---- build.xml	1 Nov 2011 07:51:20 -0000	1.23
-+++ build.xml	22 Feb 2012 23:57:47 -0000
-@@ -75,10 +75,10 @@
-     <copy file="tmp/htmlparser-1.3.1/htmlparser-1.3.1.jar" tofile="lib/htmlparser-1.3.1.jar"/>
-   </target>
- 
--	<target name="build" description="Builds the validator" depends="prepare">
-+	<target name="build" description="Builds the validator">
- 		<mkdir dir="./build"/>
- 		<javac classpathref="build.class.path" destdir="./build" encoding="UTF-8"
--           debug="yes" includes="org/w3c/**" srcdir="." source="1.6" target="1.6"/>
-+           includes="org/w3c/**" srcdir="."/>
- 		<copy todir="./build">
-       <fileset dir="./">
-         <include name="org/**"/>
-@@ -91,7 +91,7 @@
- 	<target name="jigsaw" description="Builds the validator for Jigsaw" depends="prepare">
- 		<mkdir dir="./build"/>
- 		<javac classpathref="build.class.path" destdir="." encoding="UTF-8"
--           debug="yes" source="1.6" target="1.6">
-+           >
- 			<src path="./org/w3c"/>
- 		</javac>
- 	</target>
-@@ -99,6 +99,7 @@
- 	<target name="javadoc" description="Generates API docs">
- 		<mkdir dir="./javadoc"/>
- 		<javadoc 
-+			classpathref="build.class.path"
- 			packagenames="org.w3c.*"
- 			sourcepath="./"
- 			destdir="./javadoc"
diff --git a/dev-java/css-validator/metadata.xml b/dev-java/css-validator/metadata.xml
deleted file mode 100644
index 7303cef969642..0000000000000
--- a/dev-java/css-validator/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>
diff --git a/dev-java/jigsaw/Manifest b/dev-java/jigsaw/Manifest
deleted file mode 100644
index 81940823e23f7..0000000000000
--- a/dev-java/jigsaw/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jigsaw_2.2.6.tar.bz2 4674802 SHA256 9d0b177c6e2bc07aff91648270ef09e50d3fc2fee0ce87940e29b43695265342 SHA512 99fb362468b13d250d4e5fe33e0dc397b3bd6a98e3c012da10bfdef93511bdf5ae7c0ad3498bbd191b6c07cc658ce55d3737721fdec8f474470cbfc66c4e049a WHIRLPOOL df879de51a084a187a1172212157c486192c5af891be4ebf3c721340bd28cfd78618349bfc0573ee334e54efc87fb170c4257f0263024afd1fc6624f80985020
diff --git a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch b/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
deleted file mode 100644
index d0225de839b82..0000000000000
--- a/dev-java/jigsaw/files/jigsaw-2.2.6-build.xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build.xml.vanilla	2012-02-23 01:17:09.137602588 +0100
-+++ build.xml	2012-02-23 01:21:35.431836983 +0100
-@@ -79,6 +79,9 @@
-     <pathelement path="classes/xp.jar"/>
-     <pathelement path="classes/servlet.jar"/>
-     <pathelement path="${build.core.classes}"/>
-+    <fileset dir="jars">
-+        <include name="**/*.jar"/>
-+    </fileset>
-   </path>
- 
-   <!-- =================================================================== -->
-@@ -99,6 +102,7 @@
-   <!-- =================================================================== -->
-   <target name="compile.core" depends="prepare">
-     <javac srcdir="${src.dir}" 
-+	   encoding="iso-8859-1"
- 	   destdir="${build.core.classes}" 
- 	   debug="${debug}"
- 	   excludes="org/w3c/jigadm/** org/w3c/jigedit/**"
-@@ -111,6 +115,7 @@
-   <!-- =================================================================== -->
-   <target name="compile.admin" depends="compile.core">
-     <javac srcdir="${src.dir}" 
-+	   encoding="iso-8859-1"
- 	   destdir="${build.admin.classes}" 
- 	   debug="${debug}"
- 	   includes="org/w3c/jigadm/**"
-@@ -122,7 +127,8 @@
-   <!-- Compiles the edit package                                           -->
-   <!-- =================================================================== -->
-   <target name="compile.edit" depends="compile.core">
--    <javac srcdir="${src.dir}" 
-+    <javac srcdir="${src.dir}"
-+	   encoding="iso-8859-1"
- 	   destdir="${build.edit.classes}" 
- 	   debug="${debug}"
- 	   includes="org/w3c/jigedit/**"
-@@ -173,7 +179,9 @@
-   <target name="javadocs" depends="prepare">
-     <mkdir dir="${build.javadocs}"/>
-     <javadoc packagenames="${packages}"
-+	     encoding="iso-8859-1"
- 	     sourcepath="${src.dir}"
-+		 classpathref="build.classpath"
-              destdir="${build.javadocs}"
-              author="true"
-              version="true"
diff --git a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild b/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
deleted file mode 100644
index 58f4df3c12a46..0000000000000
--- a/dev-java/jigsaw/jigsaw-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-# Jigsaw is actually a WWW server, it would be nice to package it as such, not
-# as a raw library like this ebuild does.
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="W3 Consortium's Java-based Web server libraries"
-HOMEPAGE="http://jigsaw.w3.org/"
-SRC_URI="http://jigsaw.w3.org/Distrib/${PN}_${PV}.tar.bz2"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-CDEPEND="
-	dev-java/jtidy:0
-	dev-java/xerces:2
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-EANT_DOC_TARGET="javadocs"
-
-S="${WORKDIR}/Jigsaw"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.xml.patch"
-)
-
-java_prepare() {
-	epatch "${PATCHES[@]}"
-
-	java-pkg_clean
-
-	mkdir -p "${S}/jars" || die "mkdir failed"
-
-	java-pkg_jar-from --into jars/ jakarta-oro-2.0
-	java-pkg_jar-from --into jars/ servlet-api-2.3
-	java-pkg_jar-from --into jars/ xerces-2
-	java-pkg_jar-from --into jars/ jtidy
-
-	cd "${S}/jars" || die
-	ln -s $(java-config --tools) || die
-}
-
-src_install() {
-	java-pkg_dojar classes/{jigsaw,jigadmin,jigedit}.jar
-
-	dodoc ANNOUNCE README
-	use doc && java-pkg_dojavadoc ant.build/javadocs
-}
diff --git a/dev-java/jigsaw/metadata.xml b/dev-java/jigsaw/metadata.xml
deleted file mode 100644
index 7303cef969642..0000000000000
--- a/dev-java/jigsaw/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>java</herd>
-</pkgmetadata>