gentoo resync : 18.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-18 00:10:51 +0100
commit: eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree: 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-java
parent: a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)
154 files changed, 1194 insertions, 3584 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d684d35c2c6a..a9da6289a9f5 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/dbus-java/Manifest b/dev-java/dbus-java/Manifest
deleted file mode 100644
index 7b2a0b8ab628..000000000000
--- a/dev-java/dbus-java/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dbus-java-2.5.1-jarfixes.patch 1761 BLAKE2B f91efbc7c0e60a9090fb48f8e789f7f85e3a8e601b1dd4cd576f5b2b8b18221e55c36cb1c53a3764cc37f7ed0a6f719eca8dd1ffccb454753cbc81611394ca6a SHA512 7f16a3cf42296f4c8f0c083f07f7afc664c0c51b78548b05c53ad7537c70f8cfcbf178b4bdf554cd9559edf3ff401fbe73097866ca842030b1619b4c92212df0
-AUX dbus-java-htlatex.patch 638 BLAKE2B f11dd6579e44f0177006139c4f3d35650149375d615d409e68ebc3fee249c7980506e95ffd63d94b4e35b35e102ad3ebaa4dfbcd43a629a0f5f4304a40c775e6 SHA512 d9c86980f9263bac50ba357a9293d3630eadc35e0b67cf4c3547caf96d0b6d9a076dab548b54d43e466f8c77412eec2ed6527de98fe10cfdd7d26645285daede
-DIST dbus-java-2.7.tar.gz 145450 BLAKE2B e854dbd7eefa9b9cef85a96ae0b301c8e51924a240e976841df4fff84c42b20331194d59b21022e3c0a7806f4e652f396f938df3ff8ef156f49937e65b0bf991 SHA512 15b44b877ce123948b07aa67bdf73e1fbf6bf2de89d09647dd11d33fc6beb76509b61b73e8a8c5f6331300ac0d9760d7e715b4b9467307f13cfc94b5c856eaa3
-EBUILD dbus-java-2.7-r1.ebuild 2722 BLAKE2B cc009d0218d632675eff04e9c77441926a88f8100069621dd7a03ba178accb6946d524ec7ceae281e1ef275aad4e7e17d9e9db494a1fd6ca6afb5b95e09b8a6d SHA512 7291603929c3b7d4a8d884055420091a52fa50b4dca63b5980bbbcc503e31426f587efa88a75e666b9426a64fc3811ce9f09c2fd3d05641dff5ea3c3fee76506
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild b/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
deleted file mode 100644
index 655984b4b0ae..000000000000
--- a/dev-java/dbus-java/dbus-java-2.7-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2
-
-DESCRIPTION="Java bindings for the D-Bus messagebus"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus-java/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="debug"
-
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/libmatthew-java-0.7-r1"
-
-DEPEND=">=virtual/jdk-1.5
-	app-text/docbook-sgml-utils
-	dev-java/libmatthew-java
-	sys-devel/gettext
-	doc? (
-		dev-tex/tex4ht
-		dev-texlive/texlive-latexextra
-	)"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PN}-2.5.1-jarfixes.patch"
-
-	# dev-tex/tex4ht changed htlatex path, see bug #318963
-	if use doc; then
-		epatch "${FILESDIR}/${PN}-htlatex.patch"
-	fi
-}
-
-src_compile() {
-	local debug="disable"
-	use debug && debug="enable"
-	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
-	emake -j1 JCFLAGS="$(java-pkg_javac-args)" \
-		STRIP=echo DEBUG=${debug} JAVAUNIXJARDIR=${libdir} bin || die "emake failed"
-
-	for i in *.sgml; do
-		docbook2man $i || die;
-		mv DBUS-JAVA.1 $(echo $i | sed 's/sgml/1/g') || die;
-	done
-
-	if use doc; then
-		emake doc || die "emake doc failed"
-	fi
-}
-
-src_install() {
-	local debug="disable"
-	use debug && debug="enable"
-	for jar in unix hexdump debug-${debug}; do
-		java-pkg_register-dependency libmatthew-java ${jar}.jar
-	done
-	java-pkg_newjar lib${P}.jar dbus.jar
-	java-pkg_newjar dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
-	java-pkg_newjar dbus-java-bin-${PV}.jar dbus-java-bin.jar
-	local javaargs='-DPid=$$'
-	javaargs="${javaargs} -DVersion=${PV}"
-
-	java-pkg_dolauncher CreateInterface \
-		--main org.freedesktop.dbus.bin.CreateInterface \
-		--java_args "${javaargs}"
-
-	java-pkg_dolauncher DBusViewer \
-		--main org.freedesktop.dbus.viewer.DBusViewer \
-		--java_args "${javaargs}"
-
-	java-pkg_dolauncher ListDBus \
-		--main org.freedesktop.dbus.bin.ListDBus \
-		--java_args "${javaargs}"
-
-	java-pkg_dolauncher DBusDaemon \
-		--main org.freedesktop.dbus.bin.DBusDaemon \
-		--java_args "${javaargs}"
-
-	java-pkg_dolauncher DBusCall \
-		--main org.freedesktop.dbus.bin.Caller \
-		--java_args "${javaargs}"
-
-	doman *.1
-	dodoc INSTALL changelog AUTHORS README || die
-	use source && java-pkg_dosrc org/
-	use doc && java-pkg_dojavadoc doc/api
-	use doc && java-pkg_dohtml doc/dbus-java/*
-}
-
-src_test() {
-	local debug="disable"
-	use debug && debug="enable"
-	local libdir=$(dirname $(java-pkg_getjar libmatthew-java unix.jar))
-	emake -j1 JCFLAGS="$(java-pkg_javac-args) -encoding UTF-8" \
-		DEBUG=${debug} JAVAUNIXJARDIR=${libdir} JAVAUNIXLIBDIR=/usr/lib/libmatthew-java check || die "emake check failed"
-}
diff --git a/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch b/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
deleted file mode 100644
index cd49726b6403..000000000000
--- a/dev-java/dbus-java/files/dbus-java-2.5.1-jarfixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur dbus-java-2.5.1/Makefile dbus-java-2.5.1_patched/Makefile
---- dbus-java-2.5.1/Makefile	2008-07-21 13:44:10.000000000 +0300
-+++ dbus-java-2.5.1_patched/Makefile	2008-11-28 07:10:30.000000000 +0200
-@@ -87,17 +87,13 @@
- 	sed -n '/_(/s/.*_("\([^"]*\)").*/\1/p' $^ | sort -u | sed 's/\(.*\)/msgid "\1"\nmsgstr "\1"/' >> $@
- 
- libdbus-java-$(VERSION).jar: .classes
--	echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
--	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
-+	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/*.class org/freedesktop/*.class org/freedesktop/dbus/types/*.class org/freedesktop/dbus/exceptions/*.class *localized*class)
- dbus-java-test-$(VERSION).jar: .testclasses
--	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
--	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class)
-+	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/test/*.class)
- dbus-java-viewer-$(VERSION).jar: .viewerclasses
--	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
--	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/viewer/*.class)
-+	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/viewer/*.class)
- dbus-java-bin-$(VERSION).jar: .binclasses
--	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
--	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/bin/*.class)
-+	(cd classes; $(JAR) -cf ../$@ org/freedesktop/dbus/bin/*.class)
- dbus.jar: libdbus-java-$(VERSION).jar
- 	ln -sf $< $@
- dbus-bin.jar: dbus-java-bin-$(VERSION).jar
diff --git a/dev-java/dbus-java/files/dbus-java-htlatex.patch b/dev-java/dbus-java/files/dbus-java-htlatex.patch
deleted file mode 100644
index ebb278ad169b..000000000000
--- a/dev-java/dbus-java/files/dbus-java-htlatex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile~	2009-11-01 14:53:27.000000000 +0100
-+++ Makefile	2010-05-08 16:26:10.000000000 +0200
-@@ -131,7 +131,7 @@
- 	(cd doc; pdflatex ../dbus-java.tex)
- doc/dbus-java/index.html: dbus-java.tex .doc
- 	mkdir -p doc/dbus-java/
--	(cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate")
-+	(cd doc/dbus-java; TEX4HTENV=/etc/tex4ht/tex4ht.env mk4ht htlatex ../../dbus-java.tex "xhtml,2" "" "-cvalidate")
- 	rm -f doc/dbus-java/*{4ct,4tc,aux,dvi,idv,lg,log,tmp,xref}
- 	cp doc/dbus-java/dbus-java.html doc/dbus-java/index.html
- doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc
diff --git a/dev-java/dbus-java/metadata.xml b/dev-java/dbus-java/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/dbus-java/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 3e9cbe7c91da..899c8bde7756 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,13 +5,24 @@ DIST icedtea-bin-core-3.10.0-arm64.tar.xz 61270912 BLAKE2B fef3e93230ec624b7e02d
 DIST icedtea-bin-core-3.10.0-ppc64.tar.xz 54444136 BLAKE2B baa42a8a5133936f6071cbd150b122d9aaeaa9cdf4d5892a881de3d470042d3b47d9808d6e1cb6138977df930c03aa14bab6a10a61d6ed306d42cb6ad7fa2a78 SHA512 4ce1bcf040ac4e2309a4dc1d927b59344102c42e032c27163e6bb1eccab9d9dea3914ef3b854a28a507a56c9a0a13063299dd843fd83a7f79a35e0780a420564
 DIST icedtea-bin-core-3.10.0-ppc64le.tar.xz 54511716 BLAKE2B ab536cd53c696828e3edee14b7bf589b332243d6cf3fba3502aed3cf5863fb62d946ba57479c7bf64c7b5a2b8e22eb571aa86a1ea0f134e6c066c23957bb7296 SHA512 d78b9d06232d2e09d2b550b9ce750190b5340254381ccb9801f437e4af73ec99f09a64d2b6a2ba2a33bcb1e0983e8bac918a3573147a448b54cd29f71871e9cc
 DIST icedtea-bin-core-3.10.0-r1-x86.tar.xz 61580012 BLAKE2B e334e6589f7603fcd881f9fea8c2178804502f83c898274e53f427752ad8f284f5ca1ba9f6a87546e4a21284a30226551fc7047ce7f84836af3f3a815e2ea50c SHA512 004a16e67804eb01d56ba9c36b67e60547198943bb086a19fd161f7f348cea774deb6a806814f6fbddefd111e59e7e98d934d895b89db2bfdd5a836b6aa4b483
+DIST icedtea-bin-core-3.12.0-amd64.tar.xz 62006904 BLAKE2B 826bf190b8c2a20d953c3eb7222020006d8101caeff3e57b5cace7758cfa1ea70ffa5aad8001f7ca6ea8e10cc71830f239edbfd1179ce5a88b691b1921548a14 SHA512 0771b8f92102086eedca945bc2d1e2f77477bda5318e5c7a4e05d43ded588df29622fa6b92f57a821f3f4e599db8f97098cd796dd5821b62e48824b806bafa76
+DIST icedtea-bin-core-3.12.0-ppc64.tar.xz 55033784 BLAKE2B 57deb4a82576b34d615ae06ed588e7304564a784d7ff8bc08597de4715c24b918716ef92f0172e9f0e9f57d4d422e21441b2adb1df4403f579fe0c0f5c1744ab SHA512 83738080c431a9b7d4dc840005ad9e1938abf2164d4cb01e2f12f81d9adf24c715c1a0306108fe4c8d0d190fe80688f158fe8a37ae9b4f5927277a4ea3609f68
+DIST icedtea-bin-core-3.12.0-ppc64le.tar.xz 55129328 BLAKE2B cb4d7b5262ed7c624ba8ad0b536dadf25fe29c8848636614c8f53fd722e3ed37bcc0adfe82f8997c1baac9610e8aef112b137935357fa623f19189bdf0c2ebca SHA512 f6711fecf9305478ece98311c13b577317f69b4c7d15acb7c8e230ef3acda3d5032067c2859f0fc6b3000e09355a1773b6caf803c4d269655dd00977ce80ec2a
+DIST icedtea-bin-core-3.12.0-x86.tar.xz 61446708 BLAKE2B 0d5790deb0092ef590eab4c631028f58fdc86df97d4e8b7ccb83993980781d7b2313c7c97bb2663e8ce43f71b7c8761a6972ff7f0c096c4fdf878f178ca8ecfd SHA512 cb5db79e955a3e7f292ece7bdaa6e3f1a0be15c1982b904bcf299699b88402390fd2b343ed95b8855ede242729c7943c6dc25befc785d153018c5e3f8dcecdcd
 DIST icedtea-bin-doc-3.10.0.tar.xz 11707560 BLAKE2B 1b09d024bfb39437365252b1c20fd55a0fbeb2b984dceb1c26b16319e95c6582cefd3e42694d56db998565714afbe6a375aa513afa8ab91479a727751b291c43 SHA512 010100e505d7deca6a3dea82075419eef842e0e49dd51caaadbd7f7ad4c2411e4c7c02709faef68b9d830943684632b111d45378ac657be9b11eccd6e0fc77fe
+DIST icedtea-bin-doc-3.12.0.tar.xz 11591700 BLAKE2B ca36760086440736248fa7e8be646e328cee415196e8f7d23186efd4abb6a763262746a1300624f35cc0b266720c8195d022d00eb5c28672856561422bc85886 SHA512 8930540379bdcd8dffaf6b9c309035483cfcfcc2b1cf38ea674bd46d2d4437513df3d298a3b43543ce9a57b29fcae4ea27038707198ce190aec393ad6041c0fe
 DIST icedtea-bin-examples-3.10.0-amd64.tar.xz 1856192 BLAKE2B ddd0ecc4eb79592e6eb7f7894decd1fac6a84e0285a252584601cab28acb860f0b6012cd15687ef5f4139431e12b043af9e187772a794e7664cffc89fb4b3835 SHA512 9535c85b36c3f66154d39f903bd5e5ba19c979ba46cd6f4e4f4a15d60f6a825f5600b108ff590254c8b1e1f194a04b80835ef3697acf9011b69285661f2e5ce4
 DIST icedtea-bin-examples-3.10.0-arm.tar.xz 1845892 BLAKE2B f071a774653c90534253d5c757e161164412ed8148e8f3fd9d91fd00f8c35a649b2221731888197730dcca4ee3af9cf5c72b9f40b62a3be2e440afa1c4628587 SHA512 79cacbd9f1e2cf7b277e1040066ebff5a982d4ee6a0df19ed48174ab287661a150d00697673728b206f9ee8709c5d8f8a6dc5908b77ffdc67ca0cc175fe90e4d
 DIST icedtea-bin-examples-3.10.0-arm64.tar.xz 1841760 BLAKE2B 89baa68800302187d0da212d4aedd3614e4a47744e75426ee81909b942ab0c0e4e0ddab7f46e1e1488c6c5a601dfa96edaff6aa4df5ca8fa8d6b3fb0baf5ef9e SHA512 36c3a2dec0fdccc836fd5bb8e37ed859b592fdabafb6ee73453fdb7d98a33989d6dd94ece2ce481676841231a9e3b6c0ba7a2fb7965bed9ba5d639f904f3b8bb
 DIST icedtea-bin-examples-3.10.0-ppc64.tar.xz 1852168 BLAKE2B 90202d9960ad99e14b223e5498a3b1d8fa399e02fa47533a812ad7d7201319a1ae32ca64bfa1cb02dcebad5fce31f7cf27882e4130812d90752e46281756b030 SHA512 734f9b2443bb038bb8e375c96147a926060eb7f0f241b5417f84da296e4353341c3f2d52d6b32d4656e3c8c68bdee854b5b2d4729dfce7fc618792c74707ba7f
 DIST icedtea-bin-examples-3.10.0-ppc64le.tar.xz 1854000 BLAKE2B c6345b3202b581a60ccbecf5dd593ccddb0ad3079e03794c4a55412bde53480651e9e3dab8714759f342eefb752fd3b509a3eab42e7e21e796aad0771aa2e1e4 SHA512 1de307b0e3230936ddfd57cae1f0a44d890d6e5cb61b6634c55abc5979c930784eda21d52a705968e59b5fc3434869693e54f61eb33dcbeeea837c99c8414128
 DIST icedtea-bin-examples-3.10.0-r1-x86.tar.xz 1863128 BLAKE2B 12002c655df6ba2228453840155495090d09b3e1fb49241f0b8d558b822f8d9fbf5395aaf0e391635034fefc170828489e5bb24470a8d98ab9b052d82f51069b SHA512 d6e7ad0c7b400acaf4bf7bdb8aa85de0028e5fcf349d04c1bf06c3a645727c2f9fb266e6f6578b6451121dac04d7d5957b717b9e97ac56079593cb42c5384da4
+DIST icedtea-bin-examples-3.12.0-amd64.tar.xz 1853616 BLAKE2B 48267b2783c402bafd1ec5988d4284a30175635035682e3761aeb36feb962977ad90130f91e55768e52eff862fd3e2c4bb1b123ec3aa629f07acd50e60335683 SHA512 6dce1b575be9d8b1e9171eb6d4724c096c8ef18508c03ba581be7b1427d266595b8fac06eb02db5583399b2763d641b712aec4cb391772c444368c79c0067ca6
+DIST icedtea-bin-examples-3.12.0-ppc64.tar.xz 1864952 BLAKE2B 8fda5731a39e36347adec379db562700392c2c482447ba2775b129cb323ccfa101b4f845baeb30a016158204d1565bd2b5e0b7cc1c597f4738848cbf1d2d2816 SHA512 9cbbec98b68437924c3cc2c81a6c341efec533d61f5e3c6df99b46222a3df7824c47e37baa99a4f23e5b868f788b4501064d52b379e77ea523592a7c493629d9
+DIST icedtea-bin-examples-3.12.0-ppc64le.tar.xz 1867256 BLAKE2B f8110bffd2d1b30fa62ebfe3ad18da02ada4d6f65b6016e939ec18cf0ab7970199edc7b9c3b2d8f2edd504db8334c384f49fb423c2c2dec13f761588cdb5c4c5 SHA512 88d9b5070676fbe14fd43fa35ff01a7e1e34002271411befd6bd6b5b69b8136e742fdc6461d58970e2ed06bc7beaa12631c2b150452edd3995faaffe7afdbbb0
+DIST icedtea-bin-examples-3.12.0-x86.tar.xz 1859900 BLAKE2B 44ea53632b82e1bbcc7b569d3aaf9f3f247c79b465ca4f4e54f70f3e3fe1752b1f5d9c84ab40328270e074be6da13b34af3803fa43584df16c9f22898b77265e SHA512 1aa895aa3e02081ec45f7b3b250605ce914c7f06ef4e9c37aaa6d7f2b084295ab48e490174fa443b419d37299f88db217407d81651c08996aba1af91401629ce
 DIST icedtea-bin-src-3.10.0.tar.xz 45755380 BLAKE2B ba6fd20de7d21e728108ff1d30599112ddf7ac24135e30891ae0d033bf77d52238c81c5c7fc7375e062ad4e8bb9492098cc0a20d3ab8486a4a02f20efa1f06a5 SHA512 0693cfe83a80d5e9e86be394b142b23097b0cfc1193f68f0fd07045ad4792b38bffcce47ea764f934d3dbfc568bdfbf5017725e7f35fbe1175b48498d53b0c5e
+DIST icedtea-bin-src-3.12.0.tar.xz 45776320 BLAKE2B 97ca4172ed8eadbcda0e20b598083b6948cd3a90705653716f1b6a9e65e150a1ef7d9e9ecdd3ad5ea90fd972ec9f1c3fe20ace44e4d2a0ede8e6d491991f7f9f SHA512 f6e7efa0962632d52032cd22a6b8de50bc2571a5ebcd18314b9aa01fb23cbd8d134eda5d1d2a6bb7fb1e26decc8a5740dfa60318019b920eb3f0498c2a9e9784
 EBUILD icedtea-bin-3.10.0-r1.ebuild 4388 BLAKE2B da06af20cb6565b9958c9b63e5d08e33273d7f6ce7f0d80a88ed450cec50a647856f973343671a1f992e7b80af671fcbb90507b91d0036472d6e889f4aaa5686 SHA512 87a69ae5cfc1e0c1596330ca7032ac7a03b4de984d9c2aee766ace77d9ce8f14461f323fb5ce1e2c280b42308d699f078f5ba912537207ecc3cd646a72d50cce
+EBUILD icedtea-bin-3.12.0.ebuild 4549 BLAKE2B 77861e6ee5c4d6872243c3f74cb52c81a7bb7192568a5e9436de0320d1cbd9c688d4d690e1c8a3d5ba976e1d63af95273cb310c92a672638c6de8749c10b0683 SHA512 24582891626aa33f30a94a001ff1d759e74904ee19b0fd2613e9f72a8fa5eea7e6a3a16cb9400554d3472d2daa5ed53156b880bd6d00d02a099b5f29f9b4e27a
 MISC metadata.xml 560 BLAKE2B f377bffd73661fbf1573f3d80906a38fa9fd170a686dee6c13ee7769ffadd8ff2de696d63cd7fdc4332ca654851da027b76e22389a98412b52b4fd5c00935429 SHA512 71613013231a9bf6daabb672557c3f419bd9443999b740a4d73fe242b827a278a66671f2cb347d20833008c332262609f7df03691e313e0dc0ec3e2a56e79565
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild
new file mode 100644
index 000000000000..00bb6c4eb2ee
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.12.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* ~amd64 ~ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~gyakovlev/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.58:2%
+	>=media-libs/fontconfig-2.13:1.0%
+	>=media-libs/freetype-2.9.1:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.11-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.28.1%
+		>=x11-libs/cairo-1.16.0%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.42%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.10%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-8.2.0[multilib?]
+	>=sys-libs/glibc-2.28[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# use system-wide cacert store
+		mv "${ddest}"/jre/lib/security/cacerts \
+			"${ddest}"/jre/lib/security/cacerts.orig || die
+		dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index d4ff5ca5f01d..a1e91216d8df 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -22,8 +22,20 @@ DIST icedtea-3.11-nashorn-3cb2fe2b1b7d.tar.xz 2317604 BLAKE2B 246d8f69c080b8b8be
 DIST icedtea-3.11-openjdk-9edccdd36f81.tar.xz 358224 BLAKE2B fe9e2351829f03f4dc5b77b7df12d88e06c617a94e118a9c09dda2feffd6f6dcb419882b57ec7c76e32bc0ff47e797618ddc50d4f460d68d0d73343b2d52f7f7 SHA512 fc3faa7d7b9531f10c40241d89c36854043921f6f1a0851f284bcab36fc54fb0bb8cf8365dd4b2fb22b3ee8ddb8ed4a79e0807f79cb95b4b00f164993f1acc0b
 DIST icedtea-3.11-shenandoah-1e8639cc8075.tar.xz 7028904 BLAKE2B 73a2f02bc95037d62464c3699b34462db73cd5905e88c86124f5bbf016dbfce0b09b8f09b05d835d52c042d9d46097cf0f2ef2c5b165b4c5a45a75392eafb382 SHA512 c35fb93164110d92bba525911bd72760bd74590885884a636e6574da0a22515fa07b4e22d84f020128221c7bd1ec5bc8ddaa9061840a06d98a30ce817ee6b9ff
 DIST icedtea-3.11.0.tar.xz 1552144 BLAKE2B c7ed5a47b71ee5dbd36f05ee775c25041b1bd5286e413e23a2c58a5b10ef9442c465b01cc3b7e29f6f7e085358ab10553b76fb4f134f36784cbaec4a0eedd60a SHA512 a71c9318d49077f8ae27f5c3e0b61df0709eded241f557c886f6b93aa98c13ad78f713d1286da286989bf62866dfff7538ad783eb804a705a160cbc096dea851
+DIST icedtea-3.12-aarch32-57f4048a925b.tar.xz 6819888 BLAKE2B 96377f8aeeaf9a1bb4b3372f82c1666e5813a97537dabe3fd8faeeac8ed2b160c402bb35d0e0b2f6f9bc2b09faa1701a43cdea407982019ca126ff7e28076625 SHA512 5e6f4cbb5b325feefd5030d1b8f9725ba8aba028c9c93c34039fcff48893b9569d0cc92f5e0c70bc20ab7014edc81d3ff12edaab68c69a280cdab248e4e0e809
+DIST icedtea-3.12-corba-fa1553d2f23e.tar.xz 946504 BLAKE2B 729efade4ed039af95fa07fd3f6ed450fb9af8e271b054979fd37b460ab6a6273513e05e49956e15777f188952a939313d8b5f6bd52f0aa111825518693f5bd8 SHA512 d4ffe454a659db6c13b74c8e190beb3b427574d54fa44c80a3ba1dceb3af6f480ee99378d370ec2e9bfc6b5447a225eeb3e11821c83522479583fb21b0705bd7
+DIST icedtea-3.12-hotspot-3f9a60eb8ef0.tar.xz 6894876 BLAKE2B 0520d0e1a84e3b755b598d73de7587c01f4cba8148d371bcbcceb1d50849d3816929cfb07a81857ad0fc8d8b52ab3a9c68a4fc8dd3476bc52f59d2cac72eba81 SHA512 2a0c18fea7b67c5042b39746f2c7ef53e252d6665efbcd74ebf9b171b13e311821310537e8b14cd4f9798c483afdb1107b9af6bb047262b97a526bfbb481777a
+DIST icedtea-3.12-jaxp-7a977b82f34c.tar.xz 2291724 BLAKE2B f3366efa7bb076b9f8c8a0873c1bb909ad9299916c1285b3aebc004a4f33b16a6ab922867c19b7679c8a0bfb7686cbe5b80605ec942b1ac817a96277fe9c4f02 SHA512 a5b8ca9b90797c5f0bc03b763fca50334a308bfd6955f5f488b661da6698abd991dbe08a7ac1a128922c546eb0061853e12a18971adb16c27302e2d9d0f13872
+DIST icedtea-3.12-jaxws-752d9e54c69a.tar.xz 2274996 BLAKE2B 980f1bb71201fa43eb4c1852b0f518e512af908abf106e211add608560bfe531a5b0597cb11edabbdec63b94fe17800b7dbedd181a18e54a992b5dcb54a0b172 SHA512 f1deb09ccf6b1dff40d61f3bc54e55d430ebcbeb0cd53d6008cacf65b94824d486913b63034ee23a473298e0bee61ad1ea3e5520c2a3ab25e9e1e6d58d50d286
+DIST icedtea-3.12-jdk-bfaa5c6df4a8.tar.xz 39292332 BLAKE2B 0cebbd46b62b9c5ce7af0c6bb54157b8c44b97a99c060e90e3b23ff68210755be58265cd0ecdb5c2bed276d2465544a7f8435e58289b8e240b6ddf2a9b14123c SHA512 2e15cdb58c9ce65c99ad5b5506343fb29cda02a4ea8490cfbe79f708deecee2ef28ad0e5a384d2113e72678aa857d821729b588e5ef53208ae06d0d5278ec326
+DIST icedtea-3.12-langtools-fb494039358f.tar.xz 2074376 BLAKE2B dfca5f107f93196d232bdb077e910eee3de3033ecffae9d168c60de5a54cfb0591eeb9309356f385fdc2f9c2a813700401e763496651befae84acd4c1d23e2fe SHA512 838e3e458734d3fc8d2d968eb3bc7190838cd9a73bf3d61de662f9a992a9951a74021e25331d26545f0181b08c80f298de24e030dad4e076bd76368f3a14e960
+DIST icedtea-3.12-nashorn-93462e8b4f4f.tar.xz 2320548 BLAKE2B f97e168cfce1e6307926d8996a74072be9783c4045963e78a9d3f6e2890e9cb64201a5d697a29ddcddbe501fe7a3fb226601e0e2e2ef3450d965334561d5e47d SHA512 918489daf6d2816d0fac85ed89cccbb0e350dc068502857f1a7e518135c40e5fcca2709a60ae51bad392592bdc459675ea3543e684ba1ed0d8debc7a451af6d5
+DIST icedtea-3.12-openjdk-f0482b9b7f7b.tar.xz 360788 BLAKE2B 5f6727b709ffedd44e0224635b75cd15e8b85d14bae93fafb8337bdd1c5ee0b18cca8374b88d00110016d2ad94f539d8884da92cab245e3c83fdac4a389a5154 SHA512 999aa17c0e73ebc465a982c5492043487b860b84dd6e4dda3fa51e3099b4642f3f5e03eb30252f835be81f1ea60dc28cf5f0905cbe347758a1f903db430fcc35
+DIST icedtea-3.12-shenandoah-adb62c0031b8.tar.xz 7056328 BLAKE2B 90035e1b3f16ca7351197dcb7795c557700aaf264179827ae3e6b331ce60e3a9922d5e815ee0c010c6ded16973446841b9d72e918420408894bb5c7c8497c4d8 SHA512 c73bf2d1011ae4d059945e2e20c2515a3cd6e10e4413b77b290461679bbceaedd38a1b948ee7bfb8a42513b73ec99b81a9088cd96e6e61576041568ea2a0b492
+DIST icedtea-3.12.0.tar.xz 1519364 BLAKE2B 0e257aabc10bd93cf448feec99fd72175d33b7a32134d824c36ca5143e40fbdd37b5c6e5f572052d347fccd6dc89f3d99ba7eec3db6e7d73c6b6d9ec0d5695b4 SHA512 22582d65b9114749c7cfee0fc58fa2cb70e4cf77f3bc62e8097a6c601ead0bf86f530b942e6b0f32ef7bbc5bd17130da236714d83d6e9857c3c5b85c984f2efa
 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.10.0.ebuild 12819 BLAKE2B 760968745fa9ee52eb0a701266a0706f57560a3fa16f2a03dd85fdb6f1fe85c9285245f83958ba6dacfbcbcdd01b5fd4500aca93572bdf561b1db9c741acf37c SHA512 73a1a50541898495cd9af6fe5205c94779eed69a54a52a2141b533b6a01aafd08a5ed4603bdfb1d1d2dffc3d4778800928e62567b6614b8ab6a06ce28c63e5d2
 EBUILD icedtea-3.11.0.ebuild 12631 BLAKE2B 1568d3d47b2b53c3247a260bd35cd27d56038c965291ad93eac7ebb8896ddf1160f6f9ae0fc4f3c2c3844123fe5f2c11bccdd835625212100647e1ce17e8a153 SHA512 27850e65cb95734a04fe59070ea5e7366fbe5b8cb0b5d38f29d326f5bc7f897f041c4949e9d2c6516d5c397ba3c7261009a7fececbeb87ba734ade0c06f2c1be
+EBUILD icedtea-3.12.0.ebuild 12703 BLAKE2B e68b86f187b7e3f0359689baf5bea1f521ca2707c0de12b422485bfd1e87606cde37960851e262ab43e993153847ff0f4c1be5b44a9c19fd980fe4a19d41d29d SHA512 42db9f45424aa96f8e7f5c03954bea3d239ffd3c859f88910e7cdcd1a34e2c202b311f061d6ff87449089edd8286faef8fa40eb349be9a998e3545cafaf99c8a
 MISC metadata.xml 2332 BLAKE2B d27aa216aaf2e93f1a939198433d9c3dfffb2426e7ae777cbbe13e353a2f0366d35fc7b3008d9e9c7f6eaa90c3d4a2dd76259e5b8856ca0a5417c1fb6eb2c59b SHA512 ccbd1a4530b69231625896171aceee756d4ecc262b095140ced6cee35f2e844e0dcbd6f6888c4f0356dca91f7eb257e911ae28adbcc33645ea76e7953a272035
diff --git a/dev-java/icedtea/icedtea-3.12.0.ebuild b/dev-java/icedtea/icedtea-3.12.0.ebuild
new file mode 100644
index 000000000000..185c29135509
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.12.0.ebuild
@@ -0,0 +1,385 @@
+# Copyright 1999-2019 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="fa1553d2f23e.tar.xz"
+JAXP_TARBALL="7a977b82f34c.tar.xz"
+JAXWS_TARBALL="752d9e54c69a.tar.xz"
+JDK_TARBALL="bfaa5c6df4a8.tar.xz"
+LANGTOOLS_TARBALL="fb494039358f.tar.xz"
+OPENJDK_TARBALL="f0482b9b7f7b.tar.xz"
+NASHORN_TARBALL="93462e8b4f4f.tar.xz"
+HOTSPOT_TARBALL="3f9a60eb8ef0.tar.xz"
+SHENANDOAH_TARBALL="adb62c0031b8.tar.xz"
+AARCH32_TARBALL="57f4048a925b.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"
+
+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
+	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-bin:7
+		dev-java/icedtea:8
+		dev-java/icedtea:7
+		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
+		icedtea-7 icedtea-bin-7
+		openjdk-8 openjdk-bin-8"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${SRC_PKG}
+}
+
+src_configure() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+
+	local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+		# Work around stack alignment issue, bug #647954.
+		use x86 && append-flags -mincoming-stack-boundary=2
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use Zero for now until alternate VMs are working
+	if test "x${hotspot_port}" != "xyes"; then
+			use_zero="yes"
+	fi
+
+	if use shenandoah; then
+		if { use amd64 || use arm64; }; then
+			hs_config="--with-hotspot-build=shenandoah"
+			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+		else
+			eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+		fi
+	else
+		if use arm ; then
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+		else
+			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# PaX breaks pch, bug #601016
+	if use pch && ! host-is-pax; then
+		config+=" --enable-precompiled-headers"
+	else
+		config+=" --disable-precompiled-headers"
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-ccache \
+		--disable-downloading --disable-Werror --disable-tests \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
+		$(use_enable headless-awt headless) \
+		$(use_enable !headless-awt system-gif) \
+		$(use_enable !headless-awt system-png) \
+		$(use_enable doc docs) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_enable system-lcms) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable sctp system-sctp) \
+		$(use_enable smartcard system-pcsc) \
+		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+	default
+}
+
+src_test() {
+	default
+}
+
+src_install() {
+	default
+
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}${dest#/}"
+
+	if ! use alsa; then
+		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+	fi
+
+	if ! use examples; then
+		rm -r "${ddest}"/demo "${ddest}"/sample || die
+	fi
+
+	if ! use source; then
+		rm -v "${ddest}"/src.zip || die
+	fi
+
+	dosym /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
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
+	mkdir "${T}/certgen" && cd "${T}/certgen" || die
+	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
+	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
+		openssl x509 -text -in "${c}" >> all.crt || die
+	done
+	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
+	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
+	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+
+	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/idm-console-framework/Manifest b/dev-java/idm-console-framework/Manifest
deleted file mode 100644
index 883876c59172..000000000000
--- a/dev-java/idm-console-framework/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST idm-console-framework-1.1.7.tar.bz2 708770 BLAKE2B 82e69ced74e92bcd0cae30a7c58ba37d890ed56694e23d464dd8ce91be5aab80a2a48ec91608a83a4e8f5892ba242c273e266c431aa00ab172b894fe04d8a841 SHA512 ce4441cbc9917f6ffd0ef6ced44c7ebc542c14db60e7c6eeb844f8c68cbb15fe533916b9ea363d1e865759138d92d38365e9172206c7cd0fa385f4bf443aa739
-EBUILD idm-console-framework-1.1.7.ebuild 1597 BLAKE2B e61a3819ffd6519a2aaf1b67c36c69a09ac8d5a0706f6b478d7f21d9b9b937ffd92c60fba01b4ad64f2fefc16dae9fde8957d24d13c5a8fd5aada236fb84b6ee SHA512 d9a8e630971d16262b9a519f9bc4853fa2676a87c363e944083d9d81e8fc718bb99eadbee679110e9795d711f4e6942520c93dcc6de86294c3301762e9065095
-MISC metadata.xml 463 BLAKE2B a8386117008d8a1ca0cff5d966188558776723de6dc5fe8ad338619e1c7759d92aff019fd4200bb2e8665d58ad6089786ab4334d2fe86e9838bd89e331f50121 SHA512 e1027ac25c797f7006d3f355b7eefcbfb9fb7947ede77338128044233eebdcf92985131f23ba3acf0754b83c0e01c9f90a8f669f5cc4b60fc570566e74e0e1c6
diff --git a/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild b/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
deleted file mode 100644
index 582a023c2b50..000000000000
--- a/dev-java/idm-console-framework/idm-console-framework-1.1.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 eutils java-ant-2
-
-DESCRIPTION="A Java Management Console framework used for remote server management"
-HOMEPAGE="http://directory.fedoraproject.org/"
-SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/jss:3.4
-	dev-java/ldapsdk:4.1"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEPEND}"
-
-src_prepare() {
-	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	java-pkg_jar-from jss-3.4 xpclass.jar jss4.jar
-}
-
-src_compile() {
-	eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.local.location="${S}" \
-	     -Djss.local.location="${S}" ${antflags}
-	use doc && eant -Dbuilt.dir="${S}"/build \
-	     -Dldapjdk.local.location="${S}" \
-	     -Djss.local.location="${S}" ${antflags} javadoc
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/build/release/jars/idm-console-mcc-${PV}.jar idm-console-mcc.jar
-	java-pkg_newjar "${S}"/build/release/jars/idm-console-mcc-${PV}_en.jar idm-console-mcc_en.jar
-	java-pkg_newjar "${S}"/build/release/jars/idm-console-nmclf-${PV}.jar idm-console-nmclf.jar
-	java-pkg_newjar "${S}"/build/release/jars/idm-console-nmclf-${PV}_en.jar idm-console-nmclf_en.jar
-	java-pkg_newjar "${S}"/build/release/jars/idm-console-base-${PV}.jar idm-console-base.jar
-
-	use doc && java-pkg_dojavadoc build/doc
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml
deleted file mode 100644
index 9955befc08fc..000000000000
--- a/dev-java/idm-console-framework/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>wes@sol1.com.au</email>
-		<name>Wes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		A Java Management Console framework used for remote server management.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/jackson-databind/Manifest b/dev-java/jackson-databind/Manifest
deleted file mode 100644
index 74a3dd946b28..000000000000
--- a/dev-java/jackson-databind/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jackson-databind-2.8.5.tar.gz 1093933 BLAKE2B b049cc7752e31171918e35ccb076c0b2e24c3d275f9a23d8fe81bc671721e098ae40a9f98497fef0b3d0ebde487df4f3d0f063f5bb11528d2affec5bab4453a3 SHA512 6935b469804fc14a5d2e562c80449c4e3368256358b8ed2a0d5a0bf2bcea47385ef19a708b94f25e450f42f6f70e868d6fc79f22cdc2fb6f88a4faf35bfc3cb7
-EBUILD jackson-databind-2.8.5.ebuild 1864 BLAKE2B c44c301d10a2ed33b1a5dea51e968f91d2c06664d59fd1b649a4431253fceef60d0710bbe609c00999e44cddbb7d96181c31163c5d4084c6463dd284b3f4d7d0 SHA512 4990afed70541489c06fc01aaa08ade57c266b3353cf8f4cd09f176808326074dc8a6689321ebf222c113ecfa459a8d800fe7469f73bc86259d8b2dbe309f9a8
-MISC metadata.xml 337 BLAKE2B 340ae4a682f341d184b16216d22dd0832f1dcc15df76fe222aa7f5b20917bee659255b3797e4edd1eedc34d8b18fe8e54ea5f82394ac1d6b1c5cdbeccc8a1107 SHA512 1266365fb582e8a7aa2477bad93e7222f03bf656b952bcc0943087884adb0eb4686ceca8feb0ea1912fd81aa62cf89b7949cb69b2a1737d820de0c7ce1c124f3
diff --git a/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild b/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
deleted file mode 100644
index b999673fd45c..000000000000
--- a/dev-java/jackson-databind/jackson-databind-2.8.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Data-binding functionality and tree-model for the Java Jackson data processor"
-HOMEPAGE="https://github.com/FasterXML/jackson-databind"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Missing deps.
-
-CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
-	~dev-java/jackson-annotations-${PV}:${SLOT}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
-		-e 's:@projectartifactid@:jackson-databind:g' \
-		"${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-
-	# Requires newer JScience. Could be any class but they chose this!
-	rm "${S}/src/test/java/com/fasterxml/jackson/databind/introspect/NoClassDefFoundWorkaroundTest.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "Test*.java")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-databind/metadata.xml b/dev-java/jackson-databind/metadata.xml
deleted file mode 100644
index ddac6dfb29cc..000000000000
--- a/dev-java/jackson-databind/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">FasterXML/jackson-databind</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-xml/Manifest b/dev-java/jackson-dataformat-xml/Manifest
deleted file mode 100644
index 22b214f4386b..000000000000
--- a/dev-java/jackson-dataformat-xml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jackson-dataformat-xml-2.8.5.tar.gz 98385 BLAKE2B 5648fd1050a8c41da656f3e3399ab7bc58128e7bca8319ef2b6f0b704c18e26c25a581ed9e1386fc1640403adcec67d265e6f139d7dad9de0c918a7fe08d07a5 SHA512 ed93db9a44cacbe1638141b7336798ced03f7009da40e176b1eadcf38c83ac3bde3e2fa98efe3be1286a956db36393f925251b41a4adbc2b95d03ae6ef04b754
-EBUILD jackson-dataformat-xml-2.8.5.ebuild 1883 BLAKE2B 79b971493682c3f78297382c52f01b329e283119c8436ec28d1f261ab701cbe203260a278e043f39821cda88e7c1a4da24d75340bfdf640c022c6fbcecb25482 SHA512 dfd8cdf55948cac019f840be80c2111bb0159480f1c4306ce96db705f5e8011a60a57d1d298dfc392e2e75532f16be3575cef0d9e45821d77feab83878593c82
-MISC metadata.xml 854 BLAKE2B 171d08b86695c1dbe5f08993a38cd6198a4aa381f20574f89332bcedd0577539f8ad5a6caa90a92a4bb50ea16e362ead6a8d57c1baac957ddd5c15da699c0a8d SHA512 a4b26143c0c231ef517dd30f28a76f83afaaee4e42d45bc6337875bf822eb1965c2c093484756b40772fc022d666def4d86bdc2ca3012fb10dc77516131ae561
diff --git a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild b/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
deleted file mode 100644
index 45eb3940f5c7..000000000000
--- a/dev-java/jackson-dataformat-xml/jackson-dataformat-xml-2.8.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="XML data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-xml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Lots of failures, new Woodstox needed?
-
-CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
-	~dev-java/jackson-annotations-${PV}:${SLOT}
-	~dev-java/jackson-databind-${PV}:${SLOT}
-	~dev-java/jackson-module-jaxb-annotations-${PV}:${SLOT}
-	dev-java/stax2-api:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	test? (
-		dev-java/hamcrest-core:1.3
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.xml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e 's:@projectartifactid@:jackson-dataformat-xml:g' \
-		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/xml/PackageVersion.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-dataformat-xml/metadata.xml b/dev-java/jackson-dataformat-xml/metadata.xml
deleted file mode 100644
index fc7bd29f5460..000000000000
--- a/dev-java/jackson-dataformat-xml/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-		This projects contains Jackson extension component for reading and writing XML encoded data.
-
-		Further, the goal is to emulate how JAXB data-binding works with "Code-first" approach (that is, no support is added for "Schema-first" approach). Support for JAXB annotations is provided by JAXB annotation module; this module provides low-level abstractions (JsonParser, JsonGenerator, JsonFactory) as well as small number of higher level overrides needed to make data-binding work.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">FasterXML/jackson-dataformat-xml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
deleted file mode 100644
index 233cb2a56c78..000000000000
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jackson-dataformat-yaml-2.8.5.tar.gz 44789 BLAKE2B 65951191331f5560f0ffcdf17686d0c4791bafba7a4c53ab21abc5d3913378d01cc49d18166ae7c893e3af5eaea6171a3a049bf8df05bea11803f3d9c48de078 SHA512 e2c8163150647bf5071aeb4cb38b8273cf9cd1f8ed36bc6dfef4a82ef762f30449aa4b813821648e8216768a2b4c2a00964b86977114ee2a4526cab6a690d9cb
-EBUILD jackson-dataformat-yaml-2.8.5.ebuild 1927 BLAKE2B d9d90e2e863e69466eb93be02e0ef604721b47a73ef19ff566e736b1559b13cbc9f0fa75dab939ef994aad3c0f78f00f55e572380255fc603af20d78446e242a SHA512 228e3bf4db2d83ed62672851db94f13051ad0ed8e5e9bf8215ddb5a168eafd3e4854dbccb5f5fc6cd197f773aa736d63643c3998f6b718a437e4b51f4f68cd63
-MISC metadata.xml 630 BLAKE2B c264792152402c24a793e9235a0e5d1dedbc02b6cef8b0d8a2cfec8421964781abe19bb1e234c9d8ebad4ee21be08790cc2764f62d6368703d15eb6cdba8047b SHA512 40dac5d1eef6e8895c34f8b82c176c192942ddd17228af0c44973675633de349cba1f729b711bf5ff45a4cda98f37d24ecebd685dfc9fe50f3d387a06c0df328
diff --git a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild b/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
deleted file mode 100644
index d46ab71234e9..000000000000
--- a/dev-java/jackson-dataformat-yaml/jackson-dataformat-yaml-2.8.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="YAML data format extension for Jackson"
-HOMEPAGE="https://github.com/FasterXML/jackson-dataformat-yaml"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
-	~dev-java/jackson-databind-${PV}:${SLOT}
-	>=dev-java/snakeyaml-1.16:0"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	test? (
-		~dev-java/jackson-annotations-${PV}:${SLOT}
-		dev-java/junit:4
-	)"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.dataformat.yaml:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.dataformat:g' \
-		-e 's:@projectartifactid@:jackson-dataformat-yaml:g' \
-		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/dataformat/yaml/PackageVersion.java" || die
-
-	# Requires OPS4J Pax Exam, which isn't packaged yet.
-	rm "src/test/java/com/fasterxml/jackson/dataformat/yaml/failsafe/OSGiIT.java" || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars jackson-annotations-${SLOT},junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "*Test*.java" ! -name "*TestBase*" ! -path "*/failing/*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
deleted file mode 100644
index 0cac4c179933..000000000000
--- a/dev-java/jackson-dataformat-yaml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>This project contains Jackson extension component for reading and writing YAML encoded data. SnakeYAML library is used for low-level YAML parsing. This project adds necessary abstractions on top to make things work with other Jackson functionality.</longdescription>
-  <upstream>
-    <remote-id type="github">FasterXML/jackson-dataformat-yaml</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jackson-module-jaxb-annotations/Manifest b/dev-java/jackson-module-jaxb-annotations/Manifest
deleted file mode 100644
index ec01610a149c..000000000000
--- a/dev-java/jackson-module-jaxb-annotations/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jackson-module-jaxb-annotations-2.8.5.tar.gz 45855 BLAKE2B f122a325e546f958d04ad1ccc9c520efec42e7d6ab258591a8f5d84c61686fb24668d48326c262377a8f3046818f9cf22eb28440cf5564a0bfb06f884dd4822c SHA512 952d7fe785d7393645350a6f5e119a2af142b316b9367a612531a93e7ce3c125d0c520a149d0e032bf876edda179f521c02d76dbd0b2f6b613c9f82e048672df
-EBUILD jackson-module-jaxb-annotations-2.8.5.ebuild 1868 BLAKE2B 860fcf502d72d752974e09a1710f3662920343220fe054ceef462eea99b7362c4dedf353d4173c2b26457fe542ce27285f1c82dc4c673879d13dae546ee9888d SHA512 e0a3ad7674b84f0dd85bab3766cd218a137c71b1fcefd8fcf79e6627d5c9aa02d209d0addc29c3904984760aa36bfbf27e59f3f1e9862c0b0860e2b889813a6d
-MISC metadata.xml 651 BLAKE2B 2120b41a1d0a8fd0e9d1368e5988f4f62c9e770d50719bcd782253687756e1fd2a7587851e8d1b75497ecafed7dffed4f10637317feb1f4ebaa7bafb090796bd SHA512 0d53c3d338f1544d637140952c101ade339acfd8e30a6bf76048ed0e5467f0a35344533186a4232c10a89d47cc46a7eca4b8a55751467d526ab573074a4e5b69
diff --git a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild b/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
deleted file mode 100644
index 8064874cb093..000000000000
--- a/dev-java/jackson-module-jaxb-annotations/jackson-module-jaxb-annotations-2.8.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JAXB alternative to native Jackson annotations"
-HOMEPAGE="https://github.com/FasterXML/jackson-module-jaxb-annotations"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CP_DEPEND="~dev-java/jackson-${PV}:${SLOT}
-	~dev-java/jackson-annotations-${PV}:${SLOT}
-	~dev-java/jackson-databind-${PV}:${SLOT}"
-
-RDEPEND=">=virtual/jre-1.7
-	${CP_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.7
-	${CP_DEPEND}
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="src/main/java"
-
-src_prepare() {
-	default
-
-	sed -e 's:@package@:com.fasterxml.jackson.module.jaxb:g' \
-		-e "s:@projectversion@:${PV}:g" \
-		-e 's:@projectgroupid@:com.fasterxml.jackson.module:g' \
-		-e 's:@projectartifactid@:jackson-module-jaxb-annotations:g' \
-		  "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jaxb/PackageVersion.java.in" \
-		> "${JAVA_SRC_DIR}/com/fasterxml/jackson/module/jaxb/PackageVersion.java" || die
-
-	# Requires jax-rs, which isn't packaged yet.
-	rm "src/test/java/com/fasterxml/jackson/module/jaxb/introspect"/{Content,TestPropertyVisibility}.java || die
-
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md release-notes/{CREDITS,VERSION}
-}
-
-src_test() {
-	cd src/test/java || die
-
-	local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-	local TESTS=$(find * -name "Test*.java" ! -path "*/failing/*")
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d . $(find * -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jackson-module-jaxb-annotations/metadata.xml b/dev-java/jackson-module-jaxb-annotations/metadata.xml
deleted file mode 100644
index 761d7571d394..000000000000
--- a/dev-java/jackson-module-jaxb-annotations/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription>This Jackson extension module provides support for using JAXB (javax.xml.bind) annotations as an alternative to native Jackson annotations. It is most often used to make it easier to reuse existing data beans that used with JAXB framework to read and write XML.</longdescription>
-  <upstream>
-    <remote-id type="github">FasterXML/jackson-module-jaxb-annotations</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/jgroups/Manifest b/dev-java/jgroups/Manifest
deleted file mode 100644
index ba6fb56c0616..000000000000
--- a/dev-java/jgroups/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 2.9.0-ant-1.8-compat.patch 733 BLAKE2B 520d8c1f89cee180055711fd8568f881a9389d9e267f84962e69c91d8c672f014fd91b807f1f96db0b1ec1d217c249c721b05cf11e967caeafe59c4b931ba481 SHA512 71c8c0f4436c983a86b6eee8b4600cc573758ea5da7e33ed4fde8e40f47b47656cd453513a4b367807d51151d2298cda8df5ec1229ac6abd68f3d6bf3fdeaf22
-DIST JGroups-2.9.0.GA.src.zip 9227273 BLAKE2B 751d72adc9cf6d9c8ccddd5b006ef05de1c4ef523c465955d4d40fef847e880882ee6f51950f48f98f328373bdb0505ee39664244df5fa9eb0a8a0066095ec0c SHA512 5482e3a7d895db4d455f92d14c27559eca9370146b397efa4dc17c416a3b833fcfe0753117ca00e1445e49be239f817aad9bb8b626c1b0fb68869f7d1c9ad0df
-EBUILD jgroups-2.9.0.ebuild 1875 BLAKE2B 5c0a40d6d97b354cd30139087f6073b171de8356550f97bccfc6fd56227a4836f4c32585cc7ecc9e0138175dc150b5086eb53673875638041f6e4574d2ff6480 SHA512 1d940f2d63a2812d1475d84c8c7d586ab9824c7d38b364c746f1a13c306b63711db4c0c39e872bfe612edccfcf8781a0d23289309ec04e232f26d8d99ff75110
-MISC metadata.xml 316 BLAKE2B 1b31c10da4f0caadfd0e23b5674ee4a6d5dc053d54aca2ed3b5a2d887cbeca027bcb2d23d3f806ff811abc37359efdfb224be36f8c8ebb23d745dde628d3b36b SHA512 7f02e04f7c3598cf20c483279e740b88099344445d13559f198a863223ef27cd30fd8f9f7a8a33585899fd826db827eb7592b41805551a84ba3a66c3082f280a
diff --git a/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch b/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
deleted file mode 100644
index 46a7820377ec..000000000000
--- a/dev-java/jgroups/files/2.9.0-ant-1.8-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build.xml.orig	2010-02-28 02:14:36.000000000 +0100
-+++ build.xml	2010-02-28 02:15:13.000000000 +0100
-@@ -43,8 +43,6 @@
-     <property name="threadcount" value="false"/>
-     <property name="test.verbose" value="0"/>
- 
--    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
--
-     <!-- properties to determine IP version used -->
-     <condition property="java.net.preferIPv4Stack" value="true" else="false">
-       <isfalse value="${jgroups.useIPv6}"/>
-@@ -63,6 +61,8 @@
-         </fileset>
-     </path>
- 
-+    <taskdef resource="testngtasks" classpathref="jg.classpath"/>
-+
-     <!-- patternsets used to define test sets -->
-     <patternset id="flush.tests">
-         <include name="org/jgroups/tests/FlushTest*"/>
diff --git a/dev-java/jgroups/jgroups-2.9.0.ebuild b/dev-java/jgroups/jgroups-2.9.0.ebuild
deleted file mode 100644
index e341d59ef449..000000000000
--- a/dev-java/jgroups/jgroups-2.9.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="JGroups"
-MY_PV="${PV/_p/-sp}"
-MY_P="${MY_PN}-${MY_PV}.GA"
-DESCRIPTION="JGroups is a toolkit for reliable multicast communication"
-SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip"
-HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-RDEPEND=">=virtual/jre-1.5
-	dev-java/bsh:0
-	dev-java/log4j:0
-	java-virtuals/jmx"
-
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}.src
-
-java_prepare() {
-	# bug #305929
-	epatch "${FILESDIR}/2.9.0-ant-1.8-compat.patch"
-
-	cd "${S}/lib" || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from bsh
-	java-pkg_jar-from log4j
-	java-pkg_jar-from --virtual jmx
-
-	# Needed for unit tests
-	#java-pkg_jar-from --build-only junit
-	# One unit tests needs this
-	#java-pkg_jar-from --build-only bcprov
-
-	# Just get rid of these as they are of no use to us as we don't install them
-	# Always tries to compile them.
-	#if ! use test; then
-		rm -vr "${S}"/tests/{junit,other,junit-functional}/org || die
-		rm -v "${S}/src/org/jgroups/util/JUnitXMLReporter.java" || die
-	#fi
-}
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-# The jar target generates jgroups-all.jar that has the demos and tests in it
-EANT_BUILD_TARGET="jgroups-core.jar"
-
-src_install() {
-	java-pkg_dojar dist/jgroups-*.jar
-	dodoc CREDITS README || die
-
-	if use doc; then
-		java-pkg_dojavadoc dist/javadoc
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die
-	fi
-	use source && java-pkg_dosrc src/*
-
-}
-
-RESTRICT="test"
-# A lot of these fail. Don't know status in 2.7
-# as need testng in main tree first.
-src_test() {
-	# run the report target for nice html pages
-	ANT_TASKS="ant-junit" eant unittests-xml
-}
diff --git a/dev-java/jgroups/metadata.xml b/dev-java/jgroups/metadata.xml
deleted file mode 100644
index 6cb3fe6207e0..000000000000
--- a/dev-java/jgroups/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">javagroups</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jicmp/Manifest b/dev-java/jicmp/Manifest
deleted file mode 100644
index bf8b1ce62487..000000000000
--- a/dev-java/jicmp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jicmp-1.0.2.tar.gz 348805 BLAKE2B b3340c1b7defd950d2d8579023c6c5a3527c55f53b72747d9f50759c3e45d525e7887fb61652c1aa5a8da32bfdde7520e67a7ec15b2072b6c11c6d1bfff21c70 SHA512 8633f12fdbf978e0312c07966fa37ddb9d904fc9845343e7d947400352d3a42d53e83a97a847cd61cf44f4fd1a6a47bab208525155eadadf62c222995a6e2d7d
-EBUILD jicmp-1.0.2.ebuild 799 BLAKE2B 175202d545b53fdbb17ed595f79060e207cf8e14015678ee3bf419ddc8b8343bfc8c0cad2368482f288f1209fb0ca1fe8d694d378c01a201a9f80e56bfe02346 SHA512 487d8a97993f902d57f9cb8ca08d0085db1c331429f8bed8e87f38aa696e6bba6073c8c9e3eeb923fcb4db9ada08b9144951002d307cc3c1fa821d3c31f7e061
-MISC metadata.xml 313 BLAKE2B 3fdc90e6fc3c9fe919ac862555a4d9463999776d4665b43109faddc9b3d8179e23e5c74a7011cd4e4824c4b07435f6172146f8b3c3d9bef871f7885b6629b686 SHA512 d872cd4e19f79a2c3966435faa85f40ada954e51a0561e90c1055113254d653d51e387cadb5d79a15a30eb4764fd3fa985f1e2183fe52a5bce2ae9dd2c824089
diff --git a/dev-java/jicmp/jicmp-1.0.2.ebuild b/dev-java/jicmp/jicmp-1.0.2.ebuild
deleted file mode 100644
index b7c8839350fb..000000000000
--- a/dev-java/jicmp/jicmp-1.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils autotools base java-pkg-2
-
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
-SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
-HOMEPAGE="http://www.opennms.org/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-src_prepare() {
-	sed -i -e "s/-Werror//g" configure.ac || die "sed failed"
-	eautoreconf
-}
-
-src_compile() {
-	base_src_compile
-	if use doc; then
-		javadoc -d javadoc $(find org -name "*.java") || die "Javadoc failed"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar *.jar
-	java-pkg_doso .libs/*.so
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jicmp/metadata.xml b/dev-java/jicmp/metadata.xml
deleted file mode 100644
index fba66bc4abac..000000000000
--- a/dev-java/jicmp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">opennms</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jinklevel/Manifest b/dev-java/jinklevel/Manifest
deleted file mode 100644
index c859ab2e62fc..000000000000
--- a/dev-java/jinklevel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jinklevel-0.1.tar.bz2 7892 BLAKE2B 5c8b1cfacf0a9bd9b1da08df60c4a2bca0a5837e99c573222727d7737b8c920f107e0cd7a92bf18acd261ef969a0fbbed5a08e7bf3fb365d71490e023c9a7f14 SHA512 6ec30afd7331e3ef3393f17495a3b0f5f89a014f5f5b3bb45113c1564e856e46b79d7c7f6fa079ed6436f28034175db84aa6ec69b2b662967808bd22b2d47797
-EBUILD jinklevel-0.1.ebuild 721 BLAKE2B 21df018bdf388e74dbf96f862782dea17b51f06e71ab1dc83536bf3dee8bfcfbf8267a430b0c0c4e34e14feddb457871f9484c18296961897d5914da47cca6ae SHA512 a42cb802e83d13427e4f267d78ff424ea28bc48b5a1ed6e57626d0f768ee1713db405964cc8504314b340dbaa2c0cf152e32a84c3c56a7a00fa838b9ffbc4a1d
-MISC metadata.xml 289 BLAKE2B b71176c5c4a716271cf4bb538b9521ca8be5c5970c5b2bdec7fdc62668449cb4bde24626f1d3299a1e4f084f67c6e77c83a6039c8c18e148ef83c38e3a7d6d94 SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4
diff --git a/dev-java/jinklevel/jinklevel-0.1.ebuild b/dev-java/jinklevel/jinklevel-0.1.ebuild
deleted file mode 100644
index e0fcecceb160..000000000000
--- a/dev-java/jinklevel/jinklevel-0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java binding for libinklevel"
-HOMEPAGE="https://mso.googlecode.com/"
-SRC_URI="https://mso.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	>=net-print/libinklevel-0.8.0"
-
-DEPEND=">=virtual/jdk-1.5
-	>=net-print/libinklevel-0.8.0"
-
-EANT_BUILD_TARGET="build"
-
-src_install() {
-	use source && java-pkg_dosrc src
-	use doc && java-pkg_dojavadoc doc
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_doso build/libjinklevel.so
-	domo build/mo/*.mo || die "domo failed"
-}
diff --git a/dev-java/jinklevel/metadata.xml b/dev-java/jinklevel/metadata.xml
deleted file mode 100644
index 23f6cab9eb8f..000000000000
--- a/dev-java/jinklevel/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">mso</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/libmso/Manifest b/dev-java/libmso/Manifest
deleted file mode 100644
index ee78c41eac80..000000000000
--- a/dev-java/libmso/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libmso-0.1.tar.bz2 2874 BLAKE2B ae6145dc85255353cc53c29ca27ae3f390618f8e5e255d26156d2e7c1a1c3ab29fafb8a57920acec47c0e6544e6e8ffbb30525f170ed08f8d79c094ca08c19c0 SHA512 b0f2bf5d7eeba6d1053bc895484142d3126b40ef40ea8a624ff2f83661151157bda194ba7a0aab3633ff66ca32768818c7dd8ca42cd5bde81454a807ec1f8e28
-EBUILD libmso-0.1.ebuild 857 BLAKE2B 42fb06403bd1c5d2f1d1ed30f1b463ffa7ff55477e82ae93197d1232fb59c8f66a97cf33b358a80c5bd234acb99fa0952f84d33567b0ea8d914179b539489c1e SHA512 96f8e01315f5499a1dc4c99e3f9e3045e24a7d3736985dfc16a59149b64ef5b3394edd2653055a61864ce8c972302ef9588a81af4075d9d4e85703bc0c07056e
-MISC metadata.xml 289 BLAKE2B b71176c5c4a716271cf4bb538b9521ca8be5c5970c5b2bdec7fdc62668449cb4bde24626f1d3299a1e4f084f67c6e77c83a6039c8c18e148ef83c38e3a7d6d94 SHA512 a62a10bdcd24d253d4134029406c417dabc1f6a1a675a5500a848414fcc18235bf20e84926b11108cd213fcbba9536fd7c10520e8eac65052a62f0af1be660a4
diff --git a/dev-java/libmso/libmso-0.1.ebuild b/dev-java/libmso/libmso-0.1.ebuild
deleted file mode 100644
index d0bde1f45795..000000000000
--- a/dev-java/libmso/libmso-0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library to detect printers"
-HOMEPAGE="https://code.google.com/archive/p/mso"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mso/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5
-	sys-apps/hwinfo
-	dev-java/jinklevel:0"
-
-DEPEND=">=virtual/jdk-1.5
-	sys-apps/hwinfo
-	dev-java/jinklevel:0"
-
-EANT_BUILD_TARGET="build"
-EANT_GENTOO_CLASSPATH="jinklevel"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-src_install() {
-	use source && java-pkg_dosrc src
-	use doc && java-pkg_dojavadoc doc
-	java-pkg_dojar build/${PN}.jar
-	java-pkg_doso build/${PN}.so
-}
diff --git a/dev-java/libmso/metadata.xml b/dev-java/libmso/metadata.xml
deleted file mode 100644
index 23f6cab9eb8f..000000000000
--- a/dev-java/libmso/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">mso</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/lucene-analyzers/Manifest b/dev-java/lucene-analyzers/Manifest
deleted file mode 100644
index b640b38e4349..000000000000
--- a/dev-java/lucene-analyzers/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX manifest 489 BLAKE2B 8c9c0ab03955824613f736d81c7fbefe9fb4198a59f56bbd042672c6473886b54e8d229d4f94e2b938ad7db058b981cd9207c1e51666fba15531f7642efdf924 SHA512 959662da8f99cf3cb87bb81f6ca4df39eb7e76bfbb9d60eebc1bbf204dfb1beff48448d8ee5d3d2f8ecf8bf3eb01690a9a50b046850277609f3df77303b77c88
-DIST lucene-1.9.1-src.tar.gz 6135056 BLAKE2B 1777d5ff2e9bfda7dd0ce35f973a15c74136829ed42a8b7bcea4902b8d868cc8a6388357f6abf3406b66c4228f20d705bbf2c85e18bd67a1fcdb90df1a160811 SHA512 fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994
-DIST lucene-2.3.2-src.tar.gz 4602041 BLAKE2B baf4c6685ec88d483aa33df8970305c2b34fbe99d328349f33704e24e0ba5b6bd381da272a8aed84bcc7c2bdd25b38aa85f5585de1819a3f235d41040f1472a5 SHA512 42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d
-EBUILD lucene-analyzers-1.9.1-r1.ebuild 786 BLAKE2B 3889af10b163cb53e9a643baf1d58bb988f437c43264f44d3264074bdd0d07ab4aa2ea3dd1c38f94f8349c549f1ca3ffa15816ed2ded07ce1f3d9d521270169a SHA512 9fc2ee8e462a5f436d7d81913b59d77325b70bcc8e065da73e9bf8eb19a2b13e7a8bebc067fbb46902368b298ab07e7d4f5696e98fc0c3f64f1a10fe8918209d
-EBUILD lucene-analyzers-2.3.2.ebuild 768 BLAKE2B c3d11e2d3a81155ecc4a4ccffdca7de69e164c58c1e7a7f3fe69316a115fe431818a7b3fbac14e581f78a4dce3afcf78810764220b036ab7accbf4d3749d33fa SHA512 42d1251a695a15039c83acd711980667aede82e229792bd9b36c2f7e743d8bbbbcec2a5ec457b48c9c4ee04dce61230081aef8aff9ded62ae6f0f9345efc7961
-MISC metadata.xml 455 BLAKE2B 81a90fef0b2779f76d2da618f1b14bbaba9219ab81bb395cf255f8b5d661cd4e6a9143760275a37ec87eddac95952e30ac36bc36a8ad767b75407cdd23e36863 SHA512 41dd077d4e3c0771fdda58b3ea22ebe491e4c6ef342df8bcc144e09d2fbd60592c3077ce4763f238d1d8e3f53ac3bf2945da1ebcdda27841e02fbe5563f1226d
diff --git a/dev-java/lucene-analyzers/files/manifest b/dev-java/lucene-analyzers/files/manifest
deleted file mode 100644
index 9ab3b27d9757..000000000000
--- a/dev-java/lucene-analyzers/files/manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
-Export-Package: org.apache.lucene.analysis.br,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.cn,
- org.apache.lucene.analysis.cz,org.apache.lucene.analysis.de,org.apache.lucene.analysis.el,org.apache.lucene.analysis.fr,
- org.apache.lucene.analysis.nl,org.apache.lucene.analysis.ru
-Bundle-SymbolicName: org.apache.lucene.analysis
-Bundle-Version: 1.9.1
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
deleted file mode 100644
index d843e94f7e7c..000000000000
--- a/dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 java-osgi
-
-MY_PN="${PN/lucene-}"
-MY_P="${P/-${MY_PN}}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Lucene Analyzers additions"
-HOMEPAGE="http://lucene.apache.org/java"
-SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="1.9"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	cd "${S}/contrib/${MY_PN}"
-	eant
-}
-
-src_install() {
-	java-osgi_newjar-fromfile "build/contrib/${MY_PN}/${PN}-1.9.2-dev.jar" \
-			"${FILESDIR}/manifest" "Apache Lucene Analysis"
-
-	use source && java-pkg_dosrc contrib/${MY_PN}/src/java/org
-}
diff --git a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild b/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
deleted file mode 100644
index 8303e3149731..000000000000
--- a/dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="source"
-inherit java-pkg-2 java-ant-2 java-osgi
-
-MY_PN="${PN/lucene-}"
-MY_P="${P/-${MY_PN}}"
-
-DESCRIPTION="Lucene Analyzers additions"
-HOMEPAGE="http://lucene.apache.org/java"
-SRC_URI="mirror://apache/lucene/java/${MY_P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}/contrib/${MY_PN}"
-
-src_install() {
-	java-osgi_newjar-fromfile "${WORKDIR}/${MY_P}/build/contrib/${MY_PN}/${PN}-${SLOT}.jar" \
-			"${FILESDIR}/manifest" "Apache Lucene Analysis"
-
-	use source && java-pkg_dosrc "${S}/src/java/org"
-}
diff --git a/dev-java/lucene-analyzers/metadata.xml b/dev-java/lucene-analyzers/metadata.xml
deleted file mode 100644
index 166fe6bf054e..000000000000
--- a/dev-java/lucene-analyzers/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>
-	Set of analyzers (for various languages) to be used with the Lucene search library.
-	An analyzer's job is to take a string of text and give back a stream of tokens
-	(presumably words).
-</longdescription>
-</pkgmetadata>
diff --git a/dev-java/matrix-toolkits-java/Manifest b/dev-java/matrix-toolkits-java/Manifest
deleted file mode 100644
index 989a38c3dafa..000000000000
--- a/dev-java/matrix-toolkits-java/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mtj-0.9.12.zip 2576775 BLAKE2B 6325ec4286ba3c103439488f7bc58f0acc70d1df71cf1adc61f99715f8a653ca5198ec0ddb3a24c890bc696143e4b7f61ff38b26c0c81144cadcc63f166c5ea8 SHA512 526793d02d1a5ff7e8b9a2fb1c8fa570a88f96fcb4926623bae6cfdc31f206dc6103efa4e14a29f7b600ed2e1eba516f12c8da7e749983dd6f75a1a4c6676f4d
-EBUILD matrix-toolkits-java-0.9.12.ebuild 1158 BLAKE2B 3bb357e6da68f36277e3214241594bbc0db0560873e2bb3f647e795cbce716f2bca372cbaacf3e3f6f2452c6eccbab2d6d42aa87d24c2aff28fa07b35b12cb64 SHA512 c5926c67e2774c3bd2a07147ffefe68389937ec1ec25559e59a9817d6fd0d012735e0e310791fcb5494ab071de841468c266815b49ae5ecc17ec7aa4ef854c22
-MISC metadata.xml 405 BLAKE2B bb9879b01eac45a76e9b5a3a2ff077f8b66b296dbb649a6a5dbe4914a9586c64e81dcb85113b474d54bf26f75ebfbf99c40f4d3718d9cbe1658f2faa47a992d0 SHA512 6f4bcbfe1ce195a54a8a9f8d51e02ee26b65a2b1b1391bfe6ae80b519728825d48621510881279d5b09587fdd72d8949fc806d1df55933eccef86f5ad02b176a
diff --git a/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild b/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
deleted file mode 100644
index 1638f937a9fb..000000000000
--- a/dev-java/matrix-toolkits-java/matrix-toolkits-java-0.9.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc test"
-#WANT_ANT_TASKS="ant-junit"
-EANT_GENTOO_CLASSPATH="junit"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="BLAS and LAPACK-derived matrix data structures and linear algebra methods"
-HOMEPAGE="https://github.com/fommil/matrix-toolkits-java"
-SRC_URI="https://matrix-toolkits-java.googlecode.com/files/mtj-${PV}.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPS=""
-DEPEND="
-	dev-java/junit:0
-	>=virtual/jdk-1.5
-	${COMMON_DEPS}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPS}"
-
-S="${WORKDIR}/mtj-${PV}"
-
-src_prepare() {
-	einfo "Removing bundled jars..."
-	cd "${S}/lib/junit"
-	rm -v junit*.jar
-	java-pkg_jar-from junit
-	cd "${S}"
-	rm -v mtj*.jar
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant jar -Dplatforms.JDK_1.5.home="${JAVA_HOME}"
-}
-
-src_install() {
-	java-pkg_newjar dist/Matrix_Toolkits_for_Java.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc javadoc
-}
-
-# FIXME: Test suite compilation fails
-#src_test() {
-#	eant test -Dplatforms.JDK_1.5.home="${JAVA_HOME}"
-#}
diff --git a/dev-java/matrix-toolkits-java/metadata.xml b/dev-java/matrix-toolkits-java/metadata.xml
deleted file mode 100644
index f67cb7be8e25..000000000000
--- a/dev-java/matrix-toolkits-java/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">matrix-toolkits-java</remote-id>
-    <remote-id type="github">fommil/matrix-toolkits-java</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index c62fece46aed..cce0bc33579e 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,22 +1,14 @@
 AUX maven 5108 BLAKE2B ea00d51464bb983871760ea1683a4b3f9129a5c91040fe7d1e86998e46c6938df49481f26a0d1c94d32d2419544824022aaa439cd7c01edaaa391428e455e32b SHA512 91901a50153e148b2799b8a1298b4ef26ac07af4b7bbb3ae5c76edccdc8efe41b5613ffd78bd1dd917a78fae8086cdbe737096ff2d4912d0333fff206026dd0b
-DIST apache-maven-2.0.11-bin.tar.bz2 2104711 BLAKE2B 4bc6272957f3e258135d4efacacc625f63522a7e0277e3383ec27a9906e8e4b41cb606d44b30ba870fa5c05d79a45d26af9af00cbffb7615087949c2eec563f7 SHA512 829a583e44ea997576cb0949d74f95e6557069489329523c28c44b546f07cd9487a75f4326d7dc0a098a9755fd52630f2ee27a60daf35006eb48d6af250f84de
-DIST apache-maven-2.2.1-bin.tar.bz2 2839688 BLAKE2B 64427a0e8925c7ec4567a96878c389635aaf578a6569825749fb5786ee7566654d5e6583d40cced8e3585b72bc1cee70567388cddf32393ff1fb5962a4ad96eb SHA512 ffbf74b6b51616dcd87252973ddd776f13861fece7cd25df9cfba4bda1d8dd574772cb5d37ac7ed97ef8b93b507939d428d47b9b81742c801c7958b9fd6188e7
-DIST apache-maven-3.0.4-bin.tar.gz 4873043 BLAKE2B 6cdbc6362dfd766f8e14298873f574fff1a6b4c4e29011a234ff7f3f0d2350a7fe7ff26dd68d486b68d84ba575d77324d0cb950e0cea91894a2f0ce81da0f7de SHA512 d6935daff3b80ed6e40ee0acb4f269b4b16e63bc29b792316599a9847f1b33d9309d3c399cdb170710714a1d150957eedc909754de8f8a77d87bd20a0abcb36c
 DIST apache-maven-3.0.5-bin.tar.gz 5144659 BLAKE2B a109f1ab8656d031c4c904b9972b5dae7955956f95a383c93342bcd3b823e4355fd446150df60b19fc5754b4b19ca4f38bc11357e061e31b0a66b927611a5a6f SHA512 748c7deb8f56dd968a4dbc289b012adea3621f7b3847dc19004995c2f540bae68fb100c0f28caa57b0f9d15b74ae81eaa27c71e342342aa57afe23b41e80d35f
 DIST apache-maven-3.1.1-bin.tar.gz 5494427 BLAKE2B 39b8b29a4747562d96231f575ff5cac2f57a5faee6e74df3054df3fd71b8ada691586def77df7d8f0ab88f4ba464a0d3ba382f3259aa19e2a80e1b1d60322221 SHA512 507d340930cc32268128e8969742dbba34a0144f3e7a561b45f71e254ebff2e6f926fd5c7925081fc94995c3f5b4807caf2204ab70297374857bc66c582610a1
 DIST apache-maven-3.2.5-bin.tar.gz 7956528 BLAKE2B 41313c35859946c8387b0e58f4a25b38d97d48065deb1db9ddbb576417beef1c3391e0a06526c51878f0a7e451b949f8f8ebc001611429b68332dcef24b594ee SHA512 0cdbf4c1e045ac7f96c176058f19ebb838bd46caadc4fb479e11eda67efbb66218fe67c370ddec6d2e4d91091ac9e81ff9eea8d64174cbe1e6d5f7e15962cfc5
-DIST apache-maven-3.3.3-bin.tar.gz 8042383 BLAKE2B 2d1826e85ee558e8672ac541237248b32db1577c76eecf9ac3d08d79e157c9c7a4fa7d892a7bc0bc25d2751f9713a72959198fb6ccd68907bda7f841068b6a63 SHA512 ca64847b7980f5c406f15d433f86a77dc81aa9676baf09122061c72b3ec5790bc664896c37e0571bb2a0bfb48a1d67b0bff1c67d73d796252a132dd46724ccd5
 DIST apache-maven-3.3.9-bin.tar.gz 8491533 BLAKE2B c6947c379dd2d64fe28eeab52da443d771c276553d40f70cced2637df17b18c95108932cbb88d4b747f6a8c0a47150849360ffa9095f6ce50724abeaa2369152 SHA512 9b4b22aba67af48648c634e30edbb03de2a7742b7d4e58b3d637fcd20358a51ccb288dcbd473169a58b9322f7c8fbedcf5336b87d06460d0b20ce37d4c3948b0
 DIST apache-maven-3.6.0-bin.tar.gz 9063587 BLAKE2B c5acab74168061ef8216cf6d085c25ce3e1eb941724bf0d4bbbe1a69a2da3c255c8233233a5bef800469b7363fa34ca1c4a4717c3f18b8eb2828fdd5d5762bcb SHA512 fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
-DIST maven-1.1.tar.gz 7625074 BLAKE2B b96b5b5c74fdccba8914772fe2ba789751b85170d78afb3fb75c151d56d757be10a1f8706d9593a4ff4459a1e7d8b31801eef07cf2514e1992ba1c99c4d0a7e8 SHA512 d08e6f4f7568caec718e82d1106ab01a63855061b5ff65134cdb25ba0a4eee875472bceaccffc1425bd0e57918f69f4e48ad2dd0098f2995ba55ad61c64424a0
-EBUILD maven-bin-1.1-r3.ebuild 943 BLAKE2B 184f9d88036feecc7cf657e8bd792c126d2a5bebdc232a62c80ae845df5b9800cec324e07d543fad664add754fdc611c5b45b37eaae40ffc29767bfd5d63c2d0 SHA512 cfde3cb81d60eca2ff500228baf7aa5aaffbaa333d8364f05143811aee48b263dc3df8f5f2764bd486f04271f916e52250b7ec019fa80792527a4ca2c591e110
-EBUILD maven-bin-2.0.11-r2.ebuild 1198 BLAKE2B 7077d0a91ecffc1f5fb6e018d11a4bc0f17b477d39a46e14a4017e0cbfa9ce8136a4fb8b54d89371aa317083b7aa3374b69fedc045e935c9e1bfb53209b86002 SHA512 87e71fab63238961ab03f2509c1b1a7f19e5d027072d1c48c8e4a0b726a15e5e502e1f5afbe19fb95a2159c48ce88e742f8266bbf154ddaebdeeb4cb82379433
-EBUILD maven-bin-2.2.1-r2.ebuild 1198 BLAKE2B 53c2334854fa9215a3f9fc3b444d06363b74a7aa6444d88c742c3fe7cd83d9bce570cb8a4142db22dd4fb109f384f37619b28f91b6d17c952b9ccc17feab5503 SHA512 81db5d6d926eba62e7104a832c50799474e7a1ff2aeda48c9f0d37cb9d5649159881afecc68850538f0f946c7de6559faf6fbe728b9e1199f4a55c9cc5c5cfdf
-EBUILD maven-bin-3.0.4-r1.ebuild 1275 BLAKE2B aa254e625be8d5697261fdcafb064050a4918a77e19bc1ff16381b344347e4da0eb33dd639e4cfc0c74bc5557879dc8156a9e5ab8f851c74d746ac778fb1884a SHA512 962818f9a4762a4422498d67ee878d2e2cf33f1372192e4d8c1becae1357daef156a6588a08e7b7d43190b914d9b6d341a7cac61ce4161fd9ca1b35a1eb74fd9
-EBUILD maven-bin-3.0.5.ebuild 1275 BLAKE2B f499792eaf007071dcc11386cd6f1a26805b0aa9b8e88adf76d3445af59f47d98a98f74577550bbf99b1b4d511bbcb1ad83182350bab238171cf50e28260cbce SHA512 a80189ef83f60299d4f7db23cd1c5bfdb0453842830c86109288f1c5beca24dd87617a31bda03473b3e735ac691e4a5c9bd024a91c9b04e140d074585ba213cc
-EBUILD maven-bin-3.1.1.ebuild 2276 BLAKE2B 460b49a29f7aa9f07b672a2751b3a5df3ec6f7027380cb0c84ca4e6146c39da92f52dc6a3158c7e51e74311a1ef4d01402c27f426d9ce5bfb83ebe485b27c083 SHA512 42935864e2af19b20851fdada4ba22562a995fca5bcc63e178c0771ff5d6d9560806cb288ddf9663b1da12d1242627cf9c7903ad8acef32174b2848b4527a096
-EBUILD maven-bin-3.2.5.ebuild 2283 BLAKE2B 5d3292e5f0f2a50e0bb3fe71150d0853947af536432d6b7c6e159fd2cd16a387ee8aa0c3682ca4fc65211f1a32d8d246a901487c9445036285c57fa3397edbd8 SHA512 2a8e8145a454c2f88cf4d48c9cfc2a2cd7689f38f3ce53ffb6d579523aed92d04fe1c3368d8da1035c9ccff8c77142db25dd8fdb6a0d5a9682daf733bd6da71e
-EBUILD maven-bin-3.3.3-r1.ebuild 2220 BLAKE2B a781e334df1a9afd6b0ed76e0c67f29d20777384e7f99d54aea6c140669cdef3e060e3cac6925f7c77eabf5580296416984b21cf479d093f038e5276d09d99a3 SHA512 188beb36be65bc2699fee7ed75407399ecd66e13791242cb12de9a1c18a0c8a233018f5e86d779e597d6a7f7c0e7001a726b437a65c1e51bfba69af57a188683
-EBUILD maven-bin-3.3.9.ebuild 2222 BLAKE2B fe852cdf3e64577d3565cef67ac1be99e9d9a435dbae7609b46b53f18c0198da4da1f45bb5c55a9973eeb3d0656eee2cfe6fc52efe2dfa196c1142f2d2b7d165 SHA512 5ed211c1017f9079251f7888c9920d3bf37fe2d9be680f0d7dbc142da340da6467b328d3972c6d69cf26eb57f2e80d084f25344e02174953aa886f76b6a3a8ef
+DIST apache-maven-3.6.1-bin.tar.gz 9136463 BLAKE2B d630ceeb1c35f742eae324a025c3385fac0b7aa58e0bd3fe239a2027138127604a076958e5f6db6bba4f1e99bc524f0c62643bc4ab4d570378e93e8f72c234c0 SHA512 b4880fb7a3d81edd190a029440cdf17f308621af68475a4fe976296e71ff4a4b546dd6d8a58aaafba334d309cc11e638c52808a4b0e818fc0fd544226d952544
+EBUILD maven-bin-3.0.5.ebuild 1265 BLAKE2B c7942c23734722f217b7d5dbd51168f8e170417337ad336d36bca1d1b2cb0d894f8a183fe5c8d442754e223c3b3d3ce0d136d04dd6340b63349996b00439e543 SHA512 c22ddf526763e7162be557c0bace6ce4ea33edc7786a1d6fe7dc1297700821c6a22d387874e0a9f8b566d5582bc6be149a93d03e3ce60e0a263542ca735ae1b7
+EBUILD maven-bin-3.1.1.ebuild 2274 BLAKE2B cff19f6b3eba70d6e5890f30cb7faaba15a89777c8b35c35be85fb214e2413ac66b49376902a19a85ff8fb955445eaac50d8d2eab105bdd779289b1917c6c8fd SHA512 287cbbdbdbf3c7eb8e029bc35a26b86b9d19bbebd5bb878dbdc4ce03a88f194f8acdb72932040fd1c5574a1fa0eef7aaca07f69478e46c7bcbea6939da2edb03
+EBUILD maven-bin-3.2.5.ebuild 2279 BLAKE2B c94fc09f4aba4b15ad52b300460794d35a213b1218761996dfac0c81be3c71c4103e504ffff9948959c92da75099b5cfe9b9d5160de28318170bb6174012a84d SHA512 e11a7cd2b3620754966cfd6130baec3dbf7b3f8875506c9c80a329e125d0cbe4d360dcd519d62a8fb574b62fae92ffe085c041b3f8da0678d11ad187194f08c8
+EBUILD maven-bin-3.3.9.ebuild 2218 BLAKE2B dff6966b08eef11aebdff6858203257ef76dfd24e79c9360b19b1f2203c176929b1909582e0c0588ca6a811f6ae80d1c0948b3f3e3440e12cda0ede68bd62d83 SHA512 5a73c301485e47b68aa5e5868e8c2ecfdbcd345a4c54a8638db2bbb3767b803308ff726ef9975d146249b6d58a7509989cd97592d74219dfc4e57cde2da80007
 EBUILD maven-bin-3.6.0.ebuild 2218 BLAKE2B 4692451547ef9a1d71f63a974f0a9bf86e43f101874c7f0690be0d3b0d7903fbbf87477cd64994e0e11b8b05f09923caee1a9971dfd0138cc822789c1b2b0890 SHA512 b444131af7c1bf8376a985c88a313a7515aab30aafb69aa4984c7421f0769480c7ed82ce59e811cbd160a42ebbb8224cc7e76414fb67671c9eae2068db9463aa
+EBUILD maven-bin-3.6.1.ebuild 2218 BLAKE2B b5ec30cc9313106e0dec93cdf7bc810673bfbb497912f4329005ba0b87cae08e24723517234af4194ae704b7f83925838eb350a9a0403137f15a0ee41cacd461 SHA512 3de59f5d3bbea858a19d03d90c7deba4f901b8916455dc52849fab7d8251f1d8988f00ca183814a05d1b3354bea6e9a34b3d95011cf6c5330ed312326d6cc9a6
 MISC metadata.xml 610 BLAKE2B 84180dd51fc9e6b9089111a4f79aae2f2e8339a50b3db00cebb103714e7bb87c99a7fbfbd2401a5646f044b6d78cf370b1a1af7e524be91b7065176cf6b8673f SHA512 e761707a3985b90298ab8511d26458c9c04c7c1750b861f2c866862db07345d645953559b6ca8c1cdcd75c4aae1e84a7646eb376c32f0fe87427d4938d44a083
diff --git a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild b/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
deleted file mode 100644
index dc990e66e4cb..000000000000
--- a/dev-java/maven-bin/maven-bin-1.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-MY_PN=${PN/-bin}
-MY_PV=${PV/_/-}
-MY_P=${MY_PN}-${MY_PV}
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-MAVEN=${PN}-${SLOT}
-MAVEN_HOME="/usr/share/${MAVEN}"
-MAVEN_BIN="${MAVEN_HOME}/bin"
-
-src_install() {
-	dodir ${MAVEN_HOME}
-	insinto ${MAVEN_HOME}
-	doins -r bin lib *.xsd plugins
-
-	dodir ${MAVEN_BIN}
-	exeinto ${MAVEN_BIN}
-	doexe "${FILESDIR}/${MY_PN}"
-
-	dodir /usr/bin
-	dosym ${MAVEN_BIN}/${MY_PN} /usr/bin/mvn-${SLOT}
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild b/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
deleted file mode 100644
index 849b313ae57d..000000000000
--- a/dev-java/maven-bin/maven-bin-2.0.11-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.4
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild b/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
deleted file mode 100644
index 43b208161178..000000000000
--- a/dev-java/maven-bin/maven-bin-2.2.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.bz2"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild b/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
deleted file mode 100644
index 2a1fd224356b..000000000000
--- a/dev-java/maven-bin/maven-bin-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN=${PN}-${SLOT}
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-java_prepare() {
-	rm -v "${S}"/bin/*.bat || die
-	chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || die
-}
-
-# TODO we should use jars from packages, instead of what is bundled
-src_install() {
-	dodir "${MAVEN_SHARE}"
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE.txt README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# bug #342901
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/maven-bin/maven-bin-3.0.5.ebuild b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
index e97007ba6b02..c8fd2a500821 100644
--- a/dev-java/maven-bin/maven-bin-3.0.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit java-pkg-2
 
@@ -15,12 +15,12 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 DEPEND="app-eselect/eselect-java"
-RDEPEND=">=virtual/jdk-1.5
-	${DEPEND}"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jdk-1.5"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-java/maven-bin/maven-bin-3.1.1.ebuild b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
index 0063d4ff7c7b..b75f0e64b4d2 100644
--- a/dev-java/maven-bin/maven-bin-3.1.1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ MY_MV="${PV%%.*}"
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
+HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
diff --git a/dev-java/maven-bin/maven-bin-3.2.5.ebuild b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
index a92297f4dfb0..74e3ef2b4a48 100644
--- a/dev-java/maven-bin/maven-bin-3.2.5.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,11 +12,11 @@ MY_MV="${PV%%.*}"
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
+HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Needs further resolution:
 #
diff --git a/dev-java/maven-bin/maven-bin-3.3.9.ebuild b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
index a40b338ff43f..45c967a5d4e7 100644
--- a/dev-java/maven-bin/maven-bin-3.3.9.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,11 +12,11 @@ MY_MV="${PV%%.*}"
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
+HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Needs further resolution:
 #
diff --git a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild b/dev-java/maven-bin/maven-bin-3.6.1.ebuild
index d0a6200c052b..4a6edff4651e 100644
--- a/dev-java/maven-bin/maven-bin-3.3.3-r1.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 inherit java-pkg-2
 
@@ -12,11 +12,11 @@ MY_MV="${PV%%.*}"
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="http://maven.apache.org/"
+HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="amd64 x86"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
 
 # TODO: Needs further resolution:
 #
diff --git a/dev-java/nailgun/Manifest b/dev-java/nailgun/Manifest
deleted file mode 100644
index ce245eced987..000000000000
--- a/dev-java/nailgun/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.7.1-r1-Makefile.patch 584 BLAKE2B 2699c0ed508069d6600754548dc6496bc99a9779c52d226b8b9e2022dddc049f58beb815ad96f85b1c993f2246f30fac17a3d7c4811c7f87f51ead89e256746e SHA512 818cb35a65902cf325d06c85c4a1d896784e90cb6a770e70b3df55b8e9661c6b4d83ad46c6e8cfc99c4e6d572f1e496ccaccd514b24fc6029211b1fa2cc89de9
-DIST nailgun-src-0.7.1.zip 1489813 BLAKE2B 2acbd23177bfe2af90d3ba1e026b1c7c63110959b23ec34b6a99063327e2eb07ade21725c9078d0beee220d4dd84d85d5d68241a8581785dd55afa1f9c477664 SHA512 51867248179487b042f3fe93585390b972d1d95928f92fc6b342c3ae663696b251fcd074c8042c6ae129947105e2203cb256a987b46dd8499bb3964302f1ccae
-EBUILD nailgun-0.7.1-r1.ebuild 1613 BLAKE2B 4debc9a5bd468785fe46ddb4647e5ffaaf40f044f16a88451f718ad5833b24ccaf1650766feadd71c807a09a6c4c308c2906e4a2dcad7ca9f831de39f8fec146 SHA512 db6298b59d6393f2cdecff18112ccf0199d01e20349e4c955a114921039991449e05e1c3ec7308f4380dd85dfeaa899e54181fbcb23f5ee4991fd48567785cfa
-MISC metadata.xml 628 BLAKE2B 53019a86f797790612eb6f5bc79fe0c48fef1ad9b3ff9fa397bb43c1ff78d2485ee6e6c1e5fe8108c038556d0a89df44e8ed678dad1ed62767a8d1bd18c73cb1 SHA512 0781b073c443cbf166cd2e080dbacd51cff3bb743311acf486b8dc17f0f15a5a65f453b256dd84a32876891fb08578f930d9d2d3448671f670ef4eed3022b85b
diff --git a/dev-java/nailgun/files/0.7.1-r1-Makefile.patch b/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
deleted file mode 100644
index a38185485578..000000000000
--- a/dev-java/nailgun/files/0.7.1-r1-Makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur nailgun-0.7.1/Makefile nailgun-0.7.1_patches/Makefile
---- nailgun-0.7.1/Makefile	2004-11-25 11:00:22.000000000 +1300
-+++ nailgun-0.7.1_patches/Makefile	2012-04-19 07:22:16.000000000 +1200
-@@ -5,13 +5,11 @@
- #
- # Marty Lamb
- 
--CC=gcc
- WIN32_CC=/usr/local/mingw32/bin/mingw32-gcc
--CFLAGS=-Wall -pedantic -s -O3
- 
- ng: src/c/ng.c
- 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
--	${CC} ${CFLAGS} -o ng src/c/ng.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o ng src/c/ng.c
- 
- ng.exe: src/c/ng.c
- 	# any idea why the command line is so sensitive to the order of
diff --git a/dev-java/nailgun/metadata.xml b/dev-java/nailgun/metadata.xml
deleted file mode 100644
index 17b114b5b115..000000000000
--- a/dev-java/nailgun/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		Nailgun is a client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead. Programs run in the server (which is implemented in Java), and are triggered by the client (written in C), which handles all I/O.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">nailgun</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
deleted file mode 100644
index 53243b83e508..000000000000
--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A client, protocol and server for running without incurring JVM startup overhead"
-HOMEPAGE="http://martiansoftware.com/nailgun/index.html"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.4
-	!app-editors/ng"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/java-getopt:1
-	dev-java/bcel:0
-	dev-java/jakarta-oro:2.0
-	dev-java/log4j:0
-	app-arch/unzip
-	dev-java/junit:0
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-#need jcoverage
-RESTRICT="test"
-
-java_prepare() {
-	rm -vf ng* beansh
-	find . -iname '*.jar' -delete
-
-	epatch "${FILESDIR}/${PV}-r1-Makefile.patch"
-
-	sed -i '/<arg line="ng.exe/d' build.xml || die
-	sed -i 's/depends="test"/depends="compile"/' build.xml || die
-
-	java-pkg_jar-from --into tools/lib --build-only java-getopt-1 \
-		gnu.getopt.jar java-getopt-1.0.10.jar
-	java-pkg_jar-from --into tools/lib --build-only junit junit.jar
-	java-pkg_jar-from --into tools/lib --build-only bcel bcel.jar \
-		bcel-5.1.jar
-	java-pkg_jar-from --into tools/lib --build-only jakarta-oro-2.0 \
-		jakarta-oro.jar jakarta-oro-2.0.8.jar
-	java-pkg_jar-from --into tools/lib --build-only log4j log4j.jar \
-		log4j-1.2.8.jar
-}
-
-src_test() {
-	WANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	dobin ng
-	# Should we have a dolauncher?
-
-	java-pkg_newjar "dist/${P}.jar"
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/java/prod/*
-}
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 421a0696226c..04676fb74500 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-apisupport-8.2.ebuild 3010 BLAKE2B 6fdfe1664730ef473cc979aa36d323a235bc074a08fb28e166d0c8c92e32ad1eb741e65955f08728bebf3f6f3f117760dfd354a7d2c26736f410cff6883627dd SHA512 f20ff5bbde263b8a4992ee83ed0de8fc4c6f52fc515aa6c9ad9eda9f493cdae2659e53fa3cdc8dca23ad6cd1f0335f7db376164cd026b439326a3fcf49644135
+EBUILD netbeans-apisupport-8.2.ebuild 3009 BLAKE2B 016d62c7feddeb56662d8f6cc0c882a5e8c604eb92bc8907a1da6a7312403bdc88d2369315fdf609654d7e0481e3308433f91bb127eba7fa0b14b1d667da3f70 SHA512 ea6b05cf4c93f7d4c575e74a4db0f443ee08ca62d3eeb53b9bf1d9183ad230c4252bfc823ecee6656400e278e4d744c6b3b8cf59705e672a598387e914e0e6ce
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
index 73f3a4ebf168..b257afbdc47a 100644
--- a/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
+++ b/dev-java/netbeans-apisupport/netbeans-apisupport-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans API Support Cluster"
-HOMEPAGE="http://netbeans.org/projects/apisupport"
+HOMEPAGE="https://netbeans.org/projects/apisupport"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index f1c9ba62aa67..84e528d3dbc4 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -6,5 +6,5 @@ DIST E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip 179656 BLAKE2B 563
 DIST F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip 11747046 BLAKE2B a3cc474e94c650abf257e62979373a7909d1a8759c2536e2547fb609c05c0c545f23d8f5b541a5658257d907c55df2260ba1de9e9c435ddf79de805185529de8 SHA512 73f5c986f132bc898fe67c528f5a356868c7d5a0dd7e9201252b3a20a4906f3e729ce5444b33197c28a94513cbc47664a8c80aeb5c114f9a58c7065b41d414f8
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-cnd-8.2.ebuild 4416 BLAKE2B 895b65ef45554d056dec6c766514733d3585e8dbc8e57427170416339257947b76b6b520ee46c822e4537a590072d05a2a71ec63193e53336045e40b71e112ec SHA512 c2d7ff1d976790981856b7f4deed0b804586b47ec9425b1566e178606387537968ca28d64bac4515472e6c2132bcb324a92a5b806164499ce64db25da964a0f3
+EBUILD netbeans-cnd-8.2.ebuild 4421 BLAKE2B 55614009622d45fe00fabaa13fec66a93bf3456517bb0fc130ccda8387dc755de47314b6785921cf8496bef11eea967ec8cbc6a619b21de8f428476be3a1991a SHA512 8248374751b3871cedd0f71b275e85eb76c3e8f269c69ad00f87d47904e43915630bd8a9cc8b9cd38f011a338dcea3560d778fc0c92842c046403f95bf70106d
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
index 815b8d949a70..7c72b9d8b37b 100644
--- a/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
+++ b/dev-java/netbeans-cnd/netbeans-cnd-8.2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans CND Cluster"
-HOMEPAGE="http://netbeans.org/projects/cnd"
+HOMEPAGE="https://netbeans.org/projects/cnd"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip
-	http://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
-	http://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
-	http://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
+	https://hg.netbeans.org/binaries/5CAB59D859CAA6598E28131D30DD2E89806DB57F-antlr-3.4.jar
+	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	https://hg.netbeans.org/binaries/F20EEEDF4FE6B93B180387576FB780EED9F79C66-clank_0.3.9.zip
+	https://hg.netbeans.org/binaries/43A82EB3CE61B9B0B1C60586C7D84729BD5BE3E0-cnd-build-trace-1.0.zip
+	https://hg.netbeans.org/binaries/E59851B0E49C05D728D5C653E52750FA5B6A8F0E-cnd-rfs-1.0.zip
+	https://hg.netbeans.org/binaries/C51780D99464CBF45B0495C7646B442AB3C7B463-open-fortran-parser-0.7.1.2.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index f3c2def452cf..7541648171e6 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -1,5 +1,5 @@
 DIST 18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip 474820 BLAKE2B 0bcb5b01505060627921411b695d873c21b1529ef120078f598458978f61b24778bfe4a959e1d835640888628c49cf0e02c87482d7971ee00d83ae2dc16d563d SHA512 5bc28a6ebe734279ce4999f4657c34885f91f2f44b157dbf65b3690986189961fec138631fe39274ff43762ed74860f3adc1db605f79352dfdc362d2239677a8
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B 5fdc5ea80e83a04bf1f35f668110bf00024b274f3ab99fde29c4946338354b5bb52ead92fa725400efe89e739b1a1539ae09d353f346dd2fc468bb4191217fc0 SHA512 0c3e7b8e4b8b6c0b78ec2f882e981fd51324f718077c7c335c468efa3e4e6f513646c81bb0db60c15fba8762f2f5d7ec199c5a3f6b5a46b767bce5f7345c1558
+EBUILD netbeans-dlight-8.2.ebuild 2594 BLAKE2B c746a61f680978e28f2b1011166794fd37117fa554da37df948fb7367720d5114a1eee930970a799826a62a16d688bead70aab522bfb1d3f54b56808acb29808 SHA512 b235c1f64b3f34ea1afc412666f63befb32646585e41d35501dadba21c94224e42e0056f0d10998f3ae30d3c2171e0ea8966d3bda40c744c5c3ae0b737f30c34
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
index ccbf7aef1790..51ca2a29cb91 100644
--- a/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
+++ b/dev-java/netbeans-dlight/netbeans-dlight-8.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans D-Light Cluster"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip"
+	https://hg.netbeans.org/binaries/18E39A0D10357B72EDB76F2070E27019317792F1-fs_server-1.0.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index d93ca2a98ba9..1edbf9ee6043 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -31,5 +31,5 @@ DIST F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip 57110 BLAKE2B 3e44
 DIST FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip 5025064 BLAKE2B 0fd7e1d26d9bf61afaf51234d40a38b181022ba47ef5c365bb68c7be3cf72e8d3ac3bdfa44ad7e838db9d5dabbbc9962cc3d3387fd6c1eca6d29fc2ad2d77acd SHA512 8624cb07f939d36b7528343b7e3690427578089de7a1b46ed30d576b69002df6f1ffb5878e9c40624dfe8ccf898b7a0be056333184b51d26d3eadb073f58241c
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-enterprise-8.2-r1.ebuild 15451 BLAKE2B 08e7931a1c2204768c9bb75120fd7cc887b0ecf5db920f8b36a27d61d8b740513b8239ded8f81e3d713cea83f76ff341a095c220a04814c54bb033836a400606 SHA512 f0c6d33c7fdfc67708653548d43034baa634bf9e6d5acfe4e9897933170f39fb703c58ea0fb86dff56211c5f42b74b829b8c373153ab566185b49af3f2501a1a
+EBUILD netbeans-enterprise-8.2-r1.ebuild 15481 BLAKE2B 4c4f2cc172704b0955ec0677fce7ac2ff81ab384f9ff8c3e71c1f7ddbb112d90f510d2759059c0c4625c2ee3198dc24128a1a6c50baffa7d47df3e8101276759 SHA512 95382073f3f505c5e987d126e6c618f4be49bd76a399f71b1e284cf4e4e10a5a2a6a34eaf31eb4e470f3a16b2de0159448d0c7e4ce605a709efa620a67e1df46
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
index cd3f853e2846..bce938500a22 100644
--- a/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
+++ b/dev-java/netbeans-enterprise/netbeans-enterprise-8.2-r1.ebuild
@@ -1,46 +1,46 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Enterprise cluster"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
-	http://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
-	http://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
-	http://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
-	http://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
-	http://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
-	http://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
-	http://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
-	http://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
-	http://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
-	http://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
-	http://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
-	http://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
-	http://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
-	http://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
-	http://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
-	http://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
-	http://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
-	http://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
-	http://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
-	http://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
-	http://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
-	http://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
-	http://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
-	http://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
-	http://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
-	http://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
-	http://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
-	http://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
-	http://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
+	https://hg.netbeans.org/binaries/8BFEBCD4B39B87BBE788B4EECED068C8DBE75822-aws-java-sdk-1.2.1.jar
+	https://hg.netbeans.org/binaries/BA8A45A96AFE07D914DE153E0BB137DCDC7734F6-el-impl.jar
+	https://hg.netbeans.org/binaries/33B0D0945555A06B74931DEACF9DB1A4AE2A3EC4-glassfish-jspparser-4.0.jar
+	https://hg.netbeans.org/binaries/D813E05A06B587CD0FE36B00442EAB03C1431AA9-glassfish-logging-2.0.jar
+	https://hg.netbeans.org/binaries/3D74BFB229C259E2398F2B383D5425CB81C643F0-httpclient-4.1.1.jar
+	https://hg.netbeans.org/binaries/33FC26C02F8043AB0EDE19EADC8C9885386B255C-httpcore-4.1.jar
+	https://hg.netbeans.org/binaries/D6F416983EA13C334D5C599A9045414ECAF5D66D-javaee-api-6.0.jar
+	https://hg.netbeans.org/binaries/51399F902CC27A808122EDCBEBFAA1AD989954BA-javaee-api-7.0.jar
+	https://hg.netbeans.org/binaries/EBEC44255251E6D3B8DDBAF701F732DAF0238CBF-javaee-web-api-6.0.jar
+	https://hg.netbeans.org/binaries/B1FCE45BA94108EBF7E1CACE6427EC8761CABEC1-javaee-web-api-7.0.jar
+	https://hg.netbeans.org/binaries/27E9711AA35C39EF455BFD900D544BACB99C0E89-javaee-doc-api.jar
+	https://hg.netbeans.org/binaries/B290091E71DEED6CE7F9EB40523D49C26399A2B4-javax.annotation.jar
+	https://hg.netbeans.org/binaries/1DEEA980904E39C3D7AA240B72CDBBEB8E4860F9-javax.annotation-api.jar
+	https://hg.netbeans.org/binaries/E11C0F07A92F6D02A347DD9C55EE56692A6D9F7E-javax.xml.soap-api.jar
+	https://hg.netbeans.org/binaries/EB77D3664EEA27D67B799ED28CB766B4D0971505-jaxb-api-osgi.jar
+	https://hg.netbeans.org/binaries/45EBA8B0520A70787D5DD2EA154ACE152F817C0D-jaxb-api-osgi.jar
+	https://hg.netbeans.org/binaries/C614ECF62381F88208D66D96146A8307781058DB-jaxrs-ri-2.5.1.zip
+	https://hg.netbeans.org/binaries/D4C96D968F87B1BFEF138E91E06C8FD4A1904208-jaxws-api.jar
+	https://hg.netbeans.org/binaries/B9DB1A789C301F1D31DD6CC524DA2EBD7F89190D-jsf-1.2.zip
+	https://hg.netbeans.org/binaries/99277566601C4D5C2598B0206B5DC071932F3641-jsf-2.2.zip
+	https://hg.netbeans.org/binaries/93A58E37BA1D014375B1578F3D904736CB2D408F-jsf-api-docs.zip
+	https://hg.netbeans.org/binaries/F072F63AB1689E885AC40C221DF3E6BB3E64A84A-jstl-api.jar
+	https://hg.netbeans.org/binaries/5B2E83EF42B4EEF0A7E41D43BB1D4B835F59AC7A-jstl-impl.jar
+	https://hg.netbeans.org/binaries/FDECFB78184C7D19E7E20130A7D7E88C1DF0BDD1-metro-1.4-doc.zip
+	https://hg.netbeans.org/binaries/F05AE8173BC750ECF1B52AD1F80050226458E490-metro-2.0.zip
+	https://hg.netbeans.org/binaries/065BDCE80509320280B3B5210FCDDAE9B7D50338-primefaces-5.0.jar
+	https://hg.netbeans.org/binaries/68C97A238A2143B616879E8C1EF5BF01EA25B11E-servlet3.1-jsp2.3-api.jar
+	https://hg.netbeans.org/binaries/9319FDBED11E0D2EB03E4BB9E94BAA439A1DA469-struts-1.3.10-javadoc.zip
+	https://hg.netbeans.org/binaries/9E226CFC08177A6666E5A2C535C25837A92C54C9-struts-1.3.10-lib.zip
+	https://hg.netbeans.org/binaries/F6E990DF59BD1FD2058320002A853A5411A45CD4-syntaxref20.zip
+	https://hg.netbeans.org/binaries/A5744971ACE1F44A0FC71CCB93DE530CB3022965-webservices-api-osgi.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 50950fa201a0..37cbb44c024a 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ergonomics-8.2.ebuild 2539 BLAKE2B 295b04652fad991c40b1a0ff09927226cc60ca9a5607f8034da6dda4436c3bd9bcfaaa384818972eee2486eb50411649b0d5e6fd3079c3430d05330870dc61ea SHA512 76972a212794b1442453b5acb8d16748990b3d2ab417406ce383e6d104a2cd66122b0888ea424504346b1e71f0c2b8e7a2cf171cce18218794f93c45db2d6df8
+EBUILD netbeans-ergonomics-8.2.ebuild 2538 BLAKE2B 27a8ca484e9903d47a59f5629937f7fbb77c9824e02a31c4b69c30aa11535fcd0df988217ba86236ee2a8d9ac25eb8e59f00cecd8156909bbd68b5e70796f38d SHA512 89f16420c97f09916b224a073ad7c9c69c4c9cbca9b48aa5b30162d9a4185706c41f70743344b9575b1c162c156660d5cf0bec9fe221e18dcefd5d7233589017
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
index 224881a93101..bafd95c62e8d 100644
--- a/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
+++ b/dev-java/netbeans-ergonomics/netbeans-ergonomics-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Ergonomics Cluster"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index 6b33332a3fb6..6d4011727b2b 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -2,5 +2,5 @@ DIST 545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip 99139 BLAKE2B b
 DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-extide-8.2.ebuild 3003 BLAKE2B 0452a10c95c5f561c0c0120b22098688e1962175e8734385aec4ba67d393c81f250c2c8397d9943cdba9294f2fdfae3601fa820f0441213debb7462fbd94c61a SHA512 8baef1c1cbce3ad7d9fe6176b49306f989ff331048a899ba4a7125e232c1cddd7c61be83c18d51adb4e90d6217ff444137e2ab74deff0eb736c28ee763bee1fd
+EBUILD netbeans-extide-8.2.ebuild 3004 BLAKE2B a7692c8a5551b7a9d235ded28f17067aee191bc53b3a7d2202b54c7fdbb731ae2dd2bcea237e2a6b797792c9efbf65acdd8b6a5083eb582e3e4973167a5cd709 SHA512 7bd4d5d54db009e2327971ca6249aa073d352a664834c7efb0a17a8fd8dd23fd5910914f5570268a9aa2e037f99f8cb0e47c346b040058f2e98fed75f92fbeb0
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
index 87ded315355c..ffa1dfbbeaa9 100644
--- a/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
+++ b/dev-java/netbeans-extide/netbeans-extide-8.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans ExtIDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
+HOMEPAGE="https://netbeans.org/projects/ide"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
-	http://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
+	https://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip
+	https://hg.netbeans.org/binaries/545E2B7AB1BD579CC76E3836055877982C5CD0C6-ant-misc-1.9.7.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index 203ceead86d9..50176f2af71d 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -1,5 +1,5 @@
 DIST 01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar 6997394 BLAKE2B e7be2e27e2f1880071302f385e86b4ad7cb41e19004036c94bcbb76037b287a2ab264881eeac1d965a3cd42aaecc8222aba2cb4ee81226e0e3498a05f4a734e8 SHA512 44d66a51338c478a08092160d483c005cedc275f238d2521748d8af95fbb11920b818d7ea3780545658e76aeb25f900e6188cbc09277ca4726b90ada5d883653
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B 3bb871bbb59ead9216f4bb3d4396a63f83da2e9c86772399a23c9e76837ad95deffcf2f0dac51521e8a2d92aef1a3e8fd79653473c3162afd3ebe5cdb95ef5b4 SHA512 5ec0e771489003212f49849d7cef5a7dfbd8acbadf64c1fb6c8a880fd37b5e99e19c7f694133074ad9eb5aff649d0339e840258ab390185d87764cecbc7526ef
+EBUILD netbeans-groovy-8.2.ebuild 3042 BLAKE2B 7172cf2e3b31eaced1fc42f1d7365baeacb0b2c7847a621b824dd055e9a252b51600f8c6291b047b35fb02b38dc7ddc6d401b09d36bcc81ecb71165106f02200 SHA512 a3652af500d53cec39ff329007591943e348ac1ba2d9c066231ef94afc39c15b2476cc37b4403ecc16e57eb70b3bae716086e50529e1b7743066b48da1376745
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
index f00968df2a12..5dae5c30facb 100644
--- a/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
+++ b/dev-java/netbeans-groovy/netbeans-groovy-8.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Groovy Cluster"
-HOMEPAGE="http://netbeans.org/projects/groovy"
+HOMEPAGE="https://netbeans.org/projects/groovy"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
+	https://hg.netbeans.org/binaries/01730F61E9C9E59FD1B814371265334D7BE0B8D2-groovy-all-2.4.5.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 755a62f0d458..604c5b7c8fe1 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -5,5 +5,5 @@ DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAK
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-harness-8.2.ebuild 3752 BLAKE2B 46064f2fc61e80ad005c4de3d020d9178c0fd940704d4c6339e0384bbd50b36cf29244479ee258f7ced555e126733d1e930cd23f72dacc94eb150e81ce670ec1 SHA512 b1e360b877145e24b683e38b3b912ea19daed54bf5c0d5034b536acab40ddb535656afe082d6c1ab1ea56a1e885b332d7b6694dc513bc91b3e9fc51ef0855b18
+EBUILD netbeans-harness-8.2.ebuild 3756 BLAKE2B 88ec0597dcf06af6d7f89ac44510a7b534de60815b2de76d933a0c899100e976f8a4ced3c9ad5c4c8beda014303e7307159d07dc42a4a0473f02f58812c5850f SHA512 ca207a658bd4109adc70d42afb5a2198e9ce21c26810e81dff98385e03933b50f5574a384b9cc60f2aa8afbf69cbda881162fe861ff717481bd18960d08301fe
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
index 9e5f5e9db7a2..ce76624e69a9 100644
--- a/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
+++ b/dev-java/netbeans-harness/netbeans-harness-8.2.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Harness"
-HOMEPAGE="http://netbeans.org/features/platform/"
+HOMEPAGE="https://netbeans.org/features/platform/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
+	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index e6caf535f430..f3669fec76ba 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -71,6 +71,6 @@ DIST F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.
 DIST F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip 459564 BLAKE2B 8d847c768f545b668838b7adce3f0eba4b3b7b4f56469b59e658da0089313748843d08a4f0df180824a3a5e516fb9f103e259c37b315b0352daf58e8ff711470 SHA512 8add9ad7e3f2fb551c11841ad991f204dbeadf7d88cf2e10609644deaa1012095579fb32d568aa67715108062836b48d5c17fd69d5b61d33bca38ad85a617ab5
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-ide-8.2-r1.ebuild 29488 BLAKE2B 247c7e3ee323e91beb359c972a9a2b465c7dd1c92d01254dc2823b3dad9a62b868e254f35c5d438fbaf5342f6e1b6d5b4b204868841582656a4d8edc10cc4c6c SHA512 2bbcd0e7a5710270ce5f2565a244533a39f5e4720828d4004ba771edffec52a32055e5f8a8ff6ab5bb0c3f28aa1578c035145ea8f9d8c2d94d9f74cec848b8c9
-EBUILD netbeans-ide-8.2.ebuild 29478 BLAKE2B 762be6b50605015c8a63dbd891a16f60aacc73f84223ffd29a56f5fc9d4e599677e9187c92d8fa3953518e9b37ced817f0a976b85bc825a2e0f0253e9e8746c5 SHA512 44b7d8cf9eb45923c72b129880b1a49378e9ca2ad89c4651c9b7be40cef499c9741e1683576a2328e47f6b753bb5c1e6c92e6eb23e732445a8efd9fd626ce389
+EBUILD netbeans-ide-8.2-r1.ebuild 29561 BLAKE2B ecacd7c42a9105228f29983ff8146552e3f19c29709bead54ca62e13f8f68aa9879a6791558cfceb859770ec288d0c47232ac316749cc1a540a243fe2cd69c80 SHA512 d42998fd31854070bf33aa79c0673d5ab40a7f1748e9120ea11b959be4361fc1e1c7134cfee2cd72af08fd03b996a642226cfa0f6c8e803435007db0212c1815
+EBUILD netbeans-ide-8.2.ebuild 29551 BLAKE2B c7014ea2a420518bce5157c75e436ced3b19e3a6e6eb6fde22b860ec9802783ad96e9ca083ecb81d847919a54c99534baaa3fdbda820740e94c97d16c5fef762 SHA512 ee2ded187d9892c554be3277cb9580369bb61fe81a5592c87bccf82b7daf7164015adc16b60fcea899c06d491d8c1b666d5b587dad1bcb9599ee3baed79ff7ef
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
index 2b8cd1b3026f..159db85013e4 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2-r1.ebuild
@@ -5,82 +5,82 @@ EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
+HOMEPAGE="https://netbeans.org/projects/ide"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	https://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	https://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	https://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	https://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	https://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	https://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	https://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	https://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	https://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	https://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	https://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	https://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	https://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	https://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	https://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	https://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	https://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	https://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	https://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	https://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	https://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	https://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	https://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	https://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	https://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	https://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	https://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	https://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	https://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	https://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	https://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	https://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	https://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	https://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	https://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	https://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	https://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	https://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	https://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	https://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	https://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	https://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	https://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	https://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	https://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	https://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	https://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	https://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	https://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	https://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	https://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	https://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	https://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	https://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	https://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	https://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	https://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	https://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	https://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	https://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index 96b2ffbcf8a9..39fa17a14b66 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -5,82 +5,82 @@ EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans IDE Cluster"
-HOMEPAGE="http://netbeans.org/projects/ide"
+HOMEPAGE="https://netbeans.org/projects/ide"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
-	http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
-	http://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
-	http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
-	http://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
-	http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
-	http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
-	http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
-	http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
-	http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
-	http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
-	http://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
-	http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
-	http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
-	http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
-	http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
-	http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
-	http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
-	http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
-	http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
-	http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
-	http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
-	http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
-	http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
-	http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
-	http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
-	http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
-	http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
-	http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
-	http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
-	http://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
-	http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
-	http://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
-	http://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
-	http://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
-	http://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
-	http://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
-	http://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
-	http://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
-	http://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
-	http://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
-	http://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
-	http://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
-	http://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
-	http://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
-	http://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
-	http://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
-	http://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
-	http://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
-	http://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
-	http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
-	http://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
-	http://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
-	http://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
-	http://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
-	http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
-	http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
-	http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
-	http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
-	http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
-	http://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
-	http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
-	http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
-	http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
-	http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+	https://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+	https://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+	https://hg.netbeans.org/binaries/DCDA3604865C8E80789B4F8E8EECC3D4D15D00F8-com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733.jar
+	https://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+	https://hg.netbeans.org/binaries/0CE1EDB914C94EBC388F086C6827E8BDEEC71AC2-commons-lang-2.6.jar
+	https://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+	https://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+	https://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+	https://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+	https://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+	https://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+	https://hg.netbeans.org/binaries/ED727A8D9F247E2050281CB083F1C77B09DCB5CD-guava-15.0.jar
+	https://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+	https://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+	https://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+	https://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+	https://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+	https://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+	https://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+	https://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+	https://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+	https://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+	https://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+	https://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+	https://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+	https://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+	https://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+	https://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+	https://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+	https://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+	https://hg.netbeans.org/binaries/F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB-jzlib-1.0.7.jar
+	https://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+	https://hg.netbeans.org/binaries/AA2671239EBB762FEEE8B908E9F35473A72AFE1B-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+	https://hg.netbeans.org/binaries/1605B38BB28EAE32C11EAB8F9E238A497754A5B8-org.eclipse.core.jobs-3.5.101_nosignature.jar
+	https://hg.netbeans.org/binaries/20800206EB8B490F3CE5BB8AC8A7C3B9E8004A30-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+	https://hg.netbeans.org/binaries/D2D2105B1E3C9E2FA6240AD088237A57590DDA8D-org.eclipse.core.runtime-3.7.0_nosignature.jar
+	https://hg.netbeans.org/binaries/16507EAFDC2B95121AA718895BDB54D616EE4B0F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+	https://hg.netbeans.org/binaries/BD55836AABD558DC643A7844B78866AD990544BC-org.eclipse.equinox.app-1.3.100_nosignature.jar
+	https://hg.netbeans.org/binaries/4EE275AE73A140A403903D7E4DBA68C8FBB07001-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+	https://hg.netbeans.org/binaries/B7001D9CC2E2AC4E167D22A13063F0350C71AAA9-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+	https://hg.netbeans.org/binaries/C647079E36A4EB7A24AED2C545E4F0F94194C4D1-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+	https://hg.netbeans.org/binaries/9267CF311F979078211A70C1B19AF8A8EE71DC8E-org.eclipse.equinox.security-1.1.1_nosignature.jar
+	https://hg.netbeans.org/binaries/B580E446B543A8DD2F5AA368B07F9C4C9C2E7029-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/244560B99152F3F9BC75DF2D6FAFA8A5216B06B6-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+	https://hg.netbeans.org/binaries/8E2776DE17446EC7450285F19F2C6366117748A8-org.eclipse.mylyn.bugzilla.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/D4F2BE52B5C048158B5C046C0ACAC3965027FE12-org.eclipse.mylyn.commons.core_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4C753A9D8AB768A55EC99A377A0D22EDA67BAE25-org.eclipse.mylyn.commons.net_3.17.0.v20150706-2057.jar
+	https://hg.netbeans.org/binaries/8E52A783A3700FE2F3AED720CBEF6D895C0D5DBC-org.eclipse.mylyn.commons.repositories.core_1.9.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/50F0A49BDF7C5610E3E602609926065D47A16C6E-org.eclipse.mylyn.commons.xmlrpc_3.17.0.v20150625-2042.jar
+	https://hg.netbeans.org/binaries/4F2E28BDB091E2DD215FB9B16C8708513288F16A-org.eclipse.mylyn.tasks.core_3.17.0.v20150828-2026.jar
+	https://hg.netbeans.org/binaries/11D1982BE23B06B2721240F424DBEF9F5FDE7F45-org.eclipse.mylyn.wikitext.confluence.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/A3FEF6144ED1622E4CDD506B9D745527CC675D8D-org.eclipse.mylyn.wikitext.core_2.6.0.v20150901-2143-patched-nosignature.jar
+	https://hg.netbeans.org/binaries/825DC870D1D423E347F4F8229A211A2C297BB15D-org.eclipse.mylyn.wikitext.markdown.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/C3024631DD14008D2FF35A576C3D82AC6FCB2E10-org.eclipse.mylyn.wikitext.textile.core_2.6.0.v20150901-2143.jar
+	https://hg.netbeans.org/binaries/17C0C8D6DEBF5EBE734881C131888D8088BD9E7D-org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158.jar
+	https://hg.netbeans.org/binaries/6819C79348FCF4F5125C834E7D3B742582DCA34D-processtreekiller-1.0.7.jar
+	https://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+	https://hg.netbeans.org/binaries/DAAEFA7A5F3AF75FE4CDC86A1B5904C9F3B5BBF8-svnClientAdapter-javahl-1.10.12.jar
+	https://hg.netbeans.org/binaries/C47ED3BCD8CEAECDE3BDEEB7D8D14B577B26F9C8-svnClientAdapter-main-1.10.12.jar
+	https://hg.netbeans.org/binaries/AD4A88D99AB7C5B64C8893CA2FF2CBCFCEFC51C8-svnClientAdapter-svnkit-1.10.12.jar
+	https://hg.netbeans.org/binaries/5C47A97F05F761F190D87ED5FCBB08D1E05A7FB5-svnjavahl-1.9.3.jar
+	https://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+	https://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+	https://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+	https://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+	https://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+	https://hg.netbeans.org/binaries/15ACB06E2E3A70FC188782BA51369CA81ACFE860-validator.jar
+	https://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+	https://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+	https://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+	https://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index abb1770c97ac..3813d49f4218 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -26,6 +26,6 @@ DIST E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar 227
 DIST F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip 930828 BLAKE2B 3dd14163ec38294b42974e54fa7bcfb551468294dc4e8ef00928ec13df9eb774ee938a58c06565cc621592457f0c9c96d4f352bbb53d63bca5f2526c6022d9ea SHA512 0a65813cf76e997b362a0ce48ec55ac180907a7af6062c6f86f96448775164c2bf67c147920f2bfa6a8eb24c14046acf66d0ee9a5481bd7b9b251774a86a7db6
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-java-8.2-r1.ebuild 15304 BLAKE2B 71694169d54d481dcfb95f23eb23950473ef595eac0f1c06421b893b31ee1a00beae5fdc0e68deabe72e7a4cfa58a91f0262f59cf0a3485f32ec84d2150c0780 SHA512 c08f766179e97b6866c137b51216f9d9115304cebfe3d7cdb64b9b804a396125e32c0f313150edf41ecc08e37049a3dfad2a546f2417e2d98d7bb02b26ef6547
-EBUILD netbeans-java-8.2.ebuild 15282 BLAKE2B 6f9cc569192af99f8fb70f17564cee6e2dcff4df8d537a920447fe49aa538fa8296091388670c89e41162c1a1abfb638d1607c96b54b83fd8617df1808be3827 SHA512 833a66094812baf6ee45ead2dbe4afec5e1b9b4269bd55e77e6445d5ddd17f295e856235b62c59932a8ac27d5b0c1f3d560360dd8a19dd6ce4b7d32bcd97cc97
+EBUILD netbeans-java-8.2-r1.ebuild 15329 BLAKE2B 2046618ec1d28671d10722ac2b1a3990e3ae17e4f42140a10880686c105e60803a046822da5f3e668dfc442567e363613c1edc6ee38bb867b417b34b5004e8b8 SHA512 0f83b2e369b4b1779951cd2c9892893bd900247280763294d2b35bdd937e73539aeb77a5cdf7df38db205ed47ffc65e4bf12f210237edb99371347430bf80b6d
+EBUILD netbeans-java-8.2.ebuild 15307 BLAKE2B ccee9b7b0b72fb3c3753ca8ed5ced05419872b08595bbe1b543613eaa2dc04178d5dfb34e24cc0891f569c91a4bf272e7c434b19d69390012d452dbf05898fec SHA512 2711ab459fc2759536bc132fa0da130db084c9334e7b3f828675c886e6dab02578240081bdc95dee0a3c03cbfa1f0da120258d83d5ebc59aae1396e9cf6bc736
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild b/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
index b12ee87baf75..d876f1b61859 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,38 +7,38 @@ inherit eutils java-pkg-2 java-ant-2
 # Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
 
 DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
+HOMEPAGE="https://netbeans.org/projects/java"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 # jarjar-1.4 contains also asm libraries
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
+	https://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	https://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	https://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	https://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	https://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	https://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	https://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	https://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	https://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	https://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	https://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	https://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	https://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	https://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	https://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
+	https://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	https://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	https://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	https://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	https://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	https://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-java/netbeans-java-8.2.ebuild b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
index 20e2c32c4036..76d2c3f2a687 100644
--- a/dev-java/netbeans-java/netbeans-java-8.2.ebuild
+++ b/dev-java/netbeans-java/netbeans-java-8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,38 +7,38 @@ inherit eutils java-pkg-2 java-ant-2
 # Maven cannot be unbundled because it depends on exact maven version and exact content of maven directory
 
 DESCRIPTION="Netbeans Java Cluster"
-HOMEPAGE="http://netbeans.org/projects/java"
+HOMEPAGE="https://netbeans.org/projects/java"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 # jarjar-1.4 contains also asm libraries
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
-	http://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
-	http://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
-	http://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
-	http://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
-	http://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
-	http://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
-	http://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
-	http://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
-	http://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
-	http://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
-	http://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
-	http://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
-	http://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
-	http://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
-	http://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
-	http://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
-	http://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
-	http://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
-	http://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
-	http://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
-	http://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
-	http://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
-	http://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
+	https://hg.netbeans.org/binaries/839F93A5213FB3E233B09BFD6D6B95669F7043C0-aether-api-1.0.2.v20150114.jar
+	https://hg.netbeans.org/binaries/694F57282D92C434800F79218E64704E5947008A-apache-maven-3.0.5-bin.zip
+	https://hg.netbeans.org/binaries/F7BD95641780C2AAE8CB9BED1686441A1CE5E749-beansbinding-1.2.1-doc.zip
+	https://hg.netbeans.org/binaries/CD2211635F3011E300CA8FEDC1CE0E1CF61C175B-eclipselink.jar
+	https://hg.netbeans.org/binaries/A9A0648BD7D9FD2CDFBD22C25366E71DA72438DA-hibernate-release-4.3.1-lib.zip
+	https://hg.netbeans.org/binaries/562F0CFA47F0636EBB5A544968EE7A692FC5D26D-indexer-artifact-5.1.1.jar
+	https://hg.netbeans.org/binaries/E775F5BEB07F8303A9AD3DDC12E3128DD48AB03A-indexer-core-5.1.1-patched.jar
+	https://hg.netbeans.org/binaries/D87F53C99E4CD88F5416EDD5ABB77F2A1CCFB050-jarjar-1.4.jar
+	https://hg.netbeans.org/binaries/5BAB675816DBE0F64BB86004B108BF2A00292358-javax.persistence_2.1.0.v201304241213.jar
+	https://hg.netbeans.org/binaries/84E2020E5499015E9F40D1212C86918264B89EB1-jaxws-2.2.6.zip
+	https://hg.netbeans.org/binaries/D64C40E770C95C2A6994081C00CCD489C0AA20C9-jaxws-2.2.6-api.zip
+	https://hg.netbeans.org/binaries/8ECD169E9E308C258287E4F28B03B6D6F1E55F47-jaxws-api-doc.zip
+	https://hg.netbeans.org/binaries/A8BD39C5B88571B4D4697E78DD1A56566E44B1DD-JPAjavadocs04032013.zip
+	https://hg.netbeans.org/binaries/9EC77E2507F9CC01756964C71D91EFD8154A8C47-lucene-core-3.6.2.jar
+	https://hg.netbeans.org/binaries/A90682C6BC0B9E105BD260C9A041FEFEA9579E46-lucene-highlighter-3.6.2.jar
+	https://hg.netbeans.org/binaries/BF206C4AA93C74A739FBAF1F1C78E3AD5F167245-maven-dependency-tree-2.0.jar
+	https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar
+	https://hg.netbeans.org/binaries/5968566A351B28623DE4720B0ACB1E40338074D0-nb-javac-impl.jar
+	https://hg.netbeans.org/binaries/29AF1D338CBB76290D1A96F5A6610F1E8C319AE5-org.eclipse.persistence.jpa.jpql_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/3CE04BDB48FE315736B1DCE407362C57DFAE286D-org.eclipse.persistence.jpa.modelgen_2.5.2.v20140319-9ad6abd.jar
+	https://hg.netbeans.org/binaries/7666B94C1004AFFFE88E5328BD70EBA6F60125F4-spring-framework-3.2.7.RELEASE.zip
+	https://hg.netbeans.org/binaries/91B55CDAC59BC4DDDF0AF9A54EAAE4304EDEF266-spring-framework-4.0.1.RELEASE.zip
+	https://hg.netbeans.org/binaries/BFCC4C322190D6E3DD2FA9F191C0359D380D87C5-wagon-file-2.10.jar
+	https://hg.netbeans.org/binaries/4EF309C09ABB5F8B2D0C6A4010205DB185729CDC-wagon-http-2.10-shaded.jar
+	https://hg.netbeans.org/binaries/3B96251214DF697E902C849EB0B4A0EFA2CD1A53-wagon-http-shared-2.10.jar
+	https://hg.netbeans.org/binaries/0CD9CDDE3F56BB5250D87C54592F04CBC24F03BF-wagon-provider-api-2.10.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index 1834bc8713a6..897a380fdd4c 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -3,5 +3,5 @@ DIST 6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip 7788619 BLAKE2B 3e
 DIST 9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar 125083 BLAKE2B f5d82243a58e8dff86966d2d745ca2fd39654ba33d502cdd56ad4dcb88ca28bdf6e347dd48034bd2cb70318ff0cebc79c7b26887fcc5bad430c8ab13f9acc8f5 SHA512 52601718cefae5570412b801999b5d6799ff6425d6a090323c6dac80248598b21f8ecf09c31e6a7f73f6ca7de9e99bdd3e79f539d96c5e1192fd2958766d212c
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javacard-8.2.ebuild 4597 BLAKE2B ec30097b59f82426e3bb1ca8370365150d374d32c13af558613c15612512211a5be4c220790c42153b4803ab29fa7ecea7db9e295adff6872690e2a77d27b0a7 SHA512 08db9582217c6b8d1c151e2e04d985a5b2bb4b2321b56d1ce7e782480e6d56e77bba288513457a13e5aefd828f9b33d8e663124b760ab00b40081f0d91022114
+EBUILD netbeans-javacard-8.2.ebuild 4599 BLAKE2B 342d5e7600399827d02d468c62f975cedec800064d8c5e1f958e29cff5b5ac725a9683a74f14a22ce0a6987a970a602deb74db0564a670bc56132fb5b14446a3 SHA512 3d77dfca7a335e6c02924bec52169d057f708abc919b05ca79ab83f1e7ece1d3cb3a07fd69b24b60136f102c38ce2e09d0e16930dfa0afe6ee8b723ffe191c52
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
index ec2f0e662487..4d45318832a0 100644
--- a/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
+++ b/dev-java/netbeans-javacard/netbeans-javacard-8.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans JavaCard Cluster"
-HOMEPAGE="http://netbeans.org/projects/javacard"
+HOMEPAGE="https://netbeans.org/projects/javacard"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
-	http://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
-	http://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
+	https://hg.netbeans.org/binaries/33DCFAE258453BDD3D8A042F6ECF80656A82B8DD-anttasks.jar
+	https://hg.netbeans.org/binaries/9C1A8BC9D3270D184F1D1BCC5F60AA81D46E1ADF-apduio.jar
+	https://hg.netbeans.org/binaries/6243337E93F5841D4FFB404011AA076BFEB1590A-javacard_ri.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index ba2113a35ed3..bbbebe3a15aa 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -1,5 +1,5 @@
 DIST BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip 2341753 BLAKE2B e322b5aff8830c4e20fe8ed132b06169ab12a22b2c6416d85c6b7e45d34e546e99dfaa5ff30f4bbce33c77089df0f298fffabb1d187224e6ac1b4a6ec36a8e31 SHA512 024b1458f74ae977f5864b543b39417205203f27ff94518aa61ee4c7336c887dc5704b71909fd2b6286c3a29a9ee0aeb86aafc32f741c7650adcacc8374f62ca
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javadoc-8.2.ebuild 5940 BLAKE2B c1c7576e47437d5ab5847d8b640ef43d03d9921cc19106667a38ac5336a814075d78f9596add3c483be3e7cb658c0a3346bc8a14af91e394ee1b9490f3bd5060 SHA512 e977fadc36971140cad10206051e54d149fea8026c993a5c1cdb9e64313e94717f1429310b61c2f8846e8ca715f5a3065384bed56756c0a55a1e3204f87a9b75
+EBUILD netbeans-javadoc-8.2.ebuild 5940 BLAKE2B f3a310b8fbe84b0015556102b1bbc7e1d9044207c7bebfe17ade8d7d17afbfe9f811628f526b9ed5f9a063d8efb52001afa9fea4c1017670e77093f0776a9b03 SHA512 21de0f01eb935aa3c2829b4f29ab9809744c20863969fb82c1b107bfde8697c8f206a1aa69d5d08a38328d106e705df33486a934d5123bfe42c70081a30bdc7d
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
index 45c1e8fc8c28..019d5fcbb5b8 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans JavaDocs"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
+	https://hg.netbeans.org/binaries/BEA15848D713D491C6EBA1307E0564A5BC3965E7-ant-libs-1.9.7.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 279c592c77c7..5139a9724edc 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -6,5 +6,5 @@ DIST D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip 1647417 BLAK
 DIST D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar 1713398 BLAKE2B e06cc8c989a3ecf5c501ad3e187b8f2afcd7a4838345812b52e0496a2a68b481d2f4406bde00f9cad662d94d97494769d7ea3a2686cf62d3691d953d67701010 SHA512 66d1435d2214c7259a4a683bbc3596a11bc99568081c214281a635fc0d5af10bbbddf5efbd040169e0e077abc25a4cb3f790530ce2e514270cdf51e9c916d065
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-javafx-8.2.ebuild 4343 BLAKE2B 3aba488e1f9745ea11e9205a7058338d60db2378c8cc05c0620871b1ff89c0d9310c631dc7b686787870ec468b1ad9b04e4cc7dedf64a0b8542cbedd004d080b SHA512 b883be9a1d77a1933e719a7713ead18206dc3301212cd23a9cc88aa7d06560139e95a2dabf53fb2a5b926d0ab085ab266751d8aed646a97d6ea9fabe7cb9aa19
+EBUILD netbeans-javafx-8.2.ebuild 4348 BLAKE2B c9f605b6ae1c8b2986327ab391f45ad504fb797c28dc83264b42997b9c64f63bd135b98fc6d8054120eb11509777d52ce104a4055e3112abda6f146aee1729d3 SHA512 cd1a48b98600871ce4a247cd5bff9c62b2b876e3c8212de51541a485785a8642f5364424cd4e295bebcefa30dceb7930f9da75bc85c481c1375d074b1b47c4ac
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
index 1709fa057411..5e72a9f1475f 100644
--- a/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
+++ b/dev-java/netbeans-javafx/netbeans-javafx-8.2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans JavaFX Cluster"
-HOMEPAGE="http://netbeans.org/projects/javafx"
+HOMEPAGE="https://netbeans.org/projects/javafx"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
-	http://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
-	http://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
-	http://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
-	http://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
-	http://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
+	https://hg.netbeans.org/binaries/A806D99716C5E9441BFD8B401176FDDEFC673022-bindex-2.2.jar
+	https://hg.netbeans.org/binaries/D325D3913CBC0F9A8D73A466FABB98EDEEC014AB-jemmy-2.3.1.1.jar
+	https://hg.netbeans.org/binaries/D06C8980C9025183C044202419EA29E69FBD4B99-jemmy-2.3.1.1-doc.zip
+	https://hg.netbeans.org/binaries/49197106637CCA8C337AF16CC01BB5D9DEC7E179-jemmy-2.3.1.1-src.zip
+	https://hg.netbeans.org/binaries/20D826CC819A5A969CF3F7204E2E26CB6263EC43-jnlp-servlet.jar
+	https://hg.netbeans.org/binaries/5D007C6037A8501E73A3D3FB98A1F6AE5768C3DD-nb-javac-api.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 91b436c23ad7..d4b608d98608 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-mobility-8.2.ebuild 4038 BLAKE2B 1811d5c1e5e59ffed5b0846dd862f0397d974ef10af800cfa873918f1e78cf5e09a3a2e92f3b9e6768dc31dba1d54285632253eb620b8163a86219dcfcfc5dd3 SHA512 efd620ee98dd6482f87a01f6b114f867a67de9e772b1ae6759d71ba6deca253492759fdc1c674d1b57ae30caa4f7c0f53ddde103d370372acbe886cb1f20bebf
+EBUILD netbeans-mobility-8.2.ebuild 4037 BLAKE2B 56d7871931169f3e32b0ec3ab9b47b955612941e112f5457cedabc18ba75cfc28170f9559ec4afcb3e0824bbd430683fbe788be2499a7f5d911151a1d9c595e0 SHA512 262472493c7105ad1f8246290d27e05d975ff3c6e7df23938fe004338fc6d36af0d14f13573d9c99485896ff6c16b7b29262131de7d39e3f04acfe04c565d55f
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
index 46b758883587..598f7eabc11d 100644
--- a/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
+++ b/dev-java/netbeans-mobility/netbeans-mobility-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Mobility Cluster"
-HOMEPAGE="http://netbeans.org/features/platform/"
+HOMEPAGE="https://netbeans.org/features/platform/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index c69bd78f4c52..b81714ad542e 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -3,5 +3,5 @@ AUX 8.0/keychain-support.patch 872 BLAKE2B b03371474ee9153bd9d2d1008089e1c1730b3
 DIST netbeans-7.0.png 20011 BLAKE2B f502517c7495b888f4942ae0aa7ea5206205ecadf13ffb5abb7470abeaf27db84dd5a8ff39e540c3da701c3e56f6ba196933f00ba38aa13d022e5b4d0cc19eaf SHA512 67bc2673f3e770bbde10587e68890c3091ef38a850cdf48ca73e4c1a288246e1f757fd4ef1c7b052b6137f31fa6044c9bf3ea5a2a9e0ceaede132c106a746113
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-nb-8.2.ebuild 3738 BLAKE2B 775f43c9e5ef5ecd71615e9ff5b13a2338a828b02e31d3fcf9d99176011d342c98f69e478e1235ebb830088b4e9d50b9c1866c398c04fb0f93d857a3a9ebb473 SHA512 729097b8a574ea971c8010adb3387aa3f4a54773f565fc735ed8ccaf6294cba8254f2c325734c7d7f9d1cf16cf1f9bc9d7ca5cb323294eb541b8f16442bdfb3c
+EBUILD netbeans-nb-8.2.ebuild 3737 BLAKE2B cba1848299b81612bb48d1a987739036a65320f3755cf2cf7f23fa440f007ba467e937b1ca24f4c38b5942d5025340b23f41636b0408fd7ab5461fca1fe13131 SHA512 a36489369206af1a5a686c46fc7452cb33cf9490e563df6552c5f498e5e5318b0531f1ef2965a909598a9ee03f727e124c394421dd23026720d64ded6f16b3e7
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
index 9025ef03d113..edeaf072c6cf 100644
--- a/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
+++ b/dev-java/netbeans-nb/netbeans-nb-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans IDE Branding"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.0.png"
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 3f0fa435ea2f..0f1c2bbba242 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -3,5 +3,5 @@ DIST 3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip 4593 BLAKE2B b
 DIST 472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip 510273 BLAKE2B b66803089a422d55a9187a51e3381f6bae6eb80d602b4bbe51423fe46065c5b8ff23ed22f8b55e3743d851b6a6c603c09daf4233e244fb5ce87ba9943e460eef SHA512 d28f46ff8cc1874108a9a2ef37b6e41b40df27cd36eb976e23d75ac2fac36dcd08f8a18a26d62126bd982724e747cdc9c344f8c25cf3cbeeec9194e0d4412341
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-php-8.2.ebuild 4044 BLAKE2B 57d223814a428803bfbb458c5e2f8da59b396d34c258ff91b27deb0b4dbccbda7cff728a43cf6c1b65929f22ddb6a49e7c17dccba9fafb2f05565a495df8541c SHA512 43f9b754382b1496f881d3a2d6f9a1ea2a04322d32cf876b9fa6dd1e9c012e31d3359f8a8828908a973f2eb9c65723f5d34e62a02d2a1b5475b87324cf02cdd5
+EBUILD netbeans-php-8.2.ebuild 4046 BLAKE2B 6c16358a34ff8d373be1cad1dd876ab10f525f01378e0e5a4081124a19efcecafbda93dfe1a48f1d1982eab7466310964cd9c53087026f1c70a8020d142d85bc SHA512 4b76dae3bdd5c9f4109a89ec7e98a92918dc2de678759741d5a27e9fd7b4db1ad6da1330e1c1b7e233391d65ab3390a108f4e319cb3329666467b14a43288225
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-php/netbeans-php-8.2.ebuild b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
index c4aaafc0b777..0b3de0e070d5 100644
--- a/dev-java/netbeans-php/netbeans-php-8.2.ebuild
+++ b/dev-java/netbeans-php/netbeans-php-8.2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans PHP Cluster"
-HOMEPAGE="http://netbeans.org/projects/php"
+HOMEPAGE="https://netbeans.org/projects/php"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
-	http://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
-	http://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
+	https://hg.netbeans.org/binaries/0702230EB3354A1687E4496D73A94F33A1E343BD-phpdocdesc.zip
+	https://hg.netbeans.org/binaries/472A52636BE09823B4E5F707071B31FB990A7375-phpsigfiles.zip
+	https://hg.netbeans.org/binaries/3D6AF75EA20D715887DAF47A3F063864EF0814C1-predefined_vars.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index 175745f3ffda..66c3a009dad0 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -15,5 +15,5 @@ DIST D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar 106018
 DIST E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar 1333309 BLAKE2B e1b8d0dd9f9e7d9a1a2220c47421bb4b4dc9ba4c60804d598fd8c93b4ea2a4ded9f08483496e6e1f5b710e5b429f7fd4c03aa4c4e02d9035d4c6142ea8ed6926 SHA512 db6581b3e208470ced2ea5c367160dcb9470a1858926da46eaad6011d5a9feb273038467f75e57a375376ad947b3c1ecb4e5ea6a2fd88096eda84e1232b2eaef
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-platform-8.2.ebuild 9165 BLAKE2B 07ce2322d9fc33b869ff3fc873b71da1433541b5d68414a083288aeffe397681e5aec0bf1412f6ace1fb0cfb4bcc4e6c286cdb8b18c8ac33d1c46fa62ab03368 SHA512 5a9f7e5489d7cf6331bd49e6f8959a023a1329816b0853a229e24c10bace76676a53e509b04411d19b405d892cead1190ee5b9f507a3e4ffa63908c6003df1cd
+EBUILD netbeans-platform-8.2.ebuild 9179 BLAKE2B b1d295cbf9e57b985cf2b1de68ee9094114c7a2f37765b6a956bec91c40102fd6522dd3d8515e654467879d95e34639665877eb3d1da74b938f6b5c718c11c7c SHA512 107ccfc2d1449559b9ad7bd7d006e6501a2408c1966107876bf673a2b0b453fe1d5dd7e5d2c23096e4b62114833554f579966a865e6585a4bb91379cabbcc340
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
index 4060b0f86ede..24d34e90b44d 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.2.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Platform"
-HOMEPAGE="http://netbeans.org/features/platform/"
+HOMEPAGE="https://netbeans.org/features/platform/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
-	http://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
-	http://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
-	http://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
-	http://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
-	http://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
-	http://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
-	http://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
-	http://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
-	http://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
-	http://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
-	http://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
-	http://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
-	http://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
-	http://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
+	https://hg.netbeans.org/binaries/2F7553F50B0D14ED811B849C282DA8C1FFC32AAE-asm-all-5.0.1.jar
+	https://hg.netbeans.org/binaries/1BA97A9FFD4A1DFF3E75B76CD3AE3D0EFF8493B7-felix-4.2.1.jar
+	https://hg.netbeans.org/binaries/941A8BE4506C65F0A9001C08812FB7DA1E505E21-junit-4.12-javadoc.jar
+	https://hg.netbeans.org/binaries/771CDCA0A3F2F3CE818E20CC2D707A3592422485-ko4j-1.3.jar
+	https://hg.netbeans.org/binaries/A3085BAA78C8EE7F55081E70C79ABE04CA38CE93-net.java.html-1.3.jar
+	https://hg.netbeans.org/binaries/7FC91530F4395FA0D58F9539F3B40858E766BFA3-net.java.html.boot-1.3.jar
+	https://hg.netbeans.org/binaries/5C992BAEC0111EE293BD44173140A9D8EC860765-net.java.html.boot.fx-1.3.jar
+	https://hg.netbeans.org/binaries/BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72-net.java.html.boot.script-1.3.jar
+	https://hg.netbeans.org/binaries/10E4214A89082C70FCF9F721953001C0932037BA-net.java.html.geo-1.3.jar
+	https://hg.netbeans.org/binaries/D97314CE1869DD3B8B8942256A70673E2991C9DD-net.java.html.json-1.3.jar
+	https://hg.netbeans.org/binaries/6BDCE8349F83CD02F2942D4FBFA86A81A129F42A-net.java.html.sound-1.3.jar
+	https://hg.netbeans.org/binaries/E5DDC5E827D3D62E7BE9F7E32927CA01F2839971-org.eclipse.osgi_3.9.1.v20140110-1610.jar
+	https://hg.netbeans.org/binaries/1C7FE319052EF49126CF07D0DB6953CB7007229E-swing-layout-1.0.4-doc.zip
+	https://hg.netbeans.org/binaries/AF022CBCACD8CBFCF946816441D1E7568D817745-testng-6.8.1-javadoc.zip
+	https://hg.netbeans.org/binaries/CEC2829EC391CB404AD32EB2D08F879C418B745B-xhr4j-1.3.jar"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index 4628461f1b39..d29ccbb28925 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-profiler-8.2.ebuild 3098 BLAKE2B 8e9d62d5153ea361a7d32e3849eea4db39703296c08dd2e1c3313a4b560274351c7651d187726c6376d2379f5d50d9f78cb13b81bb45735f3cfb97ae2a60fb4d SHA512 9a501315ac528476b7fb610a5ce4a74b820c9098adbffa880b1750ead5066006287943abdd4292f46134013f9ef09708b3e4cb322ebb9ee9382fd39c9e5b9fb0
+EBUILD netbeans-profiler-8.2.ebuild 3097 BLAKE2B 31705e6b37dc437c9ded4f216c1ca97c5d7627537455fab7f52e5ceeddbf7bebf602f8605f4935117fff27223d0d37d0dfdf649c982184a96cd9440dd9430964 SHA512 aa6e923137e4ffdb2c738cc5bf17fed4ccee67186c524d3f89efa4581fcbdda0f5b256ecc88b8c0fe88176abf56cc5ead5220e7bc2cfd0dfa3befafc78ee15d5
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
index f48d6c544a99..cedcb8e3d60c 100644
--- a/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
+++ b/dev-java/netbeans-profiler/netbeans-profiler-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Profiler Cluster"
-HOMEPAGE="http://netbeans.org/projects/profiler"
+HOMEPAGE="https://netbeans.org/projects/profiler"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index 4961c056cb6e..33f800d7b69a 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -14,5 +14,5 @@ DIST CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip 2179489 BLAKE2B
 DIST D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip 912402 BLAKE2B 8f128e9bf4fa6811d085316dd4f2ce38e309dda300b59e1fa614f2cdc75fd4b19cc46a6d91fc96f3e418dfc2008a585aaccb94a14b6a057090339a7ade8debab SHA512 0bc0a65bb7b6d78a003634027c93d842e2f1d928fcfedc9b12db4b508752b06931429a4a580a08b5fd5e666e4f3a208aed86eb21e81377973b43cb77b48cf4ce
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-webcommon-8.2.ebuild 5868 BLAKE2B a7720483ee3105fe326deb68cd204751fcfc5a78addcd2be873cd4567bc3925ecbd0640887d28011e28ed06c66de9e02d856887df246c0018d86807ccfba00f6 SHA512 b0973af70d56fcbac4e5b22706069acebe5eb46435212cfa5163773c1070ad66bcc0eb7f193703aee381c38a62d4cf357e0457edf140558455dd30126635917d
+EBUILD netbeans-webcommon-8.2.ebuild 5881 BLAKE2B 68de9c0af97bc8242cee0df002a43f7448486a30483366ea8c20c5ec4300c756f1ed9d61e6bd32087c9723dd1589a7338c5114b355f30cd5a605d1f472dd66d3 SHA512 872b36891ba69bc74abab86f42a0775ed4dcc2505436e37267dc58a6111e90c2b81a9752deaece635785698539e056ca46e35df5c8aaecf2dd3f6d5a3f8a1dfc
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
index 0ea4053b2eac..e292fd5fb9d1 100644
--- a/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
+++ b/dev-java/netbeans-webcommon/netbeans-webcommon-8.2.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Web Services Cluster"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2
-	http://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
-	http://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
-	http://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
-	http://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
-	http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
-	http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
-	http://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
-	http://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
-	http://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
-	http://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
-	http://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
-	http://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
-	http://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
-	http://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
+	https://hg.netbeans.org/binaries/7CA13589F586F659BB0E1561719A91CA47BF1897-com.oracle.js.parser.jar
+	https://hg.netbeans.org/binaries/59631804B5A7FF3CEAA3F0E113584AF7E1BB6E9B-dd-plist.jar
+	https://hg.netbeans.org/binaries/7C4A82593A85524A3541E55A4A9C906B773ABAD6-ios-sim
+	https://hg.netbeans.org/binaries/C8EEAB10E4539BEAF97476EBA252BD4B40377FA9-js-corestubs.zip
+	https://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+	https://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+	https://hg.netbeans.org/binaries/0929AC5F40B5A8667021408748D64F30F77B3165-libiDeviceNativeBinding.dylib
+	https://hg.netbeans.org/binaries/2A38DA3DB5D36DBBDC0B03990B46810F72430D5E-libimobiledevice.4.dylib
+	https://hg.netbeans.org/binaries/480C9E376169E21EA3BDA5D5841425BD7CC054D7-libplist.1.dylib
+	https://hg.netbeans.org/binaries/08FE518AB60FFA2E5440B75B4D9F8502E0791B3C-libs.jstestdriver-ext.jar
+	https://hg.netbeans.org/binaries/C1BB9FF4232248B0054E5A26A33474A251EA19CB-libusbmuxd.2.dylib
+	https://hg.netbeans.org/binaries/D4BD3F62EADB61216A47EF96B3152EDD35A56005-ojetdocs-1_0_0.zip
+	https://hg.netbeans.org/binaries/1EFED55F8C442E4DB1C2338A5C35D494364F9ECD-ojetdocs-1_1_2.zip
+	https://hg.netbeans.org/binaries/CA8F6968FED0BE20E786C70CF9B603F4D7B66C68-ojetdocs-2_0_0.zip"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
 KEYWORDS="amd64 ~x86"
 IUSE=""
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 6d201073d4c0..9b245165b7f4 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -1,4 +1,4 @@
 DIST netbeans-8.2-201609300101-src.zip 217356974 BLAKE2B 0afd60c1060a0a1d7be882628a0d4df1d8e214aabb4c8ec511341e40960eb291dbd768150711e3d639e6cd200136d2170e3cfead6c9c76be19509327debcf8a9 SHA512 d0499489dcd9383f719209997fd5518ea93ad5c2f727005f074a351a4adc7f8708ebff972a4bff4572e2ba9237b14c7a24b7fb1f89100e33012e14404f0336e7
 DIST netbeans-8.2-build.xml.patch.bz2 2678 BLAKE2B abfb7cb228a8f0a03d052226d4ea6b5ce111d8d246cf070a2548a6019b7abf793af5fb21dcde54bcfaaa31ffdfdc112f742971a7b55dfc79a5d78483bde299d4 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619
-EBUILD netbeans-websvccommon-8.2.ebuild 2347 BLAKE2B 95292b97d5662f360755c96b55f06e4838d90c5b0735dd86fb93039d3079eb4969bb3ec0d3ee72507ab892b83afdb55617b77f5adfdefb6f0d30efcbdd805c4d SHA512 dd69b56961f5684c49d93ad35d4cfae355e4705406f4c710819fed0d7789e241cfb97fa44b1973c7e0ec4b69cc7cda3ab860acb8f3891c029f11fd61a74cea8a
+EBUILD netbeans-websvccommon-8.2.ebuild 2346 BLAKE2B b41f37524d0f822e85773c3cd26e252ef958330e66c9ce20fc70f109068bc723444757b305c6a20ecf8c91d0e4de6c16e3a094891308244b5954f69dfad95468 SHA512 bc433c3bedd51800e2d0f4489923873d7489c62fff8bd3e10438224c506e983098efdfcc6ddd2a9701acb4c7b0489dd63d12ce04cc45a14f787569dae8ede20a
 MISC metadata.xml 342 BLAKE2B 49be3d228c95b57c3291dba351ab2d939f529fcf4ea91b6155b5d55ac90d4e736fc9b6671b682414df89a1248709b4c941671d705eb9e86bfd732425c0103822 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3
diff --git a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
index 5ab104d7c79a..933370ee9f53 100644
--- a/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
+++ b/dev-java/netbeans-websvccommon/netbeans-websvccommon-8.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Netbeans Web Services Common Cluster"
-HOMEPAGE="http://netbeans.org/"
+HOMEPAGE="https://netbeans.org/"
 SLOT="8.2"
-SOURCE_URL="http://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
+SOURCE_URL="https://download.netbeans.org/netbeans/8.2/final/zip/netbeans-8.2-201609300101-src.zip"
 SRC_URI="${SOURCE_URL}
 	https://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.2-build.xml.patch.bz2"
 LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 5f8f5fdd329a..730de576a718 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,21 +1,12 @@
 AUX openjdk-bin-11.env.sh 496 BLAKE2B 6a99de9730f8e84f6082a08fc925126a2fa1579f040b7f083af371218c4523956d5a86777e1bfbca7a63a717992d1a170d539d04f26f5317c3fbb9a14972c191 SHA512 94ec17c26c7305c57fb53356a4477711fd987c4d48af114f481579f316c20ed487ec40124361bd0cf2c947f59eaf93ca629975f9e999d47f5025269187db82ad
 AUX openjdk-bin-8.env.sh 705 BLAKE2B 0e155706fa9633a9a2e54ae2c9ecb95516c0b46ead84e24dc4c4d79a1b67644eedc6b97e6d4e17da4f6162e2ce7bfafe60dddc950e7f76a666af46920a8a5025 SHA512 ca6fc7b0889ae3d2be386696eadaf9f25fdedaf94cb24696a2de56214695cb0211226bc87671449bf366763f568229b22409201e532d14394c641164c48ffe2d
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_7.tar.gz 194181157 BLAKE2B 7883e6846670c87f4ed8338804671bff19ba2910e1e96eacd9729f2ba64e9c6b460d300080e3cd3a4f94722ff9942832681bf23f64e9401e07d824028614874f SHA512 d982d4ba8c1b99b8685b36b9c0b6bb6ff8f8ec04de74945876915e01827fb389ad72d868c387f0ef4d5dd1a21cb09170b0d14ca33a2c2ec0c1f95c09fc1a475a
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.2_9.tar.gz 194151421 BLAKE2B f2190472dc06a297ffd9fcdb69e6c432503599297ad61795ee6fe57fe7475b1bd8b32105b29da33324f74bd34de2050809362dc4cad0165fcbd09b88d75431ce SHA512 c4703e840aa719adb35e83286fb921a3e8feae08e5b483eae726c892ddbc2c312c43bec3ba093e124b8541d08e417e46dc4dd0de3d5b1aa00b253e1532d43edb
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_7.tar.gz 180394013 BLAKE2B b5b82b6cd4121e2fbf66c948435bc84d549a11a793310bf0624898562005d5fc01a2f2de84a18517a75ccb2ed7d9f5173dc0a087500eb897e8d7461838991af1 SHA512 5f1a54e7d2456b42e23488b3699b09d82c57f3cb7056684a15f5aa19b992f4b1638acac716d6ed15c0a409ff1953022892ea55f7ed0542d210f5fd43f33fd8e0
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.2_9.tar.gz 180384673 BLAKE2B 51cc7f53c371dc140f9cd17c3523251929e384ca73eb34c283b969be1b5c91b1ec15bf72fe08c80b141a96aa0de5dcb0c9631e2f776e123ad5a4059174dfbc1a SHA512 00ecb0fe1e5b4f682841eeda41525dc5a9205e55ec8ccb332aa1dc724499d2df927870c8b70da950384b50a8014bbd70d0025a5ce0ccb90bfc4df028e64613cb
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_7.tar.gz 195593592 BLAKE2B 038c88dd4475842ffd27afc9249925baea0230cd993a963e13c2e090a0f6332fbeaebefae5b5e98026a12a7d94696633507a9d08af469b0227372088b5cd4869 SHA512 f9f4d168105e499b0da4923c6fe18c31ea6f6a24a48fc9d47b643460316d75de273f8f6dcbd43c9df6efcfb77127182dab8125c55f63200c5ff53cc9eb0ddcdc
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz 195592867 BLAKE2B 91593fc849e558abf965ecfeadefbeab464e1c4562ec57d0bb6dcb9c17525a7cf37593d8fa2146d4545122a634d22c46764af32a124a0e17621da8b643c2770d SHA512 976874e04df71f747a5a7a78081b5989adfcf783b5642d3a0ca2ab2a98547fbe9495dce57b8eda69240f1850bead7bdd6cd59bf9f53ba70400e0806e0950866d
+DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.3_7.tar.gz 194142513 BLAKE2B 1809ee89a4dd31d5453d15b0e3672e1d4a9e1e4573954a8dcf793cb4f837ca4bb44eab73fb685896273fa5301011d671568cb7648c0c5095659f5441a559bfad SHA512 22964e4b0819eb214f378969501b9ad67e39f4efeb7425245022f7eae804386a5e0c7a8139a5df604efd649ff1d551323e6b08299ce0e3f71719e3cd120d7b91
+DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.3_7.tar.gz 180425080 BLAKE2B 77f571a145e837c80da49a2ef8d20089b24ec23abf8078cc5781762ec9b88038d4c47c9d36766195c2f96809c98e4706b249c14518ef450b1fbfb100ba8c49d8 SHA512 6b7542fcbd9b727e93a2c2e157ecd52fb27db74d67cc98fb713eed531c7ea4420fdae2e420131b3d046e6ad2bccb2f91461928750e7b9c4274984a983293be8a
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.3_7.tar.gz 195982221 BLAKE2B 61ccbceb07bcb72a5f9d797997b4a250c2d171d7c7930877db0865d95b1faeb83e160eab59c484d2fce06a7116f06eb8a57eb5295a254fba7315ccb2e88b6db9 SHA512 2c590492ab9bddef68afcfbb54117688e1b24b41dc871bc4ba869319c16587ebfc061ce72712f209403e76d589f01d57cd85384653b1ecf767ee8e4018e1607a
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u191b12.tar.gz 75382012 BLAKE2B 9521bb3d0dc08d5069108bb56594d401cbadf7a290652a39c7379e6ded530044e85f1ffae1cd3eb7e881d7c283c06463e6f8b76602d03a7bf5b188b1004f5daf SHA512 156f7a57f095095b72edb4bfc766d575795e496b006fb994566b0207d346e89863cf377ce97290bf1b47923c5d6aee5558eaa7a54f394f95a270b1cfec4308e2
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u202b08.tar.gz 101497437 BLAKE2B 4fdc659f9cc50fd968cd339cf24780cd0097286fe3004669972b925fa5c8bbd0e6024587f761ef05ec170c4caa6a915f9f748badd021fae6eb669aa613e1c90d SHA512 42991d2203d51492090e92ee4c7600e7b0ab613550d925f52dd7c7c3b796f9bd36e7284d55540b661a5175064d714267cddd786d81aeda358feda3927e3676e3
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u212b03.tar.gz 101610850 BLAKE2B 3a782f21855b1633255b2691e4adb516b12b84e37d81cdfda2b7b251cf78602a3b4c4120fbaec01d177fe7187b581f5dde392c7f841a39d269b548f1ada18be2 SHA512 25d53c8ca9bc4e1fd0ae1fca349d1e605e0dfb8a4aa386408875d5c23ef8b3ecc42ed297bc125f2ab74e9726e10374ec12d6c39736a53a94d3150001756e0027
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz 104336613 BLAKE2B 3bf42af57707a057077969487f66c32289d0dc96639aee553b18812262d517b07a8e80e3351a4b22731569c7d7c1443d8018d05a41a26abf844a1a2950e7c368 SHA512 8e04d22fe03d2ab92e48fbbfe7d6015d9062d8e767d55ca9235e02b39841236d47b8977ae0252d5f4351a4c5fe082d377e2f8978156cf73c0208028a422e5e4c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u212b03.tar.gz 104368598 BLAKE2B 0c16398c1e962e53316eb9301a8ebb6dc7b37ef812d3b65719c239f392074fcba999fca8442cc52a0b067eb4761b0477e9da243d0d84a2e2ded1d883614d15b3 SHA512 7674f26bbc69535c1d06d7364f515ddd00f1f43f6fb76c806c56cd3b379e03047084fbf6439e375cf57257b8a1fdf94702ba063bf843793b009a76fb449a5cc9
-EBUILD openjdk-bin-11.0.2_p7.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
-EBUILD openjdk-bin-11.0.2_p9.ebuild 2785 BLAKE2B 77c144ad87f6024f82b3ea81a0dfb9f79e6adaa2e172c061215e047f3e812ae025d0d73f05801cbd3775c36d70bf8045e8f3f9d3b2cd25d4e4fa5fab4559a186 SHA512 9b26a81ca3401bc24c54c5f1c26df6da1749adf905f1d8476ab2696bf6810deb587619ee4d57c8b05498d46f2fc1753484e2cd29929ee618ba989ab14970a34c
-EBUILD openjdk-bin-11.0.3_p7.ebuild 2719 BLAKE2B fa3bc2d29ead40bae119d5922547684d0612ac117557d3ad99dff2b8359fd847e0a86002f12f362b6bbd5db2033a3d4e4f5c18331c53acbf6e0930b16d716b3d SHA512 94f78bd9968083bcbaf72e990ce8f4071183e406c6f98fad0702845cb4f3c720a15fb088e390a70c97659e462b86993190565198e32f31d8c56f03aebde10b38
-EBUILD openjdk-bin-8.191_p12.ebuild 2590 BLAKE2B 29cc600adece87f8d040891e5ea84fdec01245e5823d7cfc9631010cdfd053545b9fa75aadb74b2b882127a87609404a7f7e4d061d7854110d5a08f4bb6359d5 SHA512 d16e2f164b8f521a3d36f24c56afef4f9b0b7f2bf01edd22d5267689f5186afc2c1079a547d73c6ad61306e3b41ab8b3dc6abbbded0f8e8444b431d4c86f6c58
-EBUILD openjdk-bin-8.202_p08.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
-EBUILD openjdk-bin-8.212_p03.ebuild 2619 BLAKE2B d96761323c832f37e8fa7b9792ba36c07ed4e9313aa8acd9a072589039b738baf0b5402fc673426203e3276e7ee624fd091c7a08f6b25baf464b026716042218 SHA512 cb07634a89a7f10bdb099188980b26e4ad6ebb7f460c52b1d0adec3b390e58619bf1a15bc2723d239e6e926fb9e43a16ecd310a838fd6e1c211f2683f8de92ae
-MISC metadata.xml 1027 BLAKE2B 19dba71d9f0c1136eb90f90ed4077275a75d7217618048f669879372fc863875c52f95c7f29ff9eb93a922d1dcf6249dfe742c34ed40b795b36e7be1efa658b8 SHA512 8e3eae238896c378a4807d58597566db7e059a0d892e949dfce095136a2788f49bfd736c4577c13ad35924a65c384fd308b13146944dd8ace382fdf6e101db56
+EBUILD openjdk-bin-11.0.3_p7-r1.ebuild 2963 BLAKE2B 83ecbd0e1d771404d63da0162604331aa5d56d1b081b65489bbcf821e7d5a6a961219002e991e986cf42b5ca0973316745319ed6268925b0dd8c3c9d76b37217 SHA512 9db8bd814a2b0a3ec915737de22d8e1082015a5dd641915fd5fd56a6abde8a72fc3b4c70f0933833bd3fbd3646bb55eb1c4b2aa2cfa32dc9e1a61dc0fe302601
+EBUILD openjdk-bin-8.191_p12-r1.ebuild 2588 BLAKE2B a5621d26ba42de2ac06e4c4bbc3b044868645d554d4a21c6290a8f25fed8b492986d2affa80d2ec5bafdf9177b0d6688a916cdbdd2f33901523e883b2fe9812d SHA512 05f94a9eace6c0388ade4a75470c63d7f93732c47bbc7475642651a9de90431fef0974be8c266fcf6246992c57170e42f16775e52718a298ac91b03982c122df
+EBUILD openjdk-bin-8.212_p03-r3.ebuild 2802 BLAKE2B be06cd2dab9c4a3654a53a148850e3fcbf6ecb541117035c6e4d872a155e456b2371665ad719d86f113d6f88ffa453a2e6b95a633543a9f0cbd688298ebd7591 SHA512 c065c02e0e807e4482577e4c3d3236cb622a002966ae17e5426cb677ac05b78a15ce0b1c3edfdd9fa6a4d3a1a17e537931160f0e1818c3294736dfdd4a6138e0
+MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml
index 5197cf9973cb..941e830900e4 100644
--- a/dev-java/openjdk-bin/metadata.xml
+++ b/dev-java/openjdk-bin/metadata.xml
@@ -11,8 +11,8 @@
 	</maintainer>
 	<longdescription>
 		Java™ is the world's leading programming language and platform.
- 		The code for Java is open source and available at OpenJDK™.
- 		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
+		The code for Java is open source and available at OpenJDK™.
+		AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure.
 	</longdescription>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
deleted file mode 100644
index ad6e3e5d68c6..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p7.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri aarch64 arm64)
-	$(abi_uri ppc64le ppc64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
index ad6e3e5d68c6..a70143ee9f51 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.2_p9.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7-r1.ebuild
@@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -53,7 +54,7 @@ S="${WORKDIR}/jdk-${MY_PV}"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	# Not sure why they bundle this as it's commonly available and they
 	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
@@ -78,9 +79,13 @@ src_install() {
 		rm -v lib/src.zip || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
deleted file mode 100644
index 8cc6752e5ae0..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.3_p7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
index baff27abbc59..6c1280109ae0 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.191_p12.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.191_p12-r1.ebuild
@@ -68,7 +68,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi
 
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild
deleted file mode 100644
index d214f0e0b459..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.202_p08.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-	$(abi_uri ppc64le ppc64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~ppc64"
-
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:1.${SLOT} )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv jre/lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v jre/lib/*/libjsoundalsa.so* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr sample || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
-			{,jre/}bin/policytool bin/appletviewer || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
index d214f0e0b459..8a192994e1e4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.212_p03.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.212_p03-r3.ebuild
@@ -29,6 +29,7 @@ IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source +we
 RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -46,14 +47,14 @@ RDEPEND="
 PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
 	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
 
-RESTRICT="preserve-libs splitdebug"
+RESTRICT="preserve-libs strip"
 QA_PREBUILT="*"
 
 S="${WORKDIR}/jdk${MY_PV}"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
 
@@ -69,7 +70,7 @@ src_install() {
 	fi
 
 	if use headless-awt ; then
-		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		rm -fvr jre/lib/*/lib*{[jx]awt,splashscreen}* \
 			{,jre/}bin/policytool bin/appletviewer || die
 	fi
 
@@ -77,9 +78,13 @@ src_install() {
 		rm -v src.zip || die
 	fi
 
+	mv jre/lib/security/cacerts jre/lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 302eb06eaf67..65c73a4c5fc1 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,11 +1,7 @@
 AUX openjdk-jre-bin-11.env.sh 513 BLAKE2B b7dfc571fda637776479ca4f8a8f0eb1fa0f03f453b48e0079670aa20f5a5bc83ed73194508aeda596a62805e5a6273b4668b870d6b7aaa99ddc72498e384c54 SHA512 dfc012876174108b768d6fbd9deaf8b9e20965c2b5dfc2ea4ded556597c0ee4807537f7b29ca1e6f92ba800313457844299fab770b833d8b3a5b3d576369411f
 AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e2c8968c96aa8d6cd09e01d193c6ab9973803e97105da4cb573b4221528d1cc830e044feac1b2c8ebe9f17d405 SHA512 ad361aeea566fd23fc21a607c9cdf63b164ad9d38a63fa01f435640af90e49cdb6562cb64409ab873a6603def04f8ecfc164340988c1a0660e8c6bdda500cd9d
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz 41525058 BLAKE2B da456e8415ef45d07968c12082f2351910284b47bac92a952d4962fbc4c63cb2fa006696b6b175e0d1073b1fca76cca61460465d0959afe80d2f5ce9006d9350 SHA512 96b527be34c49e6351bed0d000153c1bc9491cf89f8a7f90190feccd2984cce1e3d18747e108d476c4417f15947d436f20cd34fe88f8126edecf4a789d725b0a
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.3_7.tar.gz 41732132 BLAKE2B 9d3bd543fec6eb6c30eabbbb3ca6073365c5b8900dff9af47cfba5569ecfc33a8e2562ed3f8cf4940b2a7d7c427e48164a94fce1f72c8e98fa7f0fc32d923237 SHA512 b7232a3c75a8c4e67f51bd95c8441026b2bfef29cc779768a5f2d300208dc569d672402e06a2d6c6f512450723bc0631c5a18cde80cbc1ec2028c123607df30f
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz 40856726 BLAKE2B d9d4599989a0232bcc145aaf58b20dbfcedbe33adb2b3ee65b7e726dea350210f66eb81b321268a29d3234244c517642cfe908531242afb220509666e02c0617 SHA512 f9bb03cd0876f6b3b36d8ba821a14648b5ac2ec6dc6eefb95dc333aae77b55c940153cdd1715b21feaf7d7f2148bf8c272777c8afab911965e514f9792287962
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u212b03.tar.gz 40871242 BLAKE2B 8a6eee7f7465cbccc575e44ab08d6a3d2cedc32954475ea71064a4b6d4379927a795225fed7394922bdaa2a425efb6966d6a0126a55a0fa0e68dc0eeb7a6e935 SHA512 3b0c560cce673fa0e9506c18c4a25b56e26c8ccd7874098f55c37f1a556387b4c2d3ba81ef0368cc666178028eef0fd7beac6307588628c8c8c051381a21366f
-EBUILD openjdk-jre-bin-11.0.2_p9.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
-EBUILD openjdk-jre-bin-11.0.3_p7.ebuild 2575 BLAKE2B f2939c9e46d293e67533c27435584b2e592efcee5354c77cd50f17ef5d2e5b2911e66eafe2fe2d170dd72fe485a175c73ea34345a8b7c4566f52d1930e058893 SHA512 90fbaa5cb59729b00c159a46804a0fa6b0381754f4e45f0277baa390aa532ec4b53a76a40882449abc3d674e12a3306e2eb75f926bb9750bd8fe16c11bb1c250
-EBUILD openjdk-jre-bin-8.202_p08.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
-EBUILD openjdk-jre-bin-8.212_p03.ebuild 2407 BLAKE2B eb650d9bc4b90d67e6c914f557bab8bc0210b3ca6967453e25e0782f0006991684a2c92dc9ce544326366c063268e248dac9af92dd2159ca51c9f5097b9c6ab6 SHA512 171ffd95503053cd857acbd4b8014417a577d7c6fce29d20d79fa54cd06717d3ddd69965b6a1a82741a609a043be4f281b956a412f44991d7b605d196ebd0453
+EBUILD openjdk-jre-bin-11.0.3_p7-r2.ebuild 2753 BLAKE2B 2faf9a916ffb567b1dcfc04b84cdce1ad1e509a24993d5af0b0b8c7545eb61e5747c62b6f415f0a9b41210ebfee80d2e89f10903d2cccde31ada118d7cf86924 SHA512 5e3c0d813a2ed17c3816a4db62d72a6f301905d3de53fe4c79e47eefff8056fd412581ac801e96f7150f60e7f52e9c67aaffd84882b68d05d1656614ed1bb3df
+EBUILD openjdk-jre-bin-8.212_p03-r1.ebuild 2585 BLAKE2B 5c04a4f23619b9d6ee335dc24a58ffb2e4806522ebef4179f78168d0c25d51d59a3d6a8822033aafea1d7ae4d4823c4b290fe6902bd9350c08274c755d31b716 SHA512 7f7181844f9021931b38c8939841e496a53f2b3ec4f4e13d8d4f5e98628d1356df89cdc21ebfae003f7dd054f1f5b961f286ccaced04b286f188b046d147c390
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild
deleted file mode 100644
index 1f10efc02641..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.2_p9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
-		)"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Not sure why they bundle this as it's commonly available and they
-	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
-	# also has an explicit dependency while Oracle seemingly dlopens it.
-	rm -vf lib/libfreetype.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7-r2.ebuild
index 1f10efc02641..1c307ac5c275 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.3_p7-r2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -51,7 +52,7 @@ S="${WORKDIR}/jdk-${MY_PV}-jre"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	# Not sure why they bundle this as it's commonly available and they
 	# only do so on x86_64. It's needed by libfontmanager.so. IcedTea
@@ -68,9 +69,13 @@ src_install() {
 		rm -v lib/lib*{[jx]awt,splashscreen}* || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03-r1.ebuild
index 2af8e9e8e29d..072337c14fcf 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.202_p08.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03-r1.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
 	>=sys-libs/glibc-2.2.5:*
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -53,7 +54,7 @@ S="${WORKDIR}/jdk${MY_PV}-jre"
 
 src_install() {
 	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
 
@@ -69,9 +70,13 @@ src_install() {
 			bin/policytool || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
deleted file mode 100644
index 2af8e9e8e29d..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.212_p03.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
-	echo "${2-$1}? (
-			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
-		)"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
-	$(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux +webstart"
-
-RDEPEND="
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	>net-libs/libnet-1.1
-	>=sys-libs/glibc-2.2.5:*
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXtst
-	)"
-
-PDEPEND="
-	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
-	# this does not exist on arm64 hence -f
-	rm -fv lib/*/libfreetype.so* || die
-
-	if ! use alsa ; then
-		rm -v lib/*/libjsoundalsa.so* || die
-	fi
-
-	if use headless-awt ; then
-		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
-			bin/policytool || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports OpenJDK 8. This JRE must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/opt/${P}."
-	fi
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index ffd589d9957f..5fc15ab3ad8a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,26 +1,15 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX openjdk-11.env.sh 537 BLAKE2B 404aeaf3d4df54b66193b8e09521ad2e55a23dc0603beea9911e4c91ab96e30c0f4aa4a0e96b1982874e055af3b9923689657b58dc02b37f91163659343ed2f9 SHA512 f4a41891b0187048a21b1af43053375e62de249e3ba210c3cfd59178c9f4c667ff83f10ee85f9ae37db097e862ff7233f5136569d0cb1399dbf48cea075cfc6e
 AUX openjdk-8.env.sh 746 BLAKE2B b8a18bb5e2dd3c4722b78531428d4291236a6295973fdcd65c64469b3a49a520686ff8d884c0b3d5dd9017ff4027d2fc1d78d57f062a4cf8910e0bab3ed444cc SHA512 2c65d1875406deabbfadb798501de15850775a4a049f073cdfda684ca1bff4b531b93596ee91a7caf77ff6c377457093f72c7bde4b995bce9ffbc4a8fcceb6dd
-DIST jdk-11.0.2+7.tar.bz2 90189455 BLAKE2B 37473a8db4c6ad6789ea67b44f4dda94b9f59143c681a206aa0931b3a2a376fbc480c0c5a6b617072cf9ce1faca34a6c5c5e56cfec9fbf5482b82520fb2463c4 SHA512 03214d9fc920c04f3057594efa78ff588a630e6c594e5bbcc24b4c327fa08273ce060063d98720cdc04bc6978a3d04e172f38ba7a3bcabf02dd5dad397fd9952
 DIST jdk-11.0.3+7.tar.bz2 90300528 BLAKE2B db566140028ddbf9f6e10eaaac018ddf3ad13a954500c73abde8aec5c673c375f2cf0e56bc75c410a4ff90e6cb8e9c4580bb5719786e34865f00a92bd3ea8431 SHA512 46c1c13165e7d5ef480052810ccdc1b5d55f6b2b542e10303d3940536df7f17bf3d8a0cf774e73dc25af7cd69432790656a03c66d2df9efaf71cb9e44c2da684
-DIST openjdk-8.202_p08.tar.bz2 449202 BLAKE2B 8f7442918c083e94cda0e029cf2348dd9242653027f84d66deebe162e0928b2c6a86d3f273ba235bad5e5656f2b109e6521aaccfa81332fea92873d008ac0c0d SHA512 586713b889dd60c7dc65fccd39ef3ddd985ebb95a7c6c1feaef3c8d76fd1d929bbf19a99f72274c1afb77bd7f80b581d44add4aa232358d8951f7cc5befb43d0
 DIST openjdk-8.212_p03.tar.bz2 451800 BLAKE2B f8466a0d99650a07e3ff21e8dc06252ef9d31ce15e22c6ede15fc4c7b1633820e84e67aa501e816101c6bd473293fb897645b2df1530d8f7b81c6e8e6d38ce3a SHA512 ccc642da05aa00cfcc46c1eb759391dd2242218b7392bced77481600aa15b3b1d0a0c03380f59b6a6d038311721f249de1a6b116c6f651193cfb57b89fba4866
-DIST openjdk-corba-8.202_p08.tar.bz2 1033539 BLAKE2B 9cbe20fb771157142329db037866ec7d67ff7e70318bec8b74034ce59574cd730975f0e7a3d6b88fc946b1d340558a92ca867639765a205883481fd071d7059e SHA512 9b25132c76f559055698c52888f6cae287096e05b89541cb8e445b46a488126a38e58d4f28649e277862eac7aa20f75f64dbcdcf56c900dcb0530a9545c4f717
 DIST openjdk-corba-8.212_p03.tar.bz2 1033709 BLAKE2B f59b294e62425b63e881ed5534ae9beb3cc51351ff197995503671ec52ad82e34e145f8c9790dc88e4f452b4e09af80143fd0f7e0fda588b00eed08d4b2bc861 SHA512 3a786a372ab6b849a6ccd944cdfdc0aa9994a6a9f4d52afccad7d6b187e46a1fd0be30bde3da1eb03988034c36b4590b55379819245fb6f5ed4d75a958e9caa3
-DIST openjdk-hotspot-8.202_p08.tar.bz2 7918616 BLAKE2B a35cedf99a5067896dc498d4baa9b10f4ceb1ffcf946632b578c45d6354e4d025d82462797e56773507e504e5e25a25cdf63485460f9a8df234474a2e110f91a SHA512 ab53e77a4081a34c250750d7b975f790936cf370e81807d0081b006a12c0ceb452f54bd40cc8085a9f16047d270b9b610ee777f6fcd1431ff9d77461c32db464
 DIST openjdk-hotspot-8.212_p03.tar.bz2 7925246 BLAKE2B b405362450186d50228ddaf78907a98365c34d5e09a95064dc39bbc88328d1bf37e23791322fb68a44d90753cd68139627d235852dd1e03ad2b0535982badeaf SHA512 e8c8f9151c94bd821fa6810a0c70ed2749e0c39f66108deccc68718f106eb1731c91b13fb502c4a4be425ee04ecd909937247efb5891aac1ca27ee16d7bbf290
-DIST openjdk-jaxp-8.202_p08.tar.bz2 2733553 BLAKE2B 53341136b427152115ea0d4f758228090a607270104c88ebb61bc442ddd51a43cfed03c34660a47ab55bb601e1a9d8bf4fcdab05874bf0a5ada33b1ecb60df45 SHA512 9671fb56b6127359376cc2f85d91eb027fb1df1f808e36abbe3a1265d88d50809c34d73b84f52fb6e058ef78017d8d7a24bd097a9d720ad70a6861aa9fcc80f2
 DIST openjdk-jaxp-8.212_p03.tar.bz2 2734510 BLAKE2B fa920514fd499019a8f3d03edf895c11b3d67617b645444025cc5406216fed0ecb9340a08b8e314c43d0ced0ffbc1e3940f7c719930d5e4cdf9b24653d6249f8 SHA512 200516ef92b9fd50b4e7814b2f5f62c344b4654c8c836e0166c9e3669992d2fe231d3e262bc9be54d8793d6c4a3d6bdee5c93a6b6a3b6481d6a234f26dfb2a32
-DIST openjdk-jaxws-8.202_p08.tar.bz2 2541554 BLAKE2B a92aae4290e1901b736a6a93aed3b8c4bca14046a1f3eb9939ea9bf8ae0cd09785cf37045a8274641f13e543b49114ff158b9bc0cdd58163b42791e952ac76d0 SHA512 ce385f247a57695f716894137d868fa492d610776d120966c86b741688d6df54ae9538da7cf7b9530212a288ac4ff0d156e09bd5d01305b8165b939fa518fede
 DIST openjdk-jaxws-8.212_p03.tar.bz2 2540937 BLAKE2B 53c2793d9071f408a3704dacc4d61ac8f1b8ead33e75d309f217a05514661f14656711d017bcdde5821e114c5010d4417ac283571c2a52c28885d6736468402e SHA512 3e336e8cab78636b82488b7da183ba4ba2b84c0a2cb72a369c4352aaeb0fa5da05660c830db12a486e1cdfbc7a88a748d88284ca86c45b890a40dc1d23f3915a
-DIST openjdk-jdk-8.202_p08.tar.bz2 46618401 BLAKE2B e73b1341b837a0983ded4b4969ce83f9b77283e1d4d51e8d31a1b7401961a0b78943a41d2fe0aa724d85ac93dc3082511bcea341e87daecd070278ae59c8f240 SHA512 20e6747b506091383166298aeed6ff4ffd9deb92f20765ef839bf46d3ecae6b1aa218eb6857e6541df0522b8d571379341e94eb5bef765a1164cf9f59b20dfac
 DIST openjdk-jdk-8.212_p03.tar.bz2 46720739 BLAKE2B af515701052ede8b6cf828cc74f1f5938dad0874a12ed3c5c3f7b03be1f43108fce5e1820452a87e098c3469922227950f6f4fea33306f7b426487b48cc4b993 SHA512 9b3342419c82a8f243d2a7523d83b395c89629820fd99ba387991656e5754ed067877bf12b7e780368dd4bdb6eba10be09e63b1301bcbc0aa29e86e84ec394a3
-DIST openjdk-langtools-8.202_p08.tar.bz2 2392880 BLAKE2B 45ebebe4864e3274e14cf27986cd96facfe2f8e5c1292344e05743d1448f95367caf0f68886c506ce10435fbf53948c6b9f7087ad5d2cd090cf0f1becb962843 SHA512 a1e1c3dc06b3a58082e1d67d58ffeaf0bc3c5534fd1ba368e835a54d3c6ba9232e277ae685ed3ff5ccdf3cd7fe0612ad78a08ed55d1d2d06de54914a19377907
 DIST openjdk-langtools-8.212_p03.tar.bz2 2393112 BLAKE2B 96656795114bad1d2e5eabace5d1c6568646084421fbaa43045ce0ec8d222f1a7e8629e4b86bdd5ff8eb51e90ea1eaafab3e94f34c41932754249f17b2e447f8 SHA512 15b931432cb14cf60c73627bd70e66f6d18ff25763a7b8758109cf8746d278d6c2b5d945a9f0b948a76c0813b5f42c988a3d10ac13165ec12e0f4d9eab98f369
-DIST openjdk-nashorn-8.202_p08.tar.bz2 2854026 BLAKE2B 05ba828160270e52f27023db83b1ffc4e6611b7a74b300a93a6d476f319a265834b48c7de57b0d3bea502d88279e72fd9cfbc5f3eb0e719650e34e82ba4a3d09 SHA512 bea0eaa4b2247cf1e5ee33613754c8f2f6ffe074a7be562f26e63c6327f56d67f60d4877dd363ed8a812689db1d837f5c257637460e247a1592c3258f3add11b
 DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
-EBUILD openjdk-11.0.2_p7.ebuild 5902 BLAKE2B f1cc664b678083e0562941837947798c92a64c4e00d16c3f9463877b68b3f18516e747a2f176cb12275e6efee5bb751aaedaf32f24057d4ac972db442f68afda SHA512 d4b49df6be291a6876ea04115909806e16102de96bbbe9d3e614c1ba7ff136e3062c73a9f464d1ad35a34efab4a82f1ed11514767e56febcbc5f49f86d390d9d
-EBUILD openjdk-11.0.3_p7.ebuild 6121 BLAKE2B dbce68ee1e261c329ce13dbb17f43cf5c4441bf5b64c085180bbf7074252ebf98fa55d42083b3ced85194132de75f202beb94a6270694681566133b604cdb871 SHA512 e14acf622315f699dad6f7f9bb41fc911658311cb7d1628d1b61e7e1d82b709a51a438f954d68bed0e1c360281c44779aca11e38159b209f28dd9429e5aff345
-EBUILD openjdk-8.202_p08.ebuild 7135 BLAKE2B 367571346274382c2442fa350517a5a1271def6c376a141d2719100e5776f5822d96691dab389b37b20a1baf370e8228fa6c9bba47d07660b95aa8bf8c0e3225 SHA512 5aecfd0bb06fdd13994ead308d1641018f002ab4b037df535b6c17c5876953ef656f6baf7a32fd976edf2b661685b21906ad65cddd040cd2c10d366f6fed2188
-EBUILD openjdk-8.212_p03.ebuild 7319 BLAKE2B 304bc5decc78bdc2f2faddc16ea9aab7fccbcd5ac13d61bddc632947898d72fd5ebddca519609118df50ad0bbbb3dec0ef5c19ad546c3a4060b47284e96d08bc SHA512 e8215d1c26fac6949a384cd39a830f4428b285853db6cd9c50c3805e1880ed4e3d85ca7042ea50f00b29470c85b4da2086474454103bba6a71d8412923073a6c
-MISC metadata.xml 1053 BLAKE2B bc7d07c481cee341f2778eef806dae3484592c5c8ca8e015ab4cca6dc64b8d225e1eff1f03f9c7b4d06751282e566624644348eece51dbb03a603b960b6ed84d SHA512 4a749d32cf21c2a517558c2e06ed9e5cd2470db8ba758847f727a8da82252a209e00c3d23f8896d5fb99aeb4f07df8717764a2f52c81261050b88dc91b61dab7
+EBUILD openjdk-11.0.3_p7-r3.ebuild 6580 BLAKE2B f585ddb24bfed4927e4caa947afdb28d62149f9d2bb15e41039a54d55958328c1afb52a7bcd277cdf81fcb008bc4167c711ef4998d1fed57176a187adebd35fe SHA512 a66032f37b6129eeb147bc0572d64b5f90eb96ffd20328d4a29278fa39e26c74cd0291263d133beaf8dcd54e144be83a896ebd3e8b1887029ac719f0e4260f19
+EBUILD openjdk-8.212_p03-r3.ebuild 7267 BLAKE2B dbdfaddfdc2e66a19cff88144f5d1bbe46698f100766a229df1c1497fca1bd60e0f93d2907429671d6875e5ad8909a154aa8ab01adddaa897dfb811239d1e4b6 SHA512 b74b6c4a9ba9961c6b8050e5778ab3efb5b6a4498dbece6f7496ab3e7e2ba93d7f96a93549dae2e72ec6a46126642af33d606e1ab6d62585cc85602318a55bcf
+MISC metadata.xml 1263 BLAKE2B 10b2f20ba3d3627539ca0d3ed16dc6036b6966811582a6d333c90fbcdcb7ba8997c0b8dd4f0a14b58824e46d9afd2ef95f70faa2e67ae7ea4cb20d03dad3f5d4 SHA512 23416f1799ab40e2d12f96f6fc3f09a8c5e4e6896f6eef40a88f403cf51b12813992b3052ecae8bb715cafc0fc162bd065422774991adbf32dac97c8bac61461
diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml
index e75b49c2ec09..302f56980357 100644
--- a/dev-java/openjdk/metadata.xml
+++ b/dev-java/openjdk/metadata.xml
@@ -13,12 +13,16 @@
 		Java™ is the world's leading programming language and platform.
 		The code for Java is open source and available at OpenJDK™.
 	</longdescription>
+	<slots>
+		<slot name="8">Java™ 8 is Java™ 1.8, where 8 is the version number, and 1.8 is the version string</slot>
+		<slot name="11">Java™ version 11</slot>
+	</slots>
 	<use>
 		<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag>
 		<flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag>
 		<flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag>
 		<flag name="source">Install JVM sources</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap" restrict="&gt;=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild b/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
deleted file mode 100644
index b03e8a2da400..000000000000
--- a/dev-java/openjdk/openjdk-11.0.2_p7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
-
-CDEPEND="
-	media-libs/freetype:2=
-	sys-libs/zlib
-	systemtap? ( dev-util/systemtap )
-	!headless-awt? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-"
-
-# cups and alsa required to build, but not to run, make is possible to remove
-RDEPEND="
-	${CDEPEND}
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	media-libs/alsa-lib
-	net-print/cups
-	!headless-awt? (
-		x11-base/xorg-proto
-	)
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-	)
-"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-}
-
-src_configure() {
-	# Work around stack alignment issue, bug #647954. in case we ever have x86
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	# Enabling full docs appears to break doc building. If not
-	# explicitly disabled, the flag will get auto-enabled if pandoc and
-	# graphviz are detected. pandoc has loads of dependencies anyway.
-	# currently it still bundles lcms libpng giflib and libjpeg.
-
-	local myconf=(
-		--disable-ccache
-		--enable-full-docs=no
-		--with-boot-jdk="${JDK_HOME}"
-		--with-extra-cflags="${CFLAGS}"
-		--with-extra-cxxflags="${CXXFLAGS}"
-		--with-extra-ldflags="${LDFLAGS}"
-		--with-native-debug-symbols=$(usex debug internal none)
-		--with-version-pre=gentoo
-		--with-version-string=${MY_PV%+*}
-		--with-version-build=${MY_PV#*+}
-		--with-zlib=system
-		--enable-dtrace=$(usex systemtap yes no)
-		--enable-headless-only=$(usex headless-awt yes no)
-	)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	emake -j1 \
-		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
-		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/jdk || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but OpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v lib/src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/images/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
index 026d272de5ec..960d7ca146c6 100644
--- a/dev-java/openjdk/openjdk-11.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.3_p7-r3.ebuild
@@ -17,10 +17,21 @@ KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 IUSE="alsa cups debug doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source systemtap +webstart"
 
-CDEPEND="
+COMMON_DEPEND="
 	media-libs/freetype:2=
+	media-libs/giflib:0/7
+	media-libs/libpng:0=
+	media-libs/lcms:2=
 	sys-libs/zlib
+	virtual/jpeg:0=
 	systemtap? ( dev-util/systemtap )
+"
+
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
 	!headless-awt? (
 		x11-libs/libX11
 		x11-libs/libXext
@@ -29,32 +40,33 @@ CDEPEND="
 		x11-libs/libXt
 		x11-libs/libXtst
 	)
-"
-
-# cups and alsa required to build, but not to run, make is possible to remove
-RDEPEND="
-	${CDEPEND}
 	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	selinux? ( sec-policy/selinux-java )
 "
 
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	app-arch/zip
 	media-libs/alsa-lib
 	net-print/cups
-	!headless-awt? (
-		x11-base/xorg-proto
-	)
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
 		dev-java/openjdk:${SLOT}
 	)
 "
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+"
 
 S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
 
@@ -123,7 +135,6 @@ src_configure() {
 	# Enabling full docs appears to break doc building. If not
 	# explicitly disabled, the flag will get auto-enabled if pandoc and
 	# graphviz are detected. pandoc has loads of dependencies anyway.
-	# currently it still bundles lcms libpng giflib and libjpeg.
 
 	local myconf=(
 		--disable-ccache
@@ -132,6 +143,10 @@ src_configure() {
 		--with-extra-cflags="${CFLAGS}"
 		--with-extra-cxxflags="${CXXFLAGS}"
 		--with-extra-ldflags="${LDFLAGS}"
+		--with-giflib=system
+		--with-lcms=system
+		--with-libjpeg=system
+		--with-libpng=system
 		--with-native-debug-symbols=$(usex debug internal none)
 		--with-vendor-name="Gentoo"
 		--with-vendor-url="https://gentoo.org"
@@ -163,7 +178,8 @@ src_configure() {
 
 src_compile() {
 	emake -j1 \
-		$(usex jbootstrap bootcycle-images product-images) $(usex doc docs '') \
+		$(usex doc docs '') \
+		$(usex jbootstrap bootcycle-images product-images) \
 		JOBS=$(makeopts_jobs) LOG=debug CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
 }
 
@@ -187,9 +203,13 @@ src_install() {
 		rm -v lib/src.zip || die
 	fi
 
+	mv lib/security/cacerts lib/security/cacerts.orig || die
+
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
+
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
 	java-vm_revdep-mask
diff --git a/dev-java/openjdk/openjdk-8.202_p08.ebuild b/dev-java/openjdk/openjdk-8.202_p08.ebuild
deleted file mode 100644
index 9936ca2b9e1e..000000000000
--- a/dev-java/openjdk/openjdk-8.202_p08.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
-	${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
-	${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
-	${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
-	${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
-	${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
-	${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
-	${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
-	${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
-
-CDEPEND="
-	media-libs/freetype:2=
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	!headless-awt? (
-		media-libs/giflib:0/7
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXtst
-	)
-"
-
-RDEPEND="
-	${CDEPEND}
-	cups? ( net-print/cups )
-	selinux? ( sec-policy/selinux-java )
-"
-
-# cups headers requied to build, runtime dep is optional
-DEPEND="
-	${CDEPEND}
-	net-print/cups
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl:0
-	media-libs/alsa-lib
-	!headless-awt? (
-		x11-base/xorg-proto
-	)
-	|| (
-		dev-java/openjdk-bin:${SLOT}
-		dev-java/icedtea-bin:${SLOT}
-		dev-java/openjdk:${SLOT}
-		dev-java/icedtea:${SLOT}
-	)
-"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
-	local M
-	M=2048
-	M=$(( $(usex debug 3 1) * $M ))
-	M=$(( $(usex jbootstrap 2 1) * $M ))
-	M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
-	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
-	openjdk_check_requirements
-	has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
-	openjdk_check_requirements
-	java-vm-2_pkg_setup
-
-	JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
-	JAVA_PKG_WANT_SOURCE="${SLOT}"
-	JAVA_PKG_WANT_TARGET="${SLOT}"
-
-	# The nastiness below is necessary while the gentoo-vm USE flag is
-	# masked. First we call java-pkg-2_pkg_setup if it looks like the
-	# flag was unmasked against one of the possible build VMs. If not,
-	# we try finding one of them in their expected locations. This would
-	# have been slightly less messy if openjdk-bin had been installed to
-	# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
-	# file but disable it so that it would not normally be selectable.
-
-	local vm
-	for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
-		if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
-			java-pkg-2_pkg_setup
-			return
-		fi
-	done
-
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
-		export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
-	else
-		JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
-		[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
-		JDK_HOME=${JDK_HOME#*/}
-		JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
-		export JDK_HOME
-	fi
-}
-
-src_prepare() {
-	default
-	chmod +x configure || die
-	local repo
-	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
-		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
-	done
-
-	# linux 5 is ok https://bugs.gentoo.org/679506
-	sed -i '/^SUPPORTED_OS_VERSION/ s/ 4%/ 4% 5%/' hotspot/make/linux/Makefile || die
-}
-
-src_configure() {
-	# general build info found here:
-	#https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
-	# Work around stack alignment issue, bug #647954.
-	use x86 && append-flags -mincoming-stack-boundary=2
-
-	append-flags -Wno-error
-
-	local myconf=(
-			--disable-ccache
-			--enable-unlimited-crypto
-			--with-boot-jdk="${JDK_HOME}"
-			--with-extra-cflags="${CFLAGS}"
-			--with-extra-cxxflags="${CXXFLAGS}"
-			--with-extra-ldflags="${LDFLAGS}"
-			--with-giflib=system
-			--with-jtreg=no
-			--with-jobs=1
-			--with-num-cores=1
-			--with-update-version="$(ver_cut 2)"
-			--with-build-number="$(ver_cut 4)"
-			--with-milestone="gentoo"
-			--with-zlib=system
-			--with-native-debug-symbols=$(usex debug internal none)
-			$(usex headless-awt --disable-headful '')
-		)
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		myconf+=( --enable-precompiled-headers )
-	else
-		myconf+=( --disable-precompiled-headers )
-	fi
-
-	(
-		unset _JAVA_OPTIONS JAVA JAVAC XARGS
-		CFLAGS= CXXFLAGS= LDFLAGS= \
-		CONFIG_SITE=/dev/null \
-		econf "${myconf[@]}"
-	)
-}
-
-src_compile() {
-	emake -j1 LOG=debug JOBS=$(makeopts_jobs)\
-		$(usex jbootstrap bootcycle-images images) $(usex doc docs '')
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	cd "${S}"/build/*-release/images/j2sdk-image || die
-
-	if ! use alsa; then
-		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples ; then
-		rm -vr demo/ || die
-	fi
-
-	if ! use source ; then
-		rm -v src.zip || die
-	fi
-
-	dodir "${dest}"
-	cp -pPR * "${ddest}" || die
-
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
-	java-vm_set-pax-markings "${ddest}"
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}"/build/*-release/docs/*
-	fi
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if use gentoo-vm ; then
-		ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
-		ewarn "recognised by the system. This will almost certainly break things."
-	else
-		ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
-		ewarn "will not be recognised by the system. For example, simply calling"
-		ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
-		ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
-		ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
-	fi
-}
diff --git a/dev-java/openjdk/openjdk-8.212_p03.ebuild b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
index e190f2bf302a..b10d08e19c72 100644
--- a/dev-java/openjdk/openjdk-8.212_p03.ebuild
+++ b/dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
@@ -27,12 +27,17 @@ SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
 
-CDEPEND="
+COMMON_DEPEND="
 	media-libs/freetype:2=
+	media-libs/giflib:0/7
 	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
+"
+# Many libs are required to build, but not to run, make is possible to remove
+# by listing conditionally in RDEPEND unconditionally in DEPEND
+RDEPEND="
+	${COMMON_DEPEND}
+	>=sys-apps/baselayout-java-0.1.0-r1
 	!headless-awt? (
-		media-libs/giflib:0/7
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
@@ -40,26 +45,23 @@ CDEPEND="
 		x11-libs/libXt
 		x11-libs/libXtst
 	)
-"
-
-RDEPEND="
-	${CDEPEND}
+	alsa? ( media-libs/alsa-lib )
 	cups? ( net-print/cups )
 	selinux? ( sec-policy/selinux-java )
 "
 
-# cups headers requied to build, runtime dep is optional
 DEPEND="
-	${CDEPEND}
-	net-print/cups
+	${COMMON_DEPEND}
 	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl:0
 	media-libs/alsa-lib
-	!headless-awt? (
-		x11-base/xorg-proto
-	)
+	net-print/cups
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst
 	|| (
 		dev-java/openjdk-bin:${SLOT}
 		dev-java/icedtea-bin:${SLOT}
@@ -68,8 +70,10 @@ DEPEND="
 	)
 "
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+"
 
 S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
 
@@ -133,9 +137,9 @@ src_prepare() {
 	for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
 		ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
 	done
-
-	# linux 5 is ok https://bugs.gentoo.org/679506
-	sed -i '/^SUPPORTED_OS_VERSION/ s/ 4%/ 4% 5%/' hotspot/make/linux/Makefile || die
+	# new warnings in new gcc https://bugs.gentoo.org/685426
+	sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
+		hotspot/make/linux/makefiles/gcc.make || die
 }
 
 src_configure() {
@@ -145,8 +149,6 @@ src_configure() {
 	# Work around stack alignment issue, bug #647954.
 	use x86 && append-flags -mincoming-stack-boundary=2
 
-	append-flags -Wno-error
-
 	local myconf=(
 			--disable-ccache
 			--enable-unlimited-crypto
@@ -186,13 +188,15 @@ src_configure() {
 }
 
 src_compile() {
-	emake -j1 LOG=debug JOBS=$(makeopts_jobs)\
-		$(usex jbootstrap bootcycle-images images) $(usex doc docs '')
+	emake -j1 \
+		$(usex doc docs '') \
+		$(usex jbootstrap bootcycle-images images) \
+		JOBS=$(makeopts_jobs) LOG=debug
 }
 
 src_install() {
 	local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
-	local ddest="${ED}${dest#/}"
+	local ddest="${ED%/}/${dest#/}"
 
 	cd "${S}"/build/*-release/images/j2sdk-image || die
 
@@ -200,6 +204,12 @@ src_install() {
 		rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
 	fi
 
+	# stupid build system does not remove that
+	if use headless-awt ; then
+		rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
+		{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
 	if ! use examples ; then
 		rm -vr demo/ || die
 	fi
@@ -211,15 +221,7 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR * "${ddest}" || die
 
-	einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
+	dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
 
 	use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
 	java-vm_set-pax-markings "${ddest}"
diff --git a/dev-java/proguard/Manifest b/dev-java/proguard/Manifest
deleted file mode 100644
index 776aa6098169..000000000000
--- a/dev-java/proguard/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST proguard4.5.tar.gz 1827325 BLAKE2B a8bc7f8527f98094c08d178b0544e44e09b3ee03b8a100bba7a978b70ca60b655a12fbca822bd0bb60c1d81c9b83cfb61ebe7bbde6b2f854de962ede23c75d82 SHA512 bf1d9c29a4b3e1ba8062632b0f7f97e8f8d3dd2fbfbdc4bbbe98fa76151721fa45b22a1d99890654c557f3a1b87b45038d4882c0cb192b907ec2c65f4e7429fa
-DIST proguard4.8.tar.gz 1914047 BLAKE2B e32b9eab0b9d91fb7e565c881659582c3c90ebe3b068e79aecd62b7e5200420ef61ae4f303e654329e46627d8c746747019347baae74cf23ed791dc89e8a0197 SHA512 f06c98c784a71fa9e2c137c6bc4c062dfcf2eeaa28653b909b475226cf133fb67821128a3fb6ab0702807cd229330da8b64e810d9078d0b7510083453feffa10
-DIST proguard5.2.1.tar.gz 2160584 BLAKE2B 35cedaee26a8f8fb3ae28843f55867277817bdde28603c615ce4bea0b5fb8babf35b49ae494cde0b0496117077aa2984197bb06915f50699b5a5dc66197f2601 SHA512 7c2735860d689f9002e40e7a5304eb61f8fb8abc1da36ea62fa32541cdf2e655bb2d27814e2b8137d29a1ab02a57c57961491612ea8e735788fdea719e6239be
-EBUILD proguard-4.5.ebuild 1373 BLAKE2B 26d8f3e57bc3ec9de4ea55405bf2debbeac7c936a2746ec2b563936569b333488181f96677db1a855f5325cd224c44b7380fff596071ea331e349fb39232b3d1 SHA512 e1bd489456b0e92984b720dc9dbe75a473d2c4b7e5be6386e2bdebe2fa576da71f8cad4130fc4610bd88e163dce545e231cbb0d187f45ce3ff656bd0075fe558
-EBUILD proguard-4.8.ebuild 1369 BLAKE2B d6ab343bcda2e49dc203ce490af88dd1ff9bd7c0f47ba4a86fcee8c1455d3d636cba2d401639e3bc262b2ae3b3270fb12af710426fa064bba6e60fd7431775ce SHA512 67464340d8d54cd48937af8c8bb3cf6d74528e1017993f9e952d5aabd0fa4437222f9816331d270f3a1facacdec7be5cd56f20ad7bd4d3a043541753adf59ea3
-EBUILD proguard-5.2.1.ebuild 1582 BLAKE2B f5858a345acb37507e56cc9af29ac9d4efeea6bbf61f1f7a59b4ee8205fd8b54a6790ea395efa8614ab15953ba550972030ea040e4da565ba53fe13f229cad48 SHA512 3eb6154de15044062f182a1a0b0a3d58cb2f356e4d811ce4631ebcad81b1b22f671e75fcaa2badab43dd146e23db1d5ccaffbfeb1beef5a307e9fec023cb1b09
-MISC metadata.xml 404 BLAKE2B 93773f7c921b25ff141a8696b04ca82b4b88db47b1bfc186f34b06a4990f6db0eb6c50cdd435621cdc36b44edbb63dcdc8f063c7f52cdb4a42356bbde4076215 SHA512 526e2a3438bf9c71febee16baf33d3c05dc2680e5c54bf6290292cf7f6e09c979e318883e053f582fce55c28ab1b1654cffcdfb98b74b3f414f05ce0d061e887
diff --git a/dev-java/proguard/metadata.xml b/dev-java/proguard/metadata.xml
deleted file mode 100644
index 033beb86046d..000000000000
--- a/dev-java/proguard/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="ant">Ant task for using ProGuard in build.xml scripts</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">proguard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/proguard/proguard-4.5.ebuild b/dev-java/proguard/proguard-4.5.ebuild
deleted file mode 100644
index d2cf182ea8e4..000000000000
--- a/dev-java/proguard/proguard-4.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java class file shrinker, optimizer, and obfuscator"
-HOMEPAGE="http://proguard.sourceforge.net/"
-MY_P=${P/-/}
-MY_P=${MY_P/_/}
-SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ant"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7:0"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	find "${S}" -name "*.jar" | xargs rm -v
-}
-
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="basic"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	local antarg
-
-	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-
-	java-pkg-2_src_compile \
-		$(use ant && echo anttask ${antarg})
-
-	if use doc; then
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src -classpath $${cp} -subpackages proguard || die "Cannot compile javadoc"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar lib/*
-	java-pkg_dolauncher ${PN} --main proguard.ProGuard
-	java-pkg_dolauncher ${PN}gui --main proguard.gui.ProGuardGUI
-	java-pkg_dolauncher ${PN}_retrace --main proguard.retrace.ReTrace
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/proguard/proguard-4.8.ebuild b/dev-java/proguard/proguard-4.8.ebuild
deleted file mode 100644
index cf8bbd6043ec..000000000000
--- a/dev-java/proguard/proguard-4.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java class file shrinker, optimizer, and obfuscator"
-HOMEPAGE="http://proguard.sourceforge.net/"
-MY_P=${P/-/}
-MY_P=${MY_P/_/}
-SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ant"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4
-		>=dev-java/ant-core-1.7:0"
-
-S=${WORKDIR}/${MY_P}
-
-java_prepare() {
-	find "${S}" -name "*.jar" -delete
-}
-
-EANT_BUILD_XML="build/build.xml"
-EANT_BUILD_TARGET="basic"
-EANT_DOC_TARGET=""
-
-src_compile() {
-	local antarg
-
-	use ant && antarg="-Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-
-	java-pkg-2_src_compile \
-		$(use ant && echo anttask ${antarg})
-
-	if use doc; then
-		mkdir javadoc || die
-		javadoc -d javadoc -sourcepath src -classpath $${cp} -subpackages proguard || die "Cannot compile javadoc"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar lib/*
-	java-pkg_dolauncher ${PN} --main proguard.ProGuard
-	java-pkg_dolauncher ${PN}gui --main proguard.gui.ProGuardGUI
-	java-pkg_dolauncher ${PN}_retrace --main proguard.retrace.ReTrace
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/proguard/proguard-5.2.1.ebuild b/dev-java/proguard/proguard-5.2.1.ebuild
deleted file mode 100644
index 65571a4f9427..000000000000
--- a/dev-java/proguard/proguard-5.2.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java class file shrinker, optimizer, and obfuscator"
-HOMEPAGE="http://proguard.sourceforge.net/"
-MY_P=${P/-/}
-MY_P=${MY_P/_/}
-SRC_URI="mirror://sourceforge/proguard/${MY_P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ant examples"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5
-	>=dev-java/ant-core-1.7:0"
-
-S=${WORKDIR}/${MY_P}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_XML="buildscripts/build.xml"
-EANT_BUILD_TARGET="basic"
-EANT_DOC_TARGET=""
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-}
-
-src_compile() {
-	local anttask=""
-
-	if use ant; then
-		anttask="anttask"
-		EANT_GENTOO_CLASSPATH="ant-core"
-	fi
-
-	java-pkg-2_src_compile ${anttask}
-
-	if use doc; then
-		local EXCLUDE="proguard.gradle:proguard.wtk"
-		use ant || EXCLUDE+=":proguard.ant"
-
-		local CP="$([[ -n ${EANT_GENTOO_CLASSPATH} ]] && java-pkg_getjars ${EANT_GENTOO_CLASSPATH})"
-		ejavadoc -d javadoc -sourcepath src -classpath "${CP}" -subpackages proguard -exclude "${EXCLUDE}"
-	fi
-}
-
-src_install() {
-	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher ${PN} --main proguard.ProGuard
-	java-pkg_dolauncher ${PN}gui --main proguard.gui.ProGuardGUI
-	java-pkg_dolauncher ${PN}_retrace --main proguard.retrace.ReTrace
-
-	if use doc; then
-		dohtml -r docs/*
-		java-pkg_dojavadoc javadoc
-	fi
-
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/sat4j-core/Manifest b/dev-java/sat4j-core/Manifest
deleted file mode 100644
index 72830a7867ed..000000000000
--- a/dev-java/sat4j-core/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST sat4j-core-2.2.0-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
-DIST sat4j-core-2.3.1-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
-DIST sat4j-core-v20100623.zip 383901 BLAKE2B eb24cf0eed64da1d86243339644ab031e8ceceb37d6379ec5cc88e983099fb1451a55f1ffff88219eba786f015d7df3dc40284214675a0388371d6f878d3f317 SHA512 60020df4cb07a1498c3e77463b9f940a65de98de995d9f3cc0308133e264d891de4d835bf4dd28c09da34b758e4edf4a28b661805ab85028a4cb6a519e128276
-DIST sat4j-core-v20111030.zip 443396 BLAKE2B a3940480f41fc43707d5d348db30c56488deef8a7b45a1d44b6e5e84c807f41a472da5c2a15bad08c0392db2f772fc433188ea9040033fa3e6cb6b103e4a8ce5 SHA512 bb54221f70b99fb32786e37b6ab58e78cb353d8b614b76c7ef8898d0f0b2ec94f800e13f58712f994644cef24bcdc30a8ee76a513ca01db94ddb9fbff06e1550
-EBUILD sat4j-core-2.2.0.ebuild 1385 BLAKE2B fa6bc9d54618d3fae13bcd80ec2503a3709a5a4f266312d7447e94d78a443af878ccd2db37181b188ac47fd1f74c903f405ff6d554d72898466c0f2094ad3369 SHA512 36ae4e71af98bad416020af6bbfa9eb42341271a2498890788323f44cc4ed3c00c82867ee558d9b945e828269d73ca7245fa1bdff53a8bc1ce997483f8f56c48
-EBUILD sat4j-core-2.3.1-r1.ebuild 1387 BLAKE2B 986501c6dd042fe8da6c4c2c35e70d9db9cead1b0850ccbb9952b680394ecbe78b38bcc56c8cccd4e859c9df10520470504c3ce0e9083e79061654194df957eb SHA512 0ac619c5b750b8e33872cc83756be62e7c160cb1886e578bf4e683e6bb217678149bb6aa75041baef5e92d2e145152d5569de77d0449138beb1e675cf1b7dab9
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sat4j-core/metadata.xml b/dev-java/sat4j-core/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/sat4j-core/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild b/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
deleted file mode 100644
index 2f749da534ce..000000000000
--- a/dev-java/sat4j-core/sat4j-core-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-MY_PN="org.${PN//-/.}"
-MY_PV="20100623"
-BUILD_PV="2.4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight constraint programming with a SAT solver"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${PN}-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p core/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Version file is gone.
-	sed -e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		-e '/<replace/d' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# Unpack manifest.
-	cd core || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-EANT_BUILD_TARGET="core"
-EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/core
-	use source && java-pkg_dosrc core/src/org
-}
diff --git a/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild b/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
deleted file mode 100644
index 13a3083381cb..000000000000
--- a/dev-java/sat4j-core/sat4j-core-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-MY_PN="org.${PN//-/.}"
-MY_PV="20111030"
-BUILD_PV="2.4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Lightweight constraint programming with a SAT solver"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/${PN}-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2.3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${PN}-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p core/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Version file is gone.
-	sed -e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		-e '/<replace/d' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# Unpack manifest.
-	cd core || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-EANT_BUILD_TARGET="core"
-EANT_DOC_TARGET="javadoc -Dmodule=core -Dlib=core/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/core
-	use source && java-pkg_dosrc core/src/org
-}
diff --git a/dev-java/sat4j-pseudo/Manifest b/dev-java/sat4j-pseudo/Manifest
deleted file mode 100644
index 656ce73be86e..000000000000
--- a/dev-java/sat4j-pseudo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST sat4j-pb-v20100623.zip 487925 BLAKE2B 512dbef4f9362a65eac2173a2ea8a92fdaf62bc1d4e001cdf741bfc91c9f7900397992373937c6358a6cf7f5395905f16bed2f21ee8a41eeac56f2d582b3055a SHA512 6aba2438070a3060fc26229fee1e30f8cfd37f2699c2ba28c4b7071fde2ad9be6ad22138b0e6beb7409b7eb57d3c44733c440ba2cf0ea36c7ea068e411a1a2e8
-DIST sat4j-pb-v20111030.zip 650535 BLAKE2B 8f1447cd280f05286bab193e94fa786c306c27d83c1c34ec5f257f6d95e72c8202aeb8e10c856785dab9706d17db4723db2a618e727dfcb887994ccea628b4fe SHA512 ee27501e8c4efb3cf960278fdca0111442e14edcf303ffb9adea2c0e6b5dc7dce2df0304ea1aa05a1b00000478f9283230c7594325195be557a7bb459250fd9a
-DIST sat4j-pseudo-2.2.0-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
-DIST sat4j-pseudo-2.3.1-build.xml 9458 BLAKE2B e23879fb3e85a8f96313e4e6eba48e785b5940f32e0f3195fcc6d8ce5c89156694e24c3afa065e39b2c72044acf21cf6d8c50a2385494187a84da79893f3ebab SHA512 ab09e0773adaf578e87503373b6156d42430270472c07159ad8246ae6c2f20c02447776c1b925fb0d4eaeed6dd3f7c3b0f36a5a410f0e22d2594b9b4deeb4d7a
-EBUILD sat4j-pseudo-2.2.0.ebuild 1594 BLAKE2B dc6b5a36ceef190a03a9555a58077dea1136c4efc8e849c1d9a0ec19eefdf190e07a54c8473c6b92b56814eccd7e583a9a35a5f94373e0c83dfa0cdebc818882 SHA512 73cf62efcedbddc0b1d6972d7a02773c56dd07dfc2cfecc908ba017c78e6ea3b561c152c2da0ec271f6440c1174c8da6d7e0aad052eaf4789c578fd63abef199
-EBUILD sat4j-pseudo-2.3.1.ebuild 1602 BLAKE2B 4cdb1a591415931b1bf796b32e4fb0b1388af92664447cb11d00ee8ea395c9301ff2a4c1fc99e5210033d49017ef2466377b67e45531cede1511ca428c6d55d1 SHA512 e8b614d0f90ed58492743a11b1843de6c6baa72120cff41ea055b41c186d400fe5ea6ed5c169e564dba952f2636aa1e5835fa6c3558bd1c8e28c4e243e72e2e2
-MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sat4j-pseudo/metadata.xml b/dev-java/sat4j-pseudo/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/sat4j-pseudo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
deleted file mode 100644
index b8b5bfbf3d9b..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20100623"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p {core,pb}/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Don't build core.
-	sed -e 's/depends="core"//g' \
-		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# This is the version identifier used for custom builds.
-	echo 'CUSTOM' > core/src/sat4j.version || die
-
-	# Unpack manifest.
-	cd pb || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/pb
-	use source && java-pkg_dosrc pb/src/org
-}
diff --git a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild b/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
deleted file mode 100644
index d405ae412f17..000000000000
--- a/dev-java/sat4j-pseudo/sat4j-pseudo-2.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-MY_PN="org.sat4j.pb"
-MY_PV="20111030"
-BUILD_PV="2.4"
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Pseudo Boolean solvers"
-HOMEPAGE="http://www.sat4j.org/"
-SRC_URI="http://download.forge.objectweb.org/sat4j/sat4j-pb-v${MY_PV}.zip
-	http://download.forge.objectweb.org/sat4j/build-${BUILD_PV}.xml -> ${P}-build.xml"
-LICENSE="LGPL-2.1"
-SLOT="2.3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/sat4j-core:2.3"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack sat4j-pb-v${MY_PV}.zip
-}
-
-java_prepare() {
-	mkdir -p {core,pb}/{lib,src} || die
-
-	# Don't complain about missing javadoc stylesheet.
-	touch core/lib/stylesheet.css
-
-	# Grab build.xml. Don't fetch from CVS. Don't build core.
-	sed -e 's/depends="core"//g' \
-		-e 's/depends="prepare,getsource"/depends="prepare"/g' \
-		"${DISTDIR}/${P}-build.xml" > build.xml || die
-
-	# This is the version identifier used for custom builds.
-	echo 'CUSTOM' > core/src/sat4j.version || die
-
-	# Unpack manifest.
-	cd pb || die
-	jar xf "${WORKDIR}/${MY_PN}.jar" META-INF || die
-
-	# Unpack sources.
-	cd src || die
-	jar xf "${WORKDIR}/${MY_PN}-src.jar" || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_TARGET="pseudo"
-EANT_GENTOO_CLASSPATH="sat4j-core-2.3"
-EANT_DOC_TARGET="javadoc -Dmodule=pb -Dlib=pb/lib"
-
-src_install() {
-	java-pkg_dojar dist/CUSTOM/${MY_PN}.jar
-	use doc && java-pkg_dojavadoc api/pb
-	use source && java-pkg_dosrc pb/src/org
-}
diff --git a/dev-java/smack/Manifest b/dev-java/smack/Manifest
index f29ad6b02b8d..6875ba024950 100644
--- a/dev-java/smack/Manifest
+++ b/dev-java/smack/Manifest
@@ -1,3 +1,5 @@
+DIST smack-3.2.1.jar 747528 BLAKE2B bc60a8775a3eed2fdbf7403abf18468d599b49b980a129f10f118cb2240478ba14da59cd1368ab752f5c613ade679e13d0015fe303d140006a86b72c67fa8e54 SHA512 374f1a18559ee65974574cfdb2a9d83a520bbed08c75a54385e42b206a610c1fa368443007ce7357d9ad9262df749bf6d956e35e01bb2b73a912a2b330197a46
 DIST smack-dev-2.2.1.tar.gz 4052596 BLAKE2B c8be42b444533557a6d2dbc363fb58349ec677898e03d8ffcace063bf98997c7bbff6a4b04dc88eb012660b8f03da80fd710b501724260ab8147ebd6014682b6 SHA512 a6f6f70a61dec69ec2f3c82544f83100bf4ef39aa657ed7a8ce635be8484d3ed2cb539961286482ccc9f607520e0646e14668a17b4004ae6bd157b3d894146f0
 EBUILD smack-2.2.1.ebuild 1083 BLAKE2B 630883ab51bc80e33fd723146207c935ea120fa7a142dc29b88c91a20cf519a6ef3eb014cb3d5540ac6f2059aaab33fd7086fa360f90fab241bb1dd670698d67 SHA512 cb0fb55f756a5ad7be9f37dab442cd05427272b29250067b6579aab6cc953495111207af975b8338101d8d914f9604ac9c7eeb6d4450def528b2321cdffc91ac
+EBUILD smack-3.2.1.ebuild 614 BLAKE2B e9dc223f35c159cf7bdbeafa0df0c735fc599b69a28793e0c2eabb5170fbd0c5db4708b3be986b35dc2d07a167ca77a4d065a23fb7fb98bc37afedb8dd1ba50b SHA512 ecb877b4d70bde593833c02de5c147ad0523917480af3bbb60c32ddf1247055ff5ff355f2315a3c00184361ddfad69390f007c94f49c1b70c1c4551470f1743d
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/smack/smack-3.2.1.ebuild b/dev-java/smack/smack-3.2.1.ebuild
new file mode 100644
index 000000000000..139203ac8046
--- /dev/null
+++ b/dev-java/smack/smack-3.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMPP client library for instant messaging and presence"
+HOMEPAGE="http://www.jivesoftware.org/smack"
+SRC_URI="https://repo1.maven.org/maven2/org/igniterealtime/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/xpp3:0"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="xpp3"
+
+JAVA_SRC_DIR="org"
diff --git a/dev-java/stax/Manifest b/dev-java/stax/Manifest
deleted file mode 100644
index 2414469da9cf..000000000000
--- a/dev-java/stax/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.2.0-build-version.patch 438 BLAKE2B 516b97e885a94e7819f860eb2bc1e8623160884199262d0382092f735ba83d3e634ba20aaa7e095ab5d755def9be478457c6137729fb1b6237e41bb4af14e6ac SHA512 f001f61d2cf0346a5e39c1b5392357e293a0f35ccee45dd3bc9b96a346f63280088572ac2b23b01637d11c8f0b888fd91687407d70d1bdd9903cdeb9a9c7028d
-DIST stax-src-1.2.0.zip 310738 BLAKE2B 09d7c2c60c947ca06c02e660337a1da208ece8a3302b9fc234ee768e7a6d7ab41d958885e0b67cdac4e346f9b641a4de1b36498ef8cd91196b4dce6481168dc3 SHA512 41686d961c7a211ee02e9432a141ff75326414da9576608a3567ca7e154ed24ad804cd01849364a5ec8def1a6e5048197850bafd67fc5ff2b6a10307a0fec9af
-EBUILD stax-1.2.0.ebuild 1183 BLAKE2B 5b36b8a358cab7842b3a4990efe9f0cfad9961018acc83b58bce0f8f6e563afd61ce202dab829130315dfe7312ede96bf631173678a3e26f1d67348566bcbf23 SHA512 3dc8ef70f8ca94e802e04c79d98ff50ea57187df8833b45ee7fbf4e9b9678e92da8892fbd076dcb6dfccfe5f25bb29753a7f8318b62166183598929a737e23cb
-MISC metadata.xml 565 BLAKE2B 6e86ddf8323cff40e45306b90374aa3e179ead4534a2c066b0f220816dffee9e03d57656ab88088c3bf209506835d4b720f4ca849f71468777a396b6c53f1ed4 SHA512 b54fb4d000aa14a4bc583007aaf576e9cba96a17c8aed6ba1024dd925bca04a2015048490ed426522a696e614a159eeea17a587a2d6f61be8b38cb608ed06f21
diff --git a/dev-java/stax/files/1.2.0-build-version.patch b/dev-java/stax/files/1.2.0-build-version.patch
deleted file mode 100644
index 4880d1f00776..000000000000
--- a/dev-java/stax/files/1.2.0-build-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- stax/build.xml	2006-06-16 18:17:56.000000000 +0200
-+++ build.xml	2007-02-24 19:21:46.875023427 +0100
-@@ -23,7 +23,7 @@
-   />
- 
-   <!-- API properties -->
--  <property name="api_version" value="1.0.1"/>
-+  <property name="api_version" value="1.2.0"/>
-   <property name="api_src_dir" value="${build_dir}/api_src"/>
-   <property name="api_dir" value="api"/>
-   <property name="jar_api" value="${build_dir}/stax-api-${api_version}.jar"/>
diff --git a/dev-java/stax/metadata.xml b/dev-java/stax/metadata.xml
deleted file mode 100644
index 12faefe93cd7..000000000000
--- a/dev-java/stax/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription>
-Features of StAX API: Standard pull parser interface,
-Read/Write API: two levels, "raw" cursor access; object-based "event" access,
-Efficient XML access (especiall cursor API), Gives application control over
-parsing: "reverse Hollywood": you can call us, instead of waiting us to call you.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-java/stax/stax-1.2.0.ebuild b/dev-java/stax/stax-1.2.0.ebuild
deleted file mode 100644
index 5a27947da29c..000000000000
--- a/dev-java/stax/stax-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A standard XML processing API that allows you to stream XML data"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-
-#	test? ( dev-java/ant-junit dev-java/xerces )
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}" || die "cd failed"
-	epatch "${FILESDIR}/1.2.0-build-version.patch"
-}
-
-EANT_BUILD_TARGET="ri_bin_dist"
-
-# A lot of these fail and that seems expected based on upstream
-# svn logs
-RESTRICT="test"
-
-src_test() {
-	mkdir lib
-	java-ant_rewrite-classpath build.xml
-	ANT_TASKS="ant-junit" \
-		EANT_GENTOO_CLASSPATH="junit,xerces-2" eant test
-}
-
-src_install() {
-	java-pkg_newjar ${S}/build/stax-api-${PV}.jar stax-api.jar
-	java-pkg_newjar ${S}/build/stax-${PV}-dev.jar stax-dev.jar
-
-	if use doc; then
-		java-pkg_dojavadoc "${S}/build/javadoc"
-	fi
-	use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/sun-dtdparser/Manifest b/dev-java/sun-dtdparser/Manifest
deleted file mode 100644
index 9e635be10aca..000000000000
--- a/dev-java/sun-dtdparser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dtd-parser-1.0-src.zip 67545 BLAKE2B a1f38085bb88625c36156e2b08b2e8bc12e1d53c5d54172914304da0678edaead7bbe44153a77c993177be58aab3c782e3e3f716056808a1367bb11130c70868 SHA512 7a8b2d27316121e33640ff51819e9edb362197b5af340a92e24b5fcd7cd885efdf3951e12cf5056670273eceffc17c3860b56d437c7cfb2fc12b47abcf82ecfa
-EBUILD sun-dtdparser-1.0.ebuild 713 BLAKE2B f04045fffdc940acdba3f2ecf7d9729615ad6a690576f803c0008f038ccacbaa792e51c8d9e5a28a7a9df90af8ac0fededa7dfda8d38f99edccb5fbbbfa2c375 SHA512 be8a12de6e977068e805e39a69aeed301b47fe0e550b62cd8fb2d899f434d12b853ad3e1e1554aac2578b9add1370ebe89a89ba6a59a654c57833cbc297e7032
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/sun-dtdparser/metadata.xml b/dev-java/sun-dtdparser/metadata.xml
deleted file mode 100644
index 37998bf40746..000000000000
--- a/dev-java/sun-dtdparser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild b/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
deleted file mode 100644
index 385bd2683dc1..000000000000
--- a/dev-java/sun-dtdparser/sun-dtdparser-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Sun DTDParser"
-HOMEPAGE="https://jaxb2-sources.dev.java.net/"
-# Downloadable from https://jaxb2-sources.dev.java.net/
-SRC_URI="mirror://gentoo/dtd-parser-${PV}-src.zip"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/dtd-parser-${PV}"
-
-src_install() {
-	java-pkg_newjar "${S}/target/dtd-parser-1.0.jar"
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc dist/docs/api
-}
diff --git a/dev-java/sun-java3d-bin/Manifest b/dev-java/sun-java3d-bin/Manifest
deleted file mode 100644
index 612dc10f1dbf..000000000000
--- a/dev-java/sun-java3d-bin/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST j3d-1_5_2-linux-amd64.zip 1956319 BLAKE2B 05e229dedddde18c261e652adfe6dd87e9bad90ea8129fd351f9122210049a587dcbf1a6e982d06f75f8936762d37b7b2710b374462c6a0e356acfb7bb8dffb9 SHA512 6105b460d09f68c7a1ab289e23717016329900d1e113b516965ee3015fe47836d2165bb450c43f7fa5f7a42ff819c70581193990d153226cb41dcecb1b9c71bf
-DIST j3d-1_5_2-linux-i586.zip 1956020 BLAKE2B fe2dc4275b021a302a3914ae2243f75142f40370dcf01e256d4557c5dd10fdeb060b4a8cbf5e274c8ae38dc984ad6dc488a8d15aff621b0fdd5e2185c1523cea SHA512 1504d2dbcdc9a49be84f1a6327669764febc83f4e5c4365894b8a4bc15b14857262bc0d548b678820ad3aee8f349f2515cfa9a06dfdc0e8bb9afd50de0c4ca56
-DIST java3d-1_3_2-linux-amd64.zip 1241855 BLAKE2B 342b09f8643060115e642ba9da302772b1514322f1157059fdb8e9d83e8c307fa970a90d1d2dccc88fd54e26c31c8b6beef2ae61855463e6ca25613fb78716af SHA512 6781be7d5c510b9ed4fb533e58eed792ceade0245b7ace00947f6cbac711b589d787500322d3ad4e6478c61e017cf2be9c7542a59a6a0af780d9e0a06b5a5f78
-DIST java3d-1_3_2-linux-i586.zip 1235329 BLAKE2B f380465fa6442e129bcc4c2c7b0f1c2d00775735ccb1755eff0cbfa063bdceb23209fe157c1127a36dc24e5fa7988194e2b5e830a3ff43891dd8e0b00cc2d855 SHA512 5fb459ead7cfdae468017bc40cb6f8831a8fadbd27fd3c62404b9cf5ebdacef092e8a4153058731c2a004672bc69f4061b664412ed937a7b49a15ca580762839
-DIST java3d-1_4_0-build5-linux-amd64.zip 1281828 BLAKE2B 90f1faa775d1c0f29cb32dc36801dbb697721f9509a45b9cbf9e26750e928359dad5e7458d98412ed3c473ed108e4ec937d6ef1fd8bad75d5feb3a5e152a8967 SHA512 ec1074e5ad40964a80e2ec3332f67d1b7067db6aa5d99379f9e488e2c6a342b0c3d0c78aadd995bd647047efdeb0f040c8e8c7e4557a5161b6a8919fe93cff81
-DIST java3d-1_4_0-build5-linux-i586.zip 1274577 BLAKE2B 38bab843a406b563f21dbffd51aff26937035c48488c4c50fdc8268fa8fcd73455219b927018958c2a87b35085aa51c8abe565564690047a2da6628e914c5722 SHA512 1b6b87d660b98029c8a5a2cfc9435538c89032b4318243ee5dc01629c72f8f4ea189ee383150821b291a6bbe2b3284ef7c6da6404851a8d6adfe6fea0af3ac59
-EBUILD sun-java3d-bin-1.3.2-r1.ebuild 1093 BLAKE2B ac0c12e3e4c06ac4b221c02db79223895b133e530a3ec8cb79339ea9b1b23901fa61f3f748c7806a42d938ea1ad4d11cb75b232b428b47a556ec9b305db3ff7e SHA512 f1c127b90c5be9cccdff1a3df034cd02e6c0753701ddad86bf1145cecf8ee8dcd4610e55a432d1109f6eb3c098deb1fe118aae85fc25eb7ab2844146d39c05f7
-EBUILD sun-java3d-bin-1.4.0_pre5-r1.ebuild 1195 BLAKE2B 5ca9b49e29ba94b7a111bc7debae5f5f5eaa00eca0e6c3ed0a3b98591bd9f0cc0120b1bfbf4d17aa2cb393fda10adc0f6052a0100d0b86e7c931dfd4680882bc SHA512 eb65d52d2f7f1915d150aeb975f214d91292967690bb50be306a3ce5e5e50d0d070dbda75f1464503c49a6455eba0a60e73011a20e63578feeed792a48fea8ca
-EBUILD sun-java3d-bin-1.5.2.ebuild 1142 BLAKE2B 21d2b10cec2764e564cc018379702eba298e1904cc592992d7d6223f9c4855aacb97c8f4ea7c4dc47146e6981a2743ad6d5b984311093c26411e74dc3e8d317c SHA512 110605860513f90c977a00219c4f509a3415976a99ca012758e186cfe174d134efed78a8756d7c5ce704773c00ccdd97e88fa1d023f98b7823e09440390855c4
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-java3d-bin/metadata.xml b/dev-java/sun-java3d-bin/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/dev-java/sun-java3d-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
deleted file mode 100644
index 1926def2bcf6..000000000000
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2
-
-DESCRIPTION="Sun Java3D API Core"
-HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="amd64? ( java3d-${PV//./_}-linux-amd64.zip )
-	x86? ( java3d-${PV//./_}-linux-i586.zip )"
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="sun-jrl sun-jdl"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.3"
-RESTRICT="fetch"
-
-S=${WORKDIR}/${A/.zip/}
-
-pkg_nofetch() {
-	einfo "Please download java3d-${PV//./_}-linux-${ARCH/x86/i586}.zip from"
-	einfo "${HOMEPAGE} and place it into your DISTDIR directory."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip -q j3d-132-linux-${ARCH}.zip || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc COPYRIGHT.txt README.txt
-
-	java-pkg_dojar lib/ext/*.jar
-	java-pkg_doso lib/${ARCH/x86/i386}/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild installs into /opt/${PN} and /usr/share/${PN}"
-	elog 'To use you need to pass the following to java'
-	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
-}
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
deleted file mode 100644
index ac4cd0e8ee6e..000000000000
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.4.0_pre5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-MY_PV=${MY_PV//_pre/-build}
-MY_IPV=${MY_PV//_/}
-
-DESCRIPTION="Sun Java3D API Core"
-HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="
-	amd64? (
-		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-amd64.zip
-	)
-	x86? (
-		http://download.java.net/media/java3d/builds/stable/${MY_PV}/java3d-${MY_PV}-linux-i586.zip
-	)"
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="sun-jrl sun-jdl"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-QA_PREBUILT="*"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/${A/.zip/}"
-	unzip -q j3d-${MY_IPV}-linux-${ARCH}.zip || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	cd "${WORKDIR}/${A/.zip/}"
-	dodoc COPYRIGHT.txt README.txt
-
-	java-pkg_dojar lib/ext/*.jar
-	java-pkg_doso lib/${ARCH/x86/i386}/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild installs into ${JAVA_PKG_LIBDEST} and ${JAVA_PKG_JARDEST}"
-	elog 'To use this when writing your own applications you can use for example:'
-	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
-}
diff --git a/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild b/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild
deleted file mode 100644
index 89c0a7779b51..000000000000
--- a/dev-java/sun-java3d-bin/sun-java3d-bin-1.5.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-MY_PV=${PV//./_}
-MY_PV=${MY_PV//_pre/-build}
-MY_IPV=${MY_PV//_/}
-
-DESCRIPTION="Sun Java3D API Core"
-HOMEPAGE="https://j3d-core.dev.java.net/"
-SRC_URI="
-	amd64? (
-		http://download.java.net/media/java3d/builds/release/${PV}/j3d-${MY_PV}-linux-amd64.zip
-	)
-	x86? (
-		http://download.java.net/media/java3d/builds/release/${PV}/j3d-${MY_PV}-linux-i586.zip
-	)"
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="sun-jrl sun-jdl"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-QA_PREBUILT="*"
-
-S="${WORKDIR}/${A/.zip/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./j3d-jre.zip
-}
-
-src_compile() { :; }
-
-src_install() {
-	dodoc COPYRIGHT.txt README.txt
-
-	java-pkg_dojar lib/ext/*.jar
-	java-pkg_doso lib/${ARCH/x86/i386}/*.so
-}
-
-pkg_postinst() {
-	elog "This ebuild installs into ${JAVA_PKG_LIBDEST} and ${JAVA_PKG_JARDEST}"
-	elog 'To use this when writing your own applications you can use for example:'
-	elog '-Djava.library.path=$(java-config -i sun-java3d-bin) -cp $(java-config -p sun-java3d-bin)'
-}
diff --git a/dev-java/swarmcache/Manifest b/dev-java/swarmcache/Manifest
deleted file mode 100644
index 364bb4fc52b3..000000000000
--- a/dev-java/swarmcache/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST swarmcache-1.0_pre20050106.tar.bz2 34632 BLAKE2B c33ac3c27e7a034a375fe64c6df044aa65c15ef5d926243d5ffa20a831ee70980b6116eef0c333138f4488509bfa1c96cbeb7cf9a815079ba6830a2baa066be0 SHA512 21c05d83a6e05f3c31a1785e0286d2f584375e3aa97e9fa2dd18a0aca5f3678817a6a019524e6b55c2f047547296cec83c9e108c9272401b592ea0f8338878d7
-EBUILD swarmcache-1.0_pre20050106-r2.ebuild 674 BLAKE2B d46417189ce426ed2075803cb3aa7d59c3fe3fd48c028b65c7b5f1dec878bd6ffa3e5d8f13460ddce592fa72bb0711d5161385555208aad75f5743bfb2719bbb SHA512 b6f8a86b1cccd0e262d727914fdd6e823cd6bc5fe19a3e1529b079ad22bd27e215f63948ff64bc82771439fec8c4c494605cedfd761785ee3c48061216a6ba31
-MISC metadata.xml 316 BLAKE2B 6adc8bc24794557402b5e1eed5f33c8e420791de51dbc0d97b6d6110f4a39b7b5b28eb625f2b64062d743e8dc204961063bc66f5b4d63a0ff46a9dab8dc96cfb SHA512 77c639a56c22f43f936a864153af61bfb55ddc9738a76451bc337e08371ee5947c5cee2ee41674e480a74d9d78b69054400671c329511be499250c16b35a57d9
diff --git a/dev-java/swarmcache/metadata.xml b/dev-java/swarmcache/metadata.xml
deleted file mode 100644
index 8ce9a5a15af7..000000000000
--- a/dev-java/swarmcache/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">swarmcache</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild b/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
deleted file mode 100644
index 26b7ff630e5b..000000000000
--- a/dev-java/swarmcache/swarmcache-1.0_pre20050106-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Cluster-aware Caching for Java"
-HOMEPAGE="http://swarmcache.sourceforge.net"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="LGPL-2"
-SLOT="0"
-
-CDEPEND="
-	dev-java/jgroups:0
-	dev-java/ant-core:0
-	dev-java/commons-logging:0
-	dev-java/commons-collections:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-	jgroups
-	ant-core
-	commons-logging
-	commons-collections
-"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 84d56180156a..221daa683418 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -16,8 +16,10 @@ DIST apache-tomcat-8.0.53-src.tar.gz 5057041 BLAKE2B 3a50d2f61baecb5244909972384
 DIST apache-tomcat-8.5.23-src.tar.gz 5086043 BLAKE2B 9bcad0d465aff6da1ba4a846042491bc8d5963283ed1d2530a26ab48289d14e8b85834d24ca476c95a75c1a5f51ee3ecd71c190b9609983cce56b56bc046b6d3 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef
 DIST apache-tomcat-8.5.39-src.tar.gz 5264067 BLAKE2B 8cd672529660783d3310beae356c32a9392f550ae72f2cdbd60f23c3b532e3adb19a295737fb39e9a2990b14edeff51cedf1f936f32f844e496e751913f2a859 SHA512 ba591290be49a01cec38300c6321b634e3ca7417074b55103afc887b9af3eda942d302aee5f1648e7fa60b5231cd7d83428846e2b55a4964f5cc98c27a844f8d
 DIST apache-tomcat-8.5.40-src.tar.gz 5274830 BLAKE2B d96044fecd8f3bd5b971e9bfed79fd7768845f5e760140513c6701f34e0217edfb7718b669e38c3de8554fca5c5af08660c423a266909dab5b0fa089e24c107a SHA512 aef81900ef0af98122d19ef467b06569b46e084c50c14673872b82517b9b61569a2df70f5763bb30100edf73eb73bcf1c81bcb1106018c81ad96f4a019f72ae2
+DIST apache-tomcat-8.5.41-src.tar.gz 5285992 BLAKE2B 8055591319c475cda9e8124107fef94f31837095ecfcbd6388f226d09fbe14825988c956257b90a7eb36068546fd7c2958fb5f63870d8eff30a72d2c8309bb97 SHA512 59f5ffa64e8fb445b86a9413e0bc3aee3ba87a727ad5ed2c5aa1a20653068530e85d59407b2907483341d3721c6d6da52bf41c02138abc1b1ec97395b9ee727f
 DIST apache-tomcat-9.0.17-src.tar.gz 5670728 BLAKE2B 15f8518ec073a935dec6afdd3a8f9885e7867a0aa033024024bd72b7887011ca169c776f2a4d886d93a73a478f9dcad5f87c31b3a30a88ca913309c51e0f0ec7 SHA512 b5763dae05598c0a4d3638ba02c0627219de20406bddaab86ae3262299f2d9bbda1a5db612cad9fb8a54b2888e9ce1c4be67613d855cfd92b4cee5b85e226602
 DIST apache-tomcat-9.0.19-src.tar.gz 5692733 BLAKE2B 771d8afd50e9032edda09abb5d03e16663a7475d36ee9a5561cd54fbc948169c145ea95bc16ebc690280e5327a5a9868e56a29bd08acb6c10c34fc4e7bf94cc7 SHA512 0461ab9a4e5f021636957b5bc8fbe45714488837e53ca2df4bf9faab5c620270c3041859e034135ccc6e2914ae70e4e38cf4b4353cb17b543ed3dc3a7628fba1
+DIST apache-tomcat-9.0.20-src.tar.gz 5702073 BLAKE2B 80170a2b6bdb525f186814458f78211cdd7717178d5cb816b39a0c83b637434f276884c9da42e12ef04e1f43261ef36cf0508178157f5ea43a96289d2de27ecb SHA512 3635212ff28ca491243ae0f0edf0572ca82f583286296f302c5d02f93917d218e9601cbf90cb022c2f2b6b4f17c3460d74aee19b13caff9d12222ee028ee09dd
 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
 DIST jakarta-servletapi-src.tar.gz 65342 BLAKE2B 03674ca65e0cc509b04a6255d5dd20d26aa5053ed54588e9ba655330c56c9c523c5b382804aee9816cb9aa2ac19cccc1ad288ed06b2af85ba535854bc72bed73 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084
 EBUILD tomcat-servlet-api-3.ebuild 849 BLAKE2B 88f6dc377d4c33eb50a3559f5b1b275cbbddf077c119e792afc567458d74e4f6fa710a97e71543c19caecafb8a7e26ee0cfb4cf34006a2aaae9a97924cb9463b SHA512 085c9e220972fb0f923b710a33a76977aaf76c8abee84c5c0c80ff40932585fdb0cd3a00705a60ef615558a0c20f93522cfd705fc5e5c0af70fe9eb2e640ee5a
@@ -33,7 +35,9 @@ EBUILD tomcat-servlet-api-8.0.53.ebuild 961 BLAKE2B 4d207cbd6e39369ceace593d2f02
 EBUILD tomcat-servlet-api-8.5.23.ebuild 1010 BLAKE2B fb16fa9955dd865619850de21cdae0e44130895b3f886ec96ad5cff37f45f8a13b5caaddc083f46d2eab6b00e174689e652a5a0ead58fb4626e40612c1fd5784 SHA512 1ceaa37c6434f32e10705b0663bc39e2ccc5507c621a2ede604feec69a49bcb46ddd49fff33a5ccce50d4daa228170a3db30e31624ae84dfc83b538de10f7824
 EBUILD tomcat-servlet-api-8.5.39.ebuild 1009 BLAKE2B 616e51d8822c6876501edd4bc2408cf0bf8874c7bb2be477492d83aab8a90ce472072b0f92f475362109acc1468f5e80c83bc31f201694ace3485cde174dbc8d SHA512 bf685eedd82d08d142aad7301694e54ea8677f4b730def058c09e6c0b92b9db69d2df37859f113a024283e8b05e5eaa38a5ac30784c4fc269d221387e50d6e4b
 EBUILD tomcat-servlet-api-8.5.40.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
+EBUILD tomcat-servlet-api-8.5.41.ebuild 1010 BLAKE2B 04f7dd7c54b930a54631cd1e444052db3290f7e9f2e289040a58a0bdd2d2410996197a22c6a36df9462328153b8a28b58f1cfa4554283ecb10ce0806c25ff484 SHA512 e6c416bae0febef9521b8ae3385c2fe41b7926b4c734f6e09b1f77d92a74ac986579811ec93d9c1887d13133a9520b9327a82725e5c90a35b5ba2aa4f93fc53d
 EBUILD tomcat-servlet-api-9.0.17.ebuild 1004 BLAKE2B 7f18ece7027e7c7e4af92c417870389e5938963ed8d5c03c06a4c44140e0803712a356bad0853f64fc860e900905169811dd85fa733b82940da4d9b03f1bd61a SHA512 467a31bf3148372c850fa94a9c0467163038aabe29ab72be1a539e5f2642bb363c9a0bbc4416fec9e24e46aa0c76e2b51ec000512772e8964177841310468303
 EBUILD tomcat-servlet-api-9.0.19.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
+EBUILD tomcat-servlet-api-9.0.20.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
 EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
 MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild
new file mode 100644
index 000000000000..a6df79ab2dec
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.41.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+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"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	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-9.0.20.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.20.ebuild
new file mode 100644
index 000000000000..e35055493b79
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-18 00:10:51 +0100
commit	eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch)
tree	3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /dev-java
parent	a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff)