From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 15 Jan 2020 15:51:32 +0000
Subject: gentoo resync : 15.01.2020

---
 dev-java/Manifest.gz                               | Bin 86802 -> 86950 bytes
 dev-java/balloontip/Manifest                       |   4 -
 dev-java/balloontip/balloontip-1.2.1.ebuild        |  38 ----
 .../balloontip/files/balloontip-1.2.1-build.xml    | 194 ----------------
 dev-java/balloontip/metadata.xml                   |   8 -
 dev-java/gin/Manifest                              |   3 +
 dev-java/gin/gin-2.1.2.ebuild                      |  77 +++++++
 dev-java/gin/metadata.xml                          |  17 ++
 dev-java/gwt/Manifest                              |   5 +
 dev-java/gwt/files/gwt-2.8.2-build-system.patch    |  13 ++
 dev-java/gwt/gwt-2.8.2.ebuild                      |  77 +++++++
 dev-java/gwt/metadata.xml                          |  21 ++
 dev-java/icedtea-bin/Manifest                      |  15 ++
 dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild     | 165 ++++++++++++++
 dev-java/icedtea/Manifest                          |   4 +-
 dev-java/icedtea/icedtea-3.13.0.ebuild             |   4 +-
 dev-java/icedtea/icedtea-3.14.0.ebuild             |   4 +-
 dev-java/java-config/Manifest                      |   2 +-
 dev-java/java-config/java-config-2.2.0-r4.ebuild   |   4 +-
 dev-java/javatoolkit/Manifest                      |   6 +-
 dev-java/javatoolkit/javatoolkit-0.6.1.ebuild      |   4 +-
 dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild   |   4 +-
 dev-java/javatoolkit/javatoolkit-9999.ebuild       |   4 +-
 dev-java/openjdk-bin/Manifest                      |   8 +-
 dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild |   4 +-
 dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild |   4 +-
 .../openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild    |  19 +-
 dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild  |  19 +-
 dev-java/openjdk-jre-bin/Manifest                  |   8 +-
 .../openjdk-jre-bin-11.0.4_p11.ebuild              |   4 +-
 .../openjdk-jre-bin-11.0.5_p10.ebuild              |   4 +-
 .../openjdk-jre-bin-8.222_p10.ebuild               |  19 +-
 .../openjdk-jre-bin-8.232_p09.ebuild               |  19 +-
 dev-java/openjdk/Manifest                          |  19 +-
 dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild       |   4 +-
 dev-java/openjdk/openjdk-11.0.4_p11.ebuild         |   4 +-
 dev-java/openjdk/openjdk-11.0.5_p10.ebuild         |   4 +-
 dev-java/openjdk/openjdk-8.212_p03-r3.ebuild       | 252 ---------------------
 dev-java/openjdk/openjdk-8.222_p10.ebuild          |  15 +-
 dev-java/openjdk/openjdk-8.232_p09.ebuild          |  15 +-
 dev-java/protobuf-java/Manifest                    |   6 +-
 dev-java/protobuf-java/protobuf-java-3.10.1.ebuild |   2 +-
 dev-java/protobuf-java/protobuf-java-3.11.2.ebuild |  53 +++++
 dev-java/protobuf-java/protobuf-java-3.7.1.ebuild  |  54 -----
 dev-java/sbt/Manifest                              |   6 +
 dev-java/sbt/sbt-0.13.18.ebuild                    | 144 ++++++++++++
 dev-java/validation-api/Manifest                   |   2 +
 .../validation-api/validation-api-1.0.0.ebuild     |  22 ++
 48 files changed, 681 insertions(+), 702 deletions(-)
 delete mode 100644 dev-java/balloontip/Manifest
 delete mode 100644 dev-java/balloontip/balloontip-1.2.1.ebuild
 delete mode 100644 dev-java/balloontip/files/balloontip-1.2.1-build.xml
 delete mode 100644 dev-java/balloontip/metadata.xml
 create mode 100644 dev-java/gin/Manifest
 create mode 100644 dev-java/gin/gin-2.1.2.ebuild
 create mode 100644 dev-java/gin/metadata.xml
 create mode 100644 dev-java/gwt/Manifest
 create mode 100644 dev-java/gwt/files/gwt-2.8.2-build-system.patch
 create mode 100644 dev-java/gwt/gwt-2.8.2.ebuild
 create mode 100644 dev-java/gwt/metadata.xml
 create mode 100644 dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
 delete mode 100644 dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
 create mode 100644 dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
 delete mode 100644 dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
 create mode 100644 dev-java/sbt/sbt-0.13.18.ebuild
 create mode 100644 dev-java/validation-api/validation-api-1.0.0.ebuild

(limited to 'dev-java')

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6d057934752b..2f476dd3a3dc 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/balloontip/Manifest b/dev-java/balloontip/Manifest
deleted file mode 100644
index 9b1d4dc87642..000000000000
--- a/dev-java/balloontip/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX balloontip-1.2.1-build.xml 8493 BLAKE2B 1f301cffb6549acdbe613bd617d3846aa43ef6db6332455af30f133e340e771b79aedc0330e92e50d3f782b3943e6e7af0d8b4f1e0a015aefde9fd6e243c32c3 SHA512 8fac922c637b09f54b72235ba50f78cfddedb6c75fc912a4575fa6064165b4723848b81ebf960254f82a0a56e07f3fcd43895d60b90237759fc10df10460e53f
-DIST balloontip_1.2.1.zip 822609 BLAKE2B db5e0f5687b6f03e0a0b62ed73a401240ff06d2eaafadc14e9a1946e9842fadf63176e7dbe6ff97f13b8e3b0c413356cc27c13ebfbcbb2994554971213c08240 SHA512 566e38767627b73324415b329d4f3e06e37572431bb34a022cbc81daf6057f9ab20da673702b2084a0026b70e7135aa8ae83f074ecea0c5a785e5006136ac91b
-EBUILD balloontip-1.2.1.ebuild 886 BLAKE2B 63dd42211ad223b2725ce6eb5fa14f96c35e927eb3671d7d962816b7bfc4cafcd80db49446f9b1581e600ab398620f059b9542ec7d9763a67cce07ebfbb49a01 SHA512 47c2185039a48c005c455615fb6df33ea64c0106678191c710d1cd98e2879457d4d93114dcd4beb61ba59e3bc28d1fe05f02fd763e3a1e6a90b4e3519073252a
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/balloontip/balloontip-1.2.1.ebuild b/dev-java/balloontip/balloontip-1.2.1.ebuild
deleted file mode 100644
index 8f12b47cfdd6..000000000000
--- a/dev-java/balloontip/balloontip-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A balloon tip component to spice up your Java Swing applications"
-HOMEPAGE="https://balloontip.java.net/"
-SRC_URI="https://java.net/projects/${PN}/downloads/download/${PN}_${PV}.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}_${PV}/src/${PN}"
-
-java_prepare() {
-	find . -name "*.jar" -delete || die
-
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	dodoc "${WORKDIR}"/${PN}_${PV}/README.txt
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use examples && java-pkg_doexamples "${S}-examples"
-	use source && java-pkg_dosrc src/main/java/*
-
-}
diff --git a/dev-java/balloontip/files/balloontip-1.2.1-build.xml b/dev-java/balloontip/files/balloontip-1.2.1-build.xml
deleted file mode 100644
index 01613ad720ec..000000000000
--- a/dev-java/balloontip/files/balloontip-1.2.1-build.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 7/13/13 1:34 PM                       -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="balloontip-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="balloontip-1.2.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath"/>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-    <copy todir="${maven.build.outputDir}">
-      <fileset dir="${maven.build.resourceDir.0}"/>
-    </copy>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases"/>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             linksource="false" 
-             breakiterator="false">
-      <bottom>&lt;![CDATA[&lt;a href=&quot;http://balloontip.java.net/&quot;&gt;http://balloontip.java.net/&lt;/a&gt;]]&gt;</bottom>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-  </target>
-
-</project>
diff --git a/dev-java/balloontip/metadata.xml b/dev-java/balloontip/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/balloontip/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/gin/Manifest b/dev-java/gin/Manifest
new file mode 100644
index 000000000000..e5d5c84b93b5
--- /dev/null
+++ b/dev-java/gin/Manifest
@@ -0,0 +1,3 @@
+DIST google-gin-2.1.2.zip 5495552 BLAKE2B 3e07fc2e8f2e93872cb022dc57d5b06cfb81cfd855e8027fbcc312e2b95e0c8c35a783c6deb842fd1f40ae8c94e5c120f463c36e20d873a415ef62b0e717f490 SHA512 eb661760078d2053dd1f6cf0d96e9c2895c7d7fd805c14f4da63c28801b8aabb6a9cf6baff020bee3830a3ba1451bdf44d53d41cae1d720bded06f7d013d59c0
+EBUILD gin-2.1.2.ebuild 1513 BLAKE2B 48e0974df47c0c2779928e599de64f11d4e5a191c8ab62cacd694532bee89dd56d9c49f7973cd93a728ef8a416bcaa68a08df35809010117a41d6588459960c9 SHA512 98f19d22a51507e6849c3c27ba7d4f666c095b4bedde0a33e7c2135ec0ca49ac348e381db6e06ef3a2008f2b06ecb89686d29f9f5de69ef655d46fa0b57cd0c4
+MISC metadata.xml 557 BLAKE2B fbfae465245ee9fb076c37a02f6b9af1e47f304c1dd0e73a698638b1403a4665c9ac8a6cbe4202adf50ddbdbeb78f201c6330b70fcf453d6eaa1cfd2fdf374c3 SHA512 620701117b492028e619f8826d8efcb24c7861f3ac936d7a2506b2ed1da238555c74bb403ef60b333a2421515e891a9619338cd0b4f772ce2a72c0daa7c985c3
diff --git a/dev-java/gin/gin-2.1.2.ebuild b/dev-java/gin/gin-2.1.2.ebuild
new file mode 100644
index 000000000000..ef0a80cfdee8
--- /dev/null
+++ b/dev-java/gin/gin-2.1.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="google-gin"
+MY_P="${MY_PN}-${PV}"
+
+GIN_COMMIT="d62089f5b6ea33d842ab4646b51583c65a8be36b"
+
+DESCRIPTION="Google Gin (GWT INjection)"
+HOMEPAGE="https://gwtplus.github.io/google-gin/"
+SRC_URI="https://github.com/gwtplus/google-gin/archive/${GIN_COMMIT}.zip -> ${MY_P}.zip"
+RESTRICT="mirror"
+SLOT="2.1"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND="
+		dev-java/aopalliance:1
+		dev-java/javax-inject:0
+		dev-java/gwt:2.8
+		dev-java/validation-api:1.0
+"
+
+RDEPEND="
+		${CDEPEND}
+		>=virtual/jre-1.8:*"
+DEPEND="
+		${CDEPEND}
+		>=virtual/jdk-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_XML="build.xml"
+EANT_GENTOO_CLASSPATH="
+		aopalliance-1
+		javax-inject
+		gwt-2.8
+		validation-api-1.0
+"
+
+S="${WORKDIR}/${MY_PN}-${GIN_COMMIT}"
+
+JAVA_RM_FILES=(
+	trunk/lib/aopalliance.jar
+	trunk/lib/javax.inject.jar
+	lib/aopalliance.jar
+	lib/javax.inject.jar
+)
+
+src_compile() {
+	local EANT_BUILD_TARGET="compile"
+	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+		java-pkg-2_src_compile
+	EANT_BUILD_TARGET="jars"
+	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+		java-pkg-2_src_compile
+}
+
+src_test() {
+	GWT_HOME="${EROOT}/usr/share/gwt-2.8/lib" \
+		ant test || die
+}
+
+src_install() {
+	java-pkg_newjar \
+		out/dist/${P}-src.jar ${PN}-src.jar
+	java-pkg_newjar \
+		out/dist/${P}.jar ${PN}.jar
+	java-pkg_dojar \
+		lib/*.jar
+}
diff --git a/dev-java/gin/metadata.xml b/dev-java/gin/metadata.xml
new file mode 100644
index 000000000000..f5c70373f274
--- /dev/null
+++ b/dev-java/gin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		Gin (GWT INjection) brings automatic dependency injection to
+		GWT client-side code. Gin is built on top of Guice and uses (a
+		subset of) Guice's binding language.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/gwt/Manifest b/dev-java/gwt/Manifest
new file mode 100644
index 000000000000..2563bf23f91e
--- /dev/null
+++ b/dev-java/gwt/Manifest
@@ -0,0 +1,5 @@
+AUX gwt-2.8.2-build-system.patch 758 BLAKE2B b1aca717473f2ebee42bfc2902c8eb0012698c8f7a059f5c9d29944b154c1a85ae296d8639271aaa6f749e5fa84de8e4e8ad5da45c90495e1f5ab429eff13740 SHA512 c469c23ded60e5f844abda0001f4ca99fd6756f9bd433f3e8a433c9441db3dd62d0523ab90b3f2eb1bf2b26675ef0f01a3ddf7dd371df844037a9f249c5b59a5
+DIST gwt-2.8.2.zip 22017212 BLAKE2B b112df08885e607c975f9585d6b83e2a12894e974850ada052918e4b946b11bfc8d9cf9d71f4e684121d9d16714885be549eed44d77a119e695c2b50cd6bc6c3 SHA512 ac16311c3b00b36d421eef914e73ad8dea01f022c87fc7ed722fdfee8eed391f1987cc1c34522978afc542cdb90eee791efcdcc725d9a395ab468e458b708074
+DIST gwt-tools-f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d.zip 577453206 BLAKE2B 83a3824d6418727876b4708ed44ab1f58513a5b39d4e48f9bf21290ca358f76ec2ccd98ce2aee76afe7f621fb1f703bf459b8c3d6a3d4f32d4be807bc723513e SHA512 f4f033c972d955da40258020a9fb84ae90f30b7afeb1ae8044cf00f4f5f45200129bf84e2f69660a4eb80bb60f3a5a1d3c5af69fe9e07e0b985de0e708ca933f
+EBUILD gwt-2.8.2.ebuild 1855 BLAKE2B 3aaa9cc77f59b1de68576ffb181b79cea5df324bca29149430dfca81c114fe07401136e5afb8ee78dddaa7242c0ca00da4263483b7aabd756ff6c87daffb61b5 SHA512 806919aefcd54194e9c1b53066f2c7bd7585151c54b0a7706211dec59bf31e4ec4992a8a26df6217a9265019705c1ef777d1728314344e2dfa08bd42050491ee
+MISC metadata.xml 766 BLAKE2B e023f4897d31fa31c961563600b21d9a03a26b1ac70b75859c66e558177e7b42b747cfb40d22760eb132b44ac5ec2ee8906a48ea09b591e8a5cc1dd7a91cc55e SHA512 c4fdbf613e76d4be2c71a15fc9f99f0cd744aa4508725dc36a11421eee6029a22af833c360b525002a5be76b74494b14ec093945e1c5f25a9c2fb71867cf3f32
diff --git a/dev-java/gwt/files/gwt-2.8.2-build-system.patch b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
new file mode 100644
index 000000000000..82340416e7a7
--- /dev/null
+++ b/dev-java/gwt/files/gwt-2.8.2-build-system.patch
@@ -0,0 +1,13 @@
+--- gwt-2.8.2-orig/common.ant.xml	2017-10-18 22:39:31.000000000 +1100
++++ gwt-2.8.2/common.ant.xml	2020-01-13 13:23:58.653719957 +1100
+@@ -277,9 +277,7 @@
+ 
+   <macrodef name="gwt.getgitinfo" description="Identifies the GIT info of a workspace">
+     <sequential>
+-      <exec executable="git" searchpath="true" outputproperty="gwt.gitrev">
+-        <arg line="rev-parse --short HEAD"/>
+-      </exec>
++      <property name="gwt.gitrev" value="faff18e7a1f065e3a4ac4ef32ab5cce394557070"/>
+       <!-- Generally, filtering requires a sentinel file so that changes to git rev will
+          be noticed as invalidating the previously-generated filter output.  This property
+          names where such a sentinel lives; it is tested with <available/> and created
diff --git a/dev-java/gwt/gwt-2.8.2.ebuild b/dev-java/gwt/gwt-2.8.2.ebuild
new file mode 100644
index 000000000000..0a0f40fa707a
--- /dev/null
+++ b/dev-java/gwt/gwt-2.8.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 java-utils-2
+
+GWT_TOOLS_COMMIT="f42d2729a3a8e6ba9b9aec069957bce5dc0f6f6d"
+GWT_TOOLS_PN="tools"
+
+GWT_COMMIT="faff18e7a1f065e3a4ac4ef32ab5cce394557070"
+
+DESCRIPTION="Google Web Toolkit library"
+HOMEPAGE="http://www.gwtproject.org/"
+SRC_URI="https://github.com/gwtproject/${PN}/archive/${PV}.zip -> ${P}.zip
+		https://github.com/gwtproject/${GWT_TOOLS_PN}/archive/${GWT_TOOLS_COMMIT}.zip -> ${PN}-${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}.zip"
+RESTRICT="mirror"
+SLOT="2.8"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND="
+		dev-java/json:0
+		dev-java/guava:20
+		dev-java/rhino:1.6
+		>=dev-java/asm-5.0.3:4
+		dev-java/eclipse-ecj:4.5
+		dev-java/validation-api:1.0
+"
+
+RDEPEND="
+		${CDEPEND}
+		>=virtual/jre-1.8:*"
+DEPEND="
+		${CDEPEND}
+		>=virtual/jdk-1.8:*"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_XML="build.xml"
+EANT_BUILD_TARGET="build"
+EANT_EXTRA_ARGS="-Dgwt.gitrev=${GWT_COMMIT}"
+EANT_GENTOO_CLASSPATH="
+		json
+		asm-4
+		guava-20
+		rhino-1.6
+		eclipse-ecj-4.5
+		validation-api-1.0
+"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-build-system.patch
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
+		GWT_VERSION="${PV}" \
+		java-pkg-2_src_compile
+}
+
+src_test() {
+	GWT_TOOLS="${WORKDIR}/${GWT_TOOLS_PN}-${GWT_TOOLS_COMMIT}" \
+		GWT_VERSION="${PV}" \
+		TZ=America/Los_Angeles ANT_OPTS=-Dfile.encoding=UTF-8 \
+		ant ${EANT_EXTRA_ARGS} test || die
+}
+
+src_install() {
+	java-pkg_dojar \
+		build/lib/*.jar
+	java-pkg_dolauncher i18nCreator --main com.google.gwt.i18n.tools.I18NCreator --jar gwt-dev.jar
+	java-pkg_dolauncher webAppCreator --main com.google.gwt.user.tools.WebAppCreator --jar gwt-dev.jar
+}
diff --git a/dev-java/gwt/metadata.xml b/dev-java/gwt/metadata.xml
new file mode 100644
index 000000000000..15024df0cf40
--- /dev/null
+++ b/dev-java/gwt/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		GWT is a development toolkit for building and optimizing
+		complex browser-based applications. Its goal is to enable
+		productive development of high-performance web applications
+		without the developer having to be an expert in browser
+		quirks, XMLHttpRequest, and JavaScript. It’s open source,
+		completely free, and used by thousands of developers around
+		the world.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index fe59a376a0a0..a0e6736645b8 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,13 +5,28 @@ DIST icedtea-bin-core-3.13.0-arm64.tar.xz 61700464 BLAKE2B 333202f47b63ae050aa43
 DIST icedtea-bin-core-3.13.0-ppc64.tar.xz 55002324 BLAKE2B b93312e3e82c75d2611f6907c57046fc4dc1498be989fde841a43162c381247fd934c4c3d83493455f4aecec338cb343e30cf26a313cd0d26dcca9e76ee2a2d3 SHA512 c04d0afe3b5b9a592bc9d9d26cc15e920edc6a6646337f969b889388d0ae08ddfdd84435076538b27106dc7dc1edc31d7dc84abd744de927d403e8fcde0fe742
 DIST icedtea-bin-core-3.13.0-ppc64le.tar.xz 55089960 BLAKE2B 915a80eefe41dc5cbfa7baa4db133fda0057a43e2c4d4e5c042d0ec2b8cd174fd4950cf66ec60e41f038036a09b309533ad4cf647cc9f1c6641ac040d38c6afc SHA512 a914559df5981cc88d54fed48c013632771b094b49198fc742718c549c0188846a399d1fb28710bdcf1b224df6e5588aeb2d29feebd523943759e3f3fff4b20e
 DIST icedtea-bin-core-3.13.0-x86.tar.xz 61579520 BLAKE2B 736941e5b41c4f0e13f5d60e4cefe716c7759fd4eb77e8cf7bb831c13525e8d007e5039dfb15c75ac0c9a18bd3d037564eca2bed4a6229c598f8ea8d92aa58e7 SHA512 d0f70ea72a55e5abfd459f4ce7eb4e4cee6779860c6bf95cea0bf682896cba2c2e836c613d80c5f90cf5bb14ae9abc9f0692aa4cea3bb0f6c245f8f21c842fe7
+DIST icedtea-bin-core-3.14.0-amd64.tar.xz 62155444 BLAKE2B cfa6a11778d159026151fffcfa7189fe45d23d22d810375f36f237afcdcd646be73788cb5cfa0a2e4822026ae58456b69f6f4baa03c7d143429f2ffe55d73e19 SHA512 2d29f7f61ef67d93b57318c34fbccf99077f40c6322bc774326e33ba11c8dc2a07d34c8e9d8b500feaeabe4aa45644d03140b57a3996261d13da9f9bf85ebf5c
+DIST icedtea-bin-core-3.14.0-arm.tar.xz 58158680 BLAKE2B 3899136ccb43550129a33996ec50f7b60b9b3d118f758e3d5c51a837f6222033a32677fca58f8c95de12abb4b1b8940190a442d9b1901808307634662af7aeb8 SHA512 8a56048439f50bd01ce4723f8f9b97f764f655370927dad0a92db9d678e8eb797ce3a6d813a247f60d4c38ae1a3de3ab9a3b78341d19977ef05d939e85194e67
+DIST icedtea-bin-core-3.14.0-arm64.tar.xz 61710384 BLAKE2B f02c68f71a057232f9a8ea7476b476a376c0bd508b53f1043dfc6a6f86b5701e50d0d6be7d627436c3cff931ebe3c56f0d634196d8e1b96058142421214d525d SHA512 853b7ef0d21d0d9645ef3bc4b5cb24ed43ca71687d2630a10d3087a4ea82855f98cc7c8190b0de62a746cfa214489c8ac3afdc17dfc13dbb61dd4c8a908da31b
+DIST icedtea-bin-core-3.14.0-ppc64.tar.xz 55154368 BLAKE2B 0a509f1ae6ef885c18cf15a7c4dbe984650e242ea820aa65602cfc1a001f0123151fb5c33f25546391c9a62cc735c5a6a6cb98ef97c61900d65154c5b44ab3d2 SHA512 f6b19b8e7dd80df8a162665d7c3dcc8f7d739fefcd1e6a1e8d588cbbf7de08240ef49c6542524bcd173f7150a1ff5d752a9c7532dc6a9b37954ea29928bf123c
+DIST icedtea-bin-core-3.14.0-ppc64le.tar.xz 55152852 BLAKE2B 198dffad2beefa5fed0fb0a9151ba68bf4f24e8dd1ff2a430983ecb72131d82119423eba6192365620731e030a58b60bb3492b34e2a87d19a58178c43e69853d SHA512 8ccfd5ba3ae3d0a7125b99c52db7ee37229f9071209e2011023398c3dd4746e7edda92f361427667739b298ee2d0de7777bab4346cffbe6572f2729e59971ef7
+DIST icedtea-bin-core-3.14.0-x86.tar.xz 61674516 BLAKE2B 9297b3192985e1925f732c38229854781ebc61a49b487d147380c0fcd088601908f59488f8795f2c9069d103613785082f0fe4e227659fe3916d807a6622c3bf SHA512 ca61c53a1a424a059b4a0b2b8fea8fa2a8ab9cf1e3dc8f5600b89b29f280f71841a7b853bfd1e88d756211816e733aef8fb232fcfdebca85978cf50c9026f0fb
 DIST icedtea-bin-doc-3.13.0.tar.xz 11641004 BLAKE2B de8fbfe42a214276e1cbb60d4567c0d06b03078ff3db50611cce5a7381c67d0219e74ff53a63b900f6353b72ef8ec943d80c4271769a058cc191ae06f9615840 SHA512 2b786ed12424494dd4e8018b5a41a558517f2614cd6dc6f59fbf4b9be5afd94e76e0c3d0e5a170d61c2212570b9d68ca9b88728e5eacd4baf2448052d782c0dd
+DIST icedtea-bin-doc-3.14.0.tar.xz 11406340 BLAKE2B 249832aaa0093f70c8bfff78bfcbe6fe32c3e6210789e1f7993d24098d467fc0b5dba505b58135da82a3e55a357891a90a03eb8032b4c4db9af15d3c16915db9 SHA512 3665b702f25e548061970a1078c4f6fb6b412bbcf59391ad04850d64cc3a664357990ad55ef1ba0a7e1fd214b23e408ca59314ad79ca0736e0f1dd94d6f92ab8
 DIST icedtea-bin-examples-3.13.0-amd64.tar.xz 1854064 BLAKE2B ca2b4fc55561843a081edd3de935f9f78f0ce072b22fa758caa6ff323182e1b295ed777d8550645c6f954f17dfbe8b932d008698b9767f2ac1cdee8b96c1a90f SHA512 906f9a83174898b47616428d797b2ea0c96c3f21a6b0c630895950292fe69ed6431aa3dd066e68e70bfd9f267e22620f1775505e0175b8ed43006c05715dbf76
 DIST icedtea-bin-examples-3.13.0-arm.tar.xz 1841164 BLAKE2B 4b5668055a3faab4ab25383c54111e5add5056e21fb84d0f3e360faaef102c94975c8991ff4548dcc41deec5ad6450177d3da8e0cd9eeea112bb9253cbc43b08 SHA512 d0ddc2f82a4bac79830a5b36264f666f33833b6bcfbdaf815936be469446274ac969c33ac975e82478598babe04025d0a68918e1933ff1c659d23608a3129c2a
 DIST icedtea-bin-examples-3.13.0-arm64.tar.xz 1852148 BLAKE2B 1126bc4a17b3224640160066a5dff4d3a47be7cd2f100f978d39f2003a08966adbf7fe4b3611205677fff351db174b4162da2260fd18797c7011af2b8a1d0b65 SHA512 5384f3e0410818ef0565bdef574c19b1927d74b5ce52a8441608cd4a56d598a65a28ef1df43469a2bc36f161c7c4920f71d09c0e0d0b828b4ccc1f9093c77bb8
 DIST icedtea-bin-examples-3.13.0-ppc64.tar.xz 1865612 BLAKE2B f24e19d55da3cc588c61b4671b3494e42e7864efe624199be5cf7a1687724bdb86adc1e29de6f1f240bb1d21dc31b4a78757632a28960f3d235aa69aaf286ea7 SHA512 e86385db7f0d81ca9b73e0ea86e55714632aff87cb6fe959ec15fb323c3981a4817e12a69ac7dd2a1d0aa3fe10630ad104ccf70aa84f3318274d43c8b09c16c6
 DIST icedtea-bin-examples-3.13.0-ppc64le.tar.xz 1866904 BLAKE2B 35d86c859010608c276fb7358bea8a7b66aeb423d7a8479a2ca919907c91e2709ce915a16d8d4c9cc6796c05fa12216b96ad59f67bf761d58b8f140878b89d49 SHA512 1e10bd09028cba7d19f1a9d96f8b835cd7fdd8059cfab443d769575f2a0aa77f39df75943a2a446fad9d52481c7bef45846b757d375848c6d0cde329609e8bed
 DIST icedtea-bin-examples-3.13.0-x86.tar.xz 1860412 BLAKE2B 8c4f729b19e2badf4dbbab3c434f9af50bbdf792950c1c6582a4931afb6d0058c40641d15873bb3539f630df1ee3f4d1474627ed22334c4a5543b32e6c7117e1 SHA512 6f665210039af9ef2d68d4e5bb61e7dd553d2894d6f46dd56d07b36c43c47d43c0574f0fe07f42d26946dc89897b062bb41a77e0c3a4937167daddcde0f5c164
+DIST icedtea-bin-examples-3.14.0-amd64.tar.xz 1855132 BLAKE2B 751c5ce41983960a0e08c7e544cf04379a591ef7077ce72aca33bfe5237a887e47ce00f2070d6bc2bfc0660ab0ac15dd1c408dd46f9bd66b2d70ad6d06235027 SHA512 96fd2459d61d5fafe798688f1b4e0c352975728255c779a91f640bbbda01149e3522025db0c1e01b9f14200be63f242eff73689c3c81ae8fb14930e460ab9c93
+DIST icedtea-bin-examples-3.14.0-arm.tar.xz 1840984 BLAKE2B 52c58563f24033203f95a4a4ece6a44e056aef145fae4221090c417c5cf091fdb79cf38d847c80f67c79711514173f99a2d62eeb39a4a7811b3fd1c8b46d235f SHA512 1b8c1738a485fa91e3a48835fa6ca8570bf4b428bd96837dd3c1f713c73de596ab874610a7d570fc54d31795168483912462ba2a8566b798265e351f8352fe5f
+DIST icedtea-bin-examples-3.14.0-arm64.tar.xz 1849808 BLAKE2B 2faa1faa65662ceb0ccf13142781ff01d2fa8601cbff0cdf30a8f53247012d3d68355780f77701804eb82e4b26082977996e10ab38181f372318165d3e08c624 SHA512 7b09e125ae6d65096ca3ee0165347336a36dc1cd016bf6fbfb3fadb0530681b5291a93429bf820533740306e75d09632bf3a1071609951e87d447d126ead2737
+DIST icedtea-bin-examples-3.14.0-ppc64.tar.xz 1864844 BLAKE2B 393f501701f6255692026fee6f6f03758828ae9771de2527ac00fb5378f4d7e8e8c15bd2f3a25d5f27dac0e57dbd19f9b93ca1b8bb453ee7460bfbb3ffa3eb74 SHA512 02c93ca019ffd281b54747c0dae47b5283d4f96b7a174dc2d433b803ae57afb04486ea6c8cf59bce34fefa64b0bb3b565c7e083fe606d161a5033bec06a25c5f
+DIST icedtea-bin-examples-3.14.0-ppc64le.tar.xz 1862512 BLAKE2B 2ebc865f23fd94c9065bf94d718ea2eea45f3c513d066f6513f190d83565378975491a66caff521e85e3f1307178979b0435487f46373615c1980c258e600c0c SHA512 9fff9c5b490010b06b695a864ec8ddc8ce44acfddde104fcb83742d9ecff70906669e02da36cef8e903ef1ef923cf9e92342daafde47e6fa35885865dd079eb7
+DIST icedtea-bin-examples-3.14.0-x86.tar.xz 1860288 BLAKE2B a2c8eb4cee690615f624fa97e0360cd25776beabbdd52089747fa48ab0f8b440a776e601455c87803f36889d1caeee6ffc44a43c9d366e2913bd07f877997a48 SHA512 862f6a23e9eef4b271491b19b9c4a98baa76fead458d6230424693151695b0a6e082a38ef4ad2cb05fbd80db4967840de718898cab25269a10bff3ea5f5acf01
 DIST icedtea-bin-src-3.13.0.tar.xz 45821508 BLAKE2B 9054dfbbf243170d42d27579d56caabbc714951f28bd3e93e4eb4f1060649f87f81ce19b6aa0925f70e436aa415e1a4be88e5eead03f146ec360d9737554590b SHA512 db50381d81f7b02a0b4f42eba505874aff0ce8bb30fc72377a8ad99b2b97dfab53382603fe96014780c9862a25436918a27389e538d21a634af6a26845fc30fd
+DIST icedtea-bin-src-3.14.0.tar.xz 45781864 BLAKE2B b4bef50c7c8ea17cb7e5c60ea17c31120181d0616869f2ca99676328cf1ba3eef95e5750301c1dc8d1b0024ccfa56088aa0ab4ca26bebf7253de7d75cab5d346 SHA512 00e0637e825073d33099665e2aff95c1a6555fda7177c0c0057298b5a74263acb35f98db946877ddd82c1d1bfb421a07da2801c8d3013ebb99e1a0229f9781ea
 EBUILD icedtea-bin-3.13.0.ebuild 4587 BLAKE2B 987d7429ab63c3fe5a4cf7cc9fab95524fe89fae5f82800a4c8cc9fa88104acfa38b988cfbe611acd24fb164a9147bc9bee9f426e76a64ca8f8525cfb935749d SHA512 6c6b1caa8fb657a7bee206c517afcbdeb6349c031131439ff29cb90aae92a14a931ce2149470dd9c26125902f6c8403c070fee4d182c03360e7318a91f03cb44
+EBUILD icedtea-bin-3.14.0.ebuild 4587 BLAKE2B 2941cc41beddcf13c2d7f9e6dca721b1f03af83582a3e3930efe445e92c33408f3fd6d4b50d1c04cf208e34992d6e0039e9b893d3cc58f2723d7ddd1d13b1068 SHA512 dc51e269929a17fbb230cf214fa0e7332181df664c57baef7ac2baeb4c76694e4c8ba6188f8a2c170356a54caacc57991b505b701d8699bf02c42836f9286c86
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
new file mode 100644
index 000000000000..c516938e3916
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.58:2%
+	>=media-libs/fontconfig-2.13:1.0%
+	>=media-libs/freetype-2.9.1:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/zlib-1.2.11-r1%
+	virtual/jpeg-compat:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.28.1%
+		>=x11-libs/cairo-1.16.0%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.42%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.10%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-9.2.0[multilib?]
+	>=sys-libs/glibc-2.29[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# use system-wide cacert store
+		rm "${ddest}"/jre/lib/security/cacerts || die
+		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index df4a7efbad20..cee76adef3db 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -23,6 +23,6 @@ DIST icedtea-3.14-shenandoah-9e52f8d3b511.tar.xz 7061948 BLAKE2B bf26c9684d088dd
 DIST icedtea-3.14.0.tar.xz 1528612 BLAKE2B 1dd24bda5f461c2d8a354e592f618925b8c027a8aaed3b30697a2bc9b8a5aeb33fd198895985e0564d15a6e65ed6adb703f6018e0ff9fe31613eb7d72a9d6e39 SHA512 6cd366a1adde12b5cc2c0c64c0c353ebf9ad5b0ad79b77c5cca3acc93219752110eb222b74bd62180fe0bf5b063db12df6316c334d5940d1636c9d10824085ed
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.13.0.ebuild 12225 BLAKE2B 5b3318159ace6d0dc07d5420980a60dd4a4c698510f178e076a5c074654603bd81f8ab17695277ed8e0d4330ade2901a644462a540df1610d13ca4c395c41cee SHA512 0ff677a0f7f8f73daeb1ad1c03491db1cbe2944ba492f2419462c544fcc55c6d8da1ae5c1a2e372c738d402d8fc1b222ef75260bbb21fef50d5d1c6c51ef8a2d
-EBUILD icedtea-3.14.0.ebuild 12225 BLAKE2B 249265ff1d03dc2f3a37924a8ad5e01192dfb557e81a83cd4bc925d4627712bc4bfa71b8b54df48617462c5fe915e24a009ff923e88420cd31bdeb24d502fa7a SHA512 4859674f38c97c222d0f2f1c3c9a0e04965e460ca8eec16e3d08b73eebaea61ef6c26e2f584e53c47782952046e3c5a20ea25dd20a6981ae3b99c164f0e86aac
+EBUILD icedtea-3.13.0.ebuild 12224 BLAKE2B 65787bbdc6d6acf0a13795840e92e61d20b468c9e1c6b41acaa422e79f74bd6b88d2e77ca66a90295251fd1da502dcb5879703b26f17219032b354b1c9cec824 SHA512 761c9abfaedd00909a89493787bf93b265e8748442eea61b1a3e2c101c477629140f3db071d1dca46c31835d938cacef800cc53d7703fc25a00779ad73086a28
+EBUILD icedtea-3.14.0.ebuild 12224 BLAKE2B 830e90984429b75291054a7cb9e21ad1d07cd16e73f3f7fa87760fda42ec4924ad351d45a6dd8d8ff0706a32288e4029c814d765e5c8740d5668f1c6a6642319 SHA512 fb9661b0375321ffb47c9e938c6d4ccac9d35e2347105e1e306944aab0bcd173d343e671e839dbfe954d85c434cc5c9dfc3f95d0a1fa9975247e18d0d8d3a639
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.13.0.ebuild b/dev-java/icedtea/icedtea-3.13.0.ebuild
index b68d66cb8ce8..ce1979057abe 100644
--- a/dev-java/icedtea/icedtea-3.13.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -71,7 +71,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
 	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk? ( !headless-awt )"
diff --git a/dev-java/icedtea/icedtea-3.14.0.ebuild b/dev-java/icedtea/icedtea-3.14.0.ebuild
index c52bf3276540..03d9440ef6c5 100644
--- a/dev-java/icedtea/icedtea-3.14.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@@ -71,7 +71,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
 	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk? ( !headless-awt )"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 9a2e163a8a9f..2cc672bbd8c8 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
 AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 1004 BLAKE2B 855263e897311a546388a71402a17b6bc69f48c6af31c007c6a5d0a375ae7c2f103951131a83b6b8776f84277acf57d5674d2313323afbf7feea26159b0878d9 SHA512 f37af0308756340f205bcff424e6e28b2a82813a4f156d92d886bd8968115384aa598aa92a6306ca03540396954e1022172e780a1b4f822386d8c6d0870324d3
+EBUILD java-config-2.2.0-r4.ebuild 1000 BLAKE2B 8bcf285c27b81ea43cd641118f49e23f3da48a273c40e8e6f9d9f40071e7e107d086bafae6bdd73e0bf30104f8a952e9767366845cbc33ef1f4f32a7202fdd70 SHA512 29fa3e02cdb5a16de1cbaf0f94572800958be82a113deccdfd4ac04008545eb6947e9a4bc7cdd6d5a0d2249d09d7dcb8837612530031c1bbb994c091571abdd5
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index f84cdf1be071..eb779125165d 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 4f0ccf10ba47..aa22988ddfa7 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -4,7 +4,7 @@ DIST javatoolkit-0.3.0.tar.bz2 16823 BLAKE2B a19307053e0ae4e2415449470c16fced904
 DIST javatoolkit-0.6.1.tar.bz2 26036 BLAKE2B 1e63a848ff5941e34fe5c4d449b5494cb9cc3e7a42c4654af94e602f3557775f2cfe1d2db7f96e1352c891e2c20822be973ee1246f879bccf611c4db724ca028 SHA512 ddf61c23f9a31007afc672cb762fd7a655c168d73616bc703a9a8a8c27d8a836b0340dd109af0c2a311e0237a57967785d85b09f8059187ba9b4a6ca6f2a52f3
 DIST javatoolkit-0.6.2.tar.bz2 26046 BLAKE2B 9e6eec5e055fe63191cdb67b7103c4f27df4569256da0e6231eece55f1d0c32f754b9b4784c2a7f79224404dea41d9583eace8aebab6e1e10bf0cfc875d74591 SHA512 70eede9a700fa8db48fef62116eff2cc89b637991c0691e5385a66ed1830788dff355c6f6d343533e58bd89bf1fbf017d5bcc6867f6d4cf23bd56d5ee857d145
 EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
-EBUILD javatoolkit-0.6.1.ebuild 834 BLAKE2B 7bac902c01c766fd8925042f8e538db6a36f4c7e5dd2e3473ba45525992d52bb0021b205cd1e999884a5e8c118eebd7af6d94f785fd5d5664cad3149d2ea567e SHA512 37856d129645de18e6ccd9c76c829ae81216685c11e189e039b98a64eae2a350b74294aa3df751f4646901aa87a017640304a4f6f99d1b14482b31d9d0ed5e08
-EBUILD javatoolkit-0.6.2-r1.ebuild 817 BLAKE2B 493e327ab9d0147d1fa68d04890b9198393e452d00879e552f08f29130b3aabdf379fbd9950e15083bf1a74da527e5202484523581ad197e8e8ccbf61c73e9fb SHA512 a1a4b42b0248164a0d2314f1780077ed8f38f7f59bf4eb0254164cc245a9873f0e4a6819c33a3d85647dacb525837ce546b2b9b8b804e3c08e7bd738bdc41223
-EBUILD javatoolkit-9999.ebuild 676 BLAKE2B cd8e02bb65fd37d6eb50e7283dbd74ff9c1a9636056e83069693612c0760858f9f4ea2498545cc860872fbfe704c617068423adc483ed90c9f6386826452d2cd SHA512 56812eb6eceac6151ce6ff573cd7ed2d936a5188c84571bfcbf285d9077fb5dd1219a4938062f238f3d3187c79998deb09b1fa2b7f7fea965dee8a35ebfbcbf4
+EBUILD javatoolkit-0.6.1.ebuild 832 BLAKE2B fbbed1237f71b64ed6ed442edefa491e31d34fae19292f9e29a662e7939fb727231ca569d72177fcc5bade4edad183cc096b14348ae4326bdcb3188c98a21513 SHA512 5641500b4b98b519d26b4980e4fe3305b6f361fbbb7524073ba16c9862193c33bb9202d82b1f4f1794f90ef53479db57b2ab78fd845dcd2b123d43bbfdd82b29
+EBUILD javatoolkit-0.6.2-r1.ebuild 815 BLAKE2B 1f98a15c508309d4c62257988f517dda0347308e1563dd714525f5334bd4f7f779af725394ecff1772f2f29ae4edee9451db7f4734032fbe7167e05498201009 SHA512 1c15d5b74cbbb3f853884c76a7fa78d479da1ddd06b64fdc1359235f62bc8a3d82dd256337f1f2232569dacb1da7eb0ce367d76a4d00150e5d4df5cf6ccbf8f3
+EBUILD javatoolkit-9999.ebuild 672 BLAKE2B cf8895ca981e6e6499aaa00e6e76ff57802004a6c98b670b47ce4a1ac5581cbd495face40ea7621de783bbbbb273d6725ae43daba17fd896ba4d8d373d83b7bb SHA512 1320d8fa0b2306c07e9a8b5d04e948f58c996a2da642bfac12ea0ca6a5f1e403d030aa881d1cf28ecd6450bdeb0a065eb108fc00c06183006da995869f0371b4
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
index 7dfee0ff04d3..3dcdc2d8ae46 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 multilib prefix
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
index 296071a0736c..2a94aef3e960 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1 prefix
diff --git a/dev-java/javatoolkit/javatoolkit-9999.ebuild b/dev-java/javatoolkit/javatoolkit-9999.ebuild
index 798742d29afd..be73da5379c7 100644
--- a/dev-java/javatoolkit/javatoolkit-9999.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index bb93bbcda3c7..acb00e461032 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -15,8 +15,8 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
-EBUILD openjdk-bin-11.0.4_p11.ebuild 3137 BLAKE2B 0718bcbcd50aedd6c446970a9ed652a0ea485949c505129fca1bf9c95ae2df1031000c8e21e736ec178e8acf0c056a29fc0c02283cc47e3cb20c3abe6d4d5a86 SHA512 c59cebe94522c7787487ff5e00d7abcbdd91b9332a161135fcb1d4695a6251ab84cc5b6cd10e5b98377056635bc326a08cafbd05d50949057aa6a8062196cc1e
-EBUILD openjdk-bin-11.0.5_p10.ebuild 3104 BLAKE2B 4afa1206018e23a98cd85f09e90d99c960c6c2cf4fbd65c2c649e46805a1b8b514767cc21abb952932f36debe53a836985f0c2aee0ae9a3f2e3769ce2d26a235 SHA512 341f180a84fc144d18900d87a5c93125f9fbdc80628b0d664a977c820351befce0b1e238e9e93aa035ab664fc63ab37f0f8bc6cef5a8f6ab0bc4e8fe16a6428f
-EBUILD openjdk-bin-8.222_p10-r1.ebuild 2782 BLAKE2B 287a31fbaa4ff3e4f3f6add02e66fbb78808387dd448406a72e6e12ba6164f1ac882b710b3e655bb92af7b9074c1cd4d9c55ce76e11382b5655777fbf23d689a SHA512 fce4a4388b0af3c0248b9e35c1c4f2db9975a68dae14f24ef3c1a0936f7f7dc88c3deee3f1374c05a8bebfa2bd5fe8e44d4a2b0d503c1aea479b214942f55ac1
-EBUILD openjdk-bin-8.232_p09.ebuild 2785 BLAKE2B 81656728c97375789236220070635dab30b5c56f8d31243038a77509cbdb32f62e8f506ba6d4dde0696ad11e424955deaddde51fbfd022f4612819907957152f SHA512 5a728a17c18811d0681db701ea4fc1f0ef01019e5a0c5c6e1bdc06449c4e0cb7d076a769bb34523ba2a1fffe9a0266e92f61178a3b709250a149d7639adf5210
+EBUILD openjdk-bin-11.0.4_p11.ebuild 3136 BLAKE2B d6c8f6dd282760fc630db5da4a01122b3b1cab099f5baf679e841f3b585fa486952c0660f39b576b4b0dba1ddb3bb3075642238e0ea45ddf12d9d774f46d65eb SHA512 f0a481a729b3111f3ddadb55e3dde2769475844ae7e983fa2e87cc5822710f4e39a2903add53e1814ef00e13b9659e6d349979bc1e6419eb3114813f057ce616
+EBUILD openjdk-bin-11.0.5_p10.ebuild 3103 BLAKE2B 1d1ea355127fb32ace6af9780c5fcf2d5f59515bdfae4d4fe5f2ba467b1e45f0315d0251ea6c743a52b7f790e9d998e53e2a97d14fb087a8bc322e69f3918066 SHA512 389fed7ce0aad66f9fd3b706c44f7d8ce5b7f6f5534a0a14b7427eda3c01f511cc76a3289a343a4d9c657579fe0f7039bf4f5c6836e4fd5874d5e8b4b752d6c4
+EBUILD openjdk-bin-8.222_p10-r1.ebuild 2178 BLAKE2B 2b7e6e97ad3c57af952937f7dd6987b23c0a0e185cd46e026079edd57f718d7e78edb5d83616a77f5a4b8de1b0c4e1ece1feeb45059ae622cc4d044d8bbcc998 SHA512 59688aea079896962cfbac663e15d08302bb926682fa49d2a23d0c7f8eb127fdc9a4181114a027f5865a0ebd5c357d8283349fd6c32c468de1a16c0c41445e71
+EBUILD openjdk-bin-8.232_p09.ebuild 2181 BLAKE2B c514fcc5805bcaf1a112a74ed8b34f7949cd0a24f810a0da94a10e7671215a918bd1d43ee3398c6a670cee7ca54717504a53859c0f7f7ad10adabb8f1936dd1d SHA512 8650738fdd5f274e62cb5a25fe6214d8fafe8b32b22ead6e1b36584e8b709b1f0d2002a0c0e8db8ee171f93a1b011e48199bd3fffd55fd66d0009c3981177c4a
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild
index 16dc044a614d..c629d40f4861 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.4_p11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
index 3f1b4f75da71..52b3d9d67df5 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.5_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index e856f20fbf4c..1c48331fa58d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64 ~arm arm64 ppc64"
 
-IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -91,18 +91,3 @@ src_install() {
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
index 9af9550dd34d..9225c3e2202b 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
+IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -91,18 +91,3 @@ src_install() {
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index d5320fa0cc80..ffabbc6a1f57 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -4,8 +4,8 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.4_11.tar.gz 42055392 BLAKE2B d9634ee9
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b9618f653ce3df1a1f6b3a3f3fd0ceaaa2d66b9d58872817fdbb7846195459b0fd1d79cddb444e0cd17faafc46bcea85fa22b810d2e93b95a9829da6dad5 SHA512 b13ee8af718c701195765eb6c36c8a6dfc32a5a39f8da4118db4e5ef8ab2012f8952cea73a964fcac079487b6372c0be727f0f2df43b948ccdd4663e6b327d1d
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u222b10.tar.gz 40934975 BLAKE2B e03bfb1896e140b79474a4c9004a97aa07bc9fb29c608b2320c05625a56936555ff8ffda7c9656a2d3ff7628bac769e4d14694b2be6d08e4c90b0e6802a05afb SHA512 e1810c4115206cf78c69b971354474098e853c786b472c2140b9e16187efcd3e15bfff26e743e7a532a6f0619f4728482348583662c1eeccd1ebbb82b980f8af
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz 40963409 BLAKE2B 16f0cce76aad30ed27c84f5bf5e5469c947023d8ab07886013e50ce9af31c90df11dfdce6fa220ff5d59b511dcb7ef4df7dc73fa7a7648d2e92899a81eec6109 SHA512 5ce98215c36d2870ebf0112205dfae39c3d43528ebe175dd16ff54b16267b44ada5d5d26e7d7744db95c3c8faee2858fad59c92b065993397defa64cb58c294e
-EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2730 BLAKE2B fc422564705f6c9346ce41f588c6358b3afb3b25d4bc376310c6538cce99b7e3bb4dfa301d15662975675759b5b19b0c922dcc8036c6cfbfeb712324c0f6146e SHA512 a4a0563852977a301cb1bbc2ac19aaa0c9e20a5da1e3828ef1f6d43c516f83ad7667d698bf7be52713ee81708b2b542fc8095e5fc9bf6e830dcbdc9b86539741
-EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2730 BLAKE2B fc422564705f6c9346ce41f588c6358b3afb3b25d4bc376310c6538cce99b7e3bb4dfa301d15662975675759b5b19b0c922dcc8036c6cfbfeb712324c0f6146e SHA512 a4a0563852977a301cb1bbc2ac19aaa0c9e20a5da1e3828ef1f6d43c516f83ad7667d698bf7be52713ee81708b2b542fc8095e5fc9bf6e830dcbdc9b86539741
-EBUILD openjdk-jre-bin-8.222_p10.ebuild 2561 BLAKE2B d2e2e35f24b27bc71bcfb2d69b3ef1f6de9d3cc6f41de2280fdab8f8b4655c499079c23dba142d804c5f92214b9754d6806c0884513b9802cfea38d6d3e3c48d SHA512 9b16fe06cf1267d691681959bc7c643bd0f8f51ef945c3ff3513276ba69de4a6f76080e96e56a4a82458980db7a994a4bc80831aadb13d32c5c2edceeda6a122
-EBUILD openjdk-jre-bin-8.232_p09.ebuild 2562 BLAKE2B 26cd29915f566af2dc29e8f4dcf7c69bcb7596378fc27bf9b985be67a46abc8188559a300946f0f33e773876cade48780e3c9d4860aebc395b1679ebe52b4624 SHA512 5f63709dd8922db187f6afa0b5bf15dc281470d3eb68ba90284c77e9a76afed1d30ec951f0970a79ac83b14744ed092e8be8a5d92cf364ca9ee2c44a8a4d5cbc
+EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2729 BLAKE2B 6178dc7f7e31d3aed99ecc29a0eccc5d5b553c6a9080ce8a58beb662ea2720c1011a80ad6eb1e90f263233b99001676548fc501733e9f76dad2a4192f432b01b SHA512 4bb7c3c342b0771267ca8265fb688e92c8e376f611ec6ad32d0f5953ad900a519fbf688c4f2657b8d2d6fc486c6536d61fc0f2b44a806b41312c47cb6a4469f6
+EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2729 BLAKE2B 6178dc7f7e31d3aed99ecc29a0eccc5d5b553c6a9080ce8a58beb662ea2720c1011a80ad6eb1e90f263233b99001676548fc501733e9f76dad2a4192f432b01b SHA512 4bb7c3c342b0771267ca8265fb688e92c8e376f611ec6ad32d0f5953ad900a519fbf688c4f2657b8d2d6fc486c6536d61fc0f2b44a806b41312c47cb6a4469f6
+EBUILD openjdk-jre-bin-8.222_p10.ebuild 1957 BLAKE2B 0984ad6b29666dc0d15d473048f68ba3fd457b49f0ed8751f11290d510c921424d4a30729bb412e9cd4f6b7bd5b6791e712311694a0ca8619f88f91c1b82fa92 SHA512 f6edd2291f38cade03bdb04c43d96533531206977a765b0d262f89261cf4fab0bd2128974a94761f58b6b43d2c7652ed44cf5f6d673582664895ca445bda5710
+EBUILD openjdk-jre-bin-8.232_p09.ebuild 1958 BLAKE2B 28e134f5e7bf2ea1d33c99bd4de62232bdf3e90ce129f9eb3c9dabdf04b57126baf11c13a4f475540d3319454665d8a3afb6e50cd0b4155d9155d7b0e1c2808e SHA512 eacb8f26d63f287b55c965c707780f9e713cc9e37a7cf1d2de1f92443d3e1078584972161421f87877eeb7ebc00fba40ef8dd81abc252a380fe6b9ada616253d
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
index 6efa5873bdfa..6908dd4a66c9 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.4_p11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
index 6efa5873bdfa..6908dd4a66c9 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.5_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
 HOMEPAGE="https://adoptopenjdk.net"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
index 4daca60480dd..ce2ae3294602 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.222_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="amd64"
 
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -82,18 +82,3 @@ src_install() {
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
index 0b15e6a49cc9..5c67ca6a6216 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.232_p09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
 
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
+IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
 
 RDEPEND="
 	media-libs/fontconfig:1.0
@@ -82,18 +82,3 @@ src_install() {
 	java-vm_revdep-mask
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 038b9d0614d0..82766c1bed49 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -4,34 +4,25 @@ AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd
 DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684
 DIST jdk-11.0.4+11.tar.bz2 90420043 BLAKE2B 28e7ea146a14ed4629a42c69721a9d53a1c7d6a0346d96bedf15c7f3472d39b0b1d303ceb0c80dd226ba21236588a3c1222446bf98492235f9c18ca870eae26a SHA512 5211aa3d8b1215574b75137a6645ec1a3dd833a9815065f04cefa00c26d2aa6028074076645a22af2a6ffc1bd39cfa1e5e92d9ee3f24af32f9de914cf36b8056
 DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6
-DIST openjdk-8.212_p03.tar.bz2 451800 BLAKE2B f8466a0d99650a07e3ff21e8dc06252ef9d31ce15e22c6ede15fc4c7b1633820e84e67aa501e816101c6bd473293fb897645b2df1530d8f7b81c6e8e6d38ce3a SHA512 ccc642da05aa00cfcc46c1eb759391dd2242218b7392bced77481600aa15b3b1d0a0c03380f59b6a6d038311721f249de1a6b116c6f651193cfb57b89fba4866
 DIST openjdk-8.222_p10.tar.bz2 452194 BLAKE2B aa5a19245e9b5f79da217ef4e8ff87acaf6b4c7b930a6cd1c7a00d2c6d50bb3168c41da1b18e8beb072a84bca7f3956e939edd9f5fd88899d2cc3fe754ff19f8 SHA512 08f92327732fb54df847fe0b3e49460bcdd25fe2aef7bc9545d75ab6504ab92452f8f5daede6040d28fd9b8347f49d658dc7bf88abc90235d6cf4a72cb44fbba
 DIST openjdk-8.232_p09.tar.bz2 453185 BLAKE2B 9f78dc3a482f42937c9f4ed30492cf8348c903c6a419a7f2644251f853f92e2e112f72c16848adcc7102f41e8f1249e35d7019bf0b5c5fd823e4f068650f36fd SHA512 31fbaf8334b3a40f491ae87aeec5698ebac334b8425147b8f8fa1a397e64f5bf7025d22dd5ecf7c7029c07ca40424f07ae139aa5d9737b20a6eeec2e9a1d835d
-DIST openjdk-corba-8.212_p03.tar.bz2 1033709 BLAKE2B f59b294e62425b63e881ed5534ae9beb3cc51351ff197995503671ec52ad82e34e145f8c9790dc88e4f452b4e09af80143fd0f7e0fda588b00eed08d4b2bc861 SHA512 3a786a372ab6b849a6ccd944cdfdc0aa9994a6a9f4d52afccad7d6b187e46a1fd0be30bde3da1eb03988034c36b4590b55379819245fb6f5ed4d75a958e9caa3
 DIST openjdk-corba-8.222_p10.tar.bz2 1033549 BLAKE2B c75f100dc22535068588afe0460618005c46542cbe078e4e35ad80741d61012422eb21826a6ddcfc3b59fdde3bc7e6107a57cfc654114255b1d880273f54a762 SHA512 377847ae044d1e4515c6c7afaf965e037e6688ab010a24d436a5b31c251f2c09a8e622863d533b8b71625284bb5db93f114ba12ec05c731f0dc75d9dce70ec17
 DIST openjdk-corba-8.232_p09.tar.bz2 1033216 BLAKE2B ed6416fd49aa6d00804d90a40a7a3435828dc92087695eebf3426c49e5ccbd2f1a2cf63ee879a9e9da82c8ad050d38618e384defc185d44279025e5cf4326ae9 SHA512 97401d01727090f29e90735095634149a59093374c19f0611237de105ff1c87d7f0712efd6627cae57d6415f336c5750a7777abd1b30068ec57f88f78e23fbbc
-DIST openjdk-hotspot-8.212_p03.tar.bz2 7925246 BLAKE2B b405362450186d50228ddaf78907a98365c34d5e09a95064dc39bbc88328d1bf37e23791322fb68a44d90753cd68139627d235852dd1e03ad2b0535982badeaf SHA512 e8c8f9151c94bd821fa6810a0c70ed2749e0c39f66108deccc68718f106eb1731c91b13fb502c4a4be425ee04ecd909937247efb5891aac1ca27ee16d7bbf290
 DIST openjdk-hotspot-8.222_p10.tar.bz2 7937298 BLAKE2B 42a74946b0ff88f1d910751af7efbe86aefc92b9039a4629445ba08255e4a9159a592e778acb8dce557b58324ce023360d9ed892568486a11336e8a09f8e6664 SHA512 20395d55201f072fcb5a7674ee1a2e3fb7a922e03ed4630645d4f22a5ec94c945978f7dfa6d06c28d0f8e9e4025f50986e8eba573fd44bc675ff7978e25723b3
 DIST openjdk-hotspot-8.232_p09.tar.bz2 7951090 BLAKE2B 58f79b5612ae003fb3b7d89c4ce6243bf4a188c0d43ee60f56e77e3fc62b265571bbed7129aecb46c4c5f714f839f685fe2346bf239b8738c02afaeb129b3894 SHA512 26b0e5948dfa769c7f7974899d95ee372d836aab094ac13e12c904844ff414b6ac27ff1baa7f905b6c6bd4f3b4c3aad6952bcc08f85c9815b07375379d2100a5
-DIST openjdk-jaxp-8.212_p03.tar.bz2 2734510 BLAKE2B fa920514fd499019a8f3d03edf895c11b3d67617b645444025cc5406216fed0ecb9340a08b8e314c43d0ced0ffbc1e3940f7c719930d5e4cdf9b24653d6249f8 SHA512 200516ef92b9fd50b4e7814b2f5f62c344b4654c8c836e0166c9e3669992d2fe231d3e262bc9be54d8793d6c4a3d6bdee5c93a6b6a3b6481d6a234f26dfb2a32
 DIST openjdk-jaxp-8.222_p10.tar.bz2 2735189 BLAKE2B c4ab593edfc914e30bebcfbf0d5c68b64711005a2a027f165eba8b1583e673d74d0cbec582e6d1d65de06ffcf189dbdb66f2b1eb224f127a1908cd6c154c418c SHA512 e45facbaabb803191d86b477f88eb8d8960ee224bc5d6bd4fc19688e097c9d5aafc00597ff38bdaae5403ff330c3188867bc94cd3fb7bf6394b770f1fb0711b7
 DIST openjdk-jaxp-8.232_p09.tar.bz2 2736383 BLAKE2B 13a62acfc577c66cfb975684794dda18a6e1b90a7a32167ea914f646592ee973e7d57c415cf23d5069748f03f2fedb0e14482ea070aca39dde31f01ff745e36c SHA512 725e9220da0f861cee61e81ee33ec7c1ca1edfded7c8bbe407c14d0e2e6a2c980ec1e28a578c825841f4622dab408e578412a39556642e2208f78c679b78f01e
-DIST openjdk-jaxws-8.212_p03.tar.bz2 2540937 BLAKE2B 53c2793d9071f408a3704dacc4d61ac8f1b8ead33e75d309f217a05514661f14656711d017bcdde5821e114c5010d4417ac283571c2a52c28885d6736468402e SHA512 3e336e8cab78636b82488b7da183ba4ba2b84c0a2cb72a369c4352aaeb0fa5da05660c830db12a486e1cdfbc7a88a748d88284ca86c45b890a40dc1d23f3915a
 DIST openjdk-jaxws-8.222_p10.tar.bz2 2542293 BLAKE2B 832cf1b98c2cfcc55591d004c7c9f3055412a71632c671cb7343af74ff25645f68d27b298d6ae74a346c0be97470e79c0aca152e3ef702b9e88385ddbfa324f7 SHA512 560bfea42b6e7981e19d974e71382f8ad74729a2fb76974adeb592accaf58c2715ec096f3347ce56a7403c38db4dbca8892eced67eb851f16eb4cc43a1152f1c
 DIST openjdk-jaxws-8.232_p09.tar.bz2 2542463 BLAKE2B 3424528dbe22904f0355806f201dd54f0a777a983c09fdc80834fc302f41f68c75df271b24c557208c5f945fd8d8882259d9dbff3fed0e98113ef980b982516d SHA512 85d9708e231ba18f37c9844b23a13c59a78daed0a92a42b8bc167059b1aa67c25e74e6a9d980050777d8f600fe07298e0ce15fdc9621f6a469ec0dd996157e4c
-DIST openjdk-jdk-8.212_p03.tar.bz2 46720739 BLAKE2B af515701052ede8b6cf828cc74f1f5938dad0874a12ed3c5c3f7b03be1f43108fce5e1820452a87e098c3469922227950f6f4fea33306f7b426487b48cc4b993 SHA512 9b3342419c82a8f243d2a7523d83b395c89629820fd99ba387991656e5754ed067877bf12b7e780368dd4bdb6eba10be09e63b1301bcbc0aa29e86e84ec394a3
 DIST openjdk-jdk-8.222_p10.tar.bz2 47175873 BLAKE2B 47b330aa1d78607b42df650629bd88dbde7a8caff2bf6938d75a9d8ec9726b5d32cc5852bb0d877eedeecccee8e2673328697bf104b7380c275e85b9a57a1274 SHA512 d6229f4e86ee0e5798b60143454f39e8de79edc596bf89f6dc7aaf2ec73fe22631f974c2d43e832a255ed2e51e32877926874d1911c3561f9077ea28093bf057
 DIST openjdk-jdk-8.232_p09.tar.bz2 47141486 BLAKE2B d0003de4b47cf397ad9c56f08f579752fa54c1e324b4382d92132af47439ad8052a7b8e80447736411e2d870da6eda15472c4ab34820fa49172f5d57974888f0 SHA512 dfa0f1e1eea73eb13adef212f8dd949f1b30d4d60f4977a595c50bdc5b5741a2d8a2550ca31a300aa632b4aa719d5c093bd36e23100b9ce7f446aebc2f9651ad
-DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eabace5d1c6568646084421fbaa43045ce0ec8d222f1a7e8629e4b86bdd5ff8eb51e90ea1eaafab3e94f34c41932754249f17b2e447f8 SHA512 15b931432cb14cf60c73627bd70e66f6d18ff25763a7b8758109cf8746d278d6c2b5d945a9f0b948a76c0813b5f42c988a3d10ac13165ec12e0f4d9eab98f369
 DIST openjdk-langtools-8.222_p10.tar.bz2 2394871 BLAKE2B 376dd5d5cd86704b7cf6d02e8a117ce0d36f43316cc9000bee3f3f1fc7568e080c039e9adc40b6fb78720e2aa8ac921c638e20be1766e2252b29329bd17d28b8 SHA512 79a1db1c8afd5d6834ae5e565929eeb7567bc4ff3fa823789f6f170fb21e0df71d965595f4fb53efb6c5af1c1b4c7c8e2edc91e60178b57a8957935968f480c9
 DIST openjdk-langtools-8.232_p09.tar.bz2 2397864 BLAKE2B 7351a50bf5d425bec9343787c463823f24115f62d1ec8cc7f98cd8c474708415a2b9f96ca5a8f8aee6350a0a0e208d3eee117bbb778b7f3a985e994dd97139a8 SHA512 f34035d1d892e686a11c1f88b84633cc2c68bb5924ea9b278eabd6dafc86e4b2695eeed854ee2c6c96082e16acf1ceb33b7f273e44a790fe8823564690335c43
-DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
 DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
 DIST openjdk-nashorn-8.232_p09.tar.bz2 2858464 BLAKE2B a75eb94f81c4d94bb5df6a0799ce447a5a382753a95579ff0dc20e171233a84737067edd120412b14ffc93e82290998a2e8c4de6407888e7bae1f4d226034c38 SHA512 6e5d12b75735b1c51048b0e90e7d977766ae4711bccf139714e19f773e2cf6532d36492168ef6ccf797f86cb11b22b0bbfbb53d9399265a58b08ece702e96a3b
-EBUILD openjdk-11.0.3_p7-r4.ebuild 7412 BLAKE2B ae6891fa80816a734f9f9d85c23451091d59ef3132988431077fb2f4a9e42ab395ac60db0dafe2ef6c73b9de0bdf0ae850d5feade7d06b3177ab139fa2ac34bd SHA512 bbbd123c244b8e988af793bb0731d9644a640871e87e15824f787cce63dd8daad31d1772e5e1533cbce723283247c92bd6da214606b1d18fa53479b883572046
-EBUILD openjdk-11.0.4_p11.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
-EBUILD openjdk-11.0.5_p10.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
-EBUILD openjdk-8.212_p03-r3.ebuild 7338 BLAKE2B 2f1234bc40edaca88f1519a827ce29824b97e2b8ed3cfe366ff5fb7bab342f9ba5eb9f134edc6853de10e9c962e2957436b323720cbd5b455621de4951ae3d8d SHA512 891fa8038fd6ee9990d71817022c1659cb15a98ca738bd89b54977708fcdba96c2d28572414d4e81f36baa6f7342eae0097360ef77eb06debe0b6d0663ada6cc
-EBUILD openjdk-8.222_p10.ebuild 7427 BLAKE2B 0d339951fe24a8e2baf7f717dfcf6dee3158b9c60fc44a033305c1462bb74231fd3f50ea42f388c5274bcbc7bf5ca529e4b567706fa39c01d2533ce4c008558f SHA512 f58f3bbe2f71912f6322f42e5833e07e5497a702c964c78861c9a2114121312eba2a1102fc0b769a9f1955d7a161764c8ef40a21b76120f81a6c1ea58538a0ff
-EBUILD openjdk-8.232_p09.ebuild 7423 BLAKE2B 441c46eab29c687dfd8f3208404e1881cee5b3e6d8693fc9a1b8a9e9d69fd42cc76a020a9208fdcc6773e79db01382687b5ced207d62e832db594e7993c2a3d8 SHA512 ea10d96953b398b5c73a967d22874392f6e733edfccb6e1f1a7ba2afc492fd76c0fe65eb2aac828f3f0c71376b48693510fb443f286d219eddd32af8f68efd29
+EBUILD openjdk-11.0.3_p7-r4.ebuild 7411 BLAKE2B ebccff73dbd5f3fc76f8d8097bf2eaa5595b02b664de276d6be6604f72bfdbef0aa3928803e70aebfdfd3e73b0146f09466c4e6f9592d604af62d8fc65d7853b SHA512 b8aedba3ca200054a3ca2e0fa1142766ba5ffdbdc946ade7c61e4c19373b8ab47285b25a76e9d6740432e25d749dc5d379e218081b8cf64e2cac79c8c181a097
+EBUILD openjdk-11.0.4_p11.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369
+EBUILD openjdk-11.0.5_p10.ebuild 7532 BLAKE2B 9de8fc795b96eee82e2574c811971dcbe4ab9c291170be54ae91d8ac97654ac7889d055dbb3f186776964309e47ef10cd7cecb4ee9a6ca8fdeabe3ea725fa170 SHA512 6f49ac621b017fc14287709dc8e2665d0944a4ee9a3b50e4bdbfdd12e5a1ba1532f5c228d8dbc5b07ec0e33c665771fcc33829e1f262eeb9b573aef6b6def369
+EBUILD openjdk-8.222_p10.ebuild 6841 BLAKE2B d7a8f87ae3f1661a970f3f3ba8e0e996a317069717b119365789b2a514e7349c294e05414656f069132e3435ad887128e38d84f9c2a536868dce8946e7187a82 SHA512 207c9f7dab1ed4afa6838c614d4db44afd856f1d093d0425d4316c2d46431d9e790f38c6a4ce6d39b39c5ae878dcff9260743cc787b2cf22b0053831a0773496
+EBUILD openjdk-8.232_p09.ebuild 6837 BLAKE2B 4347c1e82b103112b5c72ac9bec80396214ecf6d9b933782912ed27403c92bff11239ffa967b95ad9ca1b181bf04c4ed2b01f97598a07e67c806b0f0342bddd5 SHA512 c43b02291aace24ab806d143cabfd29106c7a8ec16d4e44bc5008aad1c50b7fcd1362e732fb3265af6cec4e7ff5f1b77d8150477ab5917f90d8b962110943266
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
index 792678b70287..5bdff86cde05 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
index a40f54aa69b2..7c7b56ab423a 100644
--- a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
index a40f54aa69b2..7c7b56ab423a 100644
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap +webstart"
+IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
diff --git a/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
deleted file mode 100644
index 7626286e5fa9..000000000000
--- a/dev-java/openjdk/openjdk-8.212_p03-r3.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 check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
-
-COMMON_DEPEND="
-	media-libs/freetype:2=
-	media-libs/giflib:0/7
-	sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
-	${COMMON_DEPEND}
-	>=sys-apps/baselayout-java-0.1.0-r1
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-			JDK_HOME=${JDK_HOME#*/}
-			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-			export JDK_HOME
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
-	done
-	# new warnings in new gcc https://bugs.gentoo.org/685426
-	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
-		hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="$(ver_cut 4)"
-			--with-milestone="gentoo"
-			--with-vendor-name="Gentoo"
-			--with-vendor-url="https://gentoo.org"
-			--with-vendor-bug-url="https://bugs.gentoo.org"
-			--with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	emake -j1 \
-		$(usex doc docs '') \
-		$(usex jbootstrap bootcycle-images images) \
-		JOBS=$(makeopts_jobs) LOG=debug
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED%/}/${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	# stupid build system does not remove that
-	if use headless-awt ; then
-		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
-		{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 047e06407e8d..9a74ec428906 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 arm64 ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -241,15 +241,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild
index 2bb661e689e7..ac104740441b 100644
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
+IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source webstart"
 
 COMMON_DEPEND="
 	media-libs/freetype:2=
@@ -241,15 +241,4 @@ src_install() {
 
 pkg_postinst() {
 	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
 }
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index e7e636654d70..f39136c3ad57 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,10 +1,10 @@
 DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
-DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
+DIST protobuf-3.11.2.tar.gz 5133897 BLAKE2B 275ea52a072b4e0226e4b6dc476d4bc28e8f4f05bca0709eab51da91c02869e96c3b0ac9ab4cc46290f875d4eac6ac72374c5b45e27fa89ad3d58fd56a2c8b7e SHA512 8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f
 DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
 DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-java-3.10.1.ebuild 1413 BLAKE2B 2ebc9838b48fcf8c84c946ceabae0b4f6d2442d9c3a0c6d9a7be5e1e71d074c26d9c4e79162a6aebe07ae5c7c333aa858085ccf8bb27fa3765a12a55fbbad5d6 SHA512 ded0cad291a8599064a40300d3bc9bc0c48c49c84fd3db1b6bb4e554b1ab788495b082af779738032d2b539bf330e7963e4372c49a7901a917693d6df49e31eb
-EBUILD protobuf-java-3.7.1.ebuild 1446 BLAKE2B 0354f61083a5747a713621fcee7a59a938ff03c008260dadd8aec7b928f81758fbe348f4eeb406069ebedfaa2979d98edaede22c1b738d0ce24c25c944a795c6 SHA512 63de3822738f831d43399cfbecb0cadf341dc605c4016abddb7444d6f93b7580102fb9bb95e55c6eaa1c6b4e4cb6217227a69fe5a927c1ee0e5ce3496a34bf15
+EBUILD protobuf-java-3.10.1.ebuild 1410 BLAKE2B 1e07e6df3fc2bd9f3dd1e1496325141ef87da72ef74badbfda92bdff9a0bb4a22702d7d6839cc69bd49e82457c26e8ca91c5c62e25c9d9c8a1d473e427d7330b SHA512 bec4d51d62a0b0b7f3f712b87c9fa646420dfc28a093841f35d2a9e9c8f2e2e7b70f0395b18fe196f458eda6e2e86c6ecf00f92e3b0bc13eaff534cd0f87bc7c
+EBUILD protobuf-java-3.11.2.ebuild 1413 BLAKE2B 40aff7435541064e15315fd7cc691e72bfabfb0f45c632bb163332aedaa3f6c4f493be1c9aadd44478958dabf1f41d9139044c1d92796ce83e6de8fd2c05476b SHA512 efc9d95b66aded56576770a104209c319cd836acd3ff5decc5b0d0bc0d7dd93093265eea28f2a9e47ceaff631b2cb6bce662db2fee3236b78774127ec83938a1
 EBUILD protobuf-java-3.8.0.ebuild 1382 BLAKE2B ac6dd81e147854eeca83884b7462af2dbb71fd93c1cb805b59b705b76333c8e9a4d8532742c81930b5bfc6ef0e2d6734888fe45a78b811dd7c156b3d02efa008 SHA512 2eb33c0e82ef03a2c2ff5df6f3168310520f13838308a6ad1407b8c8506199c09305828abdb2c1bfa715fdacdb74fb7116ad6e9aa7de99e444e79d2c297acddf
 EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
 EBUILD protobuf-java-3.9.2.ebuild 1413 BLAKE2B bb9f2aa01559aa681995d29d0046d5430f3e4202b72574c4168526ade346d9379dd9d763fae0e7c35b44184bf2a8d76988bb0844fe94c1d4415d0cf8f6a09ff7 SHA512 23acb84178e4f6169658090de437562da60e88ae3eb3f03eab013c9b6c667e753b3a355c306003429e5059332874f2174302be0993d0aeed970d91008f0d3c8e
diff --git a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
index 66f0f362f4af..e24c58d532c4 100644
--- a/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/21"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
new file mode 100644
index 000000000000..2dd111153a0f
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.11.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/22"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+	>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${PV}/java"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
+}
+
+src_install() {
+	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
+}
diff --git a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild b/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
deleted file mode 100644
index e41f3168d4c5..000000000000
--- a/dev-java/protobuf-java/protobuf-java-3.7.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2008-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# True Authors: Arfrever Frehtes Taifersar Arahesis and others
-
-EAPI="6"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
-	EGIT_SUBMODULES=()
-fi
-
-DESCRIPTION="Google's Protocol Buffers - Java bindings"
-HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0/18"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="~dev-libs/protobuf-${PV}
-	>=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7
-	!<dev-libs/protobuf-3[java(-)]"
-
-S="${WORKDIR}/protobuf-${PV}/java"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
-fi
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	"${EPREFIX}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
-}
-
-src_install() {
-	JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
-}
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index 582f2794fe8a..abbeca832b59 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -2,6 +2,12 @@ DIST sbt-0.13.13-gentoo-binary.tar.xz 58011476 BLAKE2B 87f829a5a6c4047b5120b9685
 DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 BLAKE2B 7f6e508104a99c36f8f928550f7c0e41b742cefef3f3fccf2999fe7a5873cf690d693c0ded1df481535b59a7340a997cc21ef3ffd403b147fd8a323d1ee28620 SHA512 3301447a563e9a83431bb67a6281a6045630669012f1cc5cdde7a2cbae3f7db75f87abed003ecf8243fd230e2adea2ba3666468358ae29c51e346940235f5ed5
 DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 BLAKE2B 5856f19d19255a6c4a373086962f3bff195d03193bb74d8d3aee1cfb2749ef3638f5c26dff7cb7c455c5b4ce67e8cf4fa46bbf9a8363f80dc26092e6df768d81 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da
 DIST sbt-0.13.13-src.tar.xz 35911028 BLAKE2B 42157af03ae3567a2acc67cc0c96a9ffe19b69d60fddfde1cd65bbc410c14b09e5da0febb8225e49693c380a444b752296c29a21cc7f2239ee49ccef5128a3ff SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702
+DIST sbt-0.13.18-gentoo-binary.tar.xz 24312512 BLAKE2B 8601ff9d8783156f98df7e855563ebd1a1e51b4588f7fb5701b2fbd86771b7a280518272fc24f469f8810893f2762afb33f1c590764f980d9571555b3f84e4c6 SHA512 ca4b3b50d04f33c55e4bef468623a245e6001f922c8ad404e60a4369bcd6e683a97dab169b03cbc12d9e530aff194fdf1571aceca32c5dbb37b4c3d7a49a09f9
+DIST sbt-0.13.18-ivy2-deps.tar.xz 97612984 BLAKE2B d712b80cde43c46bc714d30f3009b9e46c5f50f78fbc46f8bc106f522308faa9a8d0bdbf4ad9634730f759bb3c484380d33e585771b33633aab6b8ee7dda5ba4 SHA512 c6affd495f9882b71d3a811638c803a646f71e926cc7efb2e84950d85a4fb6dcb65674ff5444d9ffc8858726342b6d3733880d1611157004b891689e67f24028
+DIST sbt-0.13.18-sbt-deps.tar.xz 34787436 BLAKE2B aba63ee1f7ec3f105bae0fa882dc193360c29f772a50ee84b9770f79491d55fcff509d70b813b62ad0bdd618729293b030b29209236ad5d9af1bfc11b7a0fdf0 SHA512 aab302c83303baa89bf6a2ed8d3af76e4d92b9c4339d0e30767fcfcf61131c29a534ba43fb73467f673dec0b3f61d2e740a19b3790fcc4f76b413d04115dfbb8
+DIST sbt-0.13.18.tar.gz 952783 BLAKE2B 31648c2cbbeb5d57db03c10bd4ac25344ae2d0351fc592e85e053e9ac0deb063e1b1e700a8dfa4a242243dd06fa491f721852ddbc2ea1d7fd4174e01febad25e SHA512 0eeb6fddc2454c2fff2eee06a80179495c0210d97fd3677bfe0f8833524ac707515b9e8f3c19e0d0372f503ef9b9f19dbe4cf15b6f8b48181ad730685004267c
 DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
+DIST sbt-launch-0.13.18.jar 1210278 BLAKE2B b3c03f0c823576db51eda51a494edeb771f7ab762afe74fa95f19a4581d80cfdf3c6d6bfacd76e195de34f420912d18b505b74414fbc02550c9331fe4b3e07e3 SHA512 2b1e27f8d873ee45cc168ab19f6e82421d6896116c7b7af60974b97f41edd034fa008e668c83f83d2ce3a501986674821d8a427ccbcda291c8c33b576d64921b
 EBUILD sbt-0.13.13.ebuild 5677 BLAKE2B 77ab2c5de7b1098ed49eb9a2570c423e07089eee4cadb4882346b7f654452141e528dbfd5375fe67183faf9d2b06255527f7eb81678c8e81c0cb8683ce35b114 SHA512 3b95619c3a561cba59734f851d2b7d9df5e59073d793d28c3907936b725a540602ec6e8ceab02c037a987dba0920c13cf7c10408785636fc343bfc955cb1d68b
+EBUILD sbt-0.13.18.ebuild 4913 BLAKE2B 003d8fef0ee9255a82de41b8a9b30c674664a8216c0d79608b104c3d8f8606e24788ca2386395c31588e39e7f99c360df7de6e99027192c37d482894337e27d6 SHA512 c2b3a53cdfe91f65d09dffdfeb552b2fb7c7a27267bad0497a7b7653d6bcb04da3d6385e447cc3f49262f7b5da0ecbe1346eefaf5c6091fb272e21712dbb4e67
 MISC metadata.xml 525 BLAKE2B c70c7e88be5a5b06cbc422d6f354535711d06590780285ee1fd7e6668a0205795a4295869d61fb91b201df9ec2c275e4d74a07734fcc39bac9d4fbf2632f4b9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505
diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
new file mode 100644
index 000000000000..f6976d5d9d1a
--- /dev/null
+++ b/dev-java/sbt/sbt-0.13.18.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit eutils java-pkg-2
+
+L_PN="sbt-launch"
+L_P="${L_PN}-${PV}"
+
+DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
+HOMEPAGE="https://www.scala-sbt.org/"
+EGIT_COMMIT="v${PV}"
+EGIT_REPO_URI="https://github.com/sbt/sbt.git"
+SRC_URI="
+	!binary? (
+		https://github.com/sbt/sbt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
+		https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz
+		http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
+	)
+	binary? (
+		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="binary"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+# test hangs or fails
+RESTRICT="test"
+
+# Note: to bump sbt, some things to try are:
+# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
+# https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
+# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# from SRC_URI
+# 2. Comment the sbt publishLocal line in src_compile.
+# 3. try:
+# FEATURES='noclean -test' emerge -v -1 dev-java/sbt
+# It should fail in src_install since the sbt publishLocal is not done.
+# Check if it downloads more stuff in
+# src_compile to ${WORKDIR}/.ivy2 and ${WORKDIR}/.sbt.
+# 4. If some of the downloads fail, it might be necessary to run the sbt compile
+# again manually to obtain all the dependencies, if so:
+# cd to ${S}
+# export EROOT=/
+# export WORKDIR='/var/tmp/portage/dev-java/${P}/work'
+# export L_P=${P}
+# export PATH="${WORKDIR}/${L_P}:${PATH}"
+# sbt compile
+# cd ${WORKDIR}
+# find .ivy2 .sbt -uid 0 -exec chown portage:portage {} \;
+# 5. cd ${WORKDIR}
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt
+# Uncomment the sbt publishLocal line in src_compile.
+# 6. It *might* download more dependencies for src_test, however the presence
+# of some of these may cause the src_compile to fail.  So download them
+# seperately as root so we can identify the
+# additional files.  As root:
+# cd ${S}
+# ${S}/${P} test
+# cd ${WORKDIR}
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-test-deps.tar.xz \
+# $(find .ivy2/cache .sbt -uid 0 -type f -print)
+# Note: It might not download anything in src_test, in which case
+# ${P}-test-deps.tar.xz is not required.
+# 7. Create the binary
+# cd $WORDKIR
+# XZ_OPT=-9 tar --owner=portage --group=portage \
+# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz ${P} .ivy2/local
+# 9. Undo the earlier temporary edits to the ebuild.
+
+src_unpack() {
+	# Unpack tar files only.
+	for f in ${A} ; do
+		[[ ${f} == *".tar."* ]] && unpack ${f}
+	done
+}
+
+src_prepare() {
+	default
+	if ! use binary; then
+		mkdir "${WORKDIR}/${L_P}" || die
+		cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die
+		cat <<- EOF > "${WORKDIR}/${L_P}/sbt"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar" "\$@"
+		EOF
+		cat <<- EOF > "${S}/${P}"
+			#!/bin/sh
+			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
+		EOF
+		chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die
+
+		# suppress this warning in build.log:
+		# [warn] Credentials file /var/tmp/portage/dev-java/${P}/work/.bintray/.credentials does not exist
+		mkdir -p "${WORKDIR}/.bintray" || die
+		cat <<- EOF > "${WORKDIR}/.bintray/.credentials"
+			realm = Bintray API Realm
+			host = api.bintray.com
+			user =
+			password =
+		EOF
+	fi
+}
+
+src_compile() {
+	if ! use binary; then
+		einfo "=== sbt compile ..."
+		"${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true compile || die
+		einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..."
+		cat <<- EOF | "${WORKDIR}/${L_P}/sbt" -Dsbt.log.noformat=true || die
+			set every javaVersionPrefix in javaVersionCheck := Some("$(java-pkg_get-vm-version)")
+			publishLocal
+		EOF
+	fi
+}
+
+src_test() {
+	"${S}/${P}" -Dsbt.log.noformat=true test || die
+}
+
+src_install() {
+	# Place sbt-launch.jar at the end of the CLASSPATH
+	java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print | grep -v sbt-launch.jar) \
+		$(find "${WORKDIR}"/.ivy2/local -name sbt-launch.jar -print)
+	local ja="-Dsbt.version=${PV} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+	java-pkg_dolauncher sbt --jar sbt-launch.jar --java_args "${ja}"
+}
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
index 5c520419c407..24979afdb7cc 100644
--- a/dev-java/validation-api/Manifest
+++ b/dev-java/validation-api/Manifest
@@ -1,3 +1,5 @@
+DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
 DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
+EBUILD validation-api-1.0.0.ebuild 583 BLAKE2B 04bce00b1bf1ce957a655b9cc6cf3db960ed79356dea5962f60fcfaca832ff4af16a2ad841e0d625739a208b0833a9d83a0fe38a45041bc495d214c44f36e20b SHA512 87b346c5454661c46a9966d0b91d165397e25c344eee2b955267cf951663786e1f92845b7c91497d21d16fe896865dba54f4ccda5a59048e5895cf3b38569654
 EBUILD validation-api-1.1.0.ebuild 557 BLAKE2B 85ffd53d4c49e2822e32425717daff1d3bd7c8b734eadf082ecd9cc1faaece990ac557cc8b2610cfb69ac2c6500a0c14248a8d6a8cbe8e48bb1e07a5c4687820 SHA512 0145dad1a8a358d64a9f9e65c5dfca7da5a95bfb066027ef94b07cbfee1f4f59be7cfa3b1b0ac6163674ee84f2cc190a7e7903fac746d2b834e1043dcef0e85d
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/validation-api/validation-api-1.0.0.ebuild b/dev-java/validation-api/validation-api-1.0.0.ebuild
new file mode 100644
index 000000000000..4cb2cbe31147
--- /dev/null
+++ b/dev-java/validation-api/validation-api-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Bean Validation (JSR-303) API"
+HOMEPAGE="http://fisheye.jboss.org/browse/Hibernate/beanvalidation/api/tags/v1_0_0_GA"
+SRC_URI="https://repository.jboss.org/nexus/service/local/repo_groups/public/content/javax/validation/${PN}/${PV}.GA/${P}.GA-sources.jar"
+
+LICENSE="Apache-2.0"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
-- 
cgit v1.2.3