baselayout-java, openjdk-bin, p11-kit, jdk, jre: upgraded packages to upstream
Upgraded dev-java/openjdk-bin to version 11.0.7_p10-r1 on amd64
Upgraded sys-apps/baselayout-java to version 0.1.0-r1 on amd64
Upgraded app-crypt/p11-kit to version 0.23.20-r1 on amd64
Upgraded virtual/jdk to 11 on amd64
Upgraded virtual/jre to 11-r1 on amd64
BUG=b:160661271
BUG=b:160646263
TEST=Recreate chroot by cros_sdk and java-config --list-available-vms
Change-Id: I8779d6acdefd67c857fe986b58138358e2d13e1d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2284327
Tested-by: Tetsui Ohkubo <tetsui@chromium.org>
Commit-Queue: Evan Rosky <erosky@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
new file mode 100644
index 0000000..af4eb80
--- /dev/null
+++ b/app-crypt/p11-kit/Manifest
@@ -0,0 +1 @@
+DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
new file mode 100644
index 0000000..21a9f71
--- /dev/null
+++ b/app-crypt/p11-kit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
+ <use>
+ <flag name="asn1">Enable ASN.1 certificate support</flag>
+ <flag name="trust">Build the trust policy module</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">p11-glue/p11-kit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
new file mode 100644
index 0000000..664727a
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+ libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+ trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+ # disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+}
+
+src_prepare() {
+ if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+ # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+ # drop to XPG6 to make feature_tests.h happy
+ sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+ # paths.h isn't available, oddly enough also not used albeit included
+ sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+ # we don't have SUN_LEN here
+ sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+ p11-kit/server.c || die
+ fi
+ default
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable trust trust-module) \
+ $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+ $(use_enable debug) \
+ $(use_with libffi) \
+ $(use_with asn1 libtasn1)
+
+ if multilib_is_native_abi; then
+ # re-use provided documentation
+ ln -s "${S}"/doc/manual/html doc/manual/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
deleted file mode 100644
index 2b898ab..0000000
--- a/dev-java/icedtea-bin/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST icedtea-bin-core-3.4.0-amd64.tar.xz 61846296 SHA256 254e4e889061e8632cbb61b86b568e9e8c143342e3fdb02cfa96f068ec0db7a9 SHA512 56bd24ec9dfc75256201a930274713630f1fb062747f721cbe75e2de41a60497f2dd9294a9b726614ce3e260400a663a2c25fd43c31705318d646b58383ba960 WHIRLPOOL 9695ee029e0df02493ddd92d6f74818d145d9fb0426838c6312d8bca949599cd11cf29d7b05929fd366deea3adedce2cfa2d6ee6ba5d7727e7e4d23532ad66e8
-DIST icedtea-bin-core-3.4.0-arm.tar.xz 53464220 SHA256 c5a793a6b967943bf51d334db15ea8608358d308dd9c5c8ba7ea4609d6d5ef85 SHA512 5bb1986caeedbdcae26637a4bea1177fc5cf89fa026245093083d9ff6d1a378878286ef7f6e5bd9527ce6fca3a6a5e9e152f87f68ce56afa66a86f65f4d6817a WHIRLPOOL 7a08039cd6934c73db4c72fa787566880d8ed66c47bf28a76bd4913695c2526c05464cb8a15522816abbf3d3fb5f9e76373e7ae51019cd21f1005ccd53a4624f
-DIST icedtea-bin-core-3.4.0-ppc64.tar.xz 54156476 SHA256 4ab0d286746e583be1d630e1e125a1abb9c77b0933f4e3d5002bcfef8e421b17 SHA512 705cd2479622db75af6732afd79fc20cb1f20d2b402372b0e40225dfc20d9d96fa5ae85654b6dc77cbf79257064f48e39bd02d35fe1d70881d96d1c64cf3730f WHIRLPOOL 0cf0e7097d4a33d448906109fe8b27cd9bbbdf715d690cae4704a339c82831ca65ab6b8ca4efb99ee4c99c24cd78384aae953b7f2e1cc14e4652c5aebf1c44fe
-DIST icedtea-bin-core-3.4.0-x86.tar.xz 61316304 SHA256 673dd4eb192b769c3781d3f286fb7cfcd71ca61a376070d511239f6903ff2e65 SHA512 52091c3e5eb7b453169d87aeeda348c122d5c7c03ec801fde11cb6cdb6f97ae5daa4889bfb724a50feba63ab073ca5a2c341c67a812ccb2bcd0f3866c11e74a2 WHIRLPOOL 6ee9e1239eb5981bb66056256e4c3d1e49b1dd91a9eb988bbc3146cf2317c07aed15d8e1bb8929cadbb4b235cbee7f7bbe9bf45e2eb3283cff7f5598cf2f058b
-DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799 WHIRLPOOL 666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
-DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3 WHIRLPOOL 8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
-DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e WHIRLPOOL e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
-DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76 WHIRLPOOL dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
-DIST icedtea-bin-examples-3.4.0-x86.tar.xz 1862844 SHA256 e61b53cb1320492ddadcf428ffc15f9a6178ebcffbeefc2bce8a870021ed809a SHA512 128f6afab5f634bab49c11e41b2e763629a728364031b5e27ab84240878b0c07cabaf94b3b7c43182fd6776a48c341074957b250f036ce42fae84754339282e3 WHIRLPOOL 37f60ac345a34dc708de62b89779eaf010438a18f49d6d3cc07b0bed8c080596e01169185c4d1e8579efa83559bb98d8d0c56694507530d53059dc0bd0105701
-DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54 WHIRLPOOL bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-8.env b/dev-java/icedtea-bin/files/icedtea-bin-8.env
deleted file mode 100644
index 91343cf..0000000
--- a/dev-java/icedtea-bin/files/icedtea-bin-8.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.8"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/jfr.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/files/icedtea-bin.env.sh b/dev-java/icedtea-bin/files/icedtea-bin.env.sh
deleted file mode 100644
index f85be43..0000000
--- a/dev-java/icedtea-bin/files/icedtea-bin.env.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK ${PV}$(multilib_is_native_abi || printf ' ('${ABI}')')"
-JAVA_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
-JDK_HOME="${EPREFIX}/opt/icedtea-bin-${PV}$(multilib_is_native_abi || printf -- -${ABI})"
-JAVAC="\${JAVA_HOME}/bin/javac"
-PATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-ROOTPATH="\${JAVA_HOME}/bin:\${JAVA_HOME}/jre/bin"
-LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
-MANPATH="${EPREFIX}/opt/icedtea-bin-${PV}/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.${SLOT}"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/sunrsasign.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
deleted file mode 100644
index 5afb195..0000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.4.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Don't block arm. See bug #600134.
-#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
-KEYWORDS="-* amd64 ~arm ppc64 x86"
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-BASE_URI="https://dev.gentoo.org/~chewi/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 ) ) )"
-
-for abi in amd64 arm ppc64 x86; do
- SRC_URI+="
- ${abi}? (
- ${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
- examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
- )"
-done
-
-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 +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.36:2%
- >=media-libs/fontconfig-2.11:1.0%
- >=media-libs/freetype-2.5.5:2%
- >=media-libs/lcms-2.6:2%
- >=sys-libs/zlib-1.2.8-r1%
- virtual/jpeg:62%
- alsa? ( >=media-libs/alsa-lib-1.0% )
- cups? ( >=net-print/cups-2.0% )
- gtk? (
- >=dev-libs/atk-2.16.0%
- >=x11-libs/cairo-1.14.2%
- x11-libs/gdk-pixbuf:2%
- >=x11-libs/gtk+-2.24:2%
- >=x11-libs/pango-1.36%
- )
- !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.8%
- >=x11-libs/libXtst-1.2%
- )"
-
-RDEPEND=">=sys-devel/gcc-4.9.0[multilib?]
- >=sys-libs/glibc-2.22[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
-
- if ! use alsa; then
- rm -v */jre/lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr */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 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-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
deleted file mode 100644
index 33843e4..0000000
--- a/dev-java/icedtea-bin/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-<use>
- <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
- <flag name="nss">Enable NSS security provider support</flag>
- <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
new file mode 100644
index 0000000..432e2ab
--- /dev/null
+++ b/dev-java/openjdk-bin/Manifest
@@ -0,0 +1,4 @@
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz 190134743 BLAKE2B 294ff3be6e68f14e9c53df04e7c4092a73fc27bfb5e1c35ab686ce6a30c69d0f7e9133815ddfdc0217098af287e1cd50353aaa204d3a813052d7c4375a8b8f1b SHA512 71054ff5c996a2ab4409d06d84900525ddd66e6b68bb2c558f0054343fb5fdc92efb4727ef6d9b91b1359e2b9c719ff3eb224eb1a9c5096753e723f12604535b
+DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz 178497327 BLAKE2B 59d84c0c09368e4bae499469efb0bc2f1f9c6f518fbcfbf75190e6e06eb4592b9da021b9101c769e6e6bd4c83e88217f177b489103f36f0ba92ba757df216989 SHA512 1ecc0b25295708af3011a5428f811a5c6c14f7edf17f853c7ed286687a3b2f982d4f8b0a45d9c7c24b476ccc60143f5e71c75464fab4d2d8be16c186f1e48341
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz 176497292 BLAKE2B 2bf45400c5d201cb6530d01b234da28078cf3a8e8bb23470a3c698b982ca700828baf653d00cf4aa1933193742474fc81b5df9054f33706545c46733a1ccc79d SHA512 adc40402de81f49fd691c7c07e805f6ee3a4298353417c5e92dd14d791253f4eaafcdb68837d614d7850f82006701b048df04cd6a1d25a16d125a2a38bc277d5
+DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32c3c1ea729e79a044f31bafad995aaf7ac23bda47b21926493aa8d473195067a2d7989b0eafb91d7054222ebd5d924567b1d4b6935be7cff9fd25b1e90 SHA512 fa19880289ce8fa4a72fddd5633cf86a33d9f81346a5a7e51c06d7fc48f1953da01f020d15151d74a624ecc22a9f8f2c8ee4f996a4b3ac2ec79f0fb5207a40f8
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
new file mode 100644
index 0000000..9e9c5ec
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-11.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH=""
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="${SLOT}"
+BOOTCLASSPATH=""
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
new file mode 100644
index 0000000..264572a
--- /dev/null
+++ b/dev-java/openjdk-bin/files/openjdk-bin-8.env.sh
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+VERSION="AdoptOpenJDK ${PV}"
+JAVA_HOME="${EPREFIX}/opt/${P}"
+JDK_HOME="${EPREFIX}/opt/${P}"
+JAVAC="\${JAVA_HOME}/bin/javac"
+PATH="\${JAVA_HOME}/bin"
+ROOTPATH="\${JAVA_HOME}/bin"
+LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/"
+MANPATH="\${JAVA_HOME}/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.${SLOT}"
+BOOTCLASSPATH="\${JAVA_HOME}/jre/lib/resources.jar:\${JAVA_HOME}/jre/lib/rt.jar:\${JAVA_HOME}/jre/lib/jsse.jar:\${JAVA_HOME}/jre/lib/jce.jar:\${JAVA_HOME}/jre/lib/charsets.jar:\${JAVA_HOME}/jre/lib/jfr.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
new file mode 100644
index 0000000..941e830
--- /dev/null
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>gyakovlev@gentoo.org</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <longdescription>
+ Java™ is the world's leading programming language and platform.
+ The code for Java is open source and available at OpenJDK™.
+ AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+ </longdescription>
+ <use>
+ <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
+ <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
+ <flag name="source">Install JVM sources</flag>
+ <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
new file mode 100644
index 0000000..7224aa6
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-vm-2 toolchain-funcs
+
+abi_uri() {
+ echo "${2-$1}? (
+ https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
+ )"
+}
+
+MY_PV=${PV/_p/+}
+SLOT=${MY_PV%%[.+]*}
+
+SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
+ $(abi_uri ppc64le ppc64)
+ $(abi_uri x64 amd64)
+"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="*"
+IUSE="alsa cups doc +gentoo-vm headless-awt nsplugin selinux source webstart"
+
+RDEPEND="
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ >=sys-libs/glibc-2.2.5:*
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ doc? ( dev-java/java-sdk-docs:${SLOT} )
+ selinux? ( sec-policy/selinux-java )
+ !headless-awt? (
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXtst
+ )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk-${MY_PV}"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ fi
+}
+
+src_install() {
+ local dest="/opt/${P}"
+ local ddest="${ED%/}/${dest#/}"
+
+ # Not sure why they bundle this as it's commonly available and they
+ # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
+ # also has an explicit dependency while Oracle seemingly dlopens it.
+ rm -vf lib/libfreetype.so || die
+
+ # Oracle and IcedTea have libjsoundalsa.so depending on
+ # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
+ if ! use alsa ; then
+ rm -v lib/libjsound.* || die
+ fi
+
+ if use headless-awt ; then
+ rm -v lib/lib*{[jx]awt,splashscreen}* || die
+ fi
+
+ if ! use source ; then
+ rm -v lib/src.zip || die
+ fi
+
+ rm -v lib/security/cacerts || die
+ dosym ../../../../etc/ssl/certs/java/cacerts \
+ "${dest}"/lib/security/cacerts
+
+ dodir "${dest}"
+ cp -pPR * "${ddest}" || die
+
+ # provide stable symlink
+ dosym "${P}" "/opt/${PN}-${SLOT}"
+
+ 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
+}
+
+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"
+ ewarn "many java ebuilds as they are not ready for openjdk-11"
+ 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 11. This JDK must therefore be invoked using its"
+ ewarn "absolute location under ${EPREFIX}/opt/${P}."
+ fi
+}
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.20-r1 b/metadata/md5-cache/app-crypt/p11-kit-0.23.20-r1
new file mode 100644
index 0000000..ef7b37f
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.20-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=asn1? ( >=dev-libs/libtasn1-3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libffi? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) trust? ( app-misc/ca-certificates )
+DESCRIPTION=Provides a standard configuration setup for installing PKCS#11
+EAPI=7
+HOMEPAGE=https://p11-glue.github.io/p11-glue/p11-kit.html
+IUSE=+asn1 debug +libffi +trust abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) libffi? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) trust? ( app-misc/ca-certificates )
+REQUIRED_USE=trust? ( asn1 )
+SLOT=0
+SRC_URI=https://github.com/p11-glue/p11-kit/releases/download/0.23.20/p11-kit-0.23.20.tar.xz
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=95647d452efcab70aa6d2c57b1bb368b
diff --git a/metadata/md5-cache/dev-java/icedtea-bin-3.4.0 b/metadata/md5-cache/dev-java/icedtea-bin-3.4.0
deleted file mode 100644
index 4103e94..0000000
--- a/metadata/md5-cache/dev-java/icedtea-bin-3.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare prerm pretend setup
-DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=A Gentoo-made binary build of the IcedTea JDK
-EAPI=5
-HOMEPAGE=http://icedtea.classpath.org
-IUSE=+alsa +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
-KEYWORDS=-* amd64 ~arm ppc64 x86
-LICENSE=GPL-2-with-classpath-exception
-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 )
-RDEPEND=>=sys-devel/gcc-4.9.0[multilib?] >=sys-libs/glibc-2.22[multilib?] virtual/ttf-fonts selinux? ( sec-policy/selinux-java ) multilib? ( >=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/fontconfig-2.11:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/freetype-2.5.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=media-libs/lcms-2.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] virtual/jpeg:62[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) gtk? ( >=dev-libs/atk-2.16.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/cairo-1.14.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/gtk+-2.24:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/pango-1.36[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) !headless-awt? ( media-libs/giflib:0/7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] =media-libs/libpng-1.6*[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libX11-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXcomposite-0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXext-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXi-1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] >=x11-libs/libXtst-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] ) ) !multilib? ( >=dev-libs/glib-2.36:2 >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.5.5:2 >=media-libs/lcms-2.6:2 >=sys-libs/zlib-1.2.8-r1 virtual/jpeg:62 alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-2.0 ) gtk? ( >=dev-libs/atk-2.16.0 >=x11-libs/cairo-1.14.2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.24:2 >=x11-libs/pango-1.36 ) !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.8 >=x11-libs/libXtst-1.2 ) ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-REQUIRED_USE=gtk? ( !headless-awt ) nsplugin? ( !headless-awt )
-RESTRICT=preserve-libs strip
-SLOT=8
-SRC_URI=doc? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-doc-3.4.0.tar.xz ) source? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-src-3.4.0.tar.xz ) multilib? ( amd64? ( abi_x86_32? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.4.0-x86.tar.xz ) ) ) amd64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.4.0-amd64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.4.0-amd64.tar.xz ) ) arm? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.4.0-arm.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.4.0-arm.tar.xz ) ) ppc64? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.4.0-ppc64.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.4.0-ppc64.tar.xz ) ) x86? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-core-3.4.0-x86.tar.xz examples? ( https://dev.gentoo.org/~chewi/distfiles/icedtea-bin-examples-3.4.0-x86.tar.xz ) )
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 java-vm-2 477ca23a49dfcd57017ee7f3bed47564 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d pax-utils 3551398d6ede2b572568832730cc2a45 prefix e51c7882b7b721e54e684f7eb143cbfe toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=434c163b5eda8d146cd308dc45d1fe24
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1 b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
new file mode 100644
index 0000000..ba09170
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-11.0.7_p10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm pretend setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups doc +gentoo-vm headless-awt nsplugin selinux source webstart
+KEYWORDS=*
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:11 ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
+RESTRICT=preserve-libs splitdebug
+SLOT=11
+SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz ) arm64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.7+10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz )
+_eclasses_=fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 java-vm-2 477ca23a49dfcd57017ee7f3bed47564 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils 3551398d6ede2b572568832730cc2a45 prefix e51c7882b7b721e54e684f7eb143cbfe toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=391523868a913710fe45d1edb0a13284
diff --git a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
deleted file mode 100644
index 6b6d3d0..0000000
--- a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Baselayout for Java
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=!<dev-java/java-config-2.2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sera/distfiles/baselayout-java-0.1.0.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=061eb7ce2df704c45a2c39f7ad1d94ee
diff --git a/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1 b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
new file mode 100644
index 0000000..6835769
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baselayout-java-0.1.0-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-crypt/p11-kit[trust] app-misc/ca-certificates
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Baselayout for Java
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=app-crypt/p11-kit[trust] app-misc/ca-certificates !<dev-java/java-config-2.2
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~gyakovlev/distfiles/baselayout-java-0.1.0.tar.gz
+_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=c5520f645b36544d650a3e249597ad7d
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 20e110f..13628a4 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1 +1 @@
-DIST baselayout-java-0.1.0.tar.gz 72571 SHA256 da5dd2210597e3aa4e2ff437cd25cadc9999fdcfdb31ca459395243695c9e2c7 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062 WHIRLPOOL 9a3111a64d04bd6f274c13f5ed3c641fa1dbbd8d8cf1ff152df7a55771148d80fdcd3c3dc5a7394675723a58aa51ce680fef20c6209380dde4ec0fe1c18a3fac
+DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
new file mode 100644
index 0000000..3f8e140
--- /dev/null
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Baselayout for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+BDEPEND="
+ app-crypt/p11-kit[trust]
+ app-misc/ca-certificates
+"
+
+RDEPEND="${BDEPEND}
+ !<dev-java/java-config-2.2"
+
+src_install() {
+ default
+ keepdir /etc/ssl/certs/java/
+ exeinto /etc/ca-certificates/update.d
+ newexe - java-cacerts <<-_EOF_
+ #!/bin/sh
+ exec trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose server-auth "${EROOT}"/etc/ssl/certs/java/cacerts
+ _EOF_
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ # on first installation generate java cacert file
+ # so jdk ebuilds can create symlink to in into security directory
+ if [[ ! -f "${EROOT}"/etc/ssl/certs/java/cacerts ]]; then
+ einfo "Generating java cacerts file from system ca-certificates"
+ "${EROOT}"/etc/ca-certificates/update.d/java-cacerts || die
+ fi
+}
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
deleted file mode 100644
index 07570b9..0000000
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fdo-mime gnome2-utils
-
-DESCRIPTION="Baselayout for Java"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-RDEPEND="!<dev-java/java-config-2.2"
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/sys-apps/baselayout-java/metadata.xml b/sys-apps/baselayout-java/metadata.xml
index a234468..2444066 100644
--- a/sys-apps/baselayout-java/metadata.xml
+++ b/sys-apps/baselayout-java/metadata.xml
@@ -5,6 +5,4 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
-<longdescription lang="en">
-</longdescription>
</pkgmetadata>
diff --git a/virtual/jdk/jdk-1.8.0-r3.ebuild b/virtual/jdk/jdk-1.8.0-r3.ebuild
deleted file mode 100644
index 2989932..0000000
--- a/virtual/jdk/jdk-1.8.0-r3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Virtual for Java Development Kit (JDK)"
-SLOT="1.8"
-KEYWORDS="*"
-
-RDEPEND="|| (
- dev-java/icedtea-bin:8
- dev-java/icedtea:8
- dev-java/oracle-jdk-bin:1.8
- )"
diff --git a/virtual/jdk/jdk-11.ebuild b/virtual/jdk/jdk-11.ebuild
new file mode 100644
index 0000000..b148cc6
--- /dev/null
+++ b/virtual/jdk/jdk-11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="${PV}"
+KEYWORDS="*"
+
+RDEPEND="|| (
+ dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)]
+ dev-java/openjdk:${SLOT}[gentoo-vm(+)]
+ dev-java/oracle-jdk-bin:${SLOT}[gentoo-vm(+)]
+ )"
diff --git a/virtual/jre/jre-1.8.0-r1.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
deleted file mode 100644
index 805cffa..0000000
--- a/virtual/jre/jre-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
-SLOT="1.8"
-KEYWORDS="*"
-
-RDEPEND="|| (
- virtual/jdk:1.8
- dev-java/oracle-jre-bin:1.8
- )"
diff --git a/virtual/jre/jre-11-r1.ebuild b/virtual/jre/jre-11-r1.ebuild
new file mode 100644
index 0000000..4dd59aa
--- /dev/null
+++ b/virtual/jre/jre-11-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="${PV}"
+KEYWORDS="*"
+
+RDEPEND="|| (
+ virtual/jdk:${SLOT}
+ dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)]
+ dev-java/oracle-jre-bin:${SLOT}[gentoo-vm(+)]
+ )"
