gentoo resync : 14.07.2018

56 files changed, 192 insertions, 495 deletions

diff --git a/java-virtuals/Manifest.gz b/java-virtuals/Manifest.gz
index 15db9ad892e9..4d8dd0e677d5 100644
--- a/java-virtuals/Manifest.gz
+++ b/java-virtuals/Manifest.gz
diff --git a/java-virtuals/ejb-api-0 b/java-virtuals/ejb-api-0
new file mode 100644
index 000000000000..cb99193699f7
--- /dev/null
+++ b/java-virtuals/ejb-api-0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Enterprise JavaBeans API (javax.ejb)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64
+LICENSE=public-domain
+RDEPEND=dev-java/glassfish-ejb-api:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f91203c03770dc6c8b45ea5a444ad2b0
diff --git a/java-virtuals/ejb-api/Manifest b/java-virtuals/ejb-api/Manifest
deleted file mode 100644
index 3e9dd20746a1..000000000000
--- a/java-virtuals/ejb-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ejb-api-0.ebuild 384 BLAKE2B aa603ede7b2a34bc1e4b81c174f2b0f0355003e71fe8005c5c4c19b4c75686e632090a3aff6dce8a8ea1efea93c8c55122a770a7d7478ffd1be3be9626e2241c SHA512 1a62b46a80710d0150b6caf6ec26dbe9abc96411905b2c81d23a7ba49bafe3d77222394d8feec7edee663fa39d0c9c964c456b900aa0514838810a28560cd326
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/ejb-api/ejb-api-0.ebuild b/java-virtuals/ejb-api/ejb-api-0.ebuild
deleted file mode 100644
index 0c6ab6168c16..000000000000
--- a/java-virtuals/ejb-api/ejb-api-0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Enterprise JavaBeans API (javax.ejb)"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND=""
-RDEPEND="dev-java/glassfish-ejb-api:0"
-
-JAVA_VIRTUAL_PROVIDES="glassfish-ejb-api"
diff --git a/java-virtuals/ejb-api/metadata.xml b/java-virtuals/ejb-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/ejb-api/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/java-virtuals/interceptor-api-0 b/java-virtuals/interceptor-api-0
new file mode 100644
index 000000000000..f81624e2edb2
--- /dev/null
+++ b/java-virtuals/interceptor-api-0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Interceptor API (javax.interceptor)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86 ~amd64-linux
+LICENSE=public-domain
+RDEPEND=dev-java/glassfish-interceptor-api:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=de0a400c3bcaebb5e6d255bedc1710d6
diff --git a/java-virtuals/interceptor-api/Manifest b/java-virtuals/interceptor-api/Manifest
deleted file mode 100644
index 714f1e580bc3..000000000000
--- a/java-virtuals/interceptor-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD interceptor-api-0.ebuild 416 BLAKE2B dc87eead284c434fcdb9abd86a6700d20afe000daac6794da45299de5c7bcc34771b503bf0efc7ca9bd35162a86213bd3dee050ab571735693453212d085f360 SHA512 1638548d9fc826367eb4235699e9a71a18eed93721ffe1b6d9c6543e104073a12e90b011693b2a716c2876b23d12bac76d88bf248d603c873a291999dbe386c3
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/interceptor-api/interceptor-api-0.ebuild b/java-virtuals/interceptor-api/interceptor-api-0.ebuild
deleted file mode 100644
index 74851ce7e7e1..000000000000
--- a/java-virtuals/interceptor-api/interceptor-api-0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Interceptor API (javax.interceptor)"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-DEPEND=""
-RDEPEND="dev-java/glassfish-interceptor-api:0"
-
-JAVA_VIRTUAL_PROVIDES="glassfish-interceptor-api"
diff --git a/java-virtuals/interceptor-api/metadata.xml b/java-virtuals/interceptor-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/interceptor-api/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/java-virtuals/jdk-with-com-sun-20111111-r3 b/java-virtuals/jdk-with-com-sun-20111111-r3
new file mode 100644
index 000000000000..cf7bd94ddad7
--- /dev/null
+++ b/java-virtuals/jdk-with-com-sun-20111111-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual ebuilds that require internal com.sun classes from a JDK
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/icedtea-bin:6 dev-java/icedtea:6 dev-java/icedtea-bin:7 dev-java/icedtea:7 dev-java/oracle-jdk-bin:1.7 dev-java/oracle-jdk-bin:1.8 dev-java/apple-jdk-bin:1.6 dev-java/ibm-jdk-bin:1.6 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5cad64208af4be7ca81e3e66b050bdd4
diff --git a/java-virtuals/jdk-with-com-sun/Manifest b/java-virtuals/jdk-with-com-sun/Manifest
deleted file mode 100644
index 4de26f178617..000000000000
--- a/java-virtuals/jdk-with-com-sun/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jdk-with-com-sun-20111111-r3.ebuild 784 BLAKE2B 111ea5e104b0f82107289a23d1f8d91980ac9d40abf3c8cc463bd245a212f53af00449e5cf8c9046d19cf90d75dc9acfd1cf1abbb0be0e5b7044db833beb83f8 SHA512 9a37e5fb41ac3a0b1aba195f8fb44388185fbae056af64eb9d5b86bdaf5859aac28389fc36206949b079ad95feb4e6ec20d26f5541901f8e49ffbdf9a0dd2e20
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild b/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild
deleted file mode 100644
index 7de769f7284d..000000000000
--- a/java-virtuals/jdk-with-com-sun/jdk-with-com-sun-20111111-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual ebuilds that require internal com.sun classes from a JDK"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-			dev-java/icedtea-bin:6
-			dev-java/icedtea:6
-			dev-java/icedtea-bin:7
-			dev-java/icedtea:7
-			dev-java/oracle-jdk-bin:1.7
-			dev-java/oracle-jdk-bin:1.8
-			dev-java/apple-jdk-bin:1.6
-			dev-java/ibm-jdk-bin:1.6
-		)"
-
-JAVA_VIRTUAL_VM="icedtea-bin-6 icedtea6-bin icedtea-6 icedtea6 icedtea-bin-6 icedtea-bin-7 icedtea-7 oracle-jdk-bin-1.7 oracle-jdk-bin-1.8 apple-jdk-bin-1.6 ibm-jdk-bin-1.6"
diff --git a/java-virtuals/jdk-with-com-sun/metadata.xml b/java-virtuals/jdk-with-com-sun/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/jdk-with-com-sun/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/java-virtuals/jms-1.1 b/java-virtuals/jms-1.1
new file mode 100644
index 000000000000..3f46d2057ba8
--- /dev/null
+++ b/java-virtuals/jms-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Java Message Service (JMS) API
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/glassfish-jms-api:0 dev-java/sun-jms:0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=5de8fed856b3fd36d193f2a07313a399
diff --git a/java-virtuals/jms/Manifest b/java-virtuals/jms/Manifest
deleted file mode 100644
index 76fb87a4637e..000000000000
--- a/java-virtuals/jms/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jms-1.1.ebuild 514 BLAKE2B bd870ba0f0af768e26f85810ec6e02a4fbed0cca5ec4bf661742a5d6abdf83c3092fbe1531d7d78bb52b924d32235ae685c66200f077caf37f9a4ad2d2c44d18 SHA512 e27ae6fbd8a98fca190daaaf468bcea0c8728f794dc7147b64018f71074c3724a08f54d6801638512e2f3d3b6100093877c36f13c44a1cad5b798ec247d0d554
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/jms/jms-1.1.ebuild b/java-virtuals/jms/jms-1.1.ebuild
deleted file mode 100644
index 26dafac2bef2..000000000000
--- a/java-virtuals/jms/jms-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Java Message Service (JMS) API"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-			dev-java/glassfish-jms-api:0
-			dev-java/sun-jms:0
-		)
-		"
-
-JAVA_VIRTUAL_PROVIDES="glassfish-jms-api sun-jms"
diff --git a/java-virtuals/jms/metadata.xml b/java-virtuals/jms/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/jms/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/java-virtuals/jmx-1.0-r4 b/java-virtuals/jmx-1.0-r4
new file mode 100644
index 000000000000..1b2d05352244
--- /dev/null
+++ b/java-virtuals/jmx-1.0-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Java Management Extensions (JMX)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=public-domain
+RDEPEND=|| ( virtual/jre:1.8 virtual/jre:1.7 virtual/jre:1.6 virtual/jre:1.5 dev-java/sun-jmx:0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8af53e24ca45b372d3686ea9affe2000
diff --git a/java-virtuals/jmx/Manifest b/java-virtuals/jmx/Manifest
deleted file mode 100644
index 62c56768ecd4..000000000000
--- a/java-virtuals/jmx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jmx-1.0-r4.ebuild 593 BLAKE2B 5ba02bbbbb51d6538cc3ae7a99b86a0992967ba20b409bbe7a8ea0094f36d0cd6ab70587ace556e198bb9d03d23973d30bfbd05eca77b05852ae67a11aafb757 SHA512 79e52a8233ed6cc24c79ca84fa13e4134f9959002347702e265807f90b7bd80b9df987e09f534ec00192f751123a364c09ede97479b7c450a58c9f14b28797be
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/jmx/jmx-1.0-r4.ebuild b/java-virtuals/jmx/jmx-1.0-r4.ebuild
deleted file mode 100644
index 59d365ee8646..000000000000
--- a/java-virtuals/jmx/jmx-1.0-r4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Java Management Extensions (JMX)"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	|| (
-		virtual/jre:1.8
-		virtual/jre:1.7
-		virtual/jre:1.6
-		virtual/jre:1.5
-		dev-java/sun-jmx:0
-	)"
-
-JAVA_VIRTUAL_PROVIDES="sun-jmx"
-JAVA_VIRTUAL_VM="=virtual/jre-1.8 =virtual/jre-1.7 =virtual/jre-1.6 =virtual/jre-1.5"
diff --git a/java-virtuals/jmx/metadata.xml b/java-virtuals/jmx/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/jmx/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/java-virtuals/metadata.xml b/java-virtuals/metadata.xml
deleted file mode 100644
index 0e8c9407bca6..000000000000
--- a/java-virtuals/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The java-virtuals category contains packages which satisfy virtual dependencies.
-		These virtuals install a file which is used by the java-config
-		system to provide information like classpath and minimum required vm values.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría java-virtuals contiene paquetes que satisfacen
-		dependencias virtuales. Estos paquetes virtuales instalan un
-		fichero el cual es utilizado por el sistema java-config para
-		ofrecer información como el classpath y los valores mínimos
-		requeridos por la máquina virtual.
-	</longdescription>
-</catmetadata>
-
diff --git a/java-virtuals/saaj-api-1.3-r3 b/java-virtuals/saaj-api-1.3-r3
new file mode 100644
index 000000000000..a2f29a7c0b84
--- /dev/null
+++ b/java-virtuals/saaj-api-1.3-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for SAAJ 1.3 (AKA JSR-67 MR3) API
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr67:0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=632495b4ef52d861178654a49c30cf7f
diff --git a/java-virtuals/saaj-api/Manifest b/java-virtuals/saaj-api/Manifest
deleted file mode 100644
index c38c7d615acb..000000000000
--- a/java-virtuals/saaj-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD saaj-api-1.3-r3.ebuild 433 BLAKE2B 67a95e531e3e4f070fa489a71c1d189740bf85c49e6b7d0360af4fd93c9f9a4a64a4465b32533ea894622fa7b208079a68c8c9f444790fd9d8df0bda298e395d SHA512 4ea16e175b238d501a48de06225da24dcde95b607739d5db77ff24525e1985180e479d380e0db268da16759fce3dfa2028f4afee4ee8e4322fe1d288f41c99a4
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/saaj-api/metadata.xml b/java-virtuals/saaj-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/saaj-api/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/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild b/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
deleted file mode 100644
index 88df05e41ee9..000000000000
--- a/java-virtuals/saaj-api/saaj-api-1.3-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for SAAJ 1.3 (AKA JSR-67 MR3) API"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| (
-			>=virtual/jre-1.6
-			dev-java/jsr67:0
-		)"
-
-JAVA_VIRTUAL_PROVIDES="jsr67"
-JAVA_VIRTUAL_VM=">=virtual/jre-1.6"
diff --git a/java-virtuals/script-api-1.0-r1 b/java-virtuals/script-api-1.0-r1
new file mode 100644
index 000000000000..761c02badf19
--- /dev/null
+++ b/java-virtuals/script-api-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Java Scripting API (jsr223)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=public-domain
+RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr223:0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7e756f8878d1dcf673d30af310f59a28
diff --git a/java-virtuals/script-api/Manifest b/java-virtuals/script-api/Manifest
deleted file mode 100644
index ffe69a8e3f34..000000000000
--- a/java-virtuals/script-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD script-api-1.0-r1.ebuild 439 BLAKE2B 9c55727d3cdd5554d6837a7f8157a9856ef698760f65380b723d1afed4994f2b0929047895ce817d850c52e5d76870ebf37e153a435c87b284aaf29388f91769 SHA512 90f8df25a24ff69c6ab38ace019ffcbec03fa417e01833a260fdb2a3e4542a33f6d5e26b4665c7a7690b51f99e413970fdd9bb4bd26a2a0a92c9c28254c39717
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/script-api/metadata.xml b/java-virtuals/script-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/script-api/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/java-virtuals/script-api/script-api-1.0-r1.ebuild b/java-virtuals/script-api/script-api-1.0-r1.ebuild
deleted file mode 100644
index 955461b8b75e..000000000000
--- a/java-virtuals/script-api/script-api-1.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Java Scripting API (jsr223)"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	|| (
-		>=virtual/jre-1.6
-		dev-java/jsr223:0
-	)"
-
-JAVA_VIRTUAL_PROVIDES="jsr223"
-JAVA_VIRTUAL_VM=">=virtual/jre-1.6"
diff --git a/java-virtuals/servlet-api-2.2 b/java-virtuals/servlet-api-2.2
new file mode 100644
index 000000000000..a84a026984cd
--- /dev/null
+++ b/java-virtuals/servlet-api-2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=5
+HOMEPAGE=http://java.sun.com/products/servlet/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-java/tomcat-servlet-api:2.2 >=dev-java/java-config-2.2.0-r3
+SLOT=2.2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d68ef704ced4e0b00f50cff7de8172ac
diff --git a/java-virtuals/servlet-api-2.3 b/java-virtuals/servlet-api-2.3
new file mode 100644
index 000000000000..49574e2b3a14
--- /dev/null
+++ b/java-virtuals/servlet-api-2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=5
+HOMEPAGE=http://java.sun.com/products/servlet/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-java/tomcat-servlet-api:2.3 >=dev-java/java-config-2.2.0-r3
+SLOT=2.3
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=9f73ae2aac41b49b2edf577396366628
diff --git a/java-virtuals/servlet-api-2.4 b/java-virtuals/servlet-api-2.4
new file mode 100644
index 000000000000..290aaeb05239
--- /dev/null
+++ b/java-virtuals/servlet-api-2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=5
+HOMEPAGE=http://java.sun.com/products/servlet/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/tomcat-servlet-api:2.4 dev-java/resin-servlet-api:2.4 ) >=dev-java/java-config-2.2.0-r3
+SLOT=2.4
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ab29852d676c4b74bca6803f0e50c3b7
diff --git a/java-virtuals/servlet-api-2.5-r2 b/java-virtuals/servlet-api-2.5-r2
new file mode 100644
index 000000000000..01596e75938e
--- /dev/null
+++ b/java-virtuals/servlet-api-2.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=6
+HOMEPAGE=http://java.sun.com/products/servlet/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/tomcat-servlet-api:2.5 dev-java/resin-servlet-api:2.5 dev-java/glassfish-servlet-api:2.5 ) >=dev-java/java-config-2.2.0-r3
+SLOT=2.5
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=1ff68a6d2da591ad86dd8553a509fbf9
diff --git a/java-virtuals/servlet-api-3.0-r2 b/java-virtuals/servlet-api-3.0-r2
new file mode 100644
index 000000000000..6fc94a7e7dcb
--- /dev/null
+++ b/java-virtuals/servlet-api-3.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=6
+HOMEPAGE=http://java.sun.com/products/servlet/
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm64 ppc64 x86 ~amd64-linux
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/tomcat-servlet-api:3.0 dev-java/resin-servlet-api:3.0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=3.0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=06bad52407aa6b355549f51c64224bf4
diff --git a/java-virtuals/servlet-api-3.1-r1 b/java-virtuals/servlet-api-3.1-r1
new file mode 100644
index 000000000000..94add672c607
--- /dev/null
+++ b/java-virtuals/servlet-api-3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for servlet api
+EAPI=6
+HOMEPAGE=https://jcp.org/en/jsr/detail?id=340
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm64 ppc64 x86
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/tomcat-servlet-api:3.1 dev-java/resin-servlet-api:3.1 ) >=dev-java/java-config-2.2.0-r3
+SLOT=3.1
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0d6c545fa80d7d22b3d4855ed22e47a3
diff --git a/java-virtuals/servlet-api/Manifest b/java-virtuals/servlet-api/Manifest
deleted file mode 100644
index 3d88cffd81db..000000000000
--- a/java-virtuals/servlet-api/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-EBUILD servlet-api-2.2.ebuild 508 BLAKE2B acb711be1ff596eee0c42a05761a496750895375b3cd52669d9099db714dddddfd9fa9c6eda8ed68dc750f156290ed7fb46710581d5b62ba156dba487c979984 SHA512 b10d8c9eff9119f20759957646e6774735c06957627a84518160f0fed25c7c956560134452ab66ead81e655f70bacfc86755481cecda5909e82512ec199042fa
-EBUILD servlet-api-2.3.ebuild 508 BLAKE2B 4e2d33f8ef020d00c1e8e1c8764cd59644209bf335bf237987063ce480ed4b935f18e325d1bbeaebba204131c0f0148d218a022b420b1fa25b32dc49849364c8 SHA512 0c05dbcc20e06e46b803b4dc2dc1316a5a119fe50d607687a8f2e32b741b82af8ba0f64485caadf58c238ffc2ad011107e14e6dc0cd387b8df57b8e2f72a86b7
-EBUILD servlet-api-2.4.ebuild 552 BLAKE2B 17b8a2fb04fb34a6402dc46bbb2da9b13cd899c2cc365e9d028166ddf58c1b514b9195c4dce57ee85ca99b15ae4ff9691d0a533758f8f534a3118514fd39985f SHA512 b45bc1a766008e5220547b9195fbf34c92cb58ab5de273ad3f4e68347d4e8544b4ff08fc6f30b4653ff59f175cea437e980137d382bb49bb81822d5aacc64f0c
-EBUILD servlet-api-2.5-r2.ebuild 600 BLAKE2B cb6d197ea55708ae45113c379bf46d5197952a2c8abe931c0c86df3c51913635c17486eb277c86136c4295bd760161f4da19b4ee9de5394973fc5536b8e62191 SHA512 6e9cb49c23073965fea2a3ae2728cba63d6f4dbfb69a6012caffbd7f53c9f2e837165b369da290249a5c278de8ecdcb7e7f867b9abe4fc3096f7e2b17b436ca0
-EBUILD servlet-api-3.0-r2.ebuild 496 BLAKE2B b06c776872619f234aa80bae78841882f415bb322fb21b66a322f0db407305a382a19be34eda030ec882f6f185e69440930c284cb9a1397cf31d3cb81f7a2d74 SHA512 6a2a7c9cf781616e0db5f61398272445d0ca9769e64cb6a5895d26def5fb31da19bf52d7611072e2e1d5c3099473381913c8aafdc823277f2c59047abf681411
-EBUILD servlet-api-3.1-r1.ebuild 482 BLAKE2B ba9f2f933e6b60adba40de4466041770b1bb908afd7e9e4250a57bf825120f6eb53418f9f8f92158b4bb84d74ea41a88332904afdebbdbbff231ec79f9515ead SHA512 3916bf4605c03088c56ad07ad61a08cfb41aafc8c28177aeb47b317a1dbb7e14b9034b04f1fe03f57154765eace4d2d239095d67a681c1f60687bfc2dbc18177
-MISC metadata.xml 379 BLAKE2B d0709460834d17877a160dd4a7314e7b6ec17c219f20d5b5e7fb2376698f0f61e15646ab388a6cf8ff388dc9226ffeb8171fbd8e7a46eae2a25019e97d0b2df6 SHA512 fe38ea1fc3db4236c9708f8edc6a4e708dd8bf24f3774c7144735e6e6aa45f5392133ce637b68fa41152bc9db8da42b519e8943934cf4b0a2c37c629a070f20f
diff --git a/java-virtuals/servlet-api/metadata.xml b/java-virtuals/servlet-api/metadata.xml
deleted file mode 100644
index f38e47921d9a..000000000000
--- a/java-virtuals/servlet-api/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="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-	Virtual of Servlet API to allow for user selectable implementation of 
-	the Servlet API specification.
-	</longdescription>
-</pkgmetadata>
diff --git a/java-virtuals/servlet-api/servlet-api-2.2.ebuild b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
deleted file mode 100644
index 49cea303af5d..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
deleted file mode 100644
index 4edbe38be357..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-java/tomcat-servlet-api:${SLOT}"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
deleted file mode 100644
index 4232342bb627..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-DEPEND=""
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
deleted file mode 100644
index ba1c8aaae1e6..000000000000
--- a/java-virtuals/servlet-api/servlet-api-2.5-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-		dev-java/glassfish-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT} glassfish-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild
deleted file mode 100644
index b7999ee7c371..000000000000
--- a/java-virtuals/servlet-api/servlet-api-3.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="http://java.sun.com/products/servlet/"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild
deleted file mode 100644
index a3ec32efe5a7..000000000000
--- a/java-virtuals/servlet-api/servlet-api-3.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for servlet api"
-HOMEPAGE="https://jcp.org/en/jsr/detail?id=340"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-RDEPEND="|| (
-		dev-java/tomcat-servlet-api:${SLOT}
-		dev-java/resin-servlet-api:${SLOT}
-	)"
-
-JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"
diff --git a/java-virtuals/stax-api-1-r4 b/java-virtuals/stax-api-1-r4
new file mode 100644
index 000000000000..458a1b4a30fb
--- /dev/null
+++ b/java-virtuals/stax-api-1-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Streaming API for XML (StAX)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+RDEPEND=|| ( >=virtual/jre-1.6 dev-java/jsr173 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ad0585a22e1e97579596a122129a82fe
diff --git a/java-virtuals/stax-api/Manifest b/java-virtuals/stax-api/Manifest
deleted file mode 100644
index 4d1564e625d3..000000000000
--- a/java-virtuals/stax-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD stax-api-1-r4.ebuild 540 BLAKE2B 1298de0d9440c718436568e333d6af1a587ab935202dc1768a2d5b9e4cb46d8caec9d8d4f5db0aeb17ae901e7ef90df3bb883b1b378cdb33fe2b30768a965dff SHA512 8e6c93f58edc6312c5eefe363e95ba5d921f1e8351c15db119a1c6bd0fc2b86f0c9c72ee1ad066d369672126a9ae63e3cb90d77a41f1cab0981b7467d5326cff
-MISC metadata.xml 338 BLAKE2B db24ab4f9e1a1cb4df70df23629d30f7f5027b45eaca4b28196254c74a819b7a1a8c3b4b7f6d40876e7bb102b886b0650492537331bd54b0ecb924211d87141d SHA512 eab5773e5199dd40c9edf1e49984e77e9c40b1cadffb1f6becb857a04e34fd8a333cb544194b3d6cefd72d4d6a28f1f2987d9d94eb5e730f93f0559cbf32fc3f
diff --git a/java-virtuals/stax-api/metadata.xml b/java-virtuals/stax-api/metadata.xml
deleted file mode 100644
index 9a43d927e858..000000000000
--- a/java-virtuals/stax-api/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>
-  <longdescription lang="en">
-    Virtual for Streaming API for XML (StAX)
-  </longdescription>
-</pkgmetadata>
diff --git a/java-virtuals/stax-api/stax-api-1-r4.ebuild b/java-virtuals/stax-api/stax-api-1-r4.ebuild
deleted file mode 100644
index 224e9b47b06e..000000000000
--- a/java-virtuals/stax-api/stax-api-1-r4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Streaming API for XML (StAX)"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-			>=virtual/jre-1.6
-			dev-java/jsr173
-		)"
-
-JAVA_VIRTUAL_PROVIDES="jsr173"
-JAVA_VIRTUAL_VM=">=virtual/jre-1.6"
diff --git a/java-virtuals/transaction-api-1.1 b/java-virtuals/transaction-api-1.1
new file mode 100644
index 000000000000..93493ae5c26c
--- /dev/null
+++ b/java-virtuals/transaction-api-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for Transaction API (javax.transaction)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 ppc64 x86
+LICENSE=public-domain
+RDEPEND=|| ( dev-java/glassfish-transaction-api:0 dev-java/jta:0 ) >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=20f204bd89b50b692b952913d1fe6200
diff --git a/java-virtuals/transaction-api/Manifest b/java-virtuals/transaction-api/Manifest
deleted file mode 100644
index 412b960d4402..000000000000
--- a/java-virtuals/transaction-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD transaction-api-1.1.ebuild 463 BLAKE2B 6f001466b93035f15399123de65c3ffb292a2c8d98b3938e53d01d0af2ae3e1811e95910f42717e26e4ebe881505e453059aa797c72520ebd7868b80f6963541 SHA512 0058283a57aaca48c52c5d3223eae4096326bebc2de1f01d24f1baa333c2ffc854958af46b7e9ab67b895d391bb0c674eae43d22460f23c6bf575b8ec79f5656
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/transaction-api/metadata.xml b/java-virtuals/transaction-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/transaction-api/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/java-virtuals/transaction-api/transaction-api-1.1.ebuild b/java-virtuals/transaction-api/transaction-api-1.1.ebuild
deleted file mode 100644
index 1ca3ed30b4ea..000000000000
--- a/java-virtuals/transaction-api/transaction-api-1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for Transaction API (javax.transaction)"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI=""
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| (
-			dev-java/glassfish-transaction-api:0
-			dev-java/jta:0
-		)
-		"
-
-JAVA_VIRTUAL_PROVIDES="glassfish-transaction-api jta"
diff --git a/java-virtuals/xmlrpc-api-0 b/java-virtuals/xmlrpc-api-0
new file mode 100644
index 000000000000..768944b6e6ce
--- /dev/null
+++ b/java-virtuals/xmlrpc-api-0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Virtual for XML RPC API (javax.xml.rpc)
+EAPI=5
+HOMEPAGE=https://www.gentoo.org
+IUSE=elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=dev-java/glassfish-xmlrpc-api:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	java-virtuals-2	be9aebb5236e69c1a0cda5b275e4ea22	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=973746f5812601fa3a7226e1302494db
diff --git a/java-virtuals/xmlrpc-api/Manifest b/java-virtuals/xmlrpc-api/Manifest
deleted file mode 100644
index ff3d021d79c3..000000000000
--- a/java-virtuals/xmlrpc-api/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD xmlrpc-api-0.ebuild 385 BLAKE2B 6772021f8f7a3032b6cb3ddbae8fed41fbbba6da8708eb4f7b44bdb481fa9bc47bf7d73f33dba02647c9bf75be7975525ba3fcb4b05fcd9b1a0a5c59f5cf5636 SHA512 93b08ca8cdfd0b90fd2fbea7aa6f15650ca6dfe914947b293e551ecace9f0563134e9ceef65afed2d0ea7970fc9dd1d19f2d7e25104d871e67c8748b41280116
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/java-virtuals/xmlrpc-api/metadata.xml b/java-virtuals/xmlrpc-api/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/java-virtuals/xmlrpc-api/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/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild b/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
deleted file mode 100644
index c03634a68a37..000000000000
--- a/java-virtuals/xmlrpc-api/xmlrpc-api-0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit java-virtuals-2
-
-DESCRIPTION="Virtual for XML RPC API (javax.xml.rpc)"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND=""
-RDEPEND="dev-java/glassfish-xmlrpc-api:0"
-
-JAVA_VIRTUAL_PROVIDES="glassfish-xmlrpc-api"