gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-java
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
63 files changed, 186 insertions, 643 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 68c2689acb53..5ebb3e29d822 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index f190aa11f55d..4950f433f3ee 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,32 +1,17 @@
 AUX icedtea-bin.env.sh 1062 BLAKE2B fd3b099ba1cd2d4f817852ad6d5f6ee5690f4c4edf481ecb0e3b6a7ce7893d983405801ac997e7df53048a64c5c8c48b5370710a897aa68a086ec79d316d0026 SHA512 7d85767b6bc1d5761d2dfcdd560199f735bd2514bd1fe78d0a11af4f491c87b89cedb063d72e3170ced9cb01ebb5c40004f23e7b97b0c7e77a4d68c051a62b12
-DIST icedtea-bin-core-3.15.0-amd64.tar.xz 62196772 BLAKE2B 0da09f58d785c3a9d8acffbe1daeb1d944370a5256ff85f4a8b92d48f465ad19d1ae6eb91729807aa67a43a00e029e9d2978b7848f59bbcddbd40252da930426 SHA512 6d9415449b5c937357f1a1b7610658446d1ac9c07a0203e02f89f5ca2077712ca59157f35f02a106674aa17c6f3e0c9b54d983c3278ca0eb8c1d25d639293db5
-DIST icedtea-bin-core-3.15.0-arm.tar.xz 58228516 BLAKE2B cc975c461ad1246257c993434035e679e57193ee70b073a072a15ba9b1f3b00848138092ad427356822a216f1142685fcfb31f4e36551846f5298a2338abc215 SHA512 517f73b41ac93dead8896b6c0894464ae2d3cae5d249258fe7426817947d1332245de5be60f027e5fb92566e062ea1fb74bbcb2fed600238713202519d70f3b7
-DIST icedtea-bin-core-3.15.0-arm64.tar.xz 61788580 BLAKE2B f2c8d1d0ac823838881f07fc3aa47f07b048924c49ec7a0f8ce5b1f942ede8d2aab70d7fd25ea75b6fe7ea68dcd181d9f834ba4b075977470181cf10b6f26696 SHA512 f0c9d683048e0cc5ab44a9bdf31b5f2c2f8a2bc425dd1a78fe366791f8b2bae4e7b77f43d9553d95c388673ccac5c1e5a916dadecb9dac2059daa66af97927f2
-DIST icedtea-bin-core-3.15.0-ppc64.tar.xz 55179660 BLAKE2B 3404f1b4ddc6f1109d141e8a88ff1a913153660b318b84fee43ffe013164c578f9fcad6b75f8212cb11cc9ee89a8260d55b39c7f9516aa910d3838b0490fe923 SHA512 7d5e3c16e156f09610e915d3c9062b0f24f5d15045545009f48ba616e8f45184161018ed4136145ab9d15bab6d853052df7fabda43b9bcbcf99aabea8e52477d
-DIST icedtea-bin-core-3.15.0-ppc64le.tar.xz 55188860 BLAKE2B 732973320837e689b42942da80015109868d5772097111d5789a3bbee100a0b8d75cb581e1825a0c62bd582e93fe828b5575ac307efb73083d248c154cc28cd0 SHA512 887af69cc6c0a4227922da2500f228b108d9ac445e62c1836411d09a88df8579e0397d89b3f62b94f73e794a0014c67f4b1c8d2247ac1118967a63092e704078
-DIST icedtea-bin-core-3.15.0-x86.tar.xz 61650896 BLAKE2B ed5140790ac2946c4162ead15cd1d8aae812d41d4be3e4fff6669eedb438576e293385ec53405a2c67674c9fad9279497b2f334ef58040f6744b62059dc4882c SHA512 2efbacbcd77474d4a8506f9c4f7d66c3ad57f929644e4c541bb76139b6f1c6a776639a9708257a4ce5085660ddf2d50f54ef179a63746a9eeeba83384f810cc5
 DIST icedtea-bin-core-3.16.0-amd64.tar.xz 62350972 BLAKE2B 0980787ee1f619907e958fcbf6c75674115adc325abe4d428e46842eab9a26fc2666f3b0498e79de0451a63d01c83302501fc5f861c4ffc7f5914dd7adbb4cf8 SHA512 0f79408811fa5b3ab60e72b3fcb8510234a22d698c66f0d5a8f06b67bead0f4a215b771065d6d189fddd25f762b64732a28fd69ad402ef57aa5cedeca745552b
 DIST icedtea-bin-core-3.16.0-arm.tar.xz 58351704 BLAKE2B a1fbd5744d3155861e7de5a85a508f8199295568d92efd840a7fc81b9eaed755366fa3212d3039d87c77215168fc6ab9baaa5c92531fc11c1099e6ea486fce48 SHA512 84624b80bfb0035b714c38f92a9982c11bae3137fe70d030111c6b2c253472c0c857edfea1a16d646a5e9c4d3215fc66d7f9bf96e8184ae1b5c75a5c3c844549
 DIST icedtea-bin-core-3.16.0-arm64.tar.xz 61918380 BLAKE2B 8f6778bd63fe037f19115d094ae32294f84a57782b63f32997c80ff580a5a13ff3beec37bae809e45fa4dc174c10335c9040119207a9489b33df590f79398b1d SHA512 dc0bbcb15c897a8f3e83e56877c5a3b7f29740a122597fc26b7f6c43eeb07c32407db060954a262ab1db92cfa6cafc44c7fad131c53c4a811938da5e76c89fe2
 DIST icedtea-bin-core-3.16.0-ppc64.tar.xz 55356056 BLAKE2B 265635ef70f244696dc09baa6cfef628d794ff851edeebb2d4b531aff4a25dafb902c4f3cbe527540ba65d76da2f3d4234b14cca16d5439d2e92f551a5aaf478 SHA512 840b0faed3882324392ad1f7ce8123d9d2f53f33576bb5eec37357d2aab292c21d947867d8b20a34de6fc25c8e1d5dc5c7f541cebe5b008b79bc9daf9250910d
 DIST icedtea-bin-core-3.16.0-ppc64le.tar.xz 55356384 BLAKE2B ffa6c0e381b20a3a9d78a61519a0d47715dbd82f9472c5335fb9e2b4dff6948486cf85f6f4f416462158a3476b9a228fdb9c0725294a58bcdc91058d60811bd9 SHA512 d9902159044135e1ff5d3b200f5fe283249a2be1da6705b9fdc94eb88c2d199ed3a5c80e70ae89aa870a05110e649e93d4710605c85db15dca360bc66d2c60da
 DIST icedtea-bin-core-3.16.0-x86.tar.xz 61745436 BLAKE2B efb37cb8ac00c6fe2a45bed9b829fc5410062105b373ba77012ec2d8f8deff03dcb88288025dcc8a8300d28139068ef202d2c709fe5aad4b8ed2ab1edd54c412 SHA512 3df52ec949d8d5ba6cd046841160fab1637666e506f536664506c1de0e74f1b2620836706cca8e194ded575761299ecb3b3f83e295e6dfed8222de1949a73077
-DIST icedtea-bin-doc-3.15.0.tar.xz 11666068 BLAKE2B a4df6db09dfe47220cbfa07e12adaa03df490e81fcf38df490710502e78cfae741bf9d8f88ee81e8cf65465fa912b3139b239e858e5479e8af79a48c08444d5c SHA512 b990ceabf846b5be889ab706c3f259c23c335bf56aaa0e660206bedec4caef3d00fdd712d2eba5326e0b716010299b5b13e1089d91fd747cdf8cf58e4acce13b
 DIST icedtea-bin-doc-3.16.0.tar.xz 11613128 BLAKE2B de8224c7e3a62178c6cc5a4c883c3c90a2712049f9e6687bf0a0d93a8dc9bd3abc562486c483c7b72bd17fa5c376495b0739babf10b1282acbd3e41beb3d1cd4 SHA512 dd3bb69de2d0f720f18700a97a549c21b67569d12a982d2fbe39eef8bf876e0f02af673e70d53ac59891377e4d48f3cc05f60d1b1dac0c7d9969a4a07e346fc6
-DIST icedtea-bin-examples-3.15.0-amd64.tar.xz 1854220 BLAKE2B 3572d1571da58c493402421db4163879aece2f3b2717f2769ef94cf9612b429a0156f278ef2ee5e114de8b171cdac787f46b7cdd0d533cf2a5568c987c836ee4 SHA512 8dd6017f4a9c90b56e5559277155afce2c37995cca3bb2a96bf62e0310a3eb9e259023faac51b5d4e5688dceaa33efad9372a5f7667b314685578c97fc937e43
-DIST icedtea-bin-examples-3.15.0-arm.tar.xz 1839548 BLAKE2B 1903f85534b49ef71a548ccf29065d301871e024402540038a81561d02ac988a9060b7c33307366dee55838c8f9a2cf277e86e152701f8e5312241e5cf499850 SHA512 de9eaf56ce6b10ea2d3d676b1896884a5a98f1def01175e3456487ebb10f0da618a5d238a7fc9fe25607e5fbf53dc6fa7c65d71d6858731c3540e270357a13c9
-DIST icedtea-bin-examples-3.15.0-arm64.tar.xz 1850912 BLAKE2B bf047a0d606bcb766e84ef90fcb169446e9bb97ada118c51762d58ed2f4fe5a9139549676fc731b2230a75c65e3a4f23b06b0f2a3224d85567f5601a1320e66c SHA512 2d5527d7daabb3cf5bcfb262bdd072af2e051cca3171aa3a973ac81b53f74b898d8c5045a0bcea28db18edca602d8ca9912cd90a157ef6026e535a0087b576a2
-DIST icedtea-bin-examples-3.15.0-ppc64.tar.xz 1865608 BLAKE2B 34afb142c6db332d399868783d2972f3d4a2a7de90120e88f70edae3d2b0ae8299dc1587c1431d810ff8d69f26f884a51d676d2b7738ee04089780f6a5719f8b SHA512 d23adb53d6df49b607ea4267570ffe8f16801d6bd9a570b1311b881cf02329804da17464ca284cd6f4b316856a3cb504ebb347e9e76fa37c8cf8c41dbc20366d
-DIST icedtea-bin-examples-3.15.0-ppc64le.tar.xz 1862752 BLAKE2B 03cf9411aef4c3797c5a542072ef7ea53f3565d7c90b2e9e2dfc9caac8ffe41cc4588b848e5c6cfc5c275245a625dbee66fa170aa38aeae3ee2110f1d4d08888 SHA512 0bacf0f9d2b7b396e5afe1962d54cd559bf777dc896dc9bf6d7581380bce1aaeff4156e4c2082ee1955f2d503a5c6b8537bf32da1d4846b264026229c22ef01a
-DIST icedtea-bin-examples-3.15.0-x86.tar.xz 1860232 BLAKE2B e0b9fa6d5c452ea8d258cc035e7d9913f9423ec972d3729b266cf03b686f3012ae16101a0d97db660ffabacd05e92e3ce47624346a7ea5fc5b42a2d89d69fb0c SHA512 2a7b7a1e45fc84d115ba09bb2617c298a8c0d8084e61ea274c16df0f36bc1e240d0a74a37ff9f0cf0dd6dfe4be8f6208f7c6c132bc5637be95b2d9e19c1fe5d7
 DIST icedtea-bin-examples-3.16.0-amd64.tar.xz 1855056 BLAKE2B 678e887ac613df96e7b255bdd6de4a9644f1b5940fbd036d88dfc1b74154d8e1e4032a380586965d727c5d9ebd2d1c4ba7d7d62a88d8994e5400eacc3f83d6dd SHA512 afea08925258e6e9d7bdabdf3078d6b580680fa43fb44589b6e0faa07ab78fea0d25e30bd22ae92317a77007ab0b30c9b3e16decf0e78bc1ff88ffa780b9d25b
 DIST icedtea-bin-examples-3.16.0-arm.tar.xz 1839892 BLAKE2B c5824fbf698f4861baa32f973f2040ae72f5a92f889309bb1aeed03c652114c89f38394559c2619c36dccc075205b91fbd6ae97d9de7554c9144fe059fc9a9db SHA512 6fb4ac90bac679cb2d1827ead49fcd1b2acac27aca3af77c7aa7c771317281d7ffe477f2c1365ee78a21ab9694c9beba38516f053ad954e78f6f5b8bfb991151
 DIST icedtea-bin-examples-3.16.0-arm64.tar.xz 1850400 BLAKE2B 577206b3b15f5eb7dfcbccbb02e209354f99e780c5989eba8f21fdca3630f7188c1b4a0c845a556ccd93916a7f6182ec9932983ee22fa37cfcb47b28fac62e41 SHA512 ff80389720947f781f48b8f39bd49a7b096eea03f48bc70d588bc326256676b568a743b70e5d13ccf161da81fd4fceef5e8a1913991a5805391de7e93e913662
 DIST icedtea-bin-examples-3.16.0-ppc64.tar.xz 1864968 BLAKE2B e806ccb1d430e42b1ae75954a8ab4dcb9d7f2e6a00b9cf0343716ef18943d66e46834859fb90c50d7553dcda3502f4f3b73c060e2cbfaec883aa98ef7c874807 SHA512 9bd762776178d117c20fabb90558f80d97d4392a4015a26729437e50f82e7bcd55a6c1e12df45726ae484d20df3bc4867e392242588062d926ae4d3b14b8b679
 DIST icedtea-bin-examples-3.16.0-ppc64le.tar.xz 1863432 BLAKE2B fa227b246e5ddb9197c065fa27092b9114ee5423e7d914ceb9dfd3491fb2ddb60707379fb50ece1e8d4834cfe24cc82cb37e341aafc338623c4720bb74f4c4af SHA512 8efa40365c0689e9fdb3d2c350d95a837706219442b46305e3314185afc9cf0dfab51854bddabdf0f6abc50ce9f45b4c3cac66d6d7a4fd472e58f0070507599e
 DIST icedtea-bin-examples-3.16.0-x86.tar.xz 1861512 BLAKE2B 3ee3bc1d9bde79aea9e765ad06e29b76617f00077d28ca08042ff23434edbdfa012033bfc5c2e4ca5bf1485b079ce412c399a9ed9ea5df137e627f1d74cadb30 SHA512 df247ee749d9fd41a3bde5c28a8894cff837ff0725c8d45b89134e294d1cba2493de9d7bbab15b6098c464ed11dc317892df87f10f14b507cc3f27e872c92637
-DIST icedtea-bin-src-3.15.0.tar.xz 45859888 BLAKE2B 39926cb75a2eb784bb29322724ff452bd6fd259e5dfd583436a980073bf4b82277676d10ce29e155a1122a424718be6277e307d781d825d93b3909f1e6f1da91 SHA512 9523180f27da1936593a41322013a3147e4bd8bfded0589e39775dcd856736b97160a356c717969eb0a26d27c05cfb1dce6f08f6c09193a722e581f22f7a1dc4
 DIST icedtea-bin-src-3.16.0.tar.xz 45993284 BLAKE2B 748ce12cf4231af2410523b394f91afffbdb774a73a0754e6df5c124c9c9f8f8cffed82fa84ec5a9940de80127ca9018379f72085b3de1a2ced3146df27aa943 SHA512 546364dcf4a20d7aa6fc68c465f9c77c3a6c24b9b8889629152dc2424b3d9f818d56ea678ecbdcb58e499c1564f246a75d6b9ff00925d9ecc305dec94ba60548
-EBUILD icedtea-bin-3.15.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
-EBUILD icedtea-bin-3.16.0.ebuild 3521 BLAKE2B da3770dea0ff7f8c561fa49521fde590c51ef7d6f563f845a49d1464401cd619b6aad2c57014aa1d5127c9aef1b931afafa52eba19c3b9aee820538941e5b9f7 SHA512 f76b92fbe75482ea4e8e4a8a3c29b30154c99123362e4160cc3b7aeff86f801be74b11e24d0e72284172bfe10496823695e52e2be71beedebfe0dca31c2353de
+EBUILD icedtea-bin-3.16.0.ebuild 3517 BLAKE2B 86c35b10ec33ca01a9619d2f57364a626b7b9f26140f0c711218a7a081e17e7800cb6ba457d34039454c448759c44ffb830e61b95b1401e8cc719649e851a01d SHA512 5877ab12f282819deb510747fba7472b7f8970d25a28ab1513774c90b19b6a4708ece2b6e6cff53a1fbde5bd1a0a18aca4e44c1a29fc861f364c6acb98f32f71
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild
deleted file mode 100644
index 930f0f3ad547..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-3.15.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 multilib-build toolchain-funcs
-
-abi_uri() {
-	echo "${2-$1}? (
-			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
-			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
-		)"
-}
-
-BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
-SRC_URI="
-	doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
-	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
-	big-endian? ( $(abi_uri ppc64) )
-	!big-endian? ( $(abi_uri ppc64le ppc64) )
-	$(abi_uri amd64)
-	$(abi_uri arm)
-	$(abi_uri arm64)
-	$(abi_uri x86)
-"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="8"
-KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
-IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
-
-REQUIRED_USE="
-	gtk? ( !headless-awt )
-	nsplugin? ( !headless-awt )
-"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-DEPEND="app-arch/xz-utils"
-
-RDEPEND="
-	>=dev-libs/glib-2.60.7:2
-	>=media-libs/fontconfig-2.13:1.0
-	>=media-libs/freetype-2.9.1:2
-	>=media-libs/lcms-2.9:2
-	>=sys-apps/baselayout-java-0.1.0-r1
-	>=sys-libs/zlib-1.2.11-r2
-	virtual/jpeg-compat:62
-	alsa? ( >=media-libs/alsa-lib-1.2 )
-	cups? ( >=net-print/cups-2.0 )
-	gtk? (
-		>=dev-libs/atk-2.32.0
-		>=x11-libs/cairo-1.16.0
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/pango-1.42
-	)
-	selinux? ( sec-policy/selinux-java )
-	virtual/ttf-fonts
-	!headless-awt? (
-		media-libs/giflib:0/7
-		=media-libs/libpng-1.6*
-		>=x11-libs/libX11-1.6
-		>=x11-libs/libXcomposite-0.4
-		>=x11-libs/libXext-1.3
-		>=x11-libs/libXi-1.7
-		>=x11-libs/libXrender-0.9.10
-		>=x11-libs/libXtst-1.2
-	)
-"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )
-"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if [[ "$(tc-is-softfloat)" != "no" ]]; then
-		die "These binaries require a hardfloat system."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# I wouldn't normally use -f below but symlinks in the arm files
-	# make this fail otherwise and any other approach would be tedious.
-
-	if ! use alsa; then
-		rm -fv */jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-		   */{,jre/}bin/policytool */bin/appletviewer || die
-	fi
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-	dodir "${dest}"
-
-	dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
-	use doc && dodoc -r ${P}/doc/html
-
-	# doins doesn't preserve executable bits.
-	cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
-	if use examples; then
-		cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
-	fi
-
-	if use source; then
-		cp ${P}/src.zip "${ddest}" || die
-	fi
-
-	# use system-wide cacert store
-	rm "${ddest}"/jre/lib/security/cacerts || die
-	dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
-	java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
-
-	# 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}"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
index 573d36309406..930f0f3ad547 100644
--- a/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-3.16.0.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://icedtea.classpath.org"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="8"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm arm64 ppc64 x86"
 IUSE="+alsa big-endian cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source webstart"
 
 REQUIRED_USE="
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 60a198e56a25..23659a174021 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,15 +1,4 @@
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-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
-DIST icedtea-3.15-jaxp-f42bdc74d2f5.tar.xz 2293320 BLAKE2B 7b32c1ea1019d92d2f7f0da7f2ab9b0e4b3ee5318c4d4fbf9899c2d92cae5a45c131847442425ec6456f5a2ec59349de8776db6b48d8aa78b710c99a01b81201 SHA512 25e166d208d99360c9ec5deba5075a5268f2fbc3f31ad9dee0dbd33ee37bc78829d12c9ea11faa5d59ec53385f7dc5f0be29512199db2856068cf81b9ec1ca79
-DIST icedtea-3.15-jaxws-4dee0def390a.tar.xz 2275928 BLAKE2B ff7af188ea2bd602621963d27d9389ad57d3e368df49ee12595af511dbcb3904f8322ae9e56dbe60e0374eed674d244cee7c522eb0257110bf9d1a436fee23d3 SHA512 cb7a9f80bd33a33f4eb03b091e6c6d3fb6a450695d0231c378d04878fc03e1574f82045c628993e6136188fd2e4144e31c82320b178b21a0aae867e989bfdeeb
-DIST icedtea-3.15-jdk-c2f574d16c2f.tar.xz 39564852 BLAKE2B 247368e9b277bd991f9d1f1040ea52e37568b9a2b36fc71269fcfb3cb9a2efa0b9ee3ec9d865b20882ce750f051ab0f3d9d33d58c1878c9d77c8576f57285647 SHA512 306e2c188987de8d1aa233db1c42522249198b4f3eb71919da911289ab2308b4ab9406c6215c5c157868618341cafbc086bb0e5c423bb6650edfedcc05b17475
-DIST icedtea-3.15-langtools-9cb3b18d9139.tar.xz 2077016 BLAKE2B 461f3941a81508d8b37ff096aa176bfa1f4bd86dfdb45b49bc431c09caa568f506fd7094b07a1de96138b5b8f2fea37d46137365a67ac1d82f22b85cc461345b SHA512 3fcb7d264ff23de8b049b264213b05ee9e9120089eaea989e881c0cddc73a2ef9d01f89f66e7ff23c88d9bc4864824c77894d0291caaf9a2a134d5fae650cc32
-DIST icedtea-3.15-nashorn-04210bbb67cd.tar.xz 2319568 BLAKE2B 1078f8847eefffffbdfb2deb6194d0532c4925f6603c47fecce8523aed520041f7234440be534780b5fa2271d0c87240a50ef20b9601e482074d28709f81ba5a SHA512 6d27137dd80d6363e64ef2c6b3abc60603480e9e7f5b99e06ee546a2cc707b801087ce8cc8d021776f5d2b15b73728f08b2e649c65265ba264655d816921ffe7
-DIST icedtea-3.15-openjdk-c0ec72b715dd.tar.xz 362300 BLAKE2B e5bd5766bd9f436f09fb5146ab1c0ee3e82f9d32526fc41e2c9320c2e330a4603883206e0ebcfd076ffeff8ccdd3c289a5018f718223b68852e08bf4822167e0 SHA512 d7dca834fc65b67b1888c4cfbd50e263e58604b70560b4dd4e8e7ca518fcd54a70eaf9e5cff89fa1954beaa3071f5b55ef36fffb36589f5008e4be39e5a1aa38
-DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e12683577e0a8fdc18be5b4db6c2ee59d64424200940c18889e6c39567f9471b44f4d7199bc1816ed2f5d2a16bfe06e0b1b1c0d93bc0722202c272115 SHA512 0c229ab3c1a2de6c24715d9713250e35c415f919ee3c4e99b0b101bc3f51fea54814f235da345d0d4954d4f3283c7757091076a7128847c879399fd1c8a6c15d
-DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
 DIST icedtea-3.16-aarch32-ecc1eb1dc760.tar.xz 6854900 BLAKE2B a4b0a4fec267f0dd64618aa83a2cf487e83bfa133e03914a079d451abb6be573e4d157f12372d6d2eaa66f834d4a1ec0bad8f1a65d2619468bb3de8567863036 SHA512 20ba1980a4f4161c632e8ec02330c3b0c971a5eff19456a568b2df4622fcfedb18594c7e350318a15a31a5395c0544899160d71805f0a3d3886ae7a16019c010
 DIST icedtea-3.16-corba-ea3169880d70.tar.xz 947604 BLAKE2B 22e7fdab5168b01501791c9537b72f884cdd008ec912e1e7afb05c410e47ab9fffc37aeeab78400a39b6216612927eb63bdc6ba2169fc7e74fe8d6c60b1af978 SHA512 bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56
 DIST icedtea-3.16-hotspot-eeb08cfebded.tar.xz 6906968 BLAKE2B 78bd9ecef9801a190ce2993d1023d6eb3db8276cc7fc726cccbf406e630a4bc62401299885de42df85f92611da10c732ae50600af9e337dcf3014472777ba38a SHA512 19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d
@@ -23,6 +12,5 @@ DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb
 DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
 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.15.0.ebuild 12150 BLAKE2B 5624d8b5003a46b9882d7d9ef5d71db4f136738c1c0764482ed5c0f57a9914d30c3d0099c514597285a2978f57cbc80842478eca01ec9c51fc807160691131ed SHA512 de17c10b87744b38c2a22b6b0010696d16830f155ed88bdb53e042ad0a99ea102bd778b4a76371dc95001806b89694c06f395cf1625d7d26cc534d69f377d699
 EBUILD icedtea-3.16.0.ebuild 12204 BLAKE2B 1cc6ba72322d962c5636f022d6fc7e60808a4305bff333f520ad5834ea6cfb608f9aabb510fdc62b4d4d00c81bd459f3bf1ecc2434fd212fc2008a5330e35fdb SHA512 64a96f379c844a4530bdaab3cfa78897dd7e814f513639d8235d338c71b8997cd0ab3fd05e20f7b04ea1a8c756f054ec428c53d87f743fdd1ae83bd0721d3a03
 MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.15.0.ebuild b/dev-java/icedtea/icedtea-3.15.0.ebuild
deleted file mode 100644
index c6bcefc57e60..000000000000
--- a/dev-java/icedtea/icedtea-3.15.0.ebuild
+++ /dev/null
@@ -1,373 +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="f59374a41938.tar.xz"
-JAXP_TARBALL="f42bdc74d2f5.tar.xz"
-JAXWS_TARBALL="4dee0def390a.tar.xz"
-JDK_TARBALL="c2f574d16c2f.tar.xz"
-LANGTOOLS_TARBALL="9cb3b18d9139.tar.xz"
-OPENJDK_TARBALL="c0ec72b715dd.tar.xz"
-NASHORN_TARBALL="04210bbb67cd.tar.xz"
-HOTSPOT_TARBALL="f76744714698.tar.xz"
-SHENANDOAH_TARBALL="9fcff2250bb4.tar.xz"
-AARCH32_TARBALL="4107aea57664.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 #nowarn
-
-	# 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" \
-		--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 ../../../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 ../../../../../../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/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index abe3377e296d..f5c0abef0789 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,3 +1,3 @@
 DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
-EBUILD java-getopt-1.0.14.ebuild 855 BLAKE2B 0164b1d9246fd44fee54d261b29298d72834e7895339a6dbfa4ea06b5321f21596d47cc9482408d484bcf35936a51a63f087d481885d20ae46dc17bb1f5652df SHA512 2aa44137ac2a3f7ee408f604e8d6d4def49c1de64e5d14111d2271deb2e0084a83ef977d706f9cf2d1ba6a06f6e73d056b1e5437a85ba8c8c1dc8b0e46614231
+EBUILD java-getopt-1.0.14.ebuild 854 BLAKE2B 9957c406ce02a777d74cfbbcb508244ee26f5c8ab1abd3de9c09228c78e86996b0921e6e84ad4b26509c75bc73c826daaf934e0bf8b73e04919ca7f0a6301df4 SHA512 8e6dd6c78ba59f8fa98babe48148e10bde44fc582d7bcba9b52f78968feb394d30c7efb6051d511dd79f8b9335244b4982fac8cfca96b908968dbd8651d5f593
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index ed3d17cc0682..d8fd667cc8fc 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java command line option parser"
-HOMEPAGE="http://www.urbanophile.com/arenn/hacking/download.html"
-SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
+HOMEPAGE="https://www.urbanophile.com/arenn/hacking/download.html"
+SRC_URI="https://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
index 647c1b40c0f7..3cbb70ac1d57 100644
--- a/dev-java/jboss-logging/Manifest
+++ b/dev-java/jboss-logging/Manifest
@@ -1,5 +1,5 @@
 AUX jboss-logging-3.1.4-MDC.patch 5607 BLAKE2B 9ea9acc22592ac5a4fa573cf9b06d473b266e8919bd34a98fb8e4290a3c1ff226e2a432ee774cc98514d1ee3868160329da9494a130ca2e61efcc4c1296d5dae SHA512 74ece235664dc49db51e4026902a67773e87655edd1879137da0b0d1cb0fefe20c4e67e3ba0625214d6c85b7f036e07732d07c842947bf312a2ed505c05ab535
 AUX jboss-logging-3.1.4-build.xml 9295 BLAKE2B aada8601b25a428a6049ded0143ebd508d50743d677f869a88a69d9ac6956ad0bf0174b88618d14f6e3928504b0979601903dad2996f0441a0e579bbdaf3a5e1 SHA512 a4d1a44ee69d48686ff9d4d32540c74ea3dd0b8198f8bd04e5cf1572db5ae596bdf95bc0bd091cb19dc00b248f5f1a41f4f51271be9bb27be72420cc425d2a14
 DIST jboss-logging-3.1.4.tar.gz 25018 BLAKE2B abc91a70cd75132621dffa44c4c2314635e0009f8eaff96c97cd6f95869a078672eac452ce4d5fb2791785d01d7fc4af208d34f4f00d635e496022792d1c14f9 SHA512 633b18b079089444a5f7406a6a2b29100abd2c752306ada4fda0c15f07a60a363d67616e2521ec079f1df37ecdadcbb46e26819a9f5647e3d1a18219c494b73a
-EBUILD jboss-logging-3.1.4.ebuild 1357 BLAKE2B 2c27bb856afde649be7ac997fb9fab16711dcfd6600b69f3fe74c3f3587043daa7aa9e371746a65a10aeebe0134fb068797922d0552a6eedfb5ef0d191f22bdb SHA512 3052c73492bb17b1032f5805b1d298b0b4d38b13f361a91bd6cb3969030263529aed262a7030ec99a437c888a976130db4f8321721fe81318fd5b4168fb6eede
+EBUILD jboss-logging-3.1.4.ebuild 1355 BLAKE2B 99f30b00adf55bf6d8dd6d2210bbd1f6f33e55f85aa12ebd10b44d3807ef4dcd49bf9c2a88704264894764294d6ead703b332ebbc6807ae9133b6c2a1428b474 SHA512 850398339f49aaf4b5ec22bdb074c6ffd8babb74d18c80478b90a0427c69f0750a6a6e929b22c85bba42afdae6d6d4b448f1101aa6ea81b39361dadd44d94297
 MISC metadata.xml 328 BLAKE2B bf2ad3aca2591452aa1578a2c32db911530ca47fcbbc7ad5199b57e4ded87d513c63f8c79c1bdcd0cb39bb38dc11bd038a43e7bafc4bea35fd78f633aefdb135 SHA512 acbf51ab138d93d7b6d137542047e019fd30e7230ba9e0ecabfac72faa1ebea3419fd8531ab9f1304ca1d735bf2082994ac4ab57e87e6febcf30588d4a0f91da
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
index 9beb6d61f3e8..6c0d7c16803e 100644
--- a/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
+++ b/dev-java/jboss-logging/jboss-logging-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="JBoss logging framework"
-HOMEPAGE="http://www.jboss.org/"
+HOMEPAGE="https://www.jboss.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/jboss-logmanager/Manifest b/dev-java/jboss-logmanager/Manifest
index 039495e6d8da..1c069c903ce8 100644
--- a/dev-java/jboss-logmanager/Manifest
+++ b/dev-java/jboss-logmanager/Manifest
@@ -1,3 +1,3 @@
 DIST jboss-logmanager-1.5.1.tar.gz 132910 BLAKE2B ebca4f63801e539c53bc5a00f76189b8ef9acadcbd1bff07bfc572350b3af3d65c80ac314130ab592f8655d849cefa8cc046ddddd237198f00654973c0e1f29d SHA512 a586f3619c90390d38c0355024f1d711b11e06efa35b3da9f12f7d98e04debad5250ef30ec9b869d27ffc60d9e5d5c8e690cc4a2b0a71553a2a994cfdef89768
-EBUILD jboss-logmanager-1.5.1.ebuild 667 BLAKE2B f6604c44a7ff47651887741a47cbedbf40ea2e3991b8234c9a4996f3ceb55619a10535c6504309f3034a75704f7ac7accbcbb17b9e8975a9aa5d79af6782dee5 SHA512 958d8d75d155743827e6e805bf5df15317b92dead065f2fd0447a37affb348b82725dc0125b9844e0768d207e3493bd96c67c053d92e64f97244b2b5df015e78
+EBUILD jboss-logmanager-1.5.1.ebuild 665 BLAKE2B c07f8e323ae8ec6d953a9e5564371ed4c84481d489c15ffffb76cfb3992ee27716a13a147a74ae995b22fae1af21e51b05d3418432811b367a853fcc4a9beca9 SHA512 69331af9e4004c291d0db8aa5755600584e1c790111e6d95f3ebf5be4294c258645f591dc88a587d8def0adc0b6023d4ef38603cec66c70098fa50b8add569ac
 MISC metadata.xml 331 BLAKE2B 77ed3ea318e75a2565d7690936371d0b89083b31da0322848ef4f2d5f7f57d006dca2118343f98a29d81488bafdad4fd33633e0fd338dc30b8109c29f226b2e3 SHA512 253e11bb23b5321b44483a7880aeb28747d3bee372fbfae830ff95d1e80d24049e8378750d9a84b931f08830e95d24991b999fb42df9b4a576e6397f4487a0d7
diff --git a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
index 8954daf2f2b1..c6cd07036bc3 100644
--- a/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
+++ b/dev-java/jboss-logmanager/jboss-logmanager-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JBoss logging framework"
-HOMEPAGE="http://www.jboss.org/"
+HOMEPAGE="https://www.jboss.org/"
 SRC_URI="https://github.com/${PN/logmanager/logging}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/jboss-marshalling-river/Manifest b/dev-java/jboss-marshalling-river/Manifest
index a7c99bc12cbb..d034abc8fb92 100644
--- a/dev-java/jboss-marshalling-river/Manifest
+++ b/dev-java/jboss-marshalling-river/Manifest
@@ -1,3 +1,3 @@
 DIST jboss-marshalling-river-1.3.0.CR9-sources.jar 45310 BLAKE2B 87eced675dbdb0d645ae4f3321954142922053008a650a9604b32c5e850c280c16d941997874c420e48e894e9f63c6441e6b3cd629fcfe7ad31ae13abb6f41e7 SHA512 0ff0ba48f8e4c1e76d378843aeae4793992fc200cf6d5aeeeec7341ddcd6bc3c93915ccb2bddbf3996661ff21e3a992e232c0721ec4469c5347811afabec4351
-EBUILD jboss-marshalling-river-1.3.0.ebuild 680 BLAKE2B a1eb8ceaea2619e1b2b863582d5dafac52c591815758db678e872ccb1a0997d49744c03663ef3cff34d37d1280bb1d4a54dd18e5632c3b0281173da326afb8f2 SHA512 8c9fec3951b2f720a6cbb0ebf06254536180cc5588f907713b8dc04867f39129df738c3dcb0380eeef9dccb417cd99da05df7a5ef5dab91204e9b2bba83bc40e
+EBUILD jboss-marshalling-river-1.3.0.ebuild 679 BLAKE2B dfe7292413af40bb33773ce3ee23708ce1e3ec8a38e80843733328ab19fc718a6e75fb0c869a41146fb9703151fd7e12337fa691f4e03880b8cc2698d49d3d09 SHA512 1072ff5fd979e0855744c8263b42ec8d73f0b743acd3bb6c781286bf3740de6a4ad19e2bfaa4f7c584e033f75f7db6bd65e6c3e9432e8920e0bbc8519c46229e
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
index 75313bf84754..89c496f77cee 100644
--- a/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling-river/jboss-marshalling-river-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="River protocol implementation for JBoss Marshalling"
-HOMEPAGE="http://jbossmarshalling.jboss.org/"
-SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+HOMEPAGE="https://jbossmarshalling.jboss.org/"
+SRC_URI="https://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-java/jboss-marshalling-serial/Manifest b/dev-java/jboss-marshalling-serial/Manifest
index 2f8c67afc14c..feb2df3c3c5e 100644
--- a/dev-java/jboss-marshalling-serial/Manifest
+++ b/dev-java/jboss-marshalling-serial/Manifest
@@ -1,3 +1,3 @@
 DIST jboss-marshalling-serial-1.3.0.CR9-sources.jar 33627 BLAKE2B 76a6d6656c456ef5b4a4acbb659f52280d63b48aea46ff4fd190f8a9b5852157e37ce511a1af87007b04f03401082dd5e9a0d540ba27ac02567e7e50f04ebc33 SHA512 23343b43d2d81fb3f9d22e82d04e3c215cf0357fe369ac316a602b4599f84602bdd38fd50c8378050b1d031db2ad31405fc38bc93ef7a9327d63a29dd73ee144
-EBUILD jboss-marshalling-serial-1.3.0.ebuild 681 BLAKE2B 3d73a06ced906f541d70235d50b684d73de8eca26c214f52cec4af35a3d9770df1f338256ed0e4634f76b44d9dcbb4ed073dc6808504c41a063dadd84afab4b9 SHA512 7999b5669cab82c6fac7d537bed15f20bf66e89417db3d286dcde9a42d4c4b820edd9da67e2236e10102d7c14dfb8fffa844cba23233eae06ab80473daeac9bd
+EBUILD jboss-marshalling-serial-1.3.0.ebuild 680 BLAKE2B 67d59735454fb80be0880b4e38861c43481211c3e97fabf05d8b74149de226e2a53b887bb9e3b94285cde0e614bdc5a766807ff878dc9e964b8519af33386f4b SHA512 00d02d5681030591f937ea34ac709cbc44064ee6d1a7ef4670e21861d6f0c7e9e238160ad4dc46e242432f96de1e227c303a6dd259892414c073102525572a43
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
index 0117913853ea..d62b7906fcb7 100644
--- a/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling-serial/jboss-marshalling-serial-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Serial protocol implementation for JBoss Marshalling"
-HOMEPAGE="http://jbossmarshalling.jboss.org/"
-SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+HOMEPAGE="https://jbossmarshalling.jboss.org/"
+SRC_URI="https://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
diff --git a/dev-java/jboss-marshalling/Manifest b/dev-java/jboss-marshalling/Manifest
index ea4815777002..ee90577af207 100644
--- a/dev-java/jboss-marshalling/Manifest
+++ b/dev-java/jboss-marshalling/Manifest
@@ -1,3 +1,3 @@
 DIST jboss-marshalling-1.3.0.CR9-sources.jar 174155 BLAKE2B 1c1a25910eb9d9d40f4f3cbb8bb6d7d59272e4806a39b602e1e336269eb3fa95d83a89b46967919d2e02b5647f43e42495f36777d82e706f1853b717f3e0e44e SHA512 d7a1ae24ec50acf20f8150cf6e741a846e9a5837f9d8e4c06d8429793f69b95a7c03449ba5a6debb00bd22b596b6f801e25e0f38ccce7ac25cafd601e2ef7058
-EBUILD jboss-marshalling-1.3.0-r2.ebuild 571 BLAKE2B 49d7cb8507674c85df97a16f8245bdb93549d1d002dfeea6c1767069757709f0d9307f40dbde98d86b00820c24cd0d9fe16dc5e8dce64d372d27e6ffb3c44e3a SHA512 dde122309e99843c6f5cb7ffe054890ac320c616d9ed50b69010a0937f585595467a40f18ae699c1ac183030b28e92f74ae1dd747ca3386e1004078292cc8d8e
+EBUILD jboss-marshalling-1.3.0-r2.ebuild 570 BLAKE2B 98bc3a7c86530889609c73cccce03d779ec191b5023f9728986345d7042000c2599b959cc36b1916569d919d061bb366063cf96bda66ad59cca0a73ad3275329 SHA512 5ae16dae3313e96a176a4acee874b6671e8db46b41f21b47d93cec03d91396d5b8069d0d5e9dd2b24ee8cd062a4c27dcb2d1e60da18c53ba61e1c663006d2ab8
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
index 6838bf02f21b..c1c838957a5d 100644
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Compatible alternative to the JDK serialization API"
-HOMEPAGE="http://jbossmarshalling.jboss.org/"
-SRC_URI="http://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
+HOMEPAGE="https://jbossmarshalling.jboss.org/"
+SRC_URI="https://download.jboss.org/jbossmarshalling/${P}.CR9-sources.jar"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64"
diff --git a/dev-java/jboss-modules/Manifest b/dev-java/jboss-modules/Manifest
index 961dca84b46f..9e03eb1215a3 100644
--- a/dev-java/jboss-modules/Manifest
+++ b/dev-java/jboss-modules/Manifest
@@ -1,3 +1,3 @@
 DIST jboss-modules-1.3.3.tar.gz 189906 BLAKE2B f291391a9292731ab9fa00d9ce94817138ea502dbeac282cac0bbb08e070ef64f72dbd5e1cec570afa6452245197fda004173d04b838d806b40a2f808e539321 SHA512 d8e19c59105358070cc7e48a0be29ee68751155d5ac88723dbf32659e73ab4bd9afddf119fec66af8c9420a7e406e77f2eb4a164fbd9c1867b91414de71ddbb7
-EBUILD jboss-modules-1.3.3-r1.ebuild 663 BLAKE2B ee026114a7d019a5fdf3390acf27335b6b7dec3396698671ef97491056ef63ccc8e69e2d998ef892e05448cc8a2e88af666e81ff6021706482f8ed67a555d3f5 SHA512 01f7215314f01082d6d5050ae1a86d776cf3efba2b1124f4c087e085e35aead0d368c9d75669deadd33dcde03d40c1e6c67c2d5273be46ed06b1b95d3ab554dd
+EBUILD jboss-modules-1.3.3-r1.ebuild 661 BLAKE2B 4297401986ba31cd80025106fda89a02befd7d352b59536457859b5b1cfb531fea0ac814c68e53dae28441e88b7c9fc5738100217a7044f3e05d082d5b4961b1 SHA512 481b4836356e6f09d8186b6863c75b71389fcb51defdf17fdfa07c9878fac652b13769d0baef8177dc6be1f8d5211949f100b535cd045403f610ce348482b10b
 MISC metadata.xml 328 BLAKE2B 70528967605fb41f0541ebc752a11e64f759840e46d6489d8da3c532b3fc253e3e2ff7807bc625a7e2c6150c7e2688059e240df8dc58a161764af0404d9c1400 SHA512 56f41e4a3acd01abe24d0ad6211e1b5f1822462ed8a3724a26fffa4e9631f310888c0b8b213d71cbe1804ac524a637e5e02cb5d4f99d2414debc560cfba5a86a
diff --git a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
index 0c0d308bfc73..141ee970261f 100644
--- a/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
+++ b/dev-java/jboss-modules/jboss-modules-1.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="source" # doc (needs APIviz)
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JBoss modular classloading system"
-HOMEPAGE="http://www.jboss.org/"
+HOMEPAGE="https://www.jboss.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.Final.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 4a845e440ea2..e7d69546be13 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -2,5 +2,5 @@ AUX 5.0.5-dist-target-depends.patch 380 BLAKE2B 2e4d8a025c986dd6bbd1e97b62987561
 AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 BLAKE2B 17c84606f144c3aedc6b61986f9f7d215ac539b044d2745682e9f98b22bd6a86996cdb693762b375fd57de21bbe09afeef4ed8a5e91d124a28ecd157a2761a3a SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5
 AUX 5.1.14-java6.patch 1301 BLAKE2B 605199c02b040a07306a26f1701ce3fb317ae7af41480329ae79491f0896847c143ae0e2c04358e291b9288c29a0eeebc613bee9d6b150a6993f6282fc8e7713 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1
 DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879
-EBUILD jdbc-mysql-5.1.26.ebuild 1883 BLAKE2B 3794714e2120f69740b16a9c32ec19cbfe349caed449582cfe92e9a36192fd3aa5c80767bc5df822781f570b12f67c193060d542c6e65df7b0078555981cb906 SHA512 0e3f1135e8f19888853a76f5fab00c2fca122707affabbf2b08569b71aa03bdf0a15b25288c5d550a8c0b6b13cff11b1c64bccf1f173a3eeb53bc28b1a053638
+EBUILD jdbc-mysql-5.1.26.ebuild 1881 BLAKE2B f581f89265b4a5aa820bbd312462fe0e3ad17ee6b4af06d4358f8a2d83a47e78f6834e748cea85e5f3fffd1ac105dd8782636c25d7d9b311d585435743fd8b29 SHA512 382cfdfa21d387d1aae0f258357c0c205d33b6a1087ad155c06f9d141bd9af8d9f74c0cbe4e424182cf3771ec489ba711126fde431b98849db792fbe9aa59d60
 MISC metadata.xml 358 BLAKE2B 634f9354e5f680e4313debca5f05fc117b44f1a43b018b3d71d92430cb8253a9da018f74e888bf535e0dbc64e79d240d4f5748d945a5caa14eba874b9e38dca9 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index dde4a01e1dc4..db996676e75d 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ MY_PN="mysql-connector-java"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
+HOMEPAGE="https://www.mysql.com/products/connector/j/"
 SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index 22229c7adbe4..1c6801df256e 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
 AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
 DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1.ebuild 3559 BLAKE2B cb64c186c540b03a3fe3f9dde699ca72f6df0cbc12e6043f2884908c3877fb3d9de918b3bf36acea532b0c07e2468d97ba2d5485661923bd5226fdb310c59aa0 SHA512 7362361d75e0ab5ce0db6ebd14429d326fa415ef9bb105735ae04fad9a4fddbce87da6887ba69860b1722d55d2d81feecf938d9e6da0f074f7e4eb2e2655155f
+EBUILD jflex-1.6.1.ebuild 3561 BLAKE2B 81a856b2da4e16fa09e939797757a10ed77c3f47a8382511732b2f854b959706b5198972fb460b49ff5e39ee3f90771e75cb214822075eb1cf4625924123a11a SHA512 9f392e643ece0f86ee089dbf6fd4722cdc635bed73f75de8b7424b5cc73ac6596d082bc1eb59da348a503a2fa9bfbe784086837b18fbbc7b7fea475b5a533894
 MISC metadata.xml 365 BLAKE2B 59ac73e145626ce1448d4edef5ad2b115fcf762d368131b3b59438e3d21a8f4aaee0d56723a3c79539b7806caa8c456acf0554ce22333b097caf9f3f07dc8014 SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 21a082774ba9..2fc529849fe4 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="JFlex is a lexical analyzer generator for Java"
-HOMEPAGE="http://www.jflex.de/"
-SRC_URI="http://${PN}.de/${P}.tar.gz"
+HOMEPAGE="https://www.jflex.de/"
+SRC_URI="https://${PN}.de/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
diff --git a/dev-java/jlex/Manifest b/dev-java/jlex/Manifest
index 8c3aac883bea..54d097fd970e 100644
--- a/dev-java/jlex/Manifest
+++ b/dev-java/jlex/Manifest
@@ -1,3 +1,3 @@
 DIST jlex-1.2.6.tar.bz2 45868 BLAKE2B d56329396668528bb626f6f03af2ebec3ccde1fc73f9e2242ff3dacc4e92c76a0e1cca29bf240832ef26c0ac98bf4b18bd820a06c99aea2b958ac13f3eadb78d SHA512 ebe16f87fe5b524de5c31651b0d5a0c282fdac99814c8f432a850a394657da4016880fba0f7418c8c42a989e78145d39188c3e68b79ed64fa1911d5680b00b9c
-EBUILD jlex-1.2.6-r2.ebuild 870 BLAKE2B 8030f4b3d536401cf25c51f2192477a1b8714787fdd40453736c3b590dcc60df4f454d39341e5985990bf8c4ff454e6800b23a9d93827fa80dcfcba1f2477bb9 SHA512 27aa4c8efdee4e0300ae131f7401a748e2b766a2741a429d36b5701a077eec6e7f858999165440741e1be8c4bb31b00898f67125057fb4d34fc98930afc9e234
+EBUILD jlex-1.2.6-r2.ebuild 868 BLAKE2B c64508dc5de46175b14c1a68f2a2d0ca17ae08942469178e4a8454fdd73398352cc5921cfec8cd960029f28acc10cb5b181acf73010c4b7d35033f92d58abd5e SHA512 67eed6530fafee862ab0bf2fe3e60aba7fc23384df7c3995b2fb27202943b8fd25702286255b0c7398183d19736c483cb2382ea56aac2825e87b2d6c2cd6391a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jlex/jlex-1.2.6-r2.ebuild b/dev-java/jlex/jlex-1.2.6-r2.ebuild
index 0a9728167410..185e730f3028 100644
--- a/dev-java/jlex/jlex-1.2.6-r2.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2
 
 DESCRIPTION="JLex: a lexical analyzer generator for Java"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/"
+HOMEPAGE="https://www.cs.princeton.edu/~appel/modern/java/JLex/"
 
 KEYWORDS="amd64 x86"
 LICENSE="jlex"
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest
index f1d47795896c..e82122019a84 100644
--- a/dev-java/joda-convert/Manifest
+++ b/dev-java/joda-convert/Manifest
@@ -1,4 +1,4 @@
 AUX joda-convert-1.3.1-build.xml 10459 BLAKE2B 79f7930f5d71e046a5e0ad8e4b7bbddb10ce2be67e6d4120685e640d51d201289e02a45bf37a5c295add8cc90404c74c06709b996a946f88b4b2c7a0467c7cb2 SHA512 cfeec9e9ee537814eaa3277037e45878a71b80cd73705bce560cf24d1c0d20033dadd030dcc447b1be5ad742fa97637f57931cab96ca7e21d6b79c7897d7f0ce
 DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451
-EBUILD joda-convert-1.3.1.ebuild 926 BLAKE2B 6244cb1f259611fc929d324ac9d8db926085d29430640cacf02092599efd312f49bb8895faa163d9b4b740fdfb9969ea46954fca2732bd3c462d348f4dfa84fd SHA512 12daac4a81b078bab1f62ea911c7f05f582ac9709fa3b40eec31cff9bd04c8a45167a6751d61a53d8f3d7a9245bd1d093197b551da77e1fad58eca0bbca23bbb
+EBUILD joda-convert-1.3.1.ebuild 927 BLAKE2B 5d013236441dd750f515439280200c45984a5e8d9ecf1bbdcfedc326b4e40b06a97f1650c65bb2817f7ff477803af6903319c7502ded60b4ce3a7ff0c77258c9 SHA512 92630d102052b71a644894835c5def32b4bb6155b5109e3dc1c253d606f5c2780b7a2d4e6adb8b6379d9dda94675f4600e53b67276593b99529ad73ccec483c1
 MISC metadata.xml 318 BLAKE2B 2222c7e9955b61b5a3369476bfdaa1087b8381846f325d3218768a672b594d64cadc6998d13012653c89df816133be237f97c9f1b2949712c4f120cd107c0a15 SHA512 13ce055f2cf64b4b5f7f6b780c98cfae6bcae0792d5bee30633cb465ab49045fc77da1337042d672bcb1c74cb3a1dc0e26b1d6c5e38f17d3a79152b423a97030
diff --git a/dev-java/joda-convert/joda-convert-1.3.1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
index 6ea4cf103456..ed172701ffa4 100644
--- a/dev-java/joda-convert/joda-convert-1.3.1.ebuild
+++ b/dev-java/joda-convert/joda-convert-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Java library for conversion between Object and String"
-HOMEPAGE="http://www.joda.org/joda-convert/"
+HOMEPAGE="https://www.joda.org/joda-convert/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/joda-time/Manifest b/dev-java/joda-time/Manifest
index ea9d6efcc532..db875c255740 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -1,4 +1,4 @@
 AUX joda-time-2.7-build.xml 11231 BLAKE2B 9b7350270773c59f3497be28581408f9984f1151b812f3ddc4bbf8fbfe50505e36cb5fdbfc330f7f07416275adc92a8176b25d7c4cb4cecbdc9d239f711bc9e7 SHA512 c614cc2425b0cefdc5f9def196cd5014d6d65552038dd22f876bbb64ee25131ead57aa94ef967491e292cf1ddefef933d9827dd588056d58c9a311640a5af63f
 DIST joda-time-2.7-dist.tar.gz 4007765 BLAKE2B ed34c988dae1f1fb3359e06cccc148f680a04244987464770024635e72d5693036ec4d1648245f44db2fd57c47d9842a964d39e04e9ba510ecda7ec25c853ee7 SHA512 2a9bf91024bf20c4f1a28c87e5c6e560994ba6f7e131757c83a5ab6984ea79549e1d00452dcf767fc5cab374e531649759703acbaed724a1e49436cae0799209
-EBUILD joda-time-2.7.ebuild 1910 BLAKE2B d1f0c4dd4d2c0715c65b1d708b13d1f5bee0b105db0018faf7a47fe1c7569855016927953ad3854cf4a52b2ee102213bb6e43347cd7f843b67430f48b80b77cd SHA512 6369190a219c9a868d5b4746f9382b84b3ffd43a7f4a13d09b66c2fca9accc6e8c5c046cb9b37b14405c43a3570f7cdceaf873f3dad6360800ef32a6183a02c6
+EBUILD joda-time-2.7.ebuild 1911 BLAKE2B 94a16745aee39443eb88b7c6aba6df6cfa8c5c0be82222684bbe41297bb50a95b521814eddde54e213178fd7f8573872283cc5832b931fc71f1b54d803d66c4b SHA512 5257e0719d996f065c87019827b740cac645f24992e0eee4841021534bf0719ffdcd9ad97a2c39a9d3ac83b8384f2beb70030164b660e2a0f8516f6da7abe9f0
 MISC metadata.xml 384 BLAKE2B 298d00eca8bdd34de1a3c30a423051cd62923963b1d239640690cf12c3ddbbe661bfaa689f1b225a968747bcc7d3b28aa53ccd90fa406322aeaa3e1f3703f4a6 SHA512 441aa3d5876d8ff91b9f9d368e817bf6869266c27f7f8686e9eb47812f899f37c5fa2e65337e979dd3247932b61d84e4b4f0d7325ea2659d54221ab428c9c089
diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7.ebuild
index 29ea57c0f51b..2f19a557d78d 100644
--- a/dev-java/joda-time/joda-time-2.7.ebuild
+++ b/dev-java/joda-time/joda-time-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A quality open-source replacement for the Java Date and Time classes"
-HOMEPAGE="http://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
+HOMEPAGE="https://www.joda.org/joda-time/ https://github.com/JodaOrg/joda-time/"
 SRC_URI="https://github.com/JodaOrg/${PN}/releases/download/v${PV}/${P}-dist.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index c29216f79d29..2b3ee0b42edf 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r2.ebuild 4298 BLAKE2B 5a536bfb3c69b6c01c2c7b9e510740f46c6ef9f1c6b74969492f7d61a887f3ff2a220bf9df611472d7a42884ba333cd68da4bef437c3a79d373bb0ce4a100524 SHA512 8ff019b22a9a7abac0f96dd4466654333de3f60c72764053f4f26ce995e1200084348aa223edcd3806037cfade26d956f57512d38d733f37652a4cdb590c7e01
+EBUILD jython-2.7.0-r2.ebuild 4297 BLAKE2B f1b3e0d8dea006946a45095afceca21d73db1926c31b176c416bc198387483e5afe112986ab1b780f396473381e8e3aa1a61384021e4d76b8db3a0723c08e692 SHA512 a99dd0d0ea96b046b431b98484680cf0b6f7fdcdf7e4690646ce13094a50958faeac9d05265b6aba31ce1c8fdbaf393fc7e755abeec8f8c194e0a6183c1d830b
 MISC metadata.xml 322 BLAKE2B 38d6e9bfdfaa08a94d90560b457b54d7e2732ddc7632b6c7c8a9fc9152ff563c36eeb31605e6bc5a96e9d4c537eb6e018dd57364456ac312cc64a3e7637cbadf SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index d8fb023be8a9..6a11902e67b6 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,8 @@ MY_PV=${PV/_beta/-b}
 MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+HOMEPAGE="https://www.jython.org"
+SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
 
 LICENSE="PSF-2"
 SLOT="2.7"
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 2633c6e39bea..06ffb32e4ba2 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,6 +1,6 @@
 AUX netty-buffer-4.0.21-build.xml 9693 BLAKE2B ec0f0c5ba4b4c259e1ab1045124190aa7cf5cc1c33a03acbe75c4f5971c1d39ef0fa99704c9663e56635b12b0f59b5582904ac2b1590f4e85686544a4a9e4472 SHA512 5b082802b6f7c7e619ba053757ede64f0ffa18c3002205207d2d129464aa89f5b52c20133299e280ea937e821a42e525e7885d773f56f0c8000726b56753fbf9
 DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-buffer-4.0.21.ebuild 1292 BLAKE2B 7109e2aa22415f7bc730213afedd242873bb98cb54432002cae0d12501393d4e00dde369177d2c6ef75323a4f6cfe11b4b37d6f8a29d57f193ce5188d1b79166 SHA512 51df749a4f546b5bc0e717d6b279397c8c5d1a9045392aea75cd84c89752b49aa0d25003b4cd0742c08980b7c554eec051ff0c78cee3ade65edd15d99e20ec42
-EBUILD netty-buffer-4.0.36.ebuild 1257 BLAKE2B 00f3c5190a72fd7fdc1ed8de82d92b25c2a182dfeec452115b6987a4b3f39377542df1d1937d4efd364253294fc7f81615aef1b9503f29efb6e142758bca1e9b SHA512 6d530b96783acb5a3c5e1608783c56ce1f0bdb2ed830b3b184d3babacfc74c4960b1f231e7f3aaef2337b9905a9e5fa3087c2ad14c8a8204742974b356cc77da
+EBUILD netty-buffer-4.0.21.ebuild 1290 BLAKE2B ef10b99db8b803f3aa667274a8b4414c9a50d00c8a63ad696c7938134ea347874a7f88d14faa0fb9ecf9ad397698b1914e5553ab18ee5b162765d82827c18fdd SHA512 a64a46e9b0d496aea9887c8494f693b70ddfb6a95ab4f383e1a5682b6c80af0e523334637a8630a189c9f0b1285e62fcb77eb0c970511220621bf551fc92331f
+EBUILD netty-buffer-4.0.36.ebuild 1258 BLAKE2B 6aff6b7d1dc6e9e5aaf26f8e56a9ca2331d1103ee7b636802c1ad8f88c2c4908aed71f06dfa33c81eaee70894e7e2c4b835ea0643ddf453593e691e61b6c53e0 SHA512 1003897203cb8ddd77dfe2d4d6c94697fe17f03ef95e4e2ae607167f65fc28ec9632873c30d4f651ea5399d1e8958dc518d891a4c8aa5a7e566a19a003e2b3f9
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
index 44d1a7d3625f..48cbb2f8942c 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index 6c11aa310f28..b8f079b88e59 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-codec-http/Manifest b/dev-java/netty-codec-http/Manifest
index caf0c7f17cd2..362569a3e081 100644
--- a/dev-java/netty-codec-http/Manifest
+++ b/dev-java/netty-codec-http/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-http-4.0.36.ebuild 1691 BLAKE2B a3899fb55a046d8487720f1748e33372aac2e6cd1a31fcfb0d8610ba9206a9ed1ba3037744fe129920ff8c403bfd50ff96b16f1a6664f6e706f299393eded3ec SHA512 dedc41466c7649ff75cb443049068cb337d067f2b6d64516b8f174a4e92515d78b201a9e6dad27cca131fa27ac6df7710065634c9f60a1daf943708bc3994782
+EBUILD netty-codec-http-4.0.36.ebuild 1692 BLAKE2B 398e0a06ddc5bed42c3c389b3af68b9f1ca356bce50e12bfd552760e4eb6f655a7a9669cd9ce152eec11b41f77b8b5d0d96408836ce071d6eea2931616124432 SHA512 d23ab6808084f407ce58ea775feb1df8816fa8868195001f6ba20cd5f731a1e8caff45b07b547f627a9f3f789e0e6e2ba2b95fd9dd12371598f458c70afdf56b
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
index 4488d079b4eb..0265bf4dde13 100644
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index c60b66b2c342..407f6ef8918a 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-4.0.36.ebuild 1589 BLAKE2B 8b1535c1b88fc14ca4f9fc5bd74ae7c4e43b63365163e624e00846acc589993bce98b2c831b0ac618fa1a3d08b96b0bca6dfdbbcc273d00eedf4260b34e12d81 SHA512 58a66f40111f26981dabd76c9f140a15a96cc08806eace73da45cc97521b1bf2c018a04db8bb8319ea2e35bbc7208e8a4bb6bad7b8af5ca8602fddb023f54d6e
+EBUILD netty-codec-4.0.36.ebuild 1590 BLAKE2B 65ef11c7facc282dec406401c347fc9f54d4cf15a8cd8009f0a7f09f010ebeef05f4fac75c040d8f597b9c7e4e12ad878a41909b5c77e0af676f183a8d874bb0 SHA512 f84c091e6f036e515aff04f7ceecc08549b8d65de4d715bb61c19f0b4b4376bff1c3b6d1b372ad3870163cb738e2cd9da9c94c9a6682c15008f05788449ffc00
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
index 0dfadb0d25fa..afea45ba0c34 100644
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 39591df3f109..1f7d06d4803d 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,5 +1,5 @@
 DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-common-4.0.21.ebuild 1077 BLAKE2B acc67ea4fb21cffcb787c13589a3277b154ad5804ad43ed9de45bf04fd1ea16a247647e5b488d77514da20c69c33d0fcdcc5cebd90dc2063a64deb7937e86e44 SHA512 72a988bc64b7177345fe084746da732deb64391caef03bceae7dea6eedbe23061d2b9e362c6fe265ca8524b43386aff12c3f262f5885f8c34a70cdd6f2bbac22
-EBUILD netty-common-4.0.36.ebuild 1599 BLAKE2B 323d3049a29e69d93dceda598bbe6ab8d4d59233e45eaf43c60f95ae23675918fb9eeb5646886f824ad8f5f3c5244dd0d88a69b2998b44a8f735104f54091bd2 SHA512 732d77a9953e7b90a737fc11f97f6067066de30f244144814c615ab83eac6d475741d51f55fb156d39a227b4833cacd672e2c5df760688669f07d2f663859477
+EBUILD netty-common-4.0.21.ebuild 1075 BLAKE2B 68120948697dd51ec09cd38944551ee2962a5f8e7c2d04d036d02b2494288cd2b75b17fb4ad08bddd20d7b0e0d27f726165022df1ab6874f5e2bc094148a8cbd SHA512 9d79fc6bd95d0c8564836107cd1d2cb231af78de350f8852763023c447112a47d83cd3a8890895d4edeb86a51d48c9dbd30533428b8c06a315f14f5480f0a077
+EBUILD netty-common-4.0.36.ebuild 1600 BLAKE2B 5a584194312af751583de682cfe336b64491bfb75aedb0ca045f7b438dba034b00c5c6fd116c91311147628a841cc01cd681c0c771573d10fc3cf0e4cfee24f6 SHA512 909b3906bcd669cb9aa353dcafd1c6160c3557f8323be854d3f8890526c14f8880f9447b643d799a4539cf3c2e397027410d64977de9a0d1a7345cfd2b719512
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index 188eed46074b..8af40d85bfea 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index 8864cbf62128..7748f7f898eb 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-handler/Manifest b/dev-java/netty-handler/Manifest
index b0672bc4bdb9..2e0c55e2d431 100644
--- a/dev-java/netty-handler/Manifest
+++ b/dev-java/netty-handler/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-handler-4.0.36.ebuild 1731 BLAKE2B b244e78e9f45f623ae0baaea52024e3184325e9d677cd6411c12c443dbd277849c37e8b08637454798e002380f7579e6d63b874aac2580bc3d1eeb1e71ed706e SHA512 2a68dfc5032499a06acee871b50f7c64855bf755ca4b10020e9c6aa5d5475c3ace9f4c23197f5e68fee4fb42438e2aa31f677f3843115689ee591dbe210a1ff6
+EBUILD netty-handler-4.0.36.ebuild 1732 BLAKE2B a0c9297e10c32bc0d8f56e4ee58688b3083183d80b8b9d2efd454e9bf0541ef9c069dc278b908edd69a6679b097f8eb15972f959932c8297ed985ec48ce68085 SHA512 de098d7010163ef45114950b449cd338fa3aa7a3fa74355c991e8347f6ee2adc7e3cd4cafaf13cb3cae4ece16263233c33b72941458606e0f55b37218c313f0f
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
index 91f939ecbf48..75b9cdb0c3de 100644
--- a/dev-java/netty-handler/netty-handler-4.0.36.ebuild
+++ b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-tcnative/Manifest b/dev-java/netty-tcnative/Manifest
index 2df0f6062d17..d33fb7794347 100644
--- a/dev-java/netty-tcnative/Manifest
+++ b/dev-java/netty-tcnative/Manifest
@@ -1,3 +1,3 @@
 DIST netty-tcnative-1.1.33.Fork15.tar.gz 186153 BLAKE2B 3d769a04e659c09aa32059fc2a2eede84f6105469de33ef7d26df436de6a1f6290a6640268934f63f77a969eb6aa024651380cca6dc69099c4016ed61f7d5310 SHA512 592c70a926473a4903b704be920aac1a4fd5a032a8d821a77800b6922b374cb28decf496a65ef62867c027dbac93f0e563e9bb4ecf6659bc70cc33663bb979f5
-EBUILD netty-tcnative-1.1.33.15.ebuild 1655 BLAKE2B f4f79650cf5159c1c74f4237ccccfa008b39cc603ed99ef76ce844083187707787b4f50cfe0de9d9a0d2edd86aed953295cf2a8cd237f8606a67b93a05313b75 SHA512 92b33eda5ac2a5ee45d2c9e438ec8107f94a77f7a4cb55858a1457833a010e46683c7f31e964d149ff7233d6c446f6f849911130c1a6117809a9f2c33c508b3e
+EBUILD netty-tcnative-1.1.33.15.ebuild 1656 BLAKE2B c077032763915bf88dfb38701a85ccd5d7e38f1827282141dff9f8d10c079e7f3f76f433fcc220eea05985ab1712e6c09f4aaf92b10b24c5e8efaf13ed190732 SHA512 6191cd52dbb0efc90219d1167a5430ecc5afefe22ca21d5376e1c12a1bbc810e31f15b349f3e93d7745b1324a7389cf17adc0149c3d289fcd06f5dbc1d1b2bf6
 MISC metadata.xml 321 BLAKE2B d5ef2b6901e18ae4fcbb63df20a62edbe59169783a0ae50553194b6e4760b421078ad26fefb1fe38527a71d2e0053b3ee24683e166660cdd2b8ca1d9e1b47d94 SHA512 cafd11002a29f2a3f485ea8c2abc2c338811c0c9e9f6fe416f089d545971b44dbd6490cdbf9c9f3be75fb1fbad56c533d9d3e6141721027545b6e1ae31bdddd5
diff --git a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
index a8a2536e6871..5facd9153492 100644
--- a/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
+++ b/dev-java/netty-tcnative/netty-tcnative-1.1.33.15.ebuild
@@ -10,7 +10,7 @@ inherit autotools versionator java-pkg-2 java-pkg-simple
 MY_P="${PN}-$(replace_version_separator 3 .Fork)"
 
 DESCRIPTION="Fork of Tomcat Native that incorporates various patches"
-HOMEPAGE="http://netty.io/wiki/forked-tomcat-native.html"
+HOMEPAGE="https://netty.io/wiki/forked-tomcat-native.html"
 SRC_URI="https://github.com/netty/netty-tcnative/archive/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index b3c872f57e83..4027bf1fa01f 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,6 +1,6 @@
 AUX netty-transport-4.0.21-build.xml 9699 BLAKE2B ca533763bf7d1a2c05436e598db421ee96dcdf62105acf9bb6be8842c03de95894559b4fdd443e0b797956d4b2b41c0b414167da3435db393f55cb492049b0e8 SHA512 1b63c011bd15c0fc0f2bcfa68b8ef969f178071eb2f9041a8812a08d9c7c871e85f16ebe049ed425fe4064df8149066ccab8bf12b32f6d5bc7e80e18a51b29a9
 DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-transport-4.0.21-r1.ebuild 1109 BLAKE2B 5dea13615eec6fe6c97f67d8c05b98fd8635aab081916c93bda4afb145086f91df79cde77127749a5501ef946796989baebe27df9554d24547f491a31824db7e SHA512 a0cd74bee02353cdccae2eecf70cc75f5bb99059dc2760c6db5dbc5aaf16673da8225ee95f569703c01f2a9a3f1248ee43379843ed7cc94904e5b4badaab0454
-EBUILD netty-transport-4.0.36.ebuild 1711 BLAKE2B 86a0e4fea5aaa225b497f5360e71070132afcf8e100001961b599f011495a4faff9a6036be36b281e374ed06fbef8b710c927113dc18eccdd903d1ccaf450ae6 SHA512 95c69366857ab03d292063f14a2158c8aa6891344230db4df94b5ec49fc42a1af192a19f9f6f57e89de518d15d13e07e218b7953ecd3b0366afa75ad04131dc9
+EBUILD netty-transport-4.0.21-r1.ebuild 1107 BLAKE2B 8d2cd8f6f80d90a6859e18015b96248749b0262ccc5e25ff508104a0811fde92be01645ddd75912a492a0c0de9963d4d254ba3f20d66c7b85d61e2afdfac29d1 SHA512 3e4caf4915993af3052fc1376e30a3dbe8716318738a353b84b1a01e477c1ab407790a2ffe4152cb4cf273e96f8702bf7b34aaa279147a45d4c78258403823dd
+EBUILD netty-transport-4.0.36.ebuild 1712 BLAKE2B f18cba6097d96d8234ec28f383e5e78a36c2be837b9d743aaddeb6e5d0e56ae1e5fe2467c164b6244eb5cfee88bbcbb9bb3df9cf821c70d53ac2d9055b2f3cf2 SHA512 61b5d880ed003fe30d0c2356bc14b4f38aa472ab509b7bc03e8f91485898e715884ef9a41ee62a417f87e0c8b0d4fbf6d972fea15b5e72b704f8e2b3a81ac66c
 MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
index d026de50d1c4..0460b4e47566 100644
--- a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index f8fd19a650cb..0c0f9456d7e5 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Async event-driven framework for high performance network applications"
-HOMEPAGE="http://netty.io/"
+HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index d35676d71fc2..e23805b44f0b 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,6 +1,6 @@
-AUX openjdk-11-make43.patch 595 BLAKE2B b33a6e4979b8a37451ca2bcf09dc11bdc180d480a43ab4b3aa1f649bf1b90395cdb089fbcbc586f8b72127c9df8999f75a118e19444f7ed8c95990f8b7ed5410 SHA512 b4ca872d9f304c6f794a326d9cce387e08352e47923fcae7a9a8328d095d24822bbf6e2811a19c5e5c83d1981687eb7da1b11c791710350f396af0493f140318
 AUX openjdk-11.0.7_p10-sigsegv.patch 2639 BLAKE2B 70750a312fbacabc7e7131d135347864fc1807f397278e614427d1ef7c401c8020aa762bfea996307f24137fab09b44c6d2478e8e4bd548401bc9856a2e74859 SHA512 94babc6fd566f366ad3531b18512c06b6d79003d3692490158f9c2a3f9ed83dfe2ffd472999a3a4f00044ce1c4fa0c950bfb147ede7b9edce758c013820835bc
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
+AUX openjdk-8-detect-gcc10.patch 2463 BLAKE2B c7c8f62dfc78894c9808fae2a517b2b45008054bf5a6349b9745da3f30db799280a6751dc532a17e1f0341dcc96fa8512d56bef4d087a54a77920ff1f5d7abac SHA512 660d8e2564cefa24b58923ef21b4691650efeeb555bdc6103995a5c634c7175de3ab019ddb3eb8661d3e4b9de6f6fac1b1d1c8a3fef7ef29a4c86a76c7fdb821
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
 DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
 DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
@@ -12,5 +12,5 @@ DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65
 DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
 DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
 EBUILD openjdk-11.0.7_p10.ebuild 7832 BLAKE2B 6dd4fe2d18646f941320729eb2e013e4607b838f86a5d944e238064ad69e7b5417e7c523baeb3d786d20b76d93ab6c42f129f55aba29d0121cd866bf79369b15 SHA512 1e64f61d8623de658e52c861ba2c663155cb4f8ad6c1f8505ed7b3820f16db533f4ffa5f0d2124ca9d2c1c60e458aaad9ea7234843667f177e0f69fd9563a61f
-EBUILD openjdk-8.252_p09.ebuild 6045 BLAKE2B 2309b78f625316abc2e38864c03033b344df753b5865806fe336b203a4f56e998a5c74e1716e4ac4b55e971e2eadabd407991cfeeacb50432cd6a29fbf83bd23 SHA512 f510d8af93e004e607ceaa294e5bd333bbde83c46e934ceccff98e683c8c8c82326f647d834d82df4141068a480b6423031fa9d451d0d0556aff0c0f5f45bc0f
+EBUILD openjdk-8.252_p09.ebuild 6128 BLAKE2B bf07a7e457673ce56ab493cf36701357c0301ef0053488cce5f4f70730f9c19bbe6a793e74ada978c67fb9583b68364903a5b6aa8b3ebb61572a20e372e9460c SHA512 92aaa45aba9d64b5fac22a0d27f59ef249a9e98f043daf4f171396866d3816e6a39811f14663c6d92c24dc80e4633a3f9edc3386fd7d72eae3e24ab4b8766528
 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
deleted file mode 100644
index 9466e2be56fb..000000000000
--- a/dev-java/openjdk/files/openjdk-11-make43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
new file mode 100644
index 000000000000..b47e012d4a39
--- /dev/null
+++ b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
@@ -0,0 +1,49 @@
+From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sat, 23 May 2020 20:48:10 -0700
+Subject: [PATCH] backport gcc10 fix
+
+https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0
+---
+ common/autoconf/generated-configure.sh | 4 ++--
+ common/autoconf/toolchain.m4           | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
+index 5e71c50..90c017d 100644
+--- a/common/autoconf/generated-configure.sh
++++ b/common/autoconf/generated-configure.sh
+@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
++        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
++        $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
+index e3a82c8..c0a4af5 100644
+--- a/common/autoconf/toolchain.m4
++++ b/common/autoconf/toolchain.m4
+@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
+     COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
+         $SED -e 's/ *Copyright .*//'`
+     COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
+-        $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
++        $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
+   elif test  "x$TOOLCHAIN_TYPE" = xclang; then
+     # clang --version output typically looks like
+     #    Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
+-- 
+2.26.2
+
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild
index 1b3576eacaf4..45c3e3cc90ca 100644
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild
@@ -80,6 +80,11 @@ PDEPEND="
 
 S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
+# bug 721970, JDK-8244760
+PATCHES=(
+	"${FILESDIR}/openjdk-8-detect-gcc10.patch"
+)
+
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
 # should be close enough to be useful.
diff --git a/dev-java/relaxng-datatype/Manifest b/dev-java/relaxng-datatype/Manifest
index bae500a49216..25508998baed 100644
--- a/dev-java/relaxng-datatype/Manifest
+++ b/dev-java/relaxng-datatype/Manifest
@@ -1,3 +1,3 @@
 DIST relaxng-datatype-1.0.zip 74033 BLAKE2B 15b488e914cab28fb9ade71b491d961ffa4f683f66759e96cd53dcf69edd39d423b5562831698bb3e03191396c86a2a93369f14d278f3c55a90728031d1921d3 SHA512 712b99209e927e8929c46797cf3733993cc2740bfbafb458c518e5e130a7860a19dee45acd360a9d7179137f9340c3edeb514cacf501233cca515b38e60d6b79
-EBUILD relaxng-datatype-1.0-r2.ebuild 760 BLAKE2B 0839f4b91de54ebfa1b258676492299434146a9a4fddb1ab08684bb97b3f37f9b2b02edaa147c42516d4503a59c83269d0609e3207ee5475bfc342488f7a373f SHA512 f61619e652284531ad0c298caa33d72eccf739867960e1bb151e37e7d2736beb17477fd15e5f55f27cd281ba10d3af31f29bd49b3264f05c233e4520d8970ec4
+EBUILD relaxng-datatype-1.0-r2.ebuild 761 BLAKE2B 2ae6c9eda961aed9f0ca5efc6811fdad5cc150db9c8189152dcf2620a6992c76f464bbf3ddf209a1c6390624ff142240cc8901263e5fb64f52f679e5cf4a4dba SHA512 0e72a551b78cb1a6f2ea7e58911c3b9cdde2f16f1f2e0a9d9c95d56be57ef9fe3944cf2113c7d2ee5808a763c5e611e91694b6bb2c813b9c7ce6b06f0b70172c
 MISC metadata.xml 313 BLAKE2B 151379a0c11efd556a9c630fdbc52358ba2ca7baa4a4701526d65d394c1fcc0ccce38f4b874e47b669c3cade9c6faaf0b5bb42ff1a652809c60cc039eac9a582 SHA512 97bbf1c308f5f2436f0c24dac17f5219cc71a8e9882037f9bf59689f75524521ea42c63989491779ca59fd2878e2c478779ed6945fcf2eab661f28be3d9e2a4b
diff --git a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
index 815a5e4cf8b5..304bd7ade70b 100644
--- a/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
+++ b/dev-java/relaxng-datatype/relaxng-datatype-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Interface between RELAX NG validators and datatype libraries"
-HOMEPAGE="http://relaxng.org/"
+HOMEPAGE="https://relaxng.org/"
 SRC_URI="mirror://sourceforge/relaxng/${MY_P}.zip -> ${P}.zip"
 
 KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 5ff0a33b0573..66704e02ff4f 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -3,6 +3,6 @@ AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda55744271
 DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
 DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
 DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
-EBUILD stringtemplate-3.2.1-r1.ebuild 1475 BLAKE2B 82afa01b1b78507d830624069f58d2435f805d2c217ba9dbadef72764f80b147f215477727de73132d0622fbeb75e6cca244e33461397dbc701f6adef4a1ff2b SHA512 2631bd95216430f64be2166df75c25d9a1f1ce509b221c17bd430108c6f76b784a224b24522863ee8c05e4de3065f250db18544849f7687efe4391f8d7b399ef
-EBUILD stringtemplate-4.0.8.ebuild 2171 BLAKE2B 09bd3adb7fc9c7c1b5e882b3a0835ee1d13f288554440064557c319254cba19c31502704e2ee39c07da750dd280186f952ebc8e0f3025aaceb8601b35425cac7 SHA512 25c3aa84f1b4eb761b6468c07d0610476bce336b5a1e91e915724325c56d4bfcbb97a0d2183f0ec7c681e953de276681266dedb8fa39a8704f8e48c2cbfac4dc
+EBUILD stringtemplate-3.2.1-r1.ebuild 1476 BLAKE2B c23c3f8c720f63050495e3d41c9ea65c384f205a4b56a73e4a18255383b285255a4b7539083cb4d9fc1f1bc06e7a72b03bde88147f8d2d4bc9206aa528d5c02c SHA512 0a78ce3012be779491f11ac47fb0543dd0e96c971e5dd23258b27c82b1cc79d376dffefca33cf443305f08706eb2e35007b5dd345a19b3be6103c5c2e5b5c3ef
+EBUILD stringtemplate-4.0.8.ebuild 2172 BLAKE2B ce3f2349df3c9b7b0c5e06abd3c1322c73f835a3120cca4bc6a66d55d1bde83af84e5e917f7ba6dc6534395f9c5f8237b350ccda9bed74162044b20d7f41034a SHA512 36bd30d02a9e9a29b487cf167f544aaebaf6cbc440587746d4509ccfea0f7f1b8e915a3432abdd3ad53862a8238b42cf44553e3fc37c51404f4ed286bbf3dde6
 MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index b8733c26b50c..0b96d950c8a1 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/"
+HOMEPAGE="https://www.stringtemplate.org/"
 SRC_URI="https://github.com/antlr/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 41fc1a76287a..f15d93c44e9f 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java template engine"
-HOMEPAGE="http://www.stringtemplate.org/"
+HOMEPAGE="https://www.stringtemplate.org/"
 SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
 LICENSE="BSD"
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 6204c925ed38..f22ea33ad6cd 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10.ebuild 1752 BLAKE2B b353be7f15254d660c500b6c39c3910354f2cdee1aed557cc958667b3d350407355b74f9e181d0102f7a86e713e21899435e83c64824d90d83138d068abd8b86 SHA512 827f51b3f53200be76d64720f02e30746091f50ea684589f1fc1df692e7712a17508fa83f3aeb1270e5063bcdfa18f93c18ea52c5411ee1461a973d73745a118
+EBUILD testng-6.9.10.ebuild 1750 BLAKE2B d371f64cb0d0df974e35adb987fc41a0c2d916b7a188f20b01255477243bdcbb98bcadbba373010df1d40a0cce1f2aad9e8b3d3ba2df0e53633d38d9607ec3ef SHA512 16a574302dbf241ba9a195f141e6626ddde5362a7ea3a025ce8f4721b7d485f14dac23a0c616a1034d353ef8399c26ac7a92a71f07ff21a5816df37bafa9d8ae
 MISC metadata.xml 314 BLAKE2B 827119483a30d9ad2a35c20ad9149f941326fe6eb74c0a10401bf8b96ae07b233fc4177f87b1fae02c6d766304ff3002d70c8b9aaa9ff87f9ae951793e191d6d SHA512 dc86504b0f3aa0bcd4adf4470e7391a05eb5cead186f79b0fc35ee3dd57ca1c927454e4150463376ca37ba5396e9f75328bdb8969613457a9ddadbd5ab81cf98
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 6a886240f14c..6be65aaa0a31 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
-HOMEPAGE="http://testng.org/"
+HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 KEYWORDS="amd64 x86"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 677e351579f6..ccac7559d65d 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,6 +8,7 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.103-src.tar.gz 5279592 BLAKE2B a8ab36fb84cf158fcd8b888276576cd523d211ab0f6fe0933f600d1990a8f68076f192177a574987e52440037c0ebefd3edaf3c84fee541afb076c5ad33cce9b SHA512 812fce83c7242ebc16dc2365f0b363f1fb2691cd6a2f19f1209ea467557c42ee2d108c8bef89f23bb4a20c800d0ecdb4afc37567ef8079966b4eec0331a2ef9b
+DIST apache-tomcat-7.0.104-src.tar.gz 5309794 BLAKE2B 0d4d5d668e1131bb533af1d56fe37ee1f5c252c2c4dd987e24aae67484f27805f88750b27248c6acfd0585eacd0d3f2155c723e9a25c8613652101944add2a15 SHA512 788eab3ac343815362decf4c0d5db91f3697cc669e7e051f93bf82905cc52f9b040d00b7e07f7b85bcf470e802418896a678f991e523e08a3ae5a2f212a53257
 DIST apache-tomcat-8.5.54-src.tar.gz 5689648 BLAKE2B 7d4c80cb86261bba46b1879d8f2b9218a63cfb069d32dfe72bd5d73baf87887cdff37c5841c44196ded1dbafcfe2d525cb09d8a15905c24600caf107255416cf SHA512 fe4a82fc58aed0df203abf03367f840d7ac498a3ba317eb2b08826e8ab5e705ea13b99f3af1e17878b2cf96271c5d9ff4e7cecf3b2631e061f1b02988449f9e2
 DIST apache-tomcat-8.5.55-src.tar.gz 5719386 BLAKE2B 4d5d20cf81e0a9aba1fe2b0fc2e9641696a2c7b4bfe1cefd1e86025612484ef06a8171e28722bcde91b671df5bd6e148b22c2fc267828109c6af762fe35f8fdb SHA512 214758bf4dc868c38fd92a19e405f3cd8e47008dee82610f8f7373d92ab5f8800c160a42c96c293f599b702c1c9d2967ca40d3410c1f6a14745edac4739f177d
 DIST apache-tomcat-9.0.34-src.tar.gz 5843244 BLAKE2B e4124c5986b0be26f17cf5e62443fa945ebea6dd713db6a7f96c8e4c7eed7d8e38610763adda928a7099c1574b00e072635576d9d29cc8ae1b98658f0e341acb SHA512 8ac8a916bfe2d3daf679dab9f299bc50f138f3cc9a6e8679a22862d122dea1e5ce3b9101472295398366f5b5d8477097a3cfb536f01136e72ff09d69b2f6c3df
@@ -16,8 +17,9 @@ EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efc
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
 EBUILD tomcat-servlet-api-7.0.103.ebuild 901 BLAKE2B d0ee4ec8ba0e77f5c555ce53b1dad3558371a7667e55a3991b9753e135eedd67af5627b7c819620ea5f52c741f14b53fbc1fb1a6cd0cc680f62e0d651de6b22c SHA512 57e57d722ed3ae8c3cd99c0a0351242c6c74bc556babb4719db51ace5b73ea57eb538e69ce3b19c32cb33defcd1ffbaea99bf401d856539560c0a4cc9f5bd685
+EBUILD tomcat-servlet-api-7.0.104.ebuild 902 BLAKE2B 67cf14b835e7ce4ee75dc7739a31ffbc5c80d858087296ea98a1d1bc080079967350683f79d8b1db67977b9d82458a720cf7213a2ae4df8de72792fb81d3d771 SHA512 ab872c195c057c032267e3b1ac6e8093823f63d3b1e268dba9be610126b88ed0de2b3419d62ebc7379835c8cff0e109bdfa272abc777d67f70ada13daddae9a4
 EBUILD tomcat-servlet-api-8.5.54.ebuild 1005 BLAKE2B 81ce97c43775137f7c4760a58abe4d7a6192dded9e9cbcef8d29fa10b5cc0868740aa0683c94a349494232c64e42dfc0b09aeac3571260dcb6d8405dc233ec6e SHA512 520be8a3bb582a0b3dc783f5bc1763076d94a84a71e7678dc9d2def1d1c2be228097282667ecd9c3a5ba84b57b2403c5a446d45cfa249468932576df81e9d0ad
-EBUILD tomcat-servlet-api-8.5.55.ebuild 1008 BLAKE2B 1560f356f09d29d3cfa9c0e69a4bab73a412cd2d174745164d1d0efae7760cff91f21c6692bfc90adb5eaed11c090ec11aec3b77fd7d2116a0d2dfdf0eb7f4c0 SHA512 5f9233d432a3710356b31633a42f16e1a500423f8fb8722772d0f8f18e95b435debedc3e53d4a87adcfd12989570d4682cc7308990b8ff00b4d15e696d5864b8
+EBUILD tomcat-servlet-api-8.5.55.ebuild 1007 BLAKE2B 8024ac34183cbcd4a4b682ec1dd586c8fef7c263cc0976e951249e6d71278bf1738e5224a5034c6d32611cc398ccd02b84621875d8c74d8980c4a62206d328ba SHA512 d2173e0e1be773992f67c77be7333e270a401d8f7e4c085a876f568e0e93055f9a7506ef8ae8774a98a576d58e0419f6367347ad34daf207b6e844b1d6b23edd
 EBUILD tomcat-servlet-api-9.0.34.ebuild 1000 BLAKE2B cf72ff5044130696fc74a4ee7cfd28e55e82077d8972c56ce9324007e5d5776e4ed7fc4d00e10ba8c08ffdcf6fc862ecd8a86f177d41fc5264d4a1f9d110f6d4 SHA512 a72ac598d71fd597c238b4fd9d7aa6365540874cb8f1ae5aff63f6bf32d0f7f8195c9a1248d05bf2fa7d03a7d12a11e18c4641ce29b0a60939f03110c9ac454d
 EBUILD tomcat-servlet-api-9.0.35.ebuild 1001 BLAKE2B 0c3a54000bca6bac53d53bce38b3caa85dff31bcefb40f257408ad2113fba2e44b819630307492287f26984fdf5e4d88b68337c39768141b4ff17dea1d1353b6 SHA512 757be3ac0c480bacc7c03cf7bf1341189c5848b66b9eeb5520c82e67dd7b704bfbf3eb9f80f54130796b814c15e5d46b35eb4e1d2aeef02183d3b0bad1c90ca8
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild
new file mode 100644
index 000000000000..647023740d07
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.104.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml ||die
+	java-pkg_clean
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
index b6216e53c6b0..2fb70f36de13 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.55.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.8"
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /dev-java
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)