gentoo resync : 05.02.2020

27 files changed, 70 insertions, 831 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index aec8ba2dcaee..7381e167e524 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b960e4b00257..ebb4d1e2a91c 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,26 +1,4 @@
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.13-aarch32-26d64a5c4b9a.tar.xz 6832524 BLAKE2B 68399b723d1f6a0fc3c940ccbbae48a47767b3870ce0eecc2eb51ef6f36f25e4d742db3eb4b204815c571d1104301a492c60ed3c608a1fc3e36271a2618d5d27 SHA512 84e8217020d8ddd62745298b2d1591e5a6d9a9ff117930524170179dee4d4c35c35007603d5bf9601b7be404ba887b69953272f687d1a9858429e1fe26c9f049
-DIST icedtea-3.13-corba-24a4cc7d7de6.tar.xz 946268 BLAKE2B d1bef8c7029c5017e0a43d6711c92643527930bb037511e84625055f38faef6fb701652458e64b062f3cdbd3e6ec35e5099411e07af3933589dc9c6a3f065ccf SHA512 834b8b09590f5b4f11bbc32af3222e1cb6bef14c44c34ae4d3f65b6320d1a78c297a341cadb76bb59156b434811510b83705d2d2994922c610ba1bafb3f59345
-DIST icedtea-3.13-hotspot-ab8fadcbbde6.tar.xz 6908200 BLAKE2B 922a86a66d670ae920c2e5a1b81da7ffbf2bb20323bc6ac1bb8d5e034528d9e767ee2ef9855dfba467c8a6a81939739f76dec28ced50531d62d1dfeae2762d16 SHA512 60c144997b2566dc42698ca4cb888b92de6a9fdbb18e01703d00f54311ad56191862c61c89e3eff4d6c4793c98d3dafd5f723bc9a22db2329138d08e832ddc11
-DIST icedtea-3.13-jaxp-7f4569c121d6.tar.xz 2292228 BLAKE2B 175847c9e9ff99555a8aa64ed2e8df718738e3203d671a965fc231363f10f41aac9948f045f7a0e12983c6c7d801026ec0b64d693ae79f86c556f43fd6ba2e30 SHA512 ccf05a50d6bc3b5ce1663bab4925cc738d32b9f1a9c696ada0cbbfe3477dc60556e5e7e9939394b2a932122500555ac9e56a935d3b8762d0ddf65201ddc48ba9
-DIST icedtea-3.13-jaxws-1c6f4ebde697.tar.xz 2275120 BLAKE2B 65ff39d6ad84a5d1f21b5b9fff8d0ce92f0682006dce93773f6b8cdeb5d1a184aaa10279a5a49045f843e5046c719fd68f0c4b872afa9c850bffd4f0066a931a SHA512 80a2539ba45e213de1f2a8e236709f3cd81c6c37ee1181474fd4f0d4d612a7cdf91eabdd6bea5d652e18e73c41c3f59a27a173d08d46ad0664628fd6ffecfc57
-DIST icedtea-3.13-jdk-51afcf17e031.tar.xz 39491120 BLAKE2B dca4e58bd41cccaf8eb13e5b182cec0fca9b82e7739f10396407ae1b40882ab8aed799bfeffeba2416e0d1966edd16d5aa666c84dda9ea7bf9db92998028a9e4 SHA512 8b1c8e0e37a9830d67feaab52915c39faf75e94d8972925702f29eea0efd5dbc2f4deaff3b45b2f0f785235bd87c7bb10e62e7a9fb46c1c27e5fddfbbb5fdaa2
-DIST icedtea-3.13-langtools-2008b12a91d1.tar.xz 2076092 BLAKE2B 39898c7d55ebbb3aa1e56c3678b3b860a389d29e8a755fc5551e179ca2d7702316f57175774477c2c4bbf479fbf212808e926ce363a9b56f3065480c6261d612 SHA512 2cd1cdbc8283f5000dd68365412ed36235cfcbecee3a79b8b6111c3a6431f817d4b1ea04463bb049abdf503fe354e4ddf7b71fee399b459e6cf98299703d6e2c
-DIST icedtea-3.13-nashorn-69b1da223d93.tar.xz 2320140 BLAKE2B f2534ef33181545f9d53362873fb8e0c2c59ba689b46c7f45511efc8ae09597dca7a1df8dc4b893b7e9adb13f694cc9b9028789b67df24833c70170568d0dfc2 SHA512 d86706393adabe5982092865addbe04c07781407d99b8d9ee49baf4224ec9b961bdf8498488548f043b099130b35ac017d846cc41874bcfb218520ee0b37004a
-DIST icedtea-3.13-openjdk-c8f86954855a.tar.xz 361204 BLAKE2B af71575af9e68b05a7b31808ccc10318569db83b938f72cb9717e0e4d7532fd342e514442969945bf39d861514cd9173bb256b6f253a83211de95b29b8081e2c SHA512 e5e1072f43b024d8341e770eb8768d0161dd91f483cfa9a719790eb81458dd2a4da4e688a2c7828025f5b39247558ea69881176c53700cddd161708f0cedb764
-DIST icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz 7071080 BLAKE2B 4af91356631762cde7e2af12f5cda2fbe30a6953fa7d0828a122c091e4e13ff10e1c3b916c2add5ff43d30756c355c879102edda0610579c9d652d328031e503 SHA512 898ad626cc84a8ff223feb8f6673e8338bee3e4112ecd977f1a61a66bdf3729fe006d16c97071bdb191e8aa83397cf1eb4ce0505d265e670d2db430d7264376d
-DIST icedtea-3.13.0.tar.xz 1526900 BLAKE2B 6fbfd5cfbd2ba712ab2c03465ae3df68f87613857e763ca7b0283876a6d86330f07c94e85868f313dda9de3f6c82dc41e11ce9d7fada22300ef2b018295a6577 SHA512 312bcc6660360eb73b96801fdac0475d6b192bc3fcb80e250225cbb4dfe39ce178e0fa5154c509e7f5605113b34077a6f9c252a52024e568bab7ed6a74140f7c
-DIST icedtea-3.14-aarch32-0d7b61c79fee.tar.xz 6845944 BLAKE2B 803595c6d51ed7373cfcccd9218b5dc4f8dee0a3ed6c532438072ad82dff3e21a1e0e8097a67fc26e42de5cc7b4c57428633a085956e5c8626948e58ad34a8b0 SHA512 6db1c437440609807a1b14aca69d87987e5fda526306b6ef2821bdcffbb29e63ade3291ca87e1491061f360e1db5a9c5f535e8e888e7a63abef9faa55aef2335
-DIST icedtea-3.14-corba-a37140ba122d.tar.xz 946604 BLAKE2B a091ae07051a07f0a1fb066f5ae63f33f45ac86b434a67ac766d38965c5128fba5bfee16aa3be9b43ba49b8d7b7bfe5b52397efeeba1db7b7e44e311ea74fece SHA512 5aedab2cff0dd8b4cb98121643009593d10da9abd150ab938cf45f5b8f18cae5f31dcc31c30090b736cf52413a290b6b11e6fc42b3575ea50e213bf334a07159
-DIST icedtea-3.14-hotspot-4ccc1ae03940.tar.xz 6899612 BLAKE2B 8d3ea95ebf4091bd5c0822547be35146580b58a389c3ce0ea9784c6e0f271ef66bcb61e878e734ca7111f110efda392b9b4843018470812d1ede6a122962090b SHA512 258cca176c6f930268f189f77dd4e6bd683fb90fbd7866870d22ca42105292cedeca7d274b70979e59af15229ebba22da64444ef14c641066e10688286ec302d
-DIST icedtea-3.14-jaxp-9f2145980ba0.tar.xz 2292812 BLAKE2B 5d9a4346c05a9513260518a45939d42430a73e1b7ac98701a38de279c3e43fac17e043bf86ab0b9b5df9250657be74335573ba7fb0b3398d6898689032ffc43c SHA512 16a34a65b20650f66eece6e33e82aefaf46bbf46c8332bac8c266405839168b924235395cbf7d6c5210d35b416ee0ab2ed0bd09c3f1c90195bff35d3db4b596d
-DIST icedtea-3.14-jaxws-af5760dceec0.tar.xz 2275368 BLAKE2B a9e870972d211f796bb2bf2cc4befdf38bcb72ae6734414482e9437707d435ceb3d81042994406cfdd1d7bc357cb1d4dc7fd21eb1bd71216c98cfe703fb98340 SHA512 706b9ce4d32c92adca44d9643e44ebe757e8503798e2b24b2591660774f4a4719f2015d3edb02f3374ec4b88c5b2f0b5578369345a9db4c5def1ff37f630bb5d
-DIST icedtea-3.14-jdk-ce6c8c2cad27.tar.xz 39515148 BLAKE2B a7749056ffa824ee03f3441fc7be1ace633953d15b3b5153f8b3818f33234a6c234917e19d463e53d15c88167d8ecea2eb7eaec21b734a9be44bef58b8b65faa SHA512 2e44c646bcbf56ce7e91be0fdb46db9887cfe7f538f866e61d757e657a4a3726caca50bd885355a85675451ea8ff9810bccb7ea026239219373688455dcc8476
-DIST icedtea-3.14-langtools-ccec65feaaac.tar.xz 2077244 BLAKE2B 53609e69b64064530137a39bcf7cc2fd9937369f25650efde7f0698985ded4bf3298159480e91f0bd38972ec0aef9e91b1a45e26fa284adc1bc2698ab896f7ce SHA512 ceef08eb53e895156afd0ec342a045c3aa29551a7939803cd821121286ec05fb3538d3b46a44c99f1a2805163b6e7351ec42b1486aaf6a8ecb7fdccc526c410d
-DIST icedtea-3.14-nashorn-13722b4babad.tar.xz 2319268 BLAKE2B 1e9d7f3e300b94f6e1d0a30840a5ce439046e9d60fee16c5ff31b3e856916ba204e58ed063a1d4bb896c7d19adcac036fb74a314fb5fec544745b655d538312b SHA512 59af524388b501c63c567dd36abbe29b3254b3f05191730740aec84e73f93cf77850ab36d9972528781bbf47a6541a75d7e80e26c4c425d6cbb6460e2b4bdbda
-DIST icedtea-3.14-openjdk-454c6cbb8073.tar.xz 361988 BLAKE2B 900a2ba53d9300ef895b8a17276055c5a776b55db2d2e56e9d56a88e254fa381d9ba554453c426a1ded7e5a9fbb0acfa61aa8b7a9bdcf2dec471f4035fecaa7d SHA512 1e8009155a9ad39405e11704bb1f8b4c51ae0f64563baa7a7ce29a79613339e82b8776193a0076b993f8839b1c5959edff18cdadaa7f2f163fa5d3b7f7d60396
-DIST icedtea-3.14-shenandoah-9e52f8d3b511.tar.xz 7061948 BLAKE2B bf26c9684d088dd24d1a7232be2b1e61ad924549a34389042820230cbe6d64cef63f8565dd0b85c5173637c9b1637a46c3213044322e156c62d7a1cdd7e033e7 SHA512 67aea51a3a37ad34ef9f0706ba0a536017be170c6dd0d26b14416fdbaa91206e7d9833c6ccaaaf7037cd242286e1442bd3746c521365fbc32f4bdb811bdf67a4
-DIST icedtea-3.14.0.tar.xz 1528612 BLAKE2B 1dd24bda5f461c2d8a354e592f618925b8c027a8aaed3b30697a2bc9b8a5aeb33fd198895985e0564d15a6e65ed6adb703f6018e0ff9fe31613eb7d72a9d6e39 SHA512 6cd366a1adde12b5cc2c0c64c0c353ebf9ad5b0ad79b77c5cca3acc93219752110eb222b74bd62180fe0bf5b063db12df6316c334d5940d1636c9d10824085ed
 DIST icedtea-3.15-aarch32-4107aea57664.tar.xz 6851120 BLAKE2B 054310c5ad3b20a7e29d1c8875d266d3c163b51349b4d852ab71ff4c4a7c40f6ee75ed0da20ea83c543d9ebc884273511a012e5199feb99ea10b38870a02ffd4 SHA512 c6400c6c9d5de671c372650839611c4e2e4a96cd6f86526e722b2023cd6f286b4bedaaa5b3c6c9f9f77e695034182d1d26bbb0ece9ecc62f1f67da08dd921a6f
 DIST icedtea-3.15-corba-f59374a41938.tar.xz 946964 BLAKE2B 0c71034c9a601bc775c9e4012bbfab07d23ba306c2d7c9d9a056e8c0adb9a323bc4b828034efd3ac16401dff73e9baf4c5971fe8dc8d699b209221393dff86b4 SHA512 b27aaef4839be9a6993d8511e492cf33884738e2fe19cd7d00f244a0f94cd0f3a3ff84c63811cd66ea18cdf7327bb270b7ab21c5b66c220a3bb0a31226bb21b5
 DIST icedtea-3.15-hotspot-f76744714698.tar.xz 6905652 BLAKE2B 619ecf93893554ce7cab5c96f4dbfdad359ca3d5d828ad51691377f97dbdb266fa762a3d3d6cbc451dedb197442fb6816a243624610397e592201be8b69c00e4 SHA512 181e9f8d0c083b26a24e6bafe0187e39313a6685f3288d62794c5ec07cb8901b53eba25badc74b367de08b53cd2176df45e184f7a6ccbfab57370e7d3cf388f9
@@ -34,7 +12,5 @@ DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e1268357
 DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
 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 12239 BLAKE2B cbbe5862a854f65e5bbe0a72e42382a0444138f6fba50543dfb7cd32a541e125823a98f01eb76c2be7c2767ec2b40d1da143dbae753f43c26c6857dd7715597b SHA512 b3ce903a047de517999eb85758f8e3007d0ae1cdaca19ac9fcfe62fccdac0400326276fb408debc498d3904eaa33f5a815b624ba1a38780331a1074c50f30c50
-EBUILD icedtea-3.14.0.ebuild 12239 BLAKE2B 37ed8dc7a4811208bc774e7584e0f449756d5b5f0c3910c27ff3c91b32a740b1cb43a6b006d416fa06179b43b8192ebb4187c777bc1966c318f8ae1d92aa3a58 SHA512 b9122e42ba979008a6aef712e28563990213c3ef4b2402c63e893c89f099f3e1637f2ae2d3b98e73482847d538ee304871a7c9731ed4a205094e7ed049eaf672
-EBUILD icedtea-3.15.0.ebuild 12239 BLAKE2B 2b18aa0d07350bd725f0f19a3d9d679afef0d712b5a0bc1045ac4351b360beb7bffd9f7f7d3ed65534a1ff6c190548d9296a515b374b55ef695616e8d15eca53 SHA512 bfd9ea872caabed82d3f4eacab9532c374618f86a931c388dafd00ced6ee47ae3589af22fa4dc6017ab5e6b6cd846b9dfb0eb6ce6d56e985fd656431109cf1ab
+EBUILD icedtea-3.15.0.ebuild 12248 BLAKE2B be6cd05a48452352e84471715dc094afc52fd433c11e77d256ef77c87114285ea96c79c41a1da50736f3312d714e40fc9529a32f10bd5fc1bd060e00d48b3116 SHA512 55e4d81ebc07841f4f03b6ad85fae2fda942574b4e880471eb222de6c37fc5d1f89bee5e4cdb652ed4e3335597f3c51615a073222ccdb69d1ec0c8cdfbeac005
 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
deleted file mode 100644
index 680a2787526e..000000000000
--- a/dev-java/icedtea/icedtea-3.13.0.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# 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)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="24a4cc7d7de6.tar.xz"
-JAXP_TARBALL="7f4569c121d6.tar.xz"
-JAXWS_TARBALL="1c6f4ebde697.tar.xz"
-JDK_TARBALL="51afcf17e031.tar.xz"
-LANGTOOLS_TARBALL="2008b12a91d1.tar.xz"
-OPENJDK_TARBALL="c8f86954855a.tar.xz"
-NASHORN_TARBALL="69b1da223d93.tar.xz"
-HOTSPOT_TARBALL="ab8fadcbbde6.tar.xz"
-SHENANDOAH_TARBALL="ff69edbcd7ae.tar.xz"
-AARCH32_TARBALL="26d64a5c4b9a.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-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"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-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}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		openjdk-8 openjdk-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.14.0.ebuild b/dev-java/icedtea/icedtea-3.14.0.ebuild
deleted file mode 100644
index 7a74a94a834f..000000000000
--- a/dev-java/icedtea/icedtea-3.14.0.ebuild
+++ /dev/null
@@ -1,375 +0,0 @@
-# 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)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="a37140ba122d.tar.xz"
-JAXP_TARBALL="9f2145980ba0.tar.xz"
-JAXWS_TARBALL="af5760dceec0.tar.xz"
-JDK_TARBALL="ce6c8c2cad27.tar.xz"
-LANGTOOLS_TARBALL="ccec65feaaac.tar.xz"
-OPENJDK_TARBALL="454c6cbb8073.tar.xz"
-NASHORN_TARBALL="13722b4babad.tar.xz"
-HOTSPOT_TARBALL="4ccc1ae03940.tar.xz"
-SHENANDOAH_TARBALL="9e52f8d3b511.tar.xz"
-AARCH32_TARBALL="0d7b61c79fee.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
-
-CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
-JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
-JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
-JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
-LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
-OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
-JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
-
-DROP_URL="https://icedtea.classpath.org/download/drops"
-ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-HOMEPAGE="https://icedtea.classpath.org"
-SRC_PKG="${ICEDTEA_PKG}.tar.xz"
-SRC_URI="
-	https://icedtea.classpath.org/download/source/${SRC_PKG}
-	${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
-	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
-	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-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"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# Ideally the following were optional at build time.
-ALSA_COMMON_DEP="
-	>=media-libs/alsa-lib-1.0"
-CUPS_COMMON_DEP="
-	>=net-print/cups-1.2.12"
-X_COMMON_DEP="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=x11-libs/libX11-1.1.3
-	>=x11-libs/libXext-1.1.1
-	>=x11-libs/libXi-1.1.3
-	>=x11-libs/libXrender-0.9.4
-	>=x11-libs/libXtst-1.0.3
-	x11-libs/libXcomposite"
-X_DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libXau-1.0.3
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXinerama-1.0.2"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	system-lcms? ( >=media-libs/lcms-2.9:2= )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests and the bootstrap javac
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea:8
-		dev-java/openjdk:8
-		dev-java/openjdk-bin:8
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-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}"/${ICEDTEA_PKG}
-
-icedtea_check_requirements() {
-	local CHECKREQS_DISK_BUILD
-
-	if use doc; then
-		CHECKREQS_DISK_BUILD="9000M"
-	else
-		CHECKREQS_DISK_BUILD="8500M"
-	fi
-
-	check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	icedtea_check_requirements
-}
-
-pkg_setup() {
-	icedtea_check_requirements
-
-	JAVA_PKG_WANT_BUILD_VM="
-		icedtea-8 icedtea-bin-8
-		openjdk-8 openjdk-bin-8"
-	JAVA_PKG_WANT_SOURCE="1.5"
-	JAVA_PKG_WANT_TARGET="1.5"
-
-	java-vm-2_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${SRC_PKG}
-}
-
-src_configure() {
-	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
-
-	# icedtea doesn't like some locales. #330433 #389717
-	export LANG="C" LC_ALL="C"
-
-	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
-	local vm=$(java-pkg_get-current-vm)
-
-	# gcj-jdk ensures ecj is present.
-	if use jbootstrap || has "${vm}" gcj-jdk; then
-		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
-		config+=" --enable-bootstrap"
-	else
-		config+=" --disable-bootstrap"
-	fi
-
-	# Use Zero if requested
-	if use zero; then
-		use_zero="yes"
-	fi
-
-	# Use JamVM if requested
-	if use jamvm; then
-		use_jamvm="yes"
-	fi
-
-	# Use CACAO if requested
-	if use cacao; then
-		use_cacao="yes"
-	fi
-
-	# Are we on a architecture with a HotSpot port?
-	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
-	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
-		hotspot_port="yes"
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
-	fi
-
-	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
-	# Otherwise use Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		fi
-	fi
-
-	# Turn on JamVM if needed (non-HS archs) or requested
-	if test "x${use_jamvm}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-jamvm"'
-		fi
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		jamvm_config="--enable-jamvm"
-	fi
-
-	# Turn on CACAO if needed (non-HS archs) or requested
-	if test "x${use_cacao}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
-			ewarn 'If so, please rebuild with USE="-cacao"'
-		fi
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		cacao_config="--enable-cacao"
-	fi
-
-	# Turn on Zero if needed (non-HS/CACAO archs) or requested
-	if test "x${use_zero}" = "xyes"; then
-		if test "x${hotspot_port}" = "xyes"; then
-			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
-		fi
-		zero_config="--enable-zero"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
-		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-ccache \
-		--disable-downloading --disable-Werror --disable-tests \
-		--disable-systemtap-tests --enable-improved-font-rendering \
-		--enable-system-jpeg --enable-system-zlib \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable system-lcms) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	java-vm-2_pkg_postrm
-}
diff --git a/dev-java/icedtea/icedtea-3.15.0.ebuild b/dev-java/icedtea/icedtea-3.15.0.ebuild
index e28dfab50559..73ff69662c2a 100644
--- a/dev-java/icedtea/icedtea-3.15.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.15.0.ebuild
@@ -196,7 +196,7 @@ src_unpack() {
 
 src_configure() {
 	# For bootstrap builds as the sandbox control file might not yet exist.
-	addpredict /proc/self/coredump_filter
+	addpredict /proc/self/coredump_filter #nowarn
 
 	# icedtea doesn't like some locales. #330433 #389717
 	export LANG="C" LC_ALL="C"
@@ -353,12 +353,12 @@ src_install() {
 		rm -v "${ddest}"/src.zip || die
 	fi
 
-	dosym "${EPREFIX}"/usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
+	dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
 
 	# Fix the permissions.
 	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
 	java-vm_sandbox-predict /proc/self/coredump_filter
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index caeebe74909f..5393479b72c4 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -17,9 +17,9 @@ DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86ab
 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
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
-EBUILD openjdk-bin-11.0.5_p10.ebuild 3103 BLAKE2B 1d1ea355127fb32ace6af9780c5fcf2d5f59515bdfae4d4fe5f2ba467b1e45f0315d0251ea6c743a52b7f790e9d998e53e2a97d14fb087a8bc322e69f3918066 SHA512 389fed7ce0aad66f9fd3b706c44f7d8ce5b7f6f5534a0a14b7427eda3c01f511cc76a3289a343a4d9c657579fe0f7039bf4f5c6836e4fd5874d5e8b4b752d6c4
-EBUILD openjdk-bin-11.0.6_p10.ebuild 3136 BLAKE2B d6c8f6dd282760fc630db5da4a01122b3b1cab099f5baf679e841f3b585fa486952c0660f39b576b4b0dba1ddb3bb3075642238e0ea45ddf12d9d774f46d65eb SHA512 f0a481a729b3111f3ddadb55e3dde2769475844ae7e983fa2e87cc5822710f4e39a2903add53e1814ef00e13b9659e6d349979bc1e6419eb3114813f057ce616
-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
-EBUILD openjdk-bin-8.242_p08.ebuild 2099 BLAKE2B 7f83e901c701701b9e88384e24a8607a01f7cf94d4062d646146f305fb3095e0335766cb78bda873c1f59d2c3023c22b5bad56bbea65500228814b6c1117eacc SHA512 aaaa0c93c0d356d12d306640ce8b3699647e8e560bd293c7695258e3de77044b187cb20e9f8296cf1170dec2f87670092f6b7c442390f96620f541e7f910aff2
+EBUILD openjdk-bin-11.0.5_p10.ebuild 3105 BLAKE2B aaeed182ade3dac85ba5439594f9ddb3f3c5e80e9e3d42ee368d61eaf992a467846eff5bc2dceed6f86a7d32019367c97e7588cbe24c8f421071329666ee5179 SHA512 f110e0df728cd1af627738c5bbe62501a2b91d748885094587aad36f22c3fc544ac0388b5c31a742aef2142eb59acf00798bdce1186f557d9cfa22084ee0fbf7
+EBUILD openjdk-bin-11.0.6_p10.ebuild 3138 BLAKE2B 6e4e145f48abec6cc80e9aa32ffa8be9506442f1c19179a28722b08a205bdd296912d1f1631053331b0776e12852b752051c8e84ae51b76956824d4cb77c51cd SHA512 ea78c81dd2ca860cdc1ecd4ed8cbf4db6449cabe85ad49dff2d67d4e6ae797084c8aa8138d40950245c80ee922e8f5a67aaf1296720aa257e2b8d3a92d41b01e
+EBUILD openjdk-bin-8.222_p10-r1.ebuild 2183 BLAKE2B f36710e5dd56938f76038d6da74e4f2517467ccfad68c85f3dd6eda2025bdcf4c4cdbbc6fa23572d6e4195c576ae2130e9bfe5424396fd7ee8467c5ba766e9c6 SHA512 2818794ed02d3c08d70217b98c79c9bebec1b4a55411124ff81292e1e0116a278604e41a1b1ae0476fa767ac35a22436c512810596446f0902d3c144c0fe6a71
+EBUILD openjdk-bin-8.232_p09.ebuild 2186 BLAKE2B 06c43bf0a9e88d9b2c3e1cce4aa8fee732f525c5b693638ed85956b4783db59e15826380fbcb2cd4eaaffd005e7dc2567432fff95aa636015f7e66325627d4e6 SHA512 5a17f4e42402bb1257ed5d4ace42533142eda1fd58bceb60cc5c1bc868bf725cbdeb3a8ae8a97748bf15ddb05f4ed0b7f5992374540e9a6db4927fa24df0f7c4
+EBUILD openjdk-bin-8.242_p08.ebuild 2104 BLAKE2B ecba03e8375d28e49089efbfff1cd43333cccf0673b7e968827edbb8f6ffabfef39500abcc0ac2549d13a38166beb4fb547637036efcc3c91d2e4b4fe289f9de SHA512 c008707c598e3ca9e155c41b225ef5de1177bbc14fcbaee5783ad4d22b26a3adf8174fccedeaa9f3b4e8aef846d6a2cd0389a0affde0382b09b9a39bc87ebbe0
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
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 52b3d9d67df5..50bf2b6b9cc7 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
@@ -86,12 +86,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
index c629d40f4861..a8cbd6ba1b40 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
@@ -87,12 +87,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
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 1c48331fa58d..49f6e257858b 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
@@ -80,12 +80,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	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
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 9225c3e2202b..f4558fbf91ef 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
@@ -80,12 +80,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	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
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
index c3d90d685e65..01ed27ee1ac4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
@@ -78,12 +78,12 @@ src_install() {
 	fi
 
 	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index a2ed6a094b39..160116694f47 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -5,9 +5,9 @@ DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.5_10.tar.gz 42132415 BLAKE2B f857b961
 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
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09
-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
-EBUILD openjdk-jre-bin-8.242_p08.ebuild 1930 BLAKE2B c26055543ab618c30dcc81c66483f0160049b9dae7b166b686d9d993e13acf2c271270e32dbc403721f68477c98dea172e73f6c532ddb2d221d2ba7b22f51fa8 SHA512 2ed5de5a47471407412f8cd3d8c7ab84d5b95e174081bf0c1b501940e9b4298e0fbb591e867b092a8aa99c84c2103004fac8bbc98064b104c199c19ee3b0c4ac
+EBUILD openjdk-jre-bin-11.0.4_p11.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
+EBUILD openjdk-jre-bin-11.0.5_p10.ebuild 2727 BLAKE2B 13c53dde5e577bfb934f108fc0b9fd07744da6fc3dcefb6d57554f2aab733906f1f8fe1009fea3440d6e481fd9c906398a83a72296f58687d93c66d97bf4d01d SHA512 592a61cf6b31657706f0a83fcec0137dd2d4ed9e56b5a94de3326d692337e1c5ad665a74fa434530ceaed5feaaf0cd2a5c9950e7de19f8514d1ae3ce7bd1c988
+EBUILD openjdk-jre-bin-8.222_p10.ebuild 1966 BLAKE2B 79eeeca03c4287d8eb9b1030164629b4c960f2aac5e6fd8d69b838afdba76ee20754e3a09777b7d7a38aee49b3ee2e5bc87dc36a891a562b479679d266164566 SHA512 82b86291e524353691b2fffd99632c376b8cf8b68b0a35ba2ffaf6eab5a8cc91d8ea71918edc083df46c3835498ccab61d8016672598fc95ac89e195e02d292b
+EBUILD openjdk-jre-bin-8.232_p09.ebuild 1967 BLAKE2B fe8b7db2a315b659b0d623d76b7aaf226b2c30a97faa3fb0c12986f65d8e9d676ea9a018884038509c1bd69e734b7222b706cde7583a730c250ec7ec460a7d0d SHA512 5089b1cb793dbd9518a25e733285866a01851bd84e3372615fe90b19cf3e4c9477766ccfb7834502b2b27ca46db3be017ca203f36ff5d785e478ace6eea56405
+EBUILD openjdk-jre-bin-8.242_p08.ebuild 1939 BLAKE2B f2653487a8bef53e3a2facfec51a25f62159c9e2310c18e4c3c201308a3e6fe2e21fad09defb52756b8804c2786bc2b444b47c352620de7482c8de6da3a6291e SHA512 9f2eb93d8cc3ca221786336f06818d03ddb6af8136e6576e89a6a2e8a6dc5af20e9cc755af0dc4c3aed32e9ca5b2596bbdee91a328b741dc9cb4140cc918ea6c
 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 6908dd4a66c9..33938cb19738 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
@@ -70,12 +70,11 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
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 6908dd4a66c9..33938cb19738 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
@@ -70,12 +70,11 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
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 ce2ae3294602..7f255fa9c63f 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
@@ -71,12 +71,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
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 5c67ca6a6216..9801e4fd0609 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
@@ -71,12 +71,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/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
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
index c19496184b2c..64875594ac49 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08.ebuild
@@ -71,12 +71,12 @@ src_install() {
 	fi
 
 	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
 
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 928ec4e19725..d9f68cd57013 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,5 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
+AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST jdk-11.0.5+10.tar.bz2 90613232 BLAKE2B 0a3cba851ac967d84f97ae1e7972d3ab593dbc76fb20664c4e7950380ad91acee7e263a2989930b45346cd170da71c500db9d8a0a6ac88982d77607089b95513 SHA512 0d52c78e217b79756be0fc6b3f9204bae254ec7b9ae10b6c3114463a9c028143807f4422711f0c02b81a034ae6e88fa2efc6bed85022720807344230a8aa12a6
@@ -27,9 +28,9 @@ DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e8
 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
 DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
-EBUILD openjdk-11.0.5_p10.ebuild 7521 BLAKE2B de076a9b7ccb2eb1e179e871d276504e2e22286e9132bf85dc8242016ddde90c2f4b6f0946e370e22b43846d1dce587b38f591d3c20dc703f4b263c14a982288 SHA512 eafa0f8562ca4aef4209499e6e4ce1e40a11317fc16b1a8cee294f42ef7d3aefcd4d496bf5854f1cad3ab8b4bbb8d21c901265ee70df09f627ffb4b88a9ecc62
-EBUILD openjdk-11.0.6.ebuild 7539 BLAKE2B 386888c85dac344cb07c894e7fc4436f2ea9408480eec628151e5bb2f5e1a555072f19fc64b639e6e91ab7ede6b7b2b78c5f97a6af8893edb191f075250211f3 SHA512 0969dc29ef201638ec529aa5d88da3e8e6e4a3615ccca2d6db313bfcd3e61debc55c5be166fcec1e239a4557af45d7a195d5428768cbe90ad12be716fbad2146
-EBUILD openjdk-8.222_p10.ebuild 6820 BLAKE2B aeef0d831bbc35a4fea1a3fbc68be8af17eedefb5f3132fc96c7f7e062b5e3eaad30f3c8a56aa3f72ce1ea768211118c6964f4980c4d7d2936d9c521c100229c SHA512 66f73bd50b960c2ccb6956fc4af216689afaf2bb70df0dc58ec1751fb4831df3c705800bc15816630386f91840eefb74338d2efa163755381487bbbb889eb7d2
-EBUILD openjdk-8.232_p09.ebuild 6816 BLAKE2B 0e260daaee8fae0ecc2987928d47d8239e0b16e8a2673bb67d6c3c3f2dd6d59407c58f431cad35d8234631a927d9c990679f0891493e54d08cfd829eeaa65607 SHA512 81bdbaa7469dc4b805abfb30e1a5ba4dab8b4ee039da06ccaef0b9b0a77ffa18544da7e9f1f8c9e370eed51e2a8ecfdd6372c1abfd5d67b8c1624e3529903ded
-EBUILD openjdk-8.242.ebuild 5790 BLAKE2B f1056bc5f24dc464e5a16e82e0f8a86fe13c5763fbd84264d5b4f3babd06229acc94b7575168495090dfdcb23a35e25df4634d69188fa24e611b413004c273df SHA512 dce306230e2460c40b0a33a58454947000c16ff65aa6e714a6f71ac3221b242ee553a41becbf3280ac458e53d938d66e9e41565f47950b8d5489192579f19c14
+EBUILD openjdk-11.0.5_p10.ebuild 7519 BLAKE2B 2e440bf6e85776df16f688365de8c9b5dbfed915cbea4b61b23e6f3823f13eef085a815972ec03eedb3ba5fa6bce7c86cf3cfefd73968c3869b9051015e14826 SHA512 85c53548989faabd60e748f4a42d0ee67f8b7b84cbd2806837c7a9b76a416809982d96dc85e4122e05edc4b258b7ed11fabcccf2056b2ea6ff26eb8ecce33d4e
+EBUILD openjdk-11.0.6.ebuild 7588 BLAKE2B 014021561468c01cd5bda8de4c45a4c03cd5bdd4b7bc731c44854b04e21e1992e941c10caf1889f515d10d963f93cf7dc1f29cd40237860dbc5944590fdc9548 SHA512 85226a6167005b6fa30f4fba8a792dff1242f3638f8117c6fb7a6105c5c9426aff2b7a638c1e0e1f6ac660384948bb2d7e31977b083e63c53309aca96d5fdb42
+EBUILD openjdk-8.222_p10.ebuild 6825 BLAKE2B ca12311854dd4891f8fb346df2b28df53f08e164e7aeb5c8e633009f16da962121b98f2758b9f5b735a1246d70648046fbe8eca40017cd05b42cc6f3c3c457f5 SHA512 856d7003325ba7647927f582d9c0d00977d2ac0c8233f729190e124ec3100c730c5cd99f1c7f65396efac8fc42377ac377e90801eb02138d865dbfd917241a72
+EBUILD openjdk-8.232_p09.ebuild 6821 BLAKE2B 36586bd65dae04e88d95276fa42449a577cb081e57709e42a1b36015f528978114825e1d1e4124df3f5df7e5a3f3ff0c7257ddfa0277085c19cf074943cfbce9 SHA512 1445e303d7573ea259adbba8e51dbe1e51668435638eec5bd2c941df415c56e286e5f4bbee5dfb8270fb2d2895089f0afcf75a6b06d64b94f10c8a0151266730
+EBUILD openjdk-8.242.ebuild 5795 BLAKE2B 7d4ac1f80227d866225bf45a3ebb293ffed1985ab945022692d83353db097da7fa4d2aee2409fcb4700d619c2855da33613b0e72cc12ae4bcad06ad95ad8220a SHA512 a54a68330b8c9b67c496d1c0e22c00f483ce9f3c22e51d4b9fefb3c4c85eb7c7c0d8259d32a399a892db4dd24a440466c14a70c0d92a545144e145fa40d8fa94
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/files/openjdk-11-make43.patch b/dev-java/openjdk/files/openjdk-11-make43.patch
new file mode 100644
index 000000000000..9466e2be56fb
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-11-make43.patch
@@ -0,0 +1,12 @@
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index 170c3ed..b3b49f1 100644
+--- a/make/common/MakeBase.gmk
++++ b/make/common/MakeBase.gmk
+@@ -974,6 +974,7 @@ DependOnVariableFileName = \
+ # Param 2 - (optional) name of file to store value in
+ DependOnVariableHelper = \
+     $(strip \
++        $(eval $(call DependOnVariableFileName, $1, $2):$(NEWLINE)	true) \
+         $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+         $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
+           $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
diff --git a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
index 8be378782e3e..e6429b524269 100644
--- a/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.5_p10.ebuild
@@ -233,7 +233,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -248,7 +248,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
index dc940a8919c6..f98807e652b0 100644
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.6.ebuild
@@ -73,6 +73,8 @@ PDEPEND="
 
 REQUIRED_USE="javafx? ( alsa !headless-awt )"
 
+PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" )
+
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
 # The space required to build varies wildly depending on USE flags,
@@ -233,7 +235,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
 
 	# must be done before running itself
 	java-vm_set-pax-markings "${ddest}"
@@ -248,7 +250,7 @@ src_install() {
 	if use doc ; then
 		docinto html
 		dodoc -r "${S}"/build/*-release/images/docs/*
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
 
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 7f674fb94cc4..1374a9be223f 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -226,7 +226,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../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}"
diff --git a/dev-java/openjdk/openjdk-8.232_p09.ebuild b/dev-java/openjdk/openjdk-8.232_p09.ebuild
index 4fa1e0c103a0..b3cd4c5a8eac 100644
--- a/dev-java/openjdk/openjdk-8.232_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.232_p09.ebuild
@@ -226,7 +226,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../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}"
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
index 803f0b77b68d..b1a5c2322839 100644
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ b/dev-java/openjdk/openjdk-8.242.ebuild
@@ -200,7 +200,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+	dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index ab51e1765f45..590b1429ab97 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -15,6 +15,6 @@ DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97
 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
 DIST openjfx-11.0.3_p1.tar.bz2 63272033 BLAKE2B 574a622b2b2587fcdc64c91cfef0fbcc6d97baa7827e84a540bf1c8493b9fbc3629bd131e5c0972fb82687d194ceb527dfdedd6c2a00edc16d9a76850699f9b6 SHA512 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7
 DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c
-EBUILD openjfx-11.0.3_p1.ebuild 6389 BLAKE2B 826e4c64d3e66fe2683377234008d37f4252bd26bfea000fee9fd5bc0c46a9ff2cc282b6315e809fc4d2b6f67abaec72b6341b31d42964add52fbaedf1573976 SHA512 a2a7306c2a17ff095f8a8e91c87412ab0efdd118b629ba06f437e6069c4addee30b85ce9ca19fa9dd75ece02802dd48ff388acf0b7569fe589478b31c8802b85
-EBUILD openjfx-11.0.6_p2.ebuild 6338 BLAKE2B 1f2209740f584b046654632ef7eee60559cd1b08cebb9ea4ec8612d3246e005b5e24dd54d15c14a3f6717aeabb5aa8b620d645dfb90bda560930657c11159083 SHA512 969d3ce35d3203697c9b4c01ac7ece913290d5421a572c9d5f6cebe7226400031f4afa33d6c8fe46961b6126505e2470fe1a82871c47ba695ff66f8fbe5a7df1
+EBUILD openjfx-11.0.3_p1.ebuild 6369 BLAKE2B 09ac2ccbf548453a6758309fc258d01b1114f33bab2b9c1bc2629bd3c71d9754eae4c86d2997d96b7494fd12d2a4e39ba42f3f33103a45a09d369e99a6ea980f SHA512 972372de07d376d9d81ebf654bd860b060ac41b0c98f786c34f79a10d95700eb595f45eb6c65b7bc38836c2d739e151da97de7054acce2d8a36bec721118a004
+EBUILD openjfx-11.0.6_p2.ebuild 6313 BLAKE2B 2eaf87b2b59d29eab054c9063f377c9cbbbdd3c044fff02124c8f2213df1e1a3872ea61dd0347085610d1a44b7e898265d3d29985fc2b1da48431574c568159f SHA512 ea1190f4effd87dafea0738a0821c5c6f82a29ce697a018705e4c1c734c7d868f50e9ea5b69754ad7d588392cf17aa9e6c01560154bc1b77877f61b2bf192889
 MISC metadata.xml 678 BLAKE2B 2b7537a59f3d6cb5b465322c68d374e664291178dad94a527a625243c1abe5846b3d0e066e9a715ccf8d5b12a9a58c46c58d00b13881265973e20a29c4f5b720 SHA512 889ad3984e64acb24e01041d98c1f9273d02256bf89810c8e84607911ba35bcac239fdc8341e839b91d7af999e575d06249d87a64c78a3684f63ad5a3003bd8d
diff --git a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
index 8298a8316d0b..a41615a7a6ae 100644
--- a/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.3_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -194,7 +194,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
+		JFX_DEPS_URL = "${T}"/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
@@ -213,8 +213,8 @@ src_install() {
 	doins build/javafx-exports.zip
 
 	if use doc; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r build/javadoc/.
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		docinto html
+		dodoc -r build/javadoc/.
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }
diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
index e262aab4929a..8132340592e9 100644
--- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild
@@ -193,7 +193,7 @@ src_configure() {
 		LINT = none
 		CONF = $(usex debug DebugNative Release)
 		NUM_COMPILE_THREADS = $(makeopts_jobs)
-		JFX_DEPS_URL = ${T}/jars
+		JFX_DEPS_URL = "${T}"/jars
 		COMPANY_NAME = "Gentoo"
 	_EOF_
 }
@@ -212,8 +212,8 @@ src_install() {
 	doins build/javafx-exports.zip
 
 	if use doc; then
-		insinto /usr/share/doc/"${PF}"/html
-		doins -r build/javadoc/.
-		dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
+		docinto html
+		dodoc -r build/javadoc/.
+		dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
 	fi
 }