Updating liguros repo

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-09 00:52:45 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-09 00:52:45 +0000
commit: 5a8162b6453bc0ab4cf7f20fc528a88da2a28137 (patch)
tree: ca1783d1585eec52d84773b9151d5daf3ab54ae2
parent: 7ec39a79bef58709b3729177b36483ab7609e0b2 (diff)
download: baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.tar.gz
baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.tar.xz
baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.zip
171 files changed, 1733 insertions, 2512 deletions
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index 335c2b502311..772e2743d6b9 100644
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/shim-signed/Manifest b/app-crypt/shim-signed/Manifest
index 33a35192d451..77ac70c5ff06 100644
--- a/app-crypt/shim-signed/Manifest
+++ b/app-crypt/shim-signed/Manifest
@@ -1 +1 @@
-DIST shim-signed-0.2.tgz 807709 SHA256 4c522aa6d9d20308d35907a03c855bdaa12a301d0b9b8c86b357e3808ae3f8b3 SHA512 8064e51a80fe51d2e94cede8bc574ba619383e718a45ebeaf3a87a12bb045cc6c55d143ec1a11080887368bdfd2736218385cae09e93bd7bd3c6d408be907afa WHIRLPOOL 37ded6310fb91ca2311d0451652e7b0499a4cb145c7d262323ce7f343f436e8118bd61662d9aa024c88b5e5158e22f0f1710d3d054f933cca8e260804aa9bc50
+DIST shim-signed-0.2.tgz 807709 BLAKE2B 1e2528e8214ca2f1b85540101dccf965a9e9e90a1b2fdb02b424f71b3a501002430dc517fce4245ca1eb9354b15fc33e31ac624a80985f862f33de1d5746bf4f SHA512 8064e51a80fe51d2e94cede8bc574ba619383e718a45ebeaf3a87a12bb045cc6c55d143ec1a11080887368bdfd2736218385cae09e93bd7bd3c6d408be907afa
diff --git a/app-crypt/shim-signed/shim-signed-0.2.ebuild b/app-crypt/shim-signed/shim-signed-0.2.ebuild
index 0a70aaa4ffc0..aa3a6692c7b5 100644
--- a/app-crypt/shim-signed/shim-signed-0.2.ebuild
+++ b/app-crypt/shim-signed/shim-signed-0.2.ebuild
@@ -2,11 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="UEFI Shim bootloader for SecureBoot signed by Microsoft"
 HOMEPAGE="https://mjg59.dreamwidth.org/20303.html"
 SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/${P}.tgz"
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/${PN}/${P}.tgz
+	http://mirror.yandex.ru/calculate/source/${PN}/${P}.tgz"
 
 LICENSE="as-is"
 SLOT="0"
diff --git a/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch b/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
new file mode 100644
index 000000000000..207cc20ba091
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
@@ -0,0 +1,61 @@
+From 4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a Mon Sep 17 00:00:00 2001
+Message-Id: <4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a.1607416232.git.mprivozn@redhat.com>
+From: Jonathon Jongsma <jjongsma@redhat.com>
+Date: Wed, 2 Dec 2020 11:52:39 -0600
+Subject: [PATCH] conf: Fix segfault when parsing mdev types
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit f1b0890 introduced a potential crash due to incorrect operator
+precedence when accessing an element from a pointer to an array.
+
+Backtrace below:
+
+  #0  virNodeDeviceGetMdevTypesCaps (sysfspath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", mdev_types=0x7fff801c9b40, nmdev_types=0x7fff801c9b48) at ../src/conf/node_device_conf.c:2676
+  #1  0x00007ffff7caf53d in virNodeDeviceGetPCIDynamicCaps (sysfsPath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", pci_dev=0x7fff801c9ac8) at ../src/conf/node_device_conf.c:2705
+  #2  0x00007ffff7cae38f in virNodeDeviceUpdateCaps (def=0x7fff80168a10) at ../src/conf/node_device_conf.c:2342
+  #3  0x00007ffff7cb11c0 in virNodeDeviceObjMatch (obj=0x7fff84002e50, flags=0) at ../src/conf/virnodedeviceobj.c:850
+  #4  0x00007ffff7cb153d in virNodeDeviceObjListExportCallback (payload=0x7fff84002e50, name=0x7fff801cbc20 "pci_0000_00_02_0", opaque=0x7fffe2ffc6a0) at ../src/conf/virnodedeviceobj.c:909
+  #5  0x00007ffff7b69146 in virHashForEach (table=0x7fff9814b700 = {...}, iter=0x7ffff7cb149e <virNodeDeviceObjListExportCallback>, opaque=0x7fffe2ffc6a0) at ../src/util/virhash.c:394
+  #6  0x00007ffff7cb1694 in virNodeDeviceObjListExport (conn=0x7fff98013170, devs=0x7fff98154430, devices=0x7fffe2ffc798, filter=0x7ffff7cf47a1 <virConnectListAllNodeDevicesCheckACL>, flags=0)
+          at ../src/conf/virnodedeviceobj.c:943
+  #7  0x00007fffe00694b2 in nodeConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/node_device/node_device_driver.c:228
+  #8  0x00007ffff7e703aa in virConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/libvirt-nodedev.c:130
+  #9  0x000055555557f796 in remoteDispatchConnectListAllNodeDevices (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1613
+  #10 0x000055555557f6f9 in remoteDispatchConnectListAllNodeDevicesHelper (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0)
+          at src/remote/remote_daemon_dispatch_stubs.h:1591
+  #11 0x00007ffff7ce9542 in virNetServerProgramDispatchCall (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:428
+  #12 0x00007ffff7ce90bd in virNetServerProgramDispatch (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:302
+  #13 0x00007ffff7cf042b in virNetServerProcessMsg (srv=0x555555627080, client=0x5555556bf050, prog=0x555555690c10, msg=0x5555556c0000) at ../src/rpc/virnetserver.c:137
+  #14 0x00007ffff7cf04eb in virNetServerHandleJob (jobOpaque=0x5555556b66b0, opaque=0x555555627080) at ../src/rpc/virnetserver.c:154
+  #15 0x00007ffff7bd912f in virThreadPoolWorker (opaque=0x55555562bc70) at ../src/util/virthreadpool.c:163
+  #16 0x00007ffff7bd8645 in virThreadHelper (data=0x55555562bc90) at ../src/util/virthread.c:233
+  #17 0x00007ffff6d90432 in start_thread () at /lib64/libpthread.so.0
+  #18 0x00007ffff75c5913 in clone () at /lib64/libc.so.6
+
+Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/node_device_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
+index 4e2837c1cd..cac4243b50 100644
+--- a/src/conf/node_device_conf.c
++++ b/src/conf/node_device_conf.c
+@@ -2673,7 +2673,7 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath,
+ 
+     /* this could be a refresh, so clear out the old data */
+     for (i = 0; i < *nmdev_types; i++)
+-       virMediatedDeviceTypeFree(*mdev_types[i]);
++       virMediatedDeviceTypeFree((*mdev_types)[i]);
+     VIR_FREE(*mdev_types);
+     *nmdev_types = 0;
+ 
+-- 
+2.26.2
+
diff --git a/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild
index 4f9f96cad620..217806ceb7d5 100644
--- a/app-emulation/libvirt/libvirt-6.10.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild
@@ -126,6 +126,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+	"${FILESDIR}"/${PN}-6.10.0-Fix-segfault-when-parsing-mdev-types.patch
 )
 
 pkg_setup() {
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 29299736b4cf..22bfed5c1f90 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,4 +1,2 @@
 DIST VBoxGuestAdditions_6.0.24.iso 77355008 BLAKE2B 3bb611323ba41ad94a75d5d28198aaf732bd7c36965abc65755c0ffeec29bd378cf4351b838675667958086e499f5791b942a8e3877c1ed815a22c4d564147a1 SHA512 aea64aff216a0cfa3535d2215ec74dd46243f9aba0c1b95f476bb8f0b3d561994f4fc8cc7d454f03482e1cec9a227014f10045e75756767bd8006e8beb9aaade
-DIST VBoxGuestAdditions_6.1.12.iso 60626944 BLAKE2B cb16f72f9c010e7e97e6ae5d86d02c81bbae2593fd502a3e6d911e794fa15254b631e37587f7ba636686e8897fe27a05f8dee58870200cbb50e2fbbe57142cc3 SHA512 dd0a7705477620205529090e37965a09906e864d3d293405414ba09c951c33d9586ac6f5e1f35e35ece1e2bae0919cc7740b21e302f9c5e2160e5458168372c0
-DIST VBoxGuestAdditions_6.1.14.iso 60981248 BLAKE2B df4e6159e4f0f1b7bb1a92dfbfdadc30aaa6499f5cb4bf80c783e9ef26dfc2d07f9198c3b20677064d1533ecb9a58100da52975478396bbec918268a7ad14e5d SHA512 51c9e128626bf1a02b4467c85829fa694dc46a469852e4effb768fdb56d1a61e28488a887920c7a8e51128370664ca50c883c590297d8c5182980fc2c176c187
 DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a SHA512 e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild
index 97dc656fbe72..feae0de326e4 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.12.ebuild
deleted file mode 100644
index 97264897ea7d..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.14.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.14.ebuild
deleted file mode 100644
index 97264897ea7d..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	return 0
-}
-
-src_install() {
-	insinto /usr/share/${PN/-additions}
-	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
index 97264897ea7d..9ef18440687e 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.16-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 235626208580..b078883334a2 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,4 +1,2 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.24-139119.tar.gz 23238486 BLAKE2B cad4e6822b51db05fb0b919f4c44ace1743a9d2b5ebcc0da6fe3c9ec43612ec6079614f5d3a9423c320e65b5438089aeef42f331946eb74093e3f8b1ef137300 SHA512 4be76fffb8508dda561e74daf68c71641a0903e554ecdf6b102f3fe35af03883bc88c2ac3cbdae2b3ddfb7ee5c9bdfa8df670662eef139f2a894dea4aa6f2e18
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.12-139181.tar.gz 11141691 BLAKE2B ac4cae428d15fa503b47337c5d2bab3e21197b82192fa2009216e438d06b867b17a62890c7525d232919751a5eec770f0ecd835c93aa3e67bcbf13b94d8d5344 SHA512 2abc9f6aaadfd6b0bb65df7eb9c45155ea2ec0d215aedd7589a76753b7323fef47c4799322ed973ef92baf1d64835dc813a235001be2cf4e166e474d5b6e2afc
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.14-140239.tar.gz 11145475 BLAKE2B fe64288068cfeb17da5b7583b5218de74dade2f3a994ef46e43bf7811cfeabae3d48f6bb200882892205d5a10294c38296e51e31c900af4cffd402030a85e3b3 SHA512 436ed94cec32365b9b19fe170323519543d18fcdad28eac09438c2238d68e452b25a415d69f244fd26b4c117fc5e2b33c8bd2fb63b31805f62ed9d59500eb304
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc SHA512 89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild
index e963a7a5ca90..1ced8bb1016c 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
 
 LICENSE="PUEL"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.14.140239.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.14.140239.ebuild
deleted file mode 100644
index 292f61b0055b..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.14.140239.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.12.139181.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
index 292f61b0055b..6e11f5652823 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.12.139181.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
 
 LICENSE="PUEL"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961.ebuild
deleted file mode 100644
index 292f61b0055b..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.16.140961.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
-	MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
-	DEP_PV="${MY_PV}"
-	MY_PV="${MY_PV/beta/BETA}"
-	MY_PV="${MY_PV/rc/RC}"
-else
-	MY_PV="${MAIN_PV}"
-	DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="=app-emulation/virtualbox-${DEP_PV}*"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
-	insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
-	doins -r linux.${ARCH}
-	doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 319ed8af7cbc..e4e5c245c444 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,4 @@
 DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534
-DIST VirtualBox-6.1.12a.tar.bz2 165246721 BLAKE2B e9ee7c10d92b151ab10833c68d0c71a09419bba4dbf86f21401263a98273f5ad5cf628347215d641e80e11d8e77bafeda606822cdd4d02344490fca6b95814ef SHA512 27fe66daf7fa254d9fc4a2cca4a8bbcfbfe6c3387a9f4a740c8ac1297587b5083bccbeef97dcc4e482c4974c843450212e02415b4952eb38b82e179615741193
-DIST VirtualBox-6.1.14a.tar.bz2 165962245 BLAKE2B 7f064ea58f7e4f36a0cda9badc7d16d5e95246de923ab9d179688c7f2f020625efa89c592aceec59d54f1c48934b20674594cc6a63f3f42e9fef39cfd5803027 SHA512 7bdf248b53c517923afc46998e46f63271f71ee73fa6826f367828128944895b2d672d7fc4d05f222e6d45897269fe699f7360ee1534c96450e2cc7bc14c0f13
 DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
 DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild
index 43d5a64becc6..8a69b30c9df7 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.24-patches-01.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
 IUSE="X"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.12a-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.12a-r1.ebuild
deleted file mode 100644
index 24c3f7e1b184..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.12a-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" emake \
-	VBOX_BUILD_PUBLISHER=_Gentoo \
-	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-	TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.14a.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.14a.ebuild
deleted file mode 100644
index 24c3f7e1b184..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.14a.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="${MY_PN}-${MY_PV}"
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
-	acct-group/vboxguest
-	acct-group/vboxsf
-	acct-user/vboxguest
-	X? ( x11-apps/xrandr
-		x11-apps/xrefresh
-		x11-libs/libXmu
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM
-		x11-libs/libICE )
-	sys-apps/dbus
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/pam
-	sys-power/iasl
-	x11-base/xorg-proto
-"
-PDEPEND="
-	X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
-	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Provide kernel sources
-	pushd src/VBox/Additions &>/dev/null || die
-	ebegin "Extracting guest kernel module sources"
-	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
-	eend
-	popd &>/dev/null || die
-
-	# PaX fixes (see bug #298988)
-	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
-	popd &>/dev/null || die
-
-	# Disable things unused or splitted into separate ebuilds
-	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
-	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
-	# Remove pointless GCC version check
-	sed -e '/^check_gcc$/d' -i configure || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-src_configure() {
-	# build the user-space tools, warnings are harmless
-	local cmd=(
-		./configure
-		--nofatal
-		--disable-xpcom
-		--disable-sdl-ttf
-		--disable-pulse
-		--disable-alsa
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--target-arch=${ARCH}
-		--with-linux="${KV_OUT_DIR}"
-		--build-headless
-	)
-	echo "${cmd[@]}"
-	"${cmd[@]}" || die "configure failed"
-	source ./env.sh
-	export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
-	MAKE="kmk" emake \
-	VBOX_BUILD_PUBLISHER=_Gentoo \
-	TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-	TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-	TOOL_YASM_AS=yasm \
-	VBOX_ONLY_ADDITIONS=1 \
-	KBUILD_VERBOSE=2
-
-	# Now creating the kernel modules. We must do this _after_
-	# we compiled the user-space tools as we need two of the
-	# automatically generated header files. (>=3.2.0)
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
-	insinto /sbin
-	newins mount.vboxsf mount.vboxsf
-	fperms 4755 /sbin/mount.vboxsf
-
-	newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
-	insinto /usr/sbin/
-	newins VBoxService vboxguest-service
-	fperms 0755 /usr/sbin/vboxguest-service
-
-	insinto /usr/bin
-	doins VBoxControl
-	fperms 0755 /usr/bin/VBoxControl
-
-	# VBoxClient user service and xrandr wrapper
-	if use X ; then
-		doins VBoxClient
-		fperms 0755 /usr/bin/VBoxClient
-
-		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
-			|| die
-		newins 98vboxadd-xclient VBoxClient-all
-		fperms 0755 /usr/bin/VBoxClient-all
-		popd &>/dev/null || die
-	fi
-
-	# udev rule for vboxdrv
-	local udev_rules_dir="/lib/udev/rules.d"
-	dodir ${udev_rules_dir}
-	echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-	echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
-		|| die
-
-	# VBoxClient autostart file
-	insinto /etc/xdg/autostart
-	doins "${FILESDIR}"/vboxclient.desktop
-
-	# sample xorg.conf
-	dodoc "${FILESDIR}"/xorg.conf.vbox
-	docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	if ! use X ; then
-		elog "use flag X is off, enable it to install the"
-		elog "X Window System video driver."
-	fi
-	elog ""
-	elog "Please add users to the \"vboxguest\" group so they can"
-	elog "benefit from seamless mode, auto-resize and clipboard."
-	elog ""
-	elog "The vboxsf group has been added to make automount services work."
-	elog "These services are part of the shared folders support."
-	elog ""
-	elog "Please add:"
-	elog "/etc/init.d/${PN}"
-	elog "to the default runlevel in order to start"
-	elog "needed services."
-	elog "To use the VirtualBox X driver, use the following"
-	elog "file as your /etc/X11/xorg.conf:"
-	elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
-	elog ""
-	elog "Also make sure you use the Mesa library for OpenGL:"
-	elog "    eselect opengl set xorg-x11"
-	elog ""
-	elog "An autostart .desktop file has been installed to start"
-	elog "VBoxClient in desktop sessions."
-	elog ""
-	elog "You can mount shared folders with:"
-	elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
-	elog ""
-	elog "Warning:"
-	elog "this ebuild is only needed if you are running gentoo"
-	elog "inside a VirtualBox Virtual Machine, you don't need"
-	elog "it to run VirtualBox itself."
-	elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
index 24c3f7e1b184..bfe310a7db9d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 	https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
 IUSE="X"
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index e7e5b285100f..eac316b19c72 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,2 @@
 DIST vbox-kernel-module-src-6.0.24.tar.xz 670960 BLAKE2B 26e4b1b6b9ab8c8fd0312b2162fe745dc11ef3f8a7e2f08f49df9d9ef346ec21b64e4a0a480bd726e9cca6ab2ce5d3cf2637aa8923c0843bf78a3ed160b98810 SHA512 9b1093307dffeb64f3ec22c4797268858e1fcc729403e89294c2e3cf0852662b7b0aad4416a593fd25b2107a1995d6bc17078f072b6f7718ed111ab61df8324e
-DIST vbox-kernel-module-src-6.1.12.tar.xz 667312 BLAKE2B 31b3f7cd60d00e26c3177c4956d493a243e39d6251aeb3f3d72331d2fa85f2c90e884aa3f27e994502d86a34b1683c7d7db54eb1cc233e220f147119f6e9ed5e SHA512 ec4903fdc74e4be28003e8b231a4c8feb6e807bc59789c2729a8ab4199c6decc878468b67bce3a17625f60a33bb1d7c611e7306815091607b1fade2be521ed44
-DIST vbox-kernel-module-src-6.1.14.tar.xz 670392 BLAKE2B e6f324e71088c71bf67791861c79a81665f2111664428ed1e8a834b8a435bd04c1da49b6755ce5f6b1d883c6de01a0821e8d5a7519e11cf30e8f01a8b4e5d8bb SHA512 ccf4896106a7c86b651ed698abee78387660b7daa0f15329fc4bf2c3a7df4715bf4cce7cace1c6f6931dd9e8d02022d1ca0d005ae12c5139e54d3fb40792cb1c
 DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild
index 80c67913b279..a56ac88cb0f4 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.14.ebuild
deleted file mode 100644
index 6ad5644e2ed2..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.14.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.12-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
index 6ad5644e2ed2..29faf7632fd4 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.12-r1.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
 IUSE="pax_kernel"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16.ebuild
deleted file mode 100644
index 6ad5644e2ed2..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.16.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-#      package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
-	if use pax_kernel && kernel_is -ge 3 0 0 ; then
-		eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
-	fi
-
-	default
-}
-
-src_install() {
-	linux-mod_src_install
-	insinto /usr/lib/modules-load.d/
-	newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
-
-pkg_postinst() {
-	# Remove vboxpci.ko from current running kernel
-	find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 319ed8af7cbc..e4e5c245c444 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,6 +1,4 @@
 DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534
-DIST VirtualBox-6.1.12a.tar.bz2 165246721 BLAKE2B e9ee7c10d92b151ab10833c68d0c71a09419bba4dbf86f21401263a98273f5ad5cf628347215d641e80e11d8e77bafeda606822cdd4d02344490fca6b95814ef SHA512 27fe66daf7fa254d9fc4a2cca4a8bbcfbfe6c3387a9f4a740c8ac1297587b5083bccbeef97dcc4e482c4974c843450212e02415b4952eb38b82e179615741193
-DIST VirtualBox-6.1.14a.tar.bz2 165962245 BLAKE2B 7f064ea58f7e4f36a0cda9badc7d16d5e95246de923ab9d179688c7f2f020625efa89c592aceec59d54f1c48934b20674594cc6a63f3f42e9fef39cfd5803027 SHA512 7bdf248b53c517923afc46998e46f63271f71ee73fa6826f367828128944895b2d672d7fc4d05f222e6d45897269fe699f7360ee1534c96450e2cc7bc14c0f13
 DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
 DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
diff --git a/app-emulation/virtualbox/virtualbox-6.0.24.ebuild b/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild
index 16becfd5bdd3..083e9516b000 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.24-patches-01.tar.xz"
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="amd64 x86"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
diff --git a/app-emulation/virtualbox/virtualbox-6.1.12a.ebuild b/app-emulation/virtualbox/virtualbox-6.1.12a.ebuild
deleted file mode 100644
index abd8a2292e9a..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.12a.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${CDEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		VBOX_WITH_VBOXIMGMOUNT=1 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.14a.ebuild b/app-emulation/virtualbox/virtualbox-6.1.14a.ebuild
deleted file mode 100644
index abd8a2292e9a..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.1.14a.ebuild
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PN="VirtualBox"
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}-${MY_PV}
-[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64"
-IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	!app-emulation/virtualbox-bin
-	acct-group/vboxusers
-	~app-emulation/virtualbox-modules-${DIR_PV:-${PV}}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	net-misc/curl
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libvpx:0=
-	sys-libs/zlib:=
-	!headless? (
-		media-libs/libsdl:0[X,video]
-		x11-libs/libX11
-		x11-libs/libxcb:=
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXmu
-		x11-libs/libXt
-		opengl? ( media-libs/libglvnd[X] )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			opengl? ( dev-qt/qtopengl:5 )
-			x11-libs/libXinerama
-		)
-	)
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	lvm? ( sys-fs/lvm2 )
-	opus? ( media-libs/opus )
-	udev? ( >=virtual/udev-171 )
-	vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
-	${CDEPEND}
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	!headless? (
-		x11-libs/libXinerama
-		opengl? ( virtual/opengl )
-	)
-	pam? ( sys-libs/pam )
-	pax_kernel? ( sys-apps/elfix )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? ( dev-qt/linguist-tools:5 )
-	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/kbuild-0.1.9998.3127
-	>=dev-lang/yasm-0.6.2
-	sys-devel/bin86
-	sys-libs/libcap
-	sys-power/iasl
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-dtd:4.4
-		dev-texlive/texlive-basic
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-fontsextra
-	)
-	java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
-	${CDEPEND}
-	java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-	usr/lib/virtualbox/VBoxSDL.so
-	usr/lib/virtualbox/VBoxSharedFolders.so
-	usr/lib/virtualbox/VBoxDD2.so
-	usr/lib/virtualbox/VBoxOGLrenderspu.so
-	usr/lib/virtualbox/VBoxPython.so
-	usr/lib/virtualbox/VBoxDD.so
-	usr/lib/virtualbox/VBoxDDU.so
-	usr/lib/virtualbox/VBoxREM64.so
-	usr/lib/virtualbox/VBoxSharedClipboard.so
-	usr/lib/virtualbox/VBoxHeadless.so
-	usr/lib/virtualbox/VBoxRT.so
-	usr/lib/virtualbox/VBoxREM.so
-	usr/lib/virtualbox/VBoxSettings.so
-	usr/lib/virtualbox/VBoxKeyboard.so
-	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
-	usr/lib/virtualbox/VBoxVMM.so
-	usr/lib/virtualbox/VirtualBox.so
-	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
-	usr/lib/virtualbox/components/VBoxC.so
-	usr/lib/virtualbox/components/VBoxSVCM.so
-	usr/lib/virtualbox/components/VBoxDDU.so
-	usr/lib/virtualbox/components/VBoxRT.so
-	usr/lib/virtualbox/components/VBoxREM.so
-	usr/lib/virtualbox/components/VBoxVMM.so
-	usr/lib/virtualbox/VBoxREM32.so
-	usr/lib/virtualbox/VBoxPython2_7.so
-	usr/lib/virtualbox/VBoxXPCOMC.so
-	usr/lib/virtualbox/VBoxOGLhostcrutil.so
-	usr/lib/virtualbox/VBoxNetDHCP.so
-	usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}"
-
-REQUIRED_USE="
-	java? ( sdk )
-	python? ( sdk )
-	vboxwebsrv? ( java )
-	${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
-	if ! use headless && ! use qt5 ; then
-		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
-	elif use headless && use qt5 ; then
-		einfo "You selected USE=\"headless qt5\", defaulting to"
-		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-	fi
-
-	if ! use opengl ; then
-		einfo "No USE=\"opengl\" selected, this build will lack"
-		einfo "the OpenGL feature."
-	fi
-	if ! use python ; then
-		einfo "You have disabled the \"python\" USE flag. This will only"
-		einfo "disable the python bindings being installed."
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-
-	tc-ld-disable-gold #bug 488176
-	tc-export CC CXX LD AR RANLIB
-	export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
-	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	rm -r kBuild/bin tools || die
-
-	# Replace pointless GCC version check with something less stupid.
-	# This is needed for the qt5 version check.
-	sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \
-		-i configure || die
-
-	# Disable things unused or split into separate ebuilds
-	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
-		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
-	# Respect LDFLAGS
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
-	# Do not use hard-coded ld (related to bug #488176)
-	sed -e '/QUIET)ld /s@ld @$(LD) @' \
-		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
-	# Use PAM only when pam USE flag is enbaled (bug #376531)
-	if ! use pam ; then
-		elog "Disabling PAM removes the possibility to use the VRDP features."
-		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
-		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
-			src/VBox/HostServices/Makefile.kmk || die
-	fi
-
-	# add correct java path
-	if use java ; then
-		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-			-i "${S}"/Config.kmk || die
-		java-pkg-opt-2_src_prepare
-	fi
-
-	# Only add nopie patch when we're on hardened
-	if gcc-specs-pie ; then
-		eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
-	fi
-
-	# Only add paxmark patch when we're on pax_kernel
-	if use pax_kernel ; then
-		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
-	fi
-
-	eapply "${WORKDIR}/patches"
-
-	eapply_user
-}
-
-doecho() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	local myconf=(
-		--with-gcc="$(tc-getCC)"
-		--with-g++="$(tc-getCXX)"
-		--disable-dbus
-		--disable-kmods
-		$(usex alsa '' --disable-alsa)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex opus '' --disable-libopus)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
-	)
-	if ! use headless ; then
-		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex qt5 '' --disable-qt)
-		)
-	else
-		myconf+=(
-			--build-headless
-			--disable-opengl
-		)
-	fi
-	if use amd64 && ! has_multilib_profile ; then
-		myconf+=( --disable-vmmraw )
-	fi
-	# not an autoconf script
-	doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
-	source ./env.sh || die
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
-	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
-	MAKE="kmk" emake \
-		VBOX_BUILD_PUBLISHER=_Gentoo \
-		TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
-		TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
-		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
-		VBOX_WITH_VBOXIMGMOUNT=1 \
-		all
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
-	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
-	vbox_inst() {
-		local binary="${1}"
-		local perms="${2:-0750}"
-		local path="${3:-${vbox_inst_path}}"
-
-		[[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
-		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
-		insinto ${path}
-		doins ${binary}
-		fowners root:vboxusers ${path}/${binary}
-		fperms ${perms} ${path}/${binary}
-	}
-
-	# Create configuration files
-	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
-	# Set the correct libdir
-	sed \
-		-e "s@MY_LIBDIR@$(get_libdir)@" \
-		-i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-	# Install the wrapper script
-	exeinto ${vbox_inst_path}
-	newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
-	fowners root:vboxusers ${vbox_inst_path}/VBox
-	fperms 0750 ${vbox_inst_path}/VBox
-
-	# Install binaries and libraries
-	insinto ${vbox_inst_path}
-	doins -r components
-
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do
-		vbox_inst ${each}
-	done
-
-	# These binaries need to be suid root.
-	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
-		vbox_inst ${each} 4750
-	done
-
-	# Install EFI Firmware files (bug #320757)
-	for each in VBoxEFI{32,64}.fd ; do
-		vbox_inst ${each} 0644
-	done
-
-	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
-	# VBoxXPCOMIPCD (bug #524202)
-	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
-		pax-mark -m "${ED}"${vbox_inst_path}/${each}
-	done
-
-	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-	done
-	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
-
-	if use pam ; then
-		# VRDPAuth only works with this (bug #351949)
-		dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
-	fi
-
-	# set an env-variable for 3rd party tools
-	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
-	doenvd "${T}/90virtualbox"
-
-	if ! use headless ; then
-		vbox_inst rdesktop-vrdp
-		vbox_inst VBoxSDL 4750
-		pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
-		for each in vboxsdl VBoxSDL ; do
-			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-		done
-
-		if use qt5 ; then
-			vbox_inst VirtualBox
-			vbox_inst VirtualBoxVM 4750
-			for each in VirtualBox{,VM} ; do
-				pax-mark -m "${ED}"${vbox_inst_path}/${each}
-			done
-
-			if use opengl ; then
-				vbox_inst VBoxTestOGL
-				pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
-			fi
-
-			for each in virtualbox{,vm} VirtualBox{,VM} ; do
-				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
-			done
-
-			insinto /usr/share/${PN}
-			doins -r nls
-			doins -r UnattendedTemplates
-
-			domenu ${PN}.desktop
-		fi
-
-		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
-		for size in 16 32 48 64 128 ; do
-			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
-		done
-		newicon ${PN}-48px.png ${PN}.png
-		doicon -s scalable ${PN}.svg
-		popd &>/dev/null || die
-		pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
-		for size in 16 24 32 48 64 72 96 128 256 512 ; do
-			for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
-				icofile="${PN}-${ico}-${size}px.png"
-				if [[ -f "${icofile}" ]] ; then
-					newicon -s ${size} ${icofile} ${PN}-${ico}.png
-				fi
-			done
-		done
-		popd &>/dev/null || die
-	fi
-
-	if use lvm ; then
-		vbox_inst VBoxVolInfo 4750
-		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
-	fi
-
-	if use sdk ; then
-		insinto ${vbox_inst_path}
-		doins -r sdk
-
-		if use java ; then
-			java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
-			java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
-		fi
-	fi
-
-	if use udev ; then
-		# New way of handling USB device nodes for VBox (bug #356215)
-		local udevdir="$(get_udevdir)"
-		insinto ${udevdir}
-		doins VBoxCreateUSBNode.sh
-		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
-		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
-		insinto ${udevdir}/rules.d
-		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
-			> "${T}"/10-virtualbox.rules || die
-		doins "${T}"/10-virtualbox.rules
-	fi
-
-	if use vboxwebsrv ; then
-		vbox_inst vboxwebsrv
-		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
-		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-	fi
-
-	# Remove dead symlinks (bug #715338)
-	find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die
-
-	# Fix version string in extensions or else they don't get accepted
-	# by the virtualbox host process (see bug #438930)
-	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
-		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
-		|| die
-
-	local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
-	if use vnc ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/VNC
-	fi
-
-	if use dtrace ; then
-		insinto ${extensions_dir}
-		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
-	fi
-
-	if use doc ; then
-		dodoc UserManual.pdf
-	fi
-
-	newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use udev ; then
-		udevadm control --reload-rules \
-			&& udevadm trigger --subsystem-match=usb
-	fi
-
-	tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
-	if ! use headless && use qt5 ; then
-		elog "To launch VirtualBox just type: \"virtualbox\"."
-	fi
-	elog "You must be in the vboxusers group to use VirtualBox."
-	elog ""
-	elog "The latest user manual is available for download at:"
-	elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
-	elog ""
-	elog "For advanced networking setups you should emerge:"
-	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-	elog ""
-	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
-	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	elog "package."
-	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
-	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
-	elog "image, please emerge"
-	elog "  app-emulation/virtualbox-additions"
-	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
-	elog "  app-emulation/virtualbox-extpack-oracle"
-	if ! use udev ; then
-		elog ""
-		elog "WARNING!"
-		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
-		elog ""
-		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
-		elog "or else USB in ${PN} won't work."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/app-emulation/virtualbox/virtualbox-6.1.16.ebuild b/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
index abd8a2292e9a..6d59d9b19039 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.16.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.16-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
 	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz"
 
 LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0"
+SLOT="0/$(ver_cut 1-2)"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64"
 IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 48e56863f259..31dd23612f6d 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,24 +1,36 @@
 DIST amd64-debug-libreoffice-6.4.6.2-r2.tar.xz 1533877704 BLAKE2B d0f95c497e94216c934c4c460b19dd8716e8722152586bfdf1a4231cdbc16028de84cfa73ca71e09e94978d45224cdc59b3fd4b9bcc4849abeff1b2886e4bf71 SHA512 46b3048f55f0e47b979572f48381aff9b97f0dcf8267d93533664ea91a45c749f402aeecc9eb2a9390972aa15ba22944e198895f4c5b121b23a1f473e2ad797f
 DIST amd64-debug-libreoffice-6.4.7.2.tar.xz 1110428328 BLAKE2B ec71c99201c6884ab8b5d94b62c43ec965c3d254768cf86d3028296f164918f4ce47529f45b54bbad0245726f0a6caa9ec3fb38b66d9ed6687a08f512cd8fa63 SHA512 48a41248076d8be24cd5356e5ba0f25ac2fa69e4c0fa822e15b59f0ff6b28f63d8eb2a5d27d47e3021cc701b562b07d5c86e81dc115b291babd6d0912c3f9891
+DIST amd64-debug-libreoffice-6.4.7.2_p1.tar.xz 1110421236 BLAKE2B b7aad45577e4a9604d3cef7a8a6d90f50772075ca041aff14bac3d0cd60ef9c42c0dc0fe4bc93dc8f6fe40c8105ff4ca3711eb5d4f54535717f224cf620f3d3a SHA512 c832575c7d32117ba22da36db3bfef17587275e99dfe58be489f97495ec9d3cbaeed0640ba1a8d9621d8d1c95f0aeabeb7a62e2fbd486e3f5ce2737390aacc6f
 DIST amd64-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1567465 BLAKE2B 7239068e9c32d58685dff3456d1c74d11092b0a5176ba5dbeba59a9bec54eee5584ee4ffb22266bc1e2854baf10057d60f73755a5e41df530b5f4cae69ff0597 SHA512 5c983a03a154a2ef3e48b65bdcd478f7f83345e9c3d4248811c0b2b98f2f4ed2d6fcb840a1862ee33911fa954371516649144e8e8e2c718f7ec1f6659ccf6b21
 DIST amd64-debug-libreoffice-gnome-6.4.7.2.xd3 1137139 BLAKE2B a4a9d56c93eddd1f67a189de9b71ca5a1f8a7623af689e43406d20bea9ae87a251000b67c098c4e53728cc8b6ea613119bce1ee8048f8435c6883be7ac9ab82d SHA512 b078e8bc899e5931acee912ac8a47cbe38700bee87c177928c58a7ee422d6b884054973d107a467f01801e9a02ce77a5203d01a50b9e0a41cc8e7724cd85ab37
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1137103 BLAKE2B 94bb01a6eb22de43778590729e96f4b60eccb2531a08df9c3cafcdf69222b0a29eb64e79f14306b265532f3d0fa5e7b24bd19b93e9104d3497f5fc381916221f SHA512 8a28e2250bb8f057fff56481e739e0ffd36c1c2cd2f0ed70c018e640b5b5f7e3512bbbeec2fb2d9123e7cee53d02125c36e2bc2de7964ed0a2d94c306306da26
 DIST amd64-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 747959737 BLAKE2B 0151ef5d689d95a3444b78f8123023508951ad106a051530b8d91efd3fa4afc3f541d97e2e50afa483725d100fe9e3efbe234990ef161f7d1821977e9491a646 SHA512 d6e4e70e00c36b473fae6718bc2687c5af3a529e21fb98de348379203d7a1c0eccee6b168e7165bc4db302a58945256c45c1fed7424f681ca524ae58683f4770
 DIST amd64-debug-libreoffice-gnome-java-6.4.7.2.xd3 505924670 BLAKE2B 078d04deccaffa28d813961c26fbe71c94f8fa1d55a91d29a3bfc55612832e67b4ecec1c83e68a053dba52ad83b28bc855e6aa1c7ed69933d5fa62e844da81af SHA512 af3f99943c9e5025bb455ffd33aa948966053f56e74358d7be797a7b800daac12e0a1acabae2aa42303e396ed00156deaa78fa125d1a5d026923733219dab48f
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505924630 BLAKE2B 4b56f6d58a9d6a4f856f5c4b95c8d6036ac16b7c19f8f68ae6f6fa8003937bb37e01541180c0d6bbb8f50b89b943153bf18a99d86bfc4c8e9d37539cf27194b8 SHA512 2f9352b0a2e336992444f513fd1eed5be90ad46077a9e734a2b777d7415edf256eec04ebffd77a178c8ecb0dbbae27ee6a03b93e7e8aa1f05dbbbc6ff4c8e869
 DIST amd64-debug-libreoffice-java-6.4.6.2-r2.xd3 746377573 BLAKE2B a2ee1b1f6b25e3f183948e9afb4a7ef07c7bfac003f64408c8de5607ffc61b0e4518c9b029e5732a98ad1d6840eeff4623e901825cc5a18bb95bd83bb8cc7944 SHA512 bfd37700646bb26fb8b59620edcff8152b85a97c323225899ceec0937326276eeb568be13c5264243ca79c486ee039da1476bba501957aa5885a2a2eb3ea0e20
 DIST amd64-debug-libreoffice-java-6.4.7.2.xd3 504794182 BLAKE2B d322b9bdec1f3e4c8284e568f65176e95586e815065422c67990675f1d90a59bc7ed00f3aae994d6c1eccf78d4382b99796ebb75c794c211f701c2d9dcb5df1f SHA512 59c4416602622fc299a2aba7daee16b7ceb497bb30af156ff202ba93cbdda6765d0d2b00935804e66047e86f45968a9456ec134babf723813417b1089380aa77
+DIST amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 504793922 BLAKE2B f5b138b430af48e9efb61f7d203c09ab20ab73e035a817d4d8b542fd3fa50dff493954818ae89f572c43312c1ca8bbbd1020d1543892e1253b8243cae9dc2397 SHA512 f2fca65534a03af999e47d6a5d2f79a69a0bad9f577d561fe4ab0638d221a19f5ba8b0370c3f05c410a69d474e709902ad8565aa72b6feed69f09d0f0c6b7016
 DIST amd64-debug-libreoffice-kde-6.4.6.2-r2.xd3 461475494 BLAKE2B c59addb14cc79422b91c0a051cf06df4fdd33279fdaeeee512db76cb8fd6224e80b485d20320b209404d8d14f679053665f23218ce7b620d8da3b20c74c72671 SHA512 dea493fae319faf8cde12c192084548bfbf55b4017d2d3d96938f5705156a5b19e8204629fe98f205488a2ff6cfd29927cbe2fbfbd27eb37adbd6b2a8a477b5c
 DIST amd64-debug-libreoffice-kde-6.4.7.2.xd3 294248970 BLAKE2B 80c8677d59f18dc5e1eb5c069e87672a84c08a10b6c0e1aca5a040a7b1f272bb3f6335023eb372747fcf8945bc331a0c84779067e056d8969fdd2797c8a3e492 SHA512 508c65afd92ec61300dd2d791dfeec4553b83ae8f07c6150a29d59f0e53b51ba6fcd430cdc82500073dc761bf9fdceb5a9d42d245f78226d2fcdacd335baea3d
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 294249182 BLAKE2B 177ebea55369432c3e3b28763d8ab8bce5b9e88cf6c6eeebb4844e8e6f36a1fcef95fe12d8972c19a1f8ecba28ec3c24117fbe007980635b4b6e9caf4ab054f8 SHA512 689023e9b69291f27edd9d1ff3844d56124e519a0d04c843a1222ae0760868b34748dcf310865d004876b91b167c4a1adf0494f6ef6b6be49bec1f691a278f10
 DIST amd64-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 755546076 BLAKE2B 4d0c2bc849793a8483d3a3a7156812f30f9b97e1add1d2d2676cf69974db88e27cf073e0844e1e05cf337d6e109d134dc1d4c6b84c7c12aa3e36cdc6184b87b4 SHA512 dfddae1f600780d088c429e6951047960036e6f31e908cdb18cc552645230b00ed0e2f6ed6be46fef815d8ff49fccf5450bc3f23b9025c8720ed30eeb78f3a57
 DIST amd64-debug-libreoffice-kde-java-6.4.7.2.xd3 513057173 BLAKE2B 8839b0a989f528d36ae2655b0f53a8f7cd977a89a38301b32d382ff26f9ea48e84552ae654294865927d9969edc23c930d9488546bc637596325de8ecb4b4e7f SHA512 30bad549f117bbd69d845e71b4acbeffa160e055bf815e7e8fdbb4cf38de7b6550591bed014b879d4fc79ff307d4979de0d8e321ee5a2fd0dcd12c18fd33ac78
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 513057171 BLAKE2B a91c73bd6d4b4883a5ada8ea9198dee1e4c5d2693be36996b73b2c092ebc3b10805e320a14927e323709167392d6e5a0473b7081c6c799665b7939711c86f6ac SHA512 f90350bd5120e64ebf6c42e3aecb0006d302c35f2192cf0fa51a99a77abf7cf6a4f3d562d40598e9ca1839b9c181835640645963795b30a22fbf3071403afdeb
 DIST x86-debug-libreoffice-6.4.6.2-r2.tar.xz 1497855216 BLAKE2B 3c87f75f3f3c2201b20e08a8bae5162d5d4f7a5a3a315ccb185b4cc98d3f15b13a896757a01db56855b8f384a601bbe2b8802794d83fb964b6775e7164aad627 SHA512 645e9448f419a59e7d20d6450821d72e56005a94aabe51ff3407a7a910fc648d34ae6e790e77b1e236b4f00fc404707566a46825992e4985707d4b29616707d4
 DIST x86-debug-libreoffice-6.4.7.2.tar.xz 1499017160 BLAKE2B a8973d320bb7f84a7153b3f2fb8de9223a4f379a9f235b11932884413830c4a1e7102255330aff2dee4e9e86ee8f613558001e2d500f3a5202bd9152154358ce SHA512 9f6b4c7da5af45500ad32a8c034b207dc498b19fc043c97d090d097a511f1fccdf3ecda23c3aed8b62d656d62a3030c0384c60a304e5182dbe4a8f8f63bba798
+DIST x86-debug-libreoffice-6.4.7.2_p1.tar.xz 1108972372 BLAKE2B 509f6482e83bdd5539e9f1affab16489ce473168251e73b260bee5be72e12de1fef1f66ec4d2c6f7e72999cf25ec515a47e6050387d3ca474c62440d75630d75 SHA512 cf8aea2a8c8c52d1d42d2a4771ceaeb0641242aa21316b47a02f9c34d4d76f96a3602102bcd8a458e7a0591848a2059a3dd4fcefb34f6cc6fda411225938c535
 DIST x86-debug-libreoffice-gnome-6.4.6.2-r2.xd3 1521667 BLAKE2B de0026bb04bc48122cf7dd1a2bda45cf3a744a32a665e7f8a4659a16771ffdcd1e86103633c390c9ae03bec59db89b3b38cdec420d1a214b15948e3c06cfb416 SHA512 b9af148a94e9cc988667bc6015b6b11342dfcefde30a085cfae0269e4528c6714291ddadcd8373320784fb12698504247e5d3959690613d024e422c04709410b
 DIST x86-debug-libreoffice-gnome-6.4.7.2.xd3 1522241 BLAKE2B efdee90ec7dd8dd0f13855a05917c3bdcb39c27539fa967ac1f0ed4a498771386ddd74ea9d473bd66961277d410f5af055d37925ecb32d102bd7d242efddbad8 SHA512 77e8f5d07fa659ac0dfb99ba0eb8c5b3c103d517d7369ee451134a3d752998c63f7476583553eef0752de1eff352851916f2e6a3c0d9329c05faff18fb893605
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1133117 BLAKE2B b45195154069fb8216967f0093ea59f6ecf1f872d636f4afcac58f500e2281275b7262176666f88d6599dd9b41072cde083ed6f6b7f939b8c1f3d3167b233f79 SHA512 31eccf49c4ab11fd3ac6ef354802e72122042efdc683ddbd3b48f25fed1ee87c1be9f9d222c1da8ee3066c2ce9b090d91d27ef3af57a84a2f275d7e5d01922ae
 DIST x86-debug-libreoffice-gnome-java-6.4.6.2-r2.xd3 722465261 BLAKE2B 682e741bb10fb54fc50cf04530af5c3e3049f5bd1b4c5667bc9f24f85552aac47f5d6825d5d1412b8557cdf0a33612b45f5d3868b74f60586c593443253f02db SHA512 e4fe34f140aa6aea94cb7e7def6463d88f6c3ddded4af19627cee84645aa72a2f810d0474364faa3409b5e7f1a8a1394dbd3728d747b8b46e4e9d26dc902006e
 DIST x86-debug-libreoffice-gnome-java-6.4.7.2.xd3 716893739 BLAKE2B 737883b6dc02841467a9d9fb1ff3602652fbad0c78b5bb6910b969ca826649f08c86d557eb7389bdb3eb397a3b237b5ae54af07b4629a19b25b5847923c93f97 SHA512 137d32f4ce10790d8438bc31e689cf532c8077d2362dca402f09611454f8922773b8ee6745f01513575e36466ce13ddafafdd5699334d360fd6983c999c29f27
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505451908 BLAKE2B f313c0eabb4ff2fc812db2fc0ed08a85e34c081bf8616c52d231db5a35a30907ecd3d1facf4dfcbbcde84db850d7914476acb8bdadb5398fe6d1800823e21681 SHA512 47f73b23276b7a8f4a6d29cb415d60f9ccb1ac66cc403bec371dd89de659e62e8158665bed69365aa3c4471ff5e28f30db15e6b17f7331c20e929ef6c538480d
 DIST x86-debug-libreoffice-java-6.4.6.2-r2.xd3 720927677 BLAKE2B 2427221039c273774fbab8f2a697366163afb69c2699b80354cea559d82e9e28805da0c248e3e851e64792af47763700783deda6b8088e5a230e06a49038a60c SHA512 fb7e2ee5164d143ddfc7c1a45e0b61047810f4f20149705bc6a4e58babec35200803de970062ce8bebe9971a476f99a82cecc2a643cdc7dc2cc86b76905fb4c0
 DIST x86-debug-libreoffice-java-6.4.7.2.xd3 715384916 BLAKE2B fe72391632dfef10f23b01e57eb7e53c9cbefc0cfe3bc24a1e7ae2dbbcd43680ed23d8bf5da4d665463c040012bd2527b401f2041160d5377c021f7177dd1cf0 SHA512 1e698539379ec4da18daede4b964271de19f0910e7a7490be95fd8b0676f94bba949df05cc171d0d99dcf6225bfcb0d9781b61b90139cc3d5b016bc2285038ad
+DIST x86-debug-libreoffice-java-6.4.7.2_p1.xd3 504312380 BLAKE2B de2fb9ba9dca1b76cb4c92b5a24540598b0e01d6cc94cf2d483190e5acf6dd6024868fcb50085ec55bd4d03a552a07dad886505a0e63678066883c7fcdf852ca SHA512 dce66dd9c5f7f3cd601dc148e838887c90bfb48a599a7051701086a1f1794fb8a5dd4d0eab3ae7ebfe48b7c99c48732a0086e16496174688370afdcf27a49cfa
 DIST x86-debug-libreoffice-kde-6.4.6.2-r2.xd3 442030408 BLAKE2B 414eb20169ea42e4b4ff73a502987433911fe1332e9ce26e1618791d74dd31f2f0c9b2ae27cab427ed8f959aef546eb2e63041c7c890937e0ffdc0fee650f27f SHA512 8d857d3567b50a109f13b120f2ffd6089193d78cb63c480985a3d0cc8068ff08bc7bcdd8b9255a53a808715085cda1f19d8c0b32910556106967533e92f7a974
 DIST x86-debug-libreoffice-kde-6.4.7.2.xd3 439198379 BLAKE2B 0d7e40e97fe44fbb4ee4d55b9c2900e9a5bd04c128e602db6d47df7127b2f9aaa0c6745556688347138d6c56282971b190e2a711e78beebd42a1bf27c164cb9f SHA512 73f51c55d67111e1e9e70a12dfc44c864d00c62c03bf20276a9d4a5df6725ed93dc38f75f7fa9b40908aa438de5f9bf5e2ee6a50a7cf58f7b5d237f87f55d38f
+DIST x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 285518032 BLAKE2B a213129359e4d5912dd514c4d00d879fdd5635f2a6237bba9771f064811a1f48bc3d0be706a3a2237ca7a48df6f1e1aae1cc0b790ac3e5c02310ace18b4fc141 SHA512 93a0475bb64849414fbf72199f6c2cffe2e67dbb64d89d8edec77af881cbdc6eb55d53362052296846619911be4f8d3e2f1d0a1b94e1eda0977d12b68e460d6e
 DIST x86-debug-libreoffice-kde-java-6.4.6.2-r2.xd3 720717402 BLAKE2B fd9c28894f274dc1be028085c3382040e4f36a49262e79d623f4c818e7c8b9dd2bf25b65f8d49914f02b93d3e61ea8758129a7f57850d559ce437d94f48dbfbc SHA512 a1e0622d6a4ff0dc05b835569c03626adee6114e8d0b25dc3739d90e0d951976df8527751c57ab65d2e79991086fc304266939f0d0d0f959a3ed5016166678f9
 DIST x86-debug-libreoffice-kde-java-6.4.7.2.xd3 715354739 BLAKE2B 063c8ac1805dc740b3d2fc58fa748ed2c70e6d41a11be81616831b9c9aa182828acdf2b6e2f6678b56e93fd797d72de352c07618c28431904b57d11316208fb4 SHA512 eff46bc156122134cc0e2e8bb14ae8170c54ba99213e9a0d950ed06a5345986803978e6dc01edd06ed08a21b5964754f66f73f3ec60ddd0804260c15504eb03e
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 504334898 BLAKE2B 20ef380020b1688b769f5d01f440cee328ba5b94e4ccd60ec6616e45d409d2e4d966ddf37d9ec1e5093cfde48874f4f866a728efa0c0015252739d4979082c2e SHA512 75498a9104e66b4acf95d765cf1c97ff61dac26c4b64e743b02cae94d4de87e3daa8971b1a069de1ba300af6bf51e2146ed0c2d118dc8cef17810b4cce031e93
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild
new file mode 100644
index 000000000000..6e24ae1fb030
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 710d16db31fa..95bfcd44159d 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,3 +1,3 @@
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
 DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
+DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index a6016b45c7ed..7444d4ee569f 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
diff --git a/app-text/po4a/po4a-0.60.ebuild b/app-text/po4a/po4a-0.61-r1.ebuild
index 8807618f22d5..ce4c88c02b9a 100644
--- a/app-text/po4a/po4a-0.60.ebuild
+++ b/app-text/po4a/po4a-0.61-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -24,7 +24,8 @@ RDEPEND="app-text/opensp
 	dev-perl/Text-WrapI18N
 	dev-perl/Unicode-LineBreak
 	dev-perl/YAML-Tiny
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	app-text/docbook-xsl-stylesheets
@@ -35,7 +36,7 @@ DEPEND="${RDEPEND}
 		virtual/latex-base
 	)"
 
-PATCHES=( "${FILESDIR}"/${P}-man.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
new file mode 100644
index 000000000000..ce4c88c02b9a
--- /dev/null
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext
+	virtual/perl-Pod-Parser"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index bab3f4c9d656..e89354dd767c 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
+DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
new file mode 100644
index 000000000000..10d5d8179d7e
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/go-bindata/go-bindata/..."
+KEYWORDS="amd64 ~arm ~arm64"
+
+DESCRIPTION="A small utility which generates Go code from any file"
+HOMEPAGE="https://github.com/go-bindata/go-bindata"
+SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="CC-PD"
+SLOT="0/${PVR}"
+
+src_install() {
+	GOBIN=${S}/bin \
+		golang-build_src_install
+	dobin bin/*
+}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
deleted file mode 100644
index 02d914964278..000000000000
--- a/dev-go/go-bindata/go-bindata-3.21.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Go Overlay Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
-#       Instead, we use a fork which is API compatible.
-#       For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
-GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
-GOLANG_PKG_ARCHIVEPREFIX="v"
-GOLANG_PKG_IS_MULTIPLE=1
-GOLANG_PKG_HAVE_TEST=1
-
-inherit golang-single
-
-DESCRIPTION="A small utility for embedding binary data in a GoLang program."
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 0afda6620771..8c1d74d431e9 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,18 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>toffanin.mauro@gmail.com</email>
-		<name>Mauro Toffanin</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
+  <maintainer type="project">
+    <email>dev@liguros.net</email>
+    <name>Development</name>
+  </maintainer>
 	<upstream>
-		<bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
+		<remote-id type="github">jteeuwen/go-bindata</remote-id>
 	</upstream>
-	<longdescription lang="en">
-		This package converts any file into managable Go source code. Useful for
-		embedding binary data into a go program. The file data is optionally
-		gzip compressed before being converted to a raw byte slice.
-	</longdescription>
-	<origin>go-overlay</origin>
+	<origin>ports</origin>
 </pkgmetadata>
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 48cf073feef4..a69e2856f2d8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,7 @@
 DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b249f83b9d06bfef4c37f99ad86dd1415c2fbaa1524cddaf57dd228d25f388fa9fe9f5b4a03ba7477080e11020fb1 SHA512 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348
 DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9
 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
+DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
 DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d94bc60a86fa93b5332c8d1f3e12a0071d9e6d4759be73bf44bf35dd14723b9e6707a84ba834e1775bc28aeec1edbe168 SHA512 81575ce7b267f5bb48bd844808e8edd4e373640bbc481372b288602eb9d3c9917e6c7c040c035b63a2f6edf437c3d826d6afdf5801765b51d9edd4a3b2a5b16f
diff --git a/dev-lang/erlang/erlang-23.1.5.ebuild b/dev-lang/erlang/erlang-23.1.5.ebuild
new file mode 100644
index 000000000000..a809e52a684b
--- /dev/null
+++ b/dev-lang/erlang/erlang-23.1.5.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit elisp-common java-pkg-opt-2 systemd wxwidgets
+
+# NOTE: If you need symlinks for binaries please tell maintainers or
+# open up a bug to let it be created.
+
+UPSTREAM_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
+HOMEPAGE="https://www.erlang.org/"
+SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
+	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
+	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
+
+LICENSE="Apache-2.0"
+# We use this subslot because Compiled HiPE Code can be loaded on the exact
+# same build of ERTS that was used when compiling the code.  See
+# http://erlang.org/doc/system_principles/misc.html for more information.
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
+
+RDEPEND="
+	acct-group/epmd
+	acct-user/epmd
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	emacs? ( >=app-editors/emacs-23.1:* )
+	java? ( >=virtual/jdk-1.8:* )
+	odbc? ( dev-db/unixODBC )
+	sctp? ( net-misc/lksctp-tools )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+S="${WORKDIR}/otp-OTP-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/18.2.1-wx3.0.patch
+	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
+)
+
+SITEFILE=50"${PN}"-gentoo.el
+
+src_prepare() {
+	default
+
+	./otp_build autoconf || die
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+
+	local myconf=(
+		--disable-builtin-zlib
+		$(use_enable hipe)
+		$(use_enable kpoll kernel-poll)
+		$(use_with java javac)
+		$(use_enable sctp)
+		$(use_with ssl ssl "${EPREFIX}"/usr)
+		$(use_enable ssl dynamic-ssl-lib)
+		$(use_enable systemd)
+		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs ; then
+		pushd lib/tools/emacs &>/dev/null || die
+		elisp-compile *.el
+		popd &>/dev/null || die
+	fi
+}
+
+extract_version() {
+	local path="$1"
+	local var_name="$2"
+	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+	local erl_libdir_rel="$(get_libdir)/erlang"
+	local erl_libdir="/usr/${erl_libdir_rel}"
+	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+	local erl_erts_ver="$(extract_version erts VSN)"
+	local my_manpath="/usr/share/${PN}/man"
+
+	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+	emake INSTALL_PREFIX="${D}" install
+
+	if use doc ; then
+		# Note: we explicitly install docs into:
+		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
+		# To maintain that layout we gather everything in 'html-docs'.
+		# See bug #684376.
+		mkdir html-docs || die
+		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+		docompress -x /usr/share/doc/${PF}
+	else
+		local DOCS=("README.md")
+	fi
+
+	einstalldocs
+
+	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+	## Clean up the no longer needed files
+	rm "${ED}/${erl_libdir}/Install" || die
+
+	insinto "${my_manpath}"
+	doins -r "${WORKDIR}"/man/*
+	# extend MANPATH, so the normal man command can find it
+	# see bug 189639
+	newenvd - "90erlang" <<-_EOF_
+		MANPATH="${my_manpath}"
+	_EOF_
+
+	if use emacs ; then
+		elisp-install erlang lib/tools/emacs/*.{el,elc}
+		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+		elisp-site-file-install "${T}/${SITEFILE}"
+	fi
+
+	newinitd "${FILESDIR}"/epmd.init-r2 epmd
+	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/luajit/luajit-2.0.5-r2.ebuild b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
index 2ee236c9d5d2..3dd7bad80377 100644
--- a/dev-lang/luajit/luajit-2.0.5-r2.ebuild
+++ b/dev-lang/luajit/luajit-2.0.5-r2.ebuild
@@ -14,8 +14,8 @@ fi
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="https://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
-	${HOTFIX:+http://luajit.org/download/${HOTFIX}}"
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz
+	${HOTFIX:+https://luajit.org/download/${HOTFIX}}"
 
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
@@ -50,7 +50,7 @@ _emake() {
 		TARGET_AR="$(tc-getAR) rcus" \
 		BUILDMODE="$(usex static-libs mixed dynamic)" \
 		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+		INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 		"$@"
 }
 
@@ -61,7 +61,7 @@ src_compile() {
 src_install() {
 	_emake install
 
-	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+	pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
 	HTML_DOCS="doc/." einstalldocs
 }
diff --git a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
index 87baa475ebd4..cb942e454d02 100644
--- a/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.0_beta3-r1.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit pax-utils toolchain-funcs
 
-MY_PV="$(ver_cut 1-4)"
+MY_PV="$(ver_cut 1-5)"
 MY_PV="${MY_PV/_beta/-beta}"
 MY_P="LuaJIT-${MY_PV}"
 
 DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
 HOMEPAGE="https://luajit.org/"
-SRC_URI="http://luajit.org/download/${MY_P}.tar.gz"
+SRC_URI="https://luajit.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
@@ -39,7 +39,7 @@ _emake() {
 		TARGET_AR="$(tc-getAR) rcus" \
 		BUILDMODE="$(usex static-libs mixed dynamic)" \
 		TARGET_STRIP="true" \
-		INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \
+		INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 		"$@"
 }
 
@@ -50,7 +50,7 @@ src_compile() {
 src_install() {
 	_emake install
 
-	pax-mark m "${ED}usr/bin/luajit-${MY_PV}"
+	pax-mark m "${ED}/usr/bin/luajit-${MY_PV}"
 
 	HTML_DOCS="doc/." einstalldocs
 }
diff --git a/dev-libs/glib/glib-2.66.3.ebuild b/dev-libs/glib/glib-2.66.3.ebuild
index cbfb42aaa692..4c161e6cbae5 100644
--- a/dev-libs/glib/glib-2.66.3.ebuild
+++ b/dev-libs/glib/glib-2.66.3.ebuild
@@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 # them or just put the (build) deps in that rare consumer instead of recursive
 # RDEPEND here (due to lack of recursive DEPEND).
 RDEPEND="
-	!<dev-util/gdbus-codegen-2.66.0
+	!<dev-util/gdbus-codegen-${PV}
 	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
 	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
 	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
index d3cb417753e1..c4388575c8b5 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/24"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libucl/libucl-0.8.1-r100.ebuild b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
new file mode 100644
index 000000000000..66e66cd2dc80
--- /dev/null
+++ b/dev-libs/libucl/libucl-0.8.1-r100.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
+
+DESCRIPTION="Universal configuration library parser"
+HOMEPAGE="https://github.com/vstakhov/libucl"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vstakhov/libucl.git"
+else
+	SRC_URI="https://github.com/vstakhov/libucl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+DEPEND="!!dev-libs/ucl
+	lua? ( ${LUA_DEPS} )
+	urls? ( net-misc/curl )
+	sign? ( dev-libs/openssl:0 )
+"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/api.md )
+
+src_prepare() {
+	default
+	rm tests/schema/{definitions,ref{,Remote}}.json || die
+	eautoreconf
+}
+
+src_configure() {
+	lua_setup
+
+	local myeconfargs=(
+		"$(use_enable lua)"
+		"$(use_enable regex)"
+		"$(use_enable sign signatures)"
+		"$(use_enable urls)"
+		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+	use lua && DOCS+=( "doc/lua_api.md" )
+	einstalldocs
+	if ! use static-libs; then
+		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
+			die "error while deleting static library"
+	fi
+}
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index c4c4911fe043..66e66cd2dc80 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit autotools
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single autotools
 
 DESCRIPTION="Universal configuration library parser"
 HOMEPAGE="https://github.com/vstakhov/libucl"
@@ -18,11 +19,12 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-
-IUSE="lua +regex sign urls +utils static-libs"
+IUSE="lua +regex sign urls +utils static-libs test"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
 
 DEPEND="!!dev-libs/ucl
-	lua? ( >=dev-lang/lua-5.1:= )
+	lua? ( ${LUA_DEPS} )
 	urls? ( net-misc/curl )
 	sign? ( dev-libs/openssl:0 )
 "
@@ -36,24 +38,31 @@ DOCS=( README.md doc/api.md )
 src_prepare() {
 	default
 	rm tests/schema/{definitions,ref{,Remote}}.json || die
-
 	eautoreconf
 }
 
 src_configure() {
+	lua_setup
+
 	local myeconfargs=(
 		"$(use_enable lua)"
 		"$(use_enable regex)"
 		"$(use_enable sign signatures)"
 		"$(use_enable urls)"
 		"$(use_enable utils)"
+		LUA_INCLUDE="$(lua_get_CFLAGS)"
+		LIB_LIBS="$(lua_get_LIBS)"
 	)
-	econf "${myeconfargs}"
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check
 }
 
 src_install() {
 	default
-	DOCS+=( $(usex lua "doc/lua_api.md" "") )
+	use lua && DOCS+=( "doc/lua_api.md" )
 	einstalldocs
 	if ! use static-libs; then
 		find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || \
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index e3dd8f55a177..a80577324d35 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1 @@
-DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
-DIST re2-2020-10-01.tar.gz 403344 BLAKE2B 163d44991dc80dc04871bc53c64d4eec9f9e8db36b057a44eba3b1f033f0b130d7fccf4ba8aec33cc515ab5b11bd4f5b0343b4381758e8d9446c5017f1f04d14 SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726
 DIST re2-2020-11-01.tar.gz 402756 BLAKE2B 4c5bb5d4859f5b822408483a90a37b4f7e18d3ee81ecfe52563b091c0594dc32343257521c53267ff0c4b62a81a58b2231b628915afd94d368aebf13b965921e SHA512 167f21ec5a94640820cc1e2e9f4a4d3819a5e70011d0f8afb3fec3b2f66e21688196cedc66ce785158e49d1a0cb34b5f9ae68729e602e77d1077eadcbca7d7fe
diff --git a/dev-libs/re2/re2-0.2020.08.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
deleted file mode 100644
index 69b48d1d9c89..000000000000
--- a/dev-libs/re2/re2-0.2020.08.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-libs/re2/re2-0.2020.10.01.ebuild b/dev-libs/re2/re2-0.2020.10.01.ebuild
deleted file mode 100644
index 9b7e0bf86ea7..000000000000
--- a/dev-libs/re2/re2-0.2020.10.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="8"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="icu"
-
-BDEPEND="icu? ( virtual/pkgconfig )"
-DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}" shared
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
index 2b180c6dc0d5..374c3077b81c 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
index cb73196e10c0..68fd925dfe8b 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 PHP_EXT_NEEDED_USE="unicode"
 DOCS=( README.md )
 
@@ -20,9 +20,3 @@ DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME complian
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-
-src_prepare() {
-	# Missing test source files in archive.  Fixed upstream in next release.
-	rm tests/011.phpt tests/bug001.phpt || die
-	php-ext-source-r3_src_prepare
-}
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
index 18221a56290e..775332d83c50 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
@@ -17,12 +17,11 @@ LICENSE="BSD"
 SLOT="7"
 IUSE="+curl examples"
 
-DEPEND="php_targets_php7-2? ( dev-lang/php:7.2[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)]
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
-	php_targets_php7-4? (
-		dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+DEPEND="
+	dev-libs/libpcre:3=
+	curl? ( net-misc/curl:0= )
+	php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] )
+	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index 6e305b0c2cc6..f02e197d9ef6 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,2 +1,3 @@
 DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
 DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5
+DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
new file mode 100644
index 000000000000..a390fa7584ed
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
index e03c2164d656..15715b90d65c 100644
--- a/dev-php/pecl-translit/Manifest
+++ b/dev-php/pecl-translit/Manifest
@@ -1 +1,2 @@
 DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1
+DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46
diff --git a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
new file mode 100644
index 000000000000..5c7709ce8eff
--- /dev/null
+++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="translit"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
+PHP_EXT_NAME="translit"
+
+inherit php-ext-source-r3
+
+SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/derickr/pecl-translit"
+
+DESCRIPTION="Transliterates non-latin character sets to latin"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
index f030569d725f..65d0a5fb0ec5 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..5a28959a98a7
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.org/project/feedparser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-sgmllib.patch"
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/mock/mock-4.0.2.ebuild b/dev-python/mock/mock-4.0.2.ebuild
index 0324e430e2a8..ea859e662d9d 100644
--- a/dev-python/mock/mock-4.0.2.ebuild
+++ b/dev-python/mock/mock-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -23,6 +23,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]"
 
+src_prepare() {
+	sed -i -e '/  pytest.*/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# Upstream supports running tests only in their dream pristine
 	# environment.  pytest doesn't work at all if mock is already
@@ -40,6 +45,9 @@ python_test() {
 			mock/tests/testmock.py || die
 	fi
 
+	# Avoid pytest dependency
+	sed -i -e '/import pytest/d' mock/tests/testhelpers.py || die
+
 	"${EPYTHON}" -m unittest discover -v || die "Tests failed with ${EPYTHON}"
 }
 
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 8bf5dad8018e..51c9d3cf1e48 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -15,4 +15,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
 distutils_enable_tests nose
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index aa669d689dd5..ac676f22ee5a 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST CLion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
-EBUILD clion-2020.2.4.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
+DIST CLion-2020.3.tar.gz 631168831 BLAKE2B 4a0a00776a91d93ab7a70a639aef25b9fe604be22d594ca451118f0057679dc29f7329e2516da0ac362312b20b18b819c3f3a494c28c443e4af478be547747bd SHA512 27d533f5b5097590a346ec28e11820a2dd82412ba5a6a4ae7dbb274572ad90b2c853cd47f0bdeb3fb38c0411469a5f5d439105535b92916b75488532be2c3c77
+EBUILD clion-2020.3.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
 EBUILD clion-9999.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
diff --git a/dev-util/clion/clion-2020.2.4.ebuild b/dev-util/clion/clion-2020.3.ebuild
index ea0bc3f5f047..ea0bc3f5f047 100644
--- a/dev-util/clion/clion-2020.2.4.ebuild
+++ b/dev-util/clion/clion-2020.3.ebuild
diff --git a/dev-util/datagrip/Manifest b/dev-util/datagrip/Manifest
index 2f7710c8eb38..db16c1611c36 100644
--- a/dev-util/datagrip/Manifest
+++ b/dev-util/datagrip/Manifest
@@ -1,3 +1,3 @@
-DIST datagrip-2020.2.3.tar.gz 386608216 BLAKE2B 9020dd7b639763c37ba666d10d7a1b6ef96c39c7fbdb4c5faa15d11f200e60f8b4ae64d84d5d37fac651a1b0bcf3545e7dfc9423e2b7c984e6378bf516d3b4dc SHA512 8aa4ef34c3bdc6f3d2c618a642eafc562c8cbfd52ecbd7686132e5c9aecb969f8222fd5341fce3ff6eef073229c8e46ebe1d1c254b2cda4ea0994b821d04095f
-EBUILD datagrip-2020.2.3.ebuild 1449 BLAKE2B f3dbe5fb3372f06bbe024e76adf29df54857d4cf2f0720322863df6b1c27045f87dd98a1bc0e507e6f4f86066364261e4f7933550dc1a80f62f32f77ea697a1f SHA512 ea8f9e0c111c352455c3533127530b60f71209e3990dc24302c6920fdfccb452421bbe9fed14553350e8f90e529f333544c31b6ff5c38f7f32f4e68edde136ea
+DIST datagrip-2020.3.tar.gz 443012748 BLAKE2B 40e93699b8c47a086cda507489c5002c7992e35d4fba53c08713d3e0ae36efd07b2360e1f41df2b3ac44ea0958c45284273ba52c29e81732589023e9c3a6e6d9 SHA512 603fe51c3301f42fc12c5b41d9e66ab212cb3d103c631b8121850a4bf8ff646ad30b2075cfecfc37354bc004cdf8594bc15b7fbb0d8c7a4335223bfa917b5b80
+EBUILD datagrip-2020.3.ebuild 1449 BLAKE2B f3dbe5fb3372f06bbe024e76adf29df54857d4cf2f0720322863df6b1c27045f87dd98a1bc0e507e6f4f86066364261e4f7933550dc1a80f62f32f77ea697a1f SHA512 ea8f9e0c111c352455c3533127530b60f71209e3990dc24302c6920fdfccb452421bbe9fed14553350e8f90e529f333544c31b6ff5c38f7f32f4e68edde136ea
 EBUILD datagrip-9999.ebuild 1449 BLAKE2B f3dbe5fb3372f06bbe024e76adf29df54857d4cf2f0720322863df6b1c27045f87dd98a1bc0e507e6f4f86066364261e4f7933550dc1a80f62f32f77ea697a1f SHA512 ea8f9e0c111c352455c3533127530b60f71209e3990dc24302c6920fdfccb452421bbe9fed14553350e8f90e529f333544c31b6ff5c38f7f32f4e68edde136ea
diff --git a/dev-util/datagrip/datagrip-2020.2.3.ebuild b/dev-util/datagrip/datagrip-2020.3.ebuild
index 49a78c76c818..49a78c76c818 100644
--- a/dev-util/datagrip/datagrip-2020.2.3.ebuild
+++ b/dev-util/datagrip/datagrip-2020.3.ebuild
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index e173db4d2b68..473414c4997e 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1 +1,2 @@
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
+DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a
diff --git a/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
new file mode 100644
index 000000000000..d6c20964ab23
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+# TODO: automagic libportal dep
+# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.37.0[introspection]
+	>=dev-libs/glib-2.65.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.26:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10= )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index c026db6f631d..ce8bcc8f213e 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.2.3.tar.gz 427140538 BLAKE2B 0bc742e4fc4c5860b364cc34b4a17fa3147881a8e110fea43440e8cf89755b24840a86c770984b3e5d640229fa7806e2739acd6bbf5c7aee83af4404c92fb517 SHA512 742a7e134f01b882778b980f19f35f9310bf5e926ab4de1994af626f453ede74ea6fb5d2ed19c8077f6c152bc0836b1d4f36c5e3752b5cdd5b143a0f72ed4e79
-EBUILD goland-2020.2.3.ebuild 1418 BLAKE2B 6da9cdb952152eea5833b3ae84a5cb77790c52c032c20fa763b8c9d33cb17ff40b7f630505bad2995b5ad1a8c0584bfcdaf1c24b8210022cdef0d26be3e98840 SHA512 cb892b7c5a9aa6c0060836d377d3a5000e65e5788c0501866b3f5a7a75278c6cefd8cacc53bb8cb3b3303a709d78f474f2594b82a10913438382c08a8985cf57
+DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
+EBUILD goland-2020.3.ebuild 1418 BLAKE2B 6da9cdb952152eea5833b3ae84a5cb77790c52c032c20fa763b8c9d33cb17ff40b7f630505bad2995b5ad1a8c0584bfcdaf1c24b8210022cdef0d26be3e98840 SHA512 cb892b7c5a9aa6c0060836d377d3a5000e65e5788c0501866b3f5a7a75278c6cefd8cacc53bb8cb3b3303a709d78f474f2594b82a10913438382c08a8985cf57
 EBUILD goland-9999.ebuild 1418 BLAKE2B 6da9cdb952152eea5833b3ae84a5cb77790c52c032c20fa763b8c9d33cb17ff40b7f630505bad2995b5ad1a8c0584bfcdaf1c24b8210022cdef0d26be3e98840 SHA512 cb892b7c5a9aa6c0060836d377d3a5000e65e5788c0501866b3f5a7a75278c6cefd8cacc53bb8cb3b3303a709d78f474f2594b82a10913438382c08a8985cf57
diff --git a/dev-util/goland/goland-2020.2.3.ebuild b/dev-util/goland/goland-2020.3.ebuild
index 09527a08e1a2..09527a08e1a2 100644
--- a/dev-util/goland/goland-2020.2.3.ebuild
+++ b/dev-util/goland/goland-2020.3.ebuild
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index 5030f858e6a2..3b26c609b67c 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -19,9 +19,5 @@ LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
index 5ccaa72f6274..66ecd1e7b2fd 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
@@ -81,8 +81,8 @@ src_install() {
 
 	# The meson build system configures the shebangs to the temporary python
 	# used during the build. We need to fix it.
-	sed -i -e 's:^#!.*:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
-	python_fix_shebang "${ED}"/usr/bin/*
+	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
+	python_fix_shebang "${ED}"/usr/bin
 
 	# Don't install this file, it's in gtk-doc-am now
 	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
new file mode 100644
index 000000000000..cb1e33d2fe62
--- /dev/null
+++ b/dev-util/hermes/Manifest
@@ -0,0 +1 @@
+DIST hermes-2.8.tar.gz 61010 BLAKE2B 520110318dd0c2f2bc150b050729f9fa36c14ea5dca9a8492e77bc67618e14adb36ca35cf67b1aeb7a1e8a2dfef84fb6662bbdad21e427bff8aea4d53c271be3 SHA512 ea3378e5311202333f6eb59e301c92d9db1937e540f00283b679bd50e54312b8a98c469cf106374e9dde78a37e8997d7022569a9f81703ba445577f8cdd7e6e3
diff --git a/dev-util/hermes/files/99hermes b/dev-util/hermes/files/99hermes
new file mode 100644
index 000000000000..364c4f4d4c3a
--- /dev/null
+++ b/dev-util/hermes/files/99hermes
@@ -0,0 +1 @@
+PATH="/opt/hermes/bin"
diff --git a/dev-util/hermes/files/hermes-2.8-lua-shebang.patch b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
new file mode 100644
index 000000000000..67058f726d78
--- /dev/null
+++ b/dev-util/hermes/files/hermes-2.8-lua-shebang.patch
@@ -0,0 +1,23 @@
+diff --git a/lib/tool.lua b/lib/tool.lua
+index a9124f3..8c39911 100755
+--- a/lib/tool.lua
++++ b/lib/tool.lua
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!@LUA@
+ 
+ require("strict")
+ function tool()
+diff --git a/bin/lua_cmd b/bin/lua_cmd
+index fabc5d5..32c8e13 100755
+--- a/bin/lua_cmd
++++ b/bin/lua_cmd
+@@ -37,7 +37,7 @@ extra=
+ if [ "x$LUA_PATH" != x ]; then
+   extra=";$LUA_PATH"
+ else
+-  extra=";`lua -e 'print(package.path)'`"
++  extra=";`@LUA@ -e 'print(package.path)'`"
+ fi
+ 
+ export LUA_PATH="$execLuaPath$extra"
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-2.8.ebuild
new file mode 100644
index 000000000000..a6b7694d1f6a
--- /dev/null
+++ b/dev-util/hermes/hermes-2.8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+inherit lua-single
+
+DESCRIPTION="Lua based testing manager"
+HOMEPAGE="https://github.com/TACC/Hermes"
+SRC_URI="https://github.com/TACC/Hermes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Hermes-${PV}
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luaposix[${LUA_USEDEP}]
+	')
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.8-lua-shebang.patch )
+
+src_compile() {
+	sed -e "s|@LUA@|${LUA}|g" \
+	    -i lib/tool.lua \
+	    -i bin/lua_cmd || die
+}
+
+src_test() {
+	local -x PATH="bin:${PATH}"
+	tm -vvv || die
+	testcleanup || die
+}
+
+src_install() {
+	dodir /opt/hermes
+	cp -r "${S}"/. "${ED}"/opt/hermes/ || die
+
+	doenvd "${FILESDIR}"/99hermes
+}
diff --git a/media-fonts/mathematica-fonts/metadata.xml b/dev-util/hermes/metadata.xml
index acf76936b23f..4ea959e3b8cc 100644
--- a/media-fonts/mathematica-fonts/metadata.xml
+++ b/dev-util/hermes/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
 	</maintainer>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 8007e43abb06..6c63d4dc3ad3 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,3 @@
-DIST ideaIC-2020.2.3.tar.gz 679519018 BLAKE2B 6f9f1a819b4b834fdc26f1f2052f6dcd0c7d0bf3acad3509f8cf3b0bc79e7843a054c8c601e216ac2b27e352513df1436579c954aaa343329e5d9e59fb9b46e4 SHA512 54b0476402626af04324520e573ab80db10e1c381c22b3d96d1a52f8cc275a69256d43236ef63b0b456bb5d214eaec0e0aa3a6289e89f24a3e4161c62eb16ad6
-EBUILD idea-community-2020.2.3.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
+DIST ideaIC-2020.3.tar.gz 738387806 BLAKE2B c2454441ce90fb80d965472b0859389bc2fc4bbc3ae79d022c387a14a56dc8e5c8b30ac720136fdf53d7a9b8912e6e83a07e2f880e7e1f690a2a7374789c9473 SHA512 bb85b4b4708730e04a75aa3bdbe5519a274425e23edc092dc5104966486252f53a75ed81c7c6e657c85822c50f24f1bc8453bff266051302206ec67a1bb6abf3
+EBUILD idea-community-2020.3.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
 EBUILD idea-community-9999.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
diff --git a/dev-util/idea-community/idea-community-2020.2.3.ebuild b/dev-util/idea-community/idea-community-2020.3.ebuild
index bf6dae4f3363..bf6dae4f3363 100644
--- a/dev-util/idea-community/idea-community-2020.2.3.ebuild
+++ b/dev-util/idea-community/idea-community-2020.3.ebuild
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 879ba4a6da55..28b78668b4be 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,3 +1,3 @@
-DIST ideaIU-2020.2.3.tar.gz 810342586 BLAKE2B 68b0829bd54407e362823500ac9dfdb7bdd7c9e7c08a6e2eb0e65b1b2499de5cd2a0bdfc6cf4570fd675eaf56f6732b245ea1cb645ede77b397d1758fbfbcce7 SHA512 7eedd47f9e4de510d2f7e9485655721585d892aad35888b4d71da2506f2175065bc3c1adf87dc2bd3f1d520a93abf098d0b65b11dce3f9638f0b3420b905ad4e
-EBUILD idea-ultimate-2020.2.3.ebuild 1586 BLAKE2B c39ca0da9e77b82bddf17352213ca299d5c301a55ee3156d3cac809fdbc5c6d1f92f2d6d90bae9f0a06890d19b020b85b0cb43adf12590fd2d2eba912947e6dd SHA512 e3e9cf8368c4ecc68b23820b2c5b99e077534dd73718f57985f394edd0d522bf1f5f7a8deb44d9f69f829fcc18101310ecddbd57a5d57c94b7047ce284267e5f
+DIST ideaIU-2020.3.tar.gz 876504666 BLAKE2B facb2fb54c0f462d8c76fe036efb4edf6aa5d2197e0f7af71570eb43ef944fd2f994518e2d0b822a3dd3a41b95fa3e078a857cd360e03390a774e105d5507b9a SHA512 282857aba166ebb4c4e84268d5c7c1d51c4e914ea8efc6a11cd36df972eb5083ccf7d9c260f9f22dc08cacee6cd3de137d483369dae4b3bab0269416d82ce4b1
+EBUILD idea-ultimate-2020.3.ebuild 1586 BLAKE2B c39ca0da9e77b82bddf17352213ca299d5c301a55ee3156d3cac809fdbc5c6d1f92f2d6d90bae9f0a06890d19b020b85b0cb43adf12590fd2d2eba912947e6dd SHA512 e3e9cf8368c4ecc68b23820b2c5b99e077534dd73718f57985f394edd0d522bf1f5f7a8deb44d9f69f829fcc18101310ecddbd57a5d57c94b7047ce284267e5f
 EBUILD idea-ultimate-9999.ebuild 1586 BLAKE2B c39ca0da9e77b82bddf17352213ca299d5c301a55ee3156d3cac809fdbc5c6d1f92f2d6d90bae9f0a06890d19b020b85b0cb43adf12590fd2d2eba912947e6dd SHA512 e3e9cf8368c4ecc68b23820b2c5b99e077534dd73718f57985f394edd0d522bf1f5f7a8deb44d9f69f829fcc18101310ecddbd57a5d57c94b7047ce284267e5f
diff --git a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.ebuild b/dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild
index 0f12f6fd55f4..0f12f6fd55f4 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2020.2.3.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c0b6914883c8..34202325db4d 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1,2 @@
 DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
+DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
new file mode 100644
index 000000000000..ad21a5af3bea
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="${SRC_URI/src\//}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index d0f3715d1a6a..d35708f52d87 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1,2 @@
 DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
+DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
new file mode 100644
index 000000000000..5cdf612c8e06
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="${SRC_URI/src\//}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index aa5ca0665efd..2c775f16899f 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
 DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
+DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
diff --git a/dev-util/kdevelop/kdevelop-5.6.1.ebuild b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
new file mode 100644
index 000000000000..06faa562e63d
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="${SRC_URI/src\//}"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+	!dev-util/kdevelop-clang-tidy
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "Static C++ Qt code analysis" dev-util/clazy
+		optfeature "Static C/C++ code analysis" dev-util/cppcheck
+		optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "Meson Project manager plugin" dev-util/meson
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/phpstorm/Manifest b/dev-util/phpstorm/Manifest
index 2201608041c5..8bf2cb3857d6 100644
--- a/dev-util/phpstorm/Manifest
+++ b/dev-util/phpstorm/Manifest
@@ -1,3 +1,3 @@
-DIST PhpStorm-2020.2.2.tar.gz 416501113 BLAKE2B 9add346dcf737f7400d059ad1b6b403426d2df77beac13f825b09cce045410b9638eefb2dec40290064cb587937ceefb19ca1418b59f7216796237a7df52bfa1 SHA512 4fe9cd4d820ecea8a82bf956f255a47569d8ac562d14555ddb8e9823bc1a288fc04faca24783cba359e79087ea41f6d41c39fc4fdcf832167d19da896fcae27a
-EBUILD phpstorm-2020.2.2.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
+DIST PhpStorm-2020.3.tar.gz 473806464 BLAKE2B cace121caa8f1229139abca36268a4dd2e98a67c201ffa607d28b6ffc5f4a2c33a8e0749ea34ad619f2740804109b847ed3bf804f751bf691c8440dd543bf3ca SHA512 86306a6c662455e7f8140a93bf381fe02ff3ece7dd23b9021e8cbacb069fdddc6805980a534f6fe2cab44fd7977f4f96cdbab7565f7b2ea184beebc9357dc8b1
+EBUILD phpstorm-2020.3.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
 EBUILD phpstorm-9999.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
diff --git a/dev-util/phpstorm/phpstorm-2020.2.2.ebuild b/dev-util/phpstorm/phpstorm-2020.3.ebuild
index 6fd2a8846e71..6fd2a8846e71 100644
--- a/dev-util/phpstorm/phpstorm-2020.2.2.ebuild
+++ b/dev-util/phpstorm/phpstorm-2020.3.ebuild
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 306f617e6f52..d6a5a674467d 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,3 +1,3 @@
-DIST pycharm-community-2020.2.3.tar.gz 404986528 BLAKE2B 0f2accb84ab1ae41b6385c11677fd7de3815be789f34d1bc192390412dec92762cd4276e34cd6e5941e1bc3c3d3bf388a14ebeca967b4305d8cdeb9937e7bf4b SHA512 3b4bdfa2ae8e3a64bf7a3fbbe98f5b09638cc11e4dbd9e3883bc6e9ed9a8329565eba7bdbedaf10fdbb53770139b9d9b2eb91b6ed4617822bb75205a1c157553
-EBUILD pycharm-community-2020.2.3.ebuild 1378 BLAKE2B b325725ce7f464ae2359552cb90358c9ab69d6709268d3e909c0cf600c316614cb05fe6e77125f0d86b19629c9f0e4a23127d5c931c13051420b585ca1639072 SHA512 ee178e775d3cab103f9f7cf9b9f66ca46edfccba3806a149830786589b09d7f3391509bf43fb41fec949dd8b9d07aeffddf19d071a3cd44b59cb89cd19dc5523
+DIST pycharm-community-2020.3.tar.gz 486641961 BLAKE2B 35172e213cd90378637adecfc12ecbb758866a5359a5b6159d5201d232ff1e99a0af447163a598057d94c2d307d4d9c627f3f971b58c18c3d95cc2d9d81ef0fc SHA512 16d3508dfd89a3c4b17cdc68e35b2f44e3e18903b94c323c3e845801a8c0d7609b5f9693d7a76ad927860f8d1ec8c9537a1595391167cb5648cb97f248ffa171
+EBUILD pycharm-community-2020.3.ebuild 1378 BLAKE2B b325725ce7f464ae2359552cb90358c9ab69d6709268d3e909c0cf600c316614cb05fe6e77125f0d86b19629c9f0e4a23127d5c931c13051420b585ca1639072 SHA512 ee178e775d3cab103f9f7cf9b9f66ca46edfccba3806a149830786589b09d7f3391509bf43fb41fec949dd8b9d07aeffddf19d071a3cd44b59cb89cd19dc5523
 EBUILD pycharm-community-9999.ebuild 1378 BLAKE2B b325725ce7f464ae2359552cb90358c9ab69d6709268d3e909c0cf600c316614cb05fe6e77125f0d86b19629c9f0e4a23127d5c931c13051420b585ca1639072 SHA512 ee178e775d3cab103f9f7cf9b9f66ca46edfccba3806a149830786589b09d7f3391509bf43fb41fec949dd8b9d07aeffddf19d071a3cd44b59cb89cd19dc5523
diff --git a/dev-util/pycharm-community/pycharm-community-2020.2.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
index 30ff563d5965..30ff563d5965 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.2.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 2f0856143059..6444cc6bb175 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,3 +1,3 @@
-DIST pycharm-professional-2020.2.3.tar.gz 528810852 BLAKE2B 2915590f4b87e95423f21211555a024b5b7a75cdb7d171b001e286f21b903300e050b76736cd3da6409b8059b54e40d8697790a931501eb6a6a39bb7b4af4172 SHA512 cf082215da7d999b2fe2449a1683795de9587ecd8f768b8e4c9821575bf4e01030ad600ec27d27d2486f68853998fbd66644dcea165335e00849a2a3b2600e82
-EBUILD pycharm-professional-2020.2.3.ebuild 1616 BLAKE2B 06c145a60e988227cde94ac1c937b5be92d681507a462339520fe47c257184e91f1426ab7fbf75c8e1f1ddf84247bf82345e5396999bf482222f33fddcfc8182 SHA512 5ef8b327fc2cbabb1f560f95da4207b70d3ee5444a4f4485c32076111f1fb740c2356d956bee392f15f565888d7f2ec4a5f0d1b143484abad6c04dafe147dd86
+DIST pycharm-professional-2020.3.tar.gz 614570714 BLAKE2B 48ecb93a8db053b2b5983392b6270388fc1bf0ddf18e99453d04f87975ac3b8accfe14895b23db9d0b2eb199c0a64c9b137ea09142fc0cbe0d2ca6196ca2ec55 SHA512 e0c726abddbb98dc5d23043e6e5d2e41a3b813c18352ee3ad9596f0c37bdadfdefba3c74890bb9d2e9c0c8f6114841c2b52c6af2169e021256060452aacb7ec7
+EBUILD pycharm-professional-2020.3.ebuild 1616 BLAKE2B 06c145a60e988227cde94ac1c937b5be92d681507a462339520fe47c257184e91f1426ab7fbf75c8e1f1ddf84247bf82345e5396999bf482222f33fddcfc8182 SHA512 5ef8b327fc2cbabb1f560f95da4207b70d3ee5444a4f4485c32076111f1fb740c2356d956bee392f15f565888d7f2ec4a5f0d1b143484abad6c04dafe147dd86
 EBUILD pycharm-professional-9999.ebuild 1616 BLAKE2B 06c145a60e988227cde94ac1c937b5be92d681507a462339520fe47c257184e91f1426ab7fbf75c8e1f1ddf84247bf82345e5396999bf482222f33fddcfc8182 SHA512 5ef8b327fc2cbabb1f560f95da4207b70d3ee5444a4f4485c32076111f1fb740c2356d956bee392f15f565888d7f2ec4a5f0d1b143484abad6c04dafe147dd86
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.2.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
index 589bec707843..589bec707843 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.2.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
diff --git a/dev-util/rubymine/Manifest b/dev-util/rubymine/Manifest
index 2a6a42960340..f4c7824a24a1 100644
--- a/dev-util/rubymine/Manifest
+++ b/dev-util/rubymine/Manifest
@@ -1,3 +1,3 @@
-DIST RubyMine-2020.2.3.tar.gz 404965606 BLAKE2B 046367f5ac9e1a11b753f498a43f103a52d33585cd367a56b684c9e6877c32d89048bf309b1fc27839f9d85a93be27fcc4ff7f10de53ae6875114e0c924521e1 SHA512 e4709295618d96d262b09e81def5131d5f781734a09b2b70f7fe660a65170a72d09578855962e6bcbbcd6d6266b2e5d0975ae0602ddb49bb5f4268d889e523c9
-EBUILD rubymine-2020.2.3.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
+DIST RubyMine-2020.3.tar.gz 454323470 BLAKE2B 26fab76be019a4f8be2615f765d6ff20ab0d234417fe801419d2d204849846b094fcf94b07bc483ecae07935c7d4e26afbd0abf3315c4c265d938d4a6f7a1d2a SHA512 0e49af983e0852bc1c7707c6567d83ad2ab0f3ce0b85dd52f3fc33175fcbdb03641f6c4b915328701733cea3ddc6ae6e3cb524af9d3afe4ceee09b8c1e0a54d7
+EBUILD rubymine-2020.3.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
 EBUILD rubymine-9999.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
diff --git a/dev-util/rubymine/rubymine-2020.2.3.ebuild b/dev-util/rubymine/rubymine-2020.3.ebuild
index 948c65c7c475..948c65c7c475 100644
--- a/dev-util/rubymine/rubymine-2020.2.3.ebuild
+++ b/dev-util/rubymine/rubymine-2020.3.ebuild
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
index 865e60b498b4..ea7d7377a609 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
@@ -14,8 +14,7 @@ SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.61.3:2
-	!=dev-util/sysprof-3.34.1-r0"
+RDEPEND="!=dev-util/sysprof-3.34.1-r0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gdbus-codegen
@@ -32,6 +31,9 @@ multilib_src_configure() {
 		# -Ddebugdir
 		-Dhelp=false
 		-Dlibunwind=false
+		-Denable_tools=false
+		-Denable_tests=false
+		-Denable_examples=false
 	)
 	meson_src_configure
 }
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index 8330b176c3f1..c96ac663adf2 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,3 +1,3 @@
-DIST WebStorm-2020.2.3.tar.gz 381273632 BLAKE2B 3ebcb5de1ebf1a02b74135a474d03535fc6f21789e72279dc2d30f78915089cd2f8f69a0e4783adc269a5a6e2203a87542814c97f402aaa6e29dffef22217625 SHA512 e973be11cb06071808bc4688a9359b2eda1df4dde65ff0dca8c94604595194990d05f6d48b687ce0036194315ef087e04de48b24dfb9f006c799abeb83ef09fa
-EBUILD webstorm-2020.2.3.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
+DIST WebStorm-2020.3.tar.gz 435281659 BLAKE2B e0cbe5df5995b6de54b66c5e73db5751fa668a6cf7e401abf90dd32e3becf943b97c07d5c5755bd0831f079a58f47ef52faf735b6130c31e2cd38604c5f86c54 SHA512 ea6faf0326df0c285211aec6b38442c5047066a0917d832d1f9f28b910fcd8d96a4b759deb7beded263f0fb03ecf292a08c5dbff3c0498dc1fb95bf8ec55335f
+EBUILD webstorm-2020.3.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
 EBUILD webstorm-9999.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
diff --git a/dev-util/webstorm/webstorm-2020.2.3.ebuild b/dev-util/webstorm/webstorm-2020.3.ebuild
index b20a3c1504e6..b20a3c1504e6 100644
--- a/dev-util/webstorm/webstorm-2020.2.3.ebuild
+++ b/dev-util/webstorm/webstorm-2020.3.ebuild
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index 0f5cfa2f87f2..3e4a4fb7b517 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -16,8 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="sys-apps/less"
-RDEPEND=""
+RDEPEND="sys-apps/less"
 
 DOCS=( CHANGES.rst README.rst )
 
diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest
index baad77293f63..3a93a1410923 100644
--- a/games-util/steam-launcher/Manifest
+++ b/games-util/steam-launcher/Manifest
@@ -1 +1 @@
-DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8
+DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
deleted file mode 100644
index 907f2c278497..000000000000
--- a/games-util/steam-launcher/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>dev@kicherer.org</email>
-		<name>Mario Kicherer</name>
-	</maintainer>
-	<longdescription>
-		This ebuild installs common files for the Steam environment,
-		like bootstrap archive and icons, but not the client itself.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
-	</upstream>
-	<use>
-		<flag name='steamruntime'>Use the official steam runtime libraries</flag>
-	</use>
-	<origin>steam-overlay</origin>
-</pkgmetadata>
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
index 87f35fafd126..350d9e8c7d5b 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit linux-info prefix xdg-utils
+inherit linux-info prefix udev xdg-utils
 
 DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="https://steampowered.com"
-SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
+SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
 
 LICENSE="ValveSteamLicense MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+joystick +steamruntime +udev"
+IUSE="+steamruntime"
 RESTRICT="bindist mirror test"
 
 RDEPEND="
@@ -27,9 +27,6 @@ RDEPEND="
 			x11-terms/xterm
 			)
 
-		joystick? (
-			udev? ( games-util/game-device-udev-rules )
-		)
 		steamruntime? (
 			virtual/opengl[abi_x86_32]
 			x11-libs/libX11[abi_x86_32]
@@ -89,6 +86,9 @@ src_prepare() {
 	xdg_environment_reset
 	default
 
+	sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
+		subprojects/steam-devices/*.rules || die
+
 	sed \
 		-e "s#@@PVR@@#${PVR}#g" \
 		-e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \
@@ -110,11 +110,14 @@ src_install() {
 
 	dodoc README debian/changelog
 	doman steam.6
+
+	udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules
 }
 
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
+	udev_reload
 
 	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"
diff --git a/media-fonts/mathematica-fonts/Manifest b/media-fonts/mathematica-fonts/Manifest
deleted file mode 100644
index 5a76ae4e7547..000000000000
--- a/media-fonts/mathematica-fonts/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mathematica-fonts-10.0.zip 586368 BLAKE2B 2be8b7bdd0c663ca0b9e4c1642ed84811adb853c6887d3adcf420d49a386b0a562d75b6cbc09d47ca6bc118703675461087b1c5b6551c55565abd94a64821df2 SHA512 4429163c427bc762cdaf7d310985becff97f78e7b452b184e9cb64f5f787559d283b5438a16f4e6bfaeffe86429bd416d2772707350830f646c70f53b519f4c7
diff --git a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild b/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
deleted file mode 100644
index f533183aaa9e..000000000000
--- a/media-fonts/mathematica-fonts/mathematica-fonts-10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit font
-
-DESCRIPTION="Mathematica's Fonts for MathML"
-HOMEPAGE="https://www.wolfram.com/mathematica"
-SRC_URI="http://support.wolfram.com/kb/data/uploads/2014/08/TrueType.zip -> ${P}.zip"
-
-LICENSE="WRI-EULA"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="binchecks mirror strip"
-
-S="${WORKDIR}"
-FONT_S="${S}"/TrueType
-FONT_SUFFIX="ttf"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
index 4ac6a54345ff..e71c3ed9862b 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-14-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
index 436ae2dbd75c..6a6fc0910818 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
index 3f8e0067dfa1..601688948101 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
index fc31f3be492b..9b942adbac0a 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-18-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
diff --git a/media-gfx/cinnamon-themes-calculate/Manifest b/media-gfx/cinnamon-themes-calculate/Manifest
index 1b35aed5e3b7..d8eeb97f9b25 100644
--- a/media-gfx/cinnamon-themes-calculate/Manifest
+++ b/media-gfx/cinnamon-themes-calculate/Manifest
@@ -1 +1 @@
-DIST cinnamon-calculate-15.tar.bz2 67947 SHA256 cfd28d3ba6ef66fb213d72690cb55080510dbb2829bcaad4ac2ab53659bfef8c SHA512 311144cc4cfceaaa851f78aa2994f70fed71e5212269ba20a37d07833cf6df0df8470b160f7f739d616ad0c6f7fb182440595912de5c21ecefac473e289bffc5 WHIRLPOOL b215024a06c5fc998db3a194961c87fadbeb05a60794dbd3efdfca2849fd16c723afdf93872d50aaf59cb945d5dee72495a6a1661de2ef8c87b0a9e81b02d2f4
+DIST cinnamon-calculate-15.tar.bz2 67947 BLAKE2B 2083c385efef94645ead053da3b23f08fde914c89bcca2f97778142c5037c3964c8b5bb7a5fad69ee38de39bba9331d42efbdc508132e2b7e934cfe257dc5c12 SHA512 311144cc4cfceaaa851f78aa2994f70fed71e5212269ba20a37d07833cf6df0df8470b160f7f739d616ad0c6f7fb182440595912de5c21ecefac473e289bffc5
diff --git a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
index 128a128d219e..5fb83d59be1c 100644
--- a/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
+++ b/media-gfx/cinnamon-themes-calculate/cinnamon-themes-calculate-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Cinnamon theme for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/cinnamon-themes-calculate"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
index a6226faca584..eff56f2fe050 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
index b62270e42d5d..e7222ce6cf45 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-14-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
index e4d939efb67c..7bfaa204835b 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
index f56ddf6ccdbe..4b509e3a65d5 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
index f56ddf6ccdbe..4b509e3a65d5 100644
--- a/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-18-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Display manager wallpapers for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 7c9bcc840ba2..bf095c3de1b4 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
index 5ad42f23528b..d3ec2bab1e38 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
index 5ad42f23528b..d3ec2bab1e38 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
index 244297617f94..9fdfbfc91c46 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
index 641510ddd9c0..303288e5652d 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
index 244297617f94..9fdfbfc91c46 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
index 3549b7300c52..a6ee1142faff 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
index 641510ddd9c0..303288e5652d 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
index 3549b7300c52..a6ee1142faff 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
index 3549b7300c52..a6ee1142faff 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
index 3549b7300c52..a6ee1142faff 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
index 3549b7300c52..a6ee1142faff 100644
--- a/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
+++ b/media-gfx/gfxboot-themes-calculate/gfxboot-themes-calculate-19.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Gfxboot themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/gfxboot-themes-calculate"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
index 99571defae1c..4c872dbfa452 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Grub splashes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/grub-splashes-calculate"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
index 0405350bc8fc..0dd3aba175bd 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Grub splashes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/grub-splashes-calculate"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
index 4f41837cd357..1e981e014f2c 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Grub splashes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/grub-splashes-calculate"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
index 96b3430e6464..3d125f2c1c33 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-17-r7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Grub splashes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/grub-splashes-calculate"
diff --git a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
index a8376d678a94..2558dde5f5ab 100644
--- a/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
+++ b/media-gfx/grub-splashes-calculate/grub-splashes-calculate-18-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Grub splashes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/grub-splashes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
index a6beab5e69d2..ae92e93edd7d 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-14-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
index a6beab5e69d2..ae92e93edd7d 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
index e2dbb9d7195b..f7685548f2b7 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
index 2feb6c3a2959..68ffeaf8081c 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-15.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
index 18fcb4c9ba89..edbb6b9921fa 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
index 18fcb4c9ba89..edbb6b9921fa 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
index 18fcb4c9ba89..edbb6b9921fa 100644
--- a/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
+++ b/media-gfx/lightdm-themes-calculate/lightdm-themes-calculate-18-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lightdm themes for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lightdm-themes-calculate"
diff --git a/media-gfx/lxdm-themes-calculate/Manifest b/media-gfx/lxdm-themes-calculate/Manifest
index 02e99cc10f65..be0d080b3a5a 100644
--- a/media-gfx/lxdm-themes-calculate/Manifest
+++ b/media-gfx/lxdm-themes-calculate/Manifest
@@ -1 +1 @@
-DIST lxdm-calculate-13.tar.bz2 28201 SHA256 2b2c8feaef5a3e070391c07e6870d7e924423c131143c43749aae6b96cae0dc5 SHA512 705b87a55adb1d005822e3151c9f33e19c1ca63bc49a72d6ad53a4bb0ba4a1b308dc3b09e8101ddad41b0d5193a4766ed42fbb61162626f3a6f0721e112fefd7 WHIRLPOOL 1d996d24d89935691c0a978a508fd8162a4e07ece1d503d3ec6bc4d3b20454759843bf61514d66dcd773131a46a9775065ed84304946ee01725e18ee4b8b548c
+DIST lxdm-calculate-13.tar.bz2 28201 BLAKE2B 900698526b5b93aa89ebe86ee1c3d0f6f88a5d3736347b5aff4a28fc3045c388717ca629e238e249844ca1248d7a23d8f3f816942f43256ca1162060d3efeda5 SHA512 705b87a55adb1d005822e3151c9f33e19c1ca63bc49a72d6ad53a4bb0ba4a1b308dc3b09e8101ddad41b0d5193a4766ed42fbb61162626f3a6f0721e112fefd7
diff --git a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
index 795b523afa22..3182a2a22a4f 100644
--- a/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
+++ b/media-gfx/lxdm-themes-calculate/lxdm-themes-calculate-13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="Lxdm theme for Calculate Linux"
 HOMEPAGE="https://www.calculate-linux.org/packages/media-gfx/lxdm-themes-calculate"
diff --git a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
index 8282a5bcdc38..ffa0723ad651 100644
--- a/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
+++ b/media-gfx/splash-themes-calculate/splash-themes-calculate-15-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit calculate
 
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
new file mode 100644
index 000000000000..f538da3c59d8
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.16-r100.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+
+inherit autotools lua-single user systemd tmpfiles multilib
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="https://www.snort.org"
+SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre
+high-availability inline-init-failopen large-pcap-64bit +libtirpc
+linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react
+reload-error-restart selinux shared-rep side-channel sourcefire static
++threads"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	net-libs/libnsl:0=
+	sys-libs/zlib
+	!libtirpc? ( sys-libs/glibc[rpc(-)] )
+	libtirpc? ( net-libs/libtirpc )
+	open-appid? ( ${LUA_DEPS} )
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )
+	open-appid? ( ${LUA_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch
+	"${FILESDIR}"/${PN}-2.9.8.3-rpc.patch
+	"${FILESDIR}"/${PN}-2.9.12-snort.pc.patch
+	"${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch
+)
+
+pkg_setup() {
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+	use open-appid && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac} || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable open-appid) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		$(use_with libtirpc) \
+		--enable-mpls \
+		--enable-normalizer \
+		--enable-reload \
+		--enable-targetbased \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+	default
+
+	keepdir /var/log/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+	systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service"
+
+	newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${ED%}/etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		"${ED}/etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+	tmpfiles_process snort.conf
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-im/element-desktop-bin/Manifest b/net-im/element-desktop-bin/Manifest
index d4723cbad55b..41ac7d3d1ccd 100644
--- a/net-im/element-desktop-bin/Manifest
+++ b/net-im/element-desktop-bin/Manifest
@@ -1 +1 @@
-DIST element-desktop_1.7.14_amd64.deb 67755832 BLAKE2B 0d67d53bf8bb6e5ee6a538c061ad5633a9be169963663ccd0acf4be257c94e855d53f765cd860d8cd5fde57e5ec7b72c838bf16413e19fe4d4046189a54e21fe SHA512 ff99e055d834dbc2f683fa2c62d3abdfc1b41f07e0feddb0909da3d95437bb0cd9767493d8acfcc0a9b82041141e57185bef803e0ed5568af0df96b7dc729dc2
+DIST element-desktop_1.7.15_amd64.deb 69147310 BLAKE2B 499c9ed94aad4b6934588a58c31e80eca0cbf1fed8701e0a190ef7cbb27474c848667cf3b842047d495f220881fa36f00890bf33f2bc9ceb12134470f585b5a4 SHA512 02e47d9930ed65d9fc3e35ce02ecb913a0825a126040ab28cb6c8a261a68490d344baec4011fd04bc83ad7b421e359f9b9cde895227bb9f411f846104f6c518a
diff --git a/net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild b/net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
index 78456abd5728..78456abd5728 100644
--- a/net-im/element-desktop-bin/element-desktop-bin-1.7.14.ebuild
+++ b/net-im/element-desktop-bin/element-desktop-bin-1.7.15.ebuild
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
deleted file mode 100644
index f39c85406a57..000000000000
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for 3.7 needs support from dependencies, first
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild
index cf0a831a7cb0..8b3273a63fce 100644
--- a/net-proxy/squidguard/squidguard-1.6.0.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild
@@ -24,9 +24,12 @@ RDEPEND="
 	)
 	ldap? ( net-nds/openldap:0 )"
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	sys-devel/bison:0
-	sys-devel/flex:0"
+	sys-devel/flex:0
+"
 
 suitable_db_version() {
 	local tested_slots="5.3 4.8"
@@ -45,8 +48,12 @@ src_prepare() {
 		"${FILESDIR}/${P}-gcc-10.patch"
 
 	# Link only with specific BerkDB versions
+	# Do not inject default paths for library searching
 	db_version="$(suitable_db_version)"
-	sed -i -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" configure.ac || die
+	sed -i \
+		-e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" \
+		-e '/$LDFLAGS $db_lib $ldap_lib/d' \
+		configure.ac || die
 
 	eapply_user
 	eautoreconf
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index b200c4873554..b902bebf0fe6 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,6 +1,5 @@
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
-DIST unifi-6.0.40.zip 237494905 BLAKE2B 29cb9161c958cc414f3a0eb47fbac045e02ab3856961f62013bd6f0edc24f2483beb701cc3eb91bf0316829508894e035a6555f16865688ac8e94ebe92c7d5ed SHA512 7b5d8eb36af190bce4e85515d14a2ecab665dba70cd0fabc3f7de23870ecb557858433bba6ee6e101c3e6e5ba3da66a7dc807d3bf72fd4d2f5798991a78839c8
 DIST unifi-6.0.41.zip 216846940 BLAKE2B 14aaabc6c33fc312ca26cae03eec7bc1a80c26d381735223753eb073baa4141e1791651e724fa6a75d16274abc2299b791d08f1032256ddfd2c6518fc2b3d30f SHA512 9264a322bf78efa38f009e81a7e7fd37534600d859a46221bc8237db159049510279c939fb2294907a94e59c841989b890693fdc800cde05d9f4e7cd6c50c7ab
+DIST unifi-6.0.42.zip 151690952 BLAKE2B 9f67f1dbb7b85f6bf92414a3d424600d610dc4ae926766e8b71dc5ceabdc1d33bccec3cbec839483aca40b2360c6dd8b31eb3de7dd20077c3d751c01b137cfcb SHA512 548f2d280065259270484e2530d800f829869eb5802939a2f13ba08ae99017f0a2dc5152e1b2f85d940a032326d4cb7d3a1a58649dc96428bea04156c26eab88
 DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
diff --git a/net-wireless/unifi/unifi-6.0.36.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
deleted file mode 100644
index 58f3f74689e6..000000000000
--- a/net-wireless/unifi/unifi-6.0.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Set this var for any releases except stable
-#RC_SUFFIX=""
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/6.0"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.0.40.ebuild b/net-wireless/unifi/unifi-6.0.42.ebuild
index 3eed307193aa..f724e3c60a0e 100644
--- a/net-wireless/unifi/unifi-6.0.40.ebuild
+++ b/net-wireless/unifi/unifi-6.0.42.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-dd08d4673a"
+RC_SUFFIX="-703ac3104b"
 
 inherit systemd
 
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 3d5a5fd3b13d..c4f0487224aa 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -427,11 +427,6 @@ dev-python/cheetah
 # Removal in 30 days. Bug #747310.
 sci-libs/mkl-rt
 
-# Matt Turner <mattst88@gentoo.org> (2020-11-08)
-# Uninstallable because of fetch restriction and dead download link.
-# Removal in 30 days.  Bug #725646.
-media-fonts/mathematica-fonts
-
 # Dirkjan Ochtman <djc@gentoo.org> (2020-11-05)
 # Incorrect DISTUTILS_USE_SETUPTOOLS value, dead upstream.
 # Removal in 30 days. Bug #748063
@@ -505,6 +500,7 @@ gnome-base/orbit
 =dev-games/openscenegraph-openmw-3.4_p20200425-r100
 =dev-libs/efl-1.25.1-r10
 =dev-libs/libprelude-5.2.0-r10
+>=dev-libs/libucl-0.8.1-r100
 >=dev-lua/busted-2.0.0-r100
 >=dev-lua/busted-htest-1.0.0-r100
 >=dev-lua/dkjson-2.5-r100
@@ -547,6 +543,7 @@ gnome-base/orbit
 >=dev-lua/say-1.3_p1-r100
 >=dev-lua/toluapp-1.0.93_p20190513-r100
 >=dev-util/geany-plugins-1.37-r100
+>=dev-util/hermes-2.8
 =games-action/minetest-5.3.0-r100
 >=games-arcade/jvgs-0.5-r100
 >=games-emulation/fceux-2.2.3-r100
@@ -573,6 +570,7 @@ gnome-base/orbit
 >=media-sound/aqualung-1.1-r100
 >=media-video/vlc-3.0.11.1-r100
 >=net-analyzer/rrdtool-1.7.2-r100
+>=net-analyzer/snort-2.9.16-r100
 >=net-analyzer/suricata-6.0.1-r100
 >=net-im/prosody-0.11.7-r100
 >=net-im/swift-4.0.2-r100
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index fa607d5c928e..814e03db1218 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -2,7 +2,7 @@ apache		http://apache.lauf-forum.at/ http://apache.mirror.digionline.de/ http://
 cpan		https://cpan.metacpan.org https://www.cpan.org
 cran		https://cran.r-project.org https://cran.us.r-project.org
 debian		https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
-gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles https://gentoo.ussg.indiana.edu/distfiles
+gentoo		https://gentoo.osuosl.org/distfiles https://ftp.halifax.rwth-aachen.de/gentoo/distfiles http://gentoo-distfiles.mirrors.tds.net/distfiles
 gimp		https://ftp.fau.de/gimp/gimp/ ftp://ftp.fau.de/gimp/gimp/ https://artfiles.org/gimp.org/pub/gimp/ https://www.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/gimp/ http://pirbot.com/mirrors/gimp/gimp/
 gmt		http://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.star.nesdis.noaa.gov/pub/sod/lsa/gmt
 gnome		https://download.gnome.org/
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index cb7cb3e32154..1e17bc3a9503 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,3 @@
-DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
-DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.1.tar.gz 2398842 BLAKE2B dce2da9807bc28c502281a75b98b21bab8fc34778ca1ed5e43b944cec2043ced7d3b997402d904eaceeb62d139182b883dfac0f4b6228750b18f8d0c66539d4f SHA512 57fa13d0c24cf9c8ec5341dca5392e054194861885233284a5a26d7c351ccdaab5a9ac9853681258882d42d21732302324719a709ff7e713885a9977430683ce
 DIST fwupd-1.5.2.tar.gz 2416756 BLAKE2B 8b5849c3b1a0758489cdc369dfa85658a3904bb9483484aded4a4f0d3ed39f0fa819171273dabf18c62a0249f09b1058269cdb57eb3c75590242f1ba6b1a0a85 SHA512 1ea7104c95f884ba52194d3136058f685ac1ad6d705930c4bc584aa4b1902164393d8702a14ec4a6af84e8b06d778a4896e63cbe9d3266f20da31d3795fc7ca7
+DIST fwupd-1.5.3.tar.gz 2429886 BLAKE2B 576823f6d235ed9ce2854cd0f44b9a7dd1eace46180ce978f906becaaefabb32e93f86cc672abafc99387427d33e3ab17052e98adfba4b6cbed85c5502a7ec1b SHA512 0c98dd7ca55afeaa4c895a837fc8d6eafcc51d215cc02be659916c7a39ddaa6bc3752adddba8cd2a9c77a4eca707b6c71522645f2847330c1c2ef44910451bf3
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
deleted file mode 100644
index 1a508c44b0b3..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
deleted file mode 100644
index 8f2f11568028..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.3.ebuild
index aafa2dc6d408..16b79ab4eb3b 100644
--- a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.3.ebuild
@@ -52,6 +52,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
 	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
 	dell? (
@@ -69,6 +70,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-libs/efivar
 		x11-libs/cairo
 	)
 "
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index bfa18d21f4a6..67cc7160595b 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -10,10 +10,8 @@
     <flag name="amt">Build and install Intel AMT plugin</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
-    <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
-    <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
     <flag name="redfish">Install redfish plugin</flag>
     <flag name="synaptics">Install synaptics plugin</flag>
     <flag name="thunderbolt">Install Thunderbolt plugin</flag>
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
index 89ed2cf03886..348823c20ed5 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
@@ -38,7 +38,7 @@ SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.x
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index fc57411ed715..49592091a471 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -19,6 +19,9 @@ DIST genpatches-4.14-219.extras.tar.xz 3340 BLAKE2B 2a7077ff685b93d393f8c1ef3e7d
 DIST genpatches-4.14-220.base.tar.xz 4745992 BLAKE2B 71ded67b5bf42e8974fc71f3c47e7b7c38a4714f004d0eab1d3fc659318382518ec265d21d36e46f8b5f7ac5d5dbac77bfd5845c45c0b10d6e8ff83af662df1d SHA512 5ab21ec37af7eec0a6322bebd6ade3043afa449ecf906fa36375b1b8f6afffd639e84eee9928916e4d5c2ba862e9ebd85b9aa58371e4c633666bc524efe05d82
 DIST genpatches-4.14-220.experimental.tar.xz 6088 BLAKE2B 5146d0b4a651db52fbab2fc7dd90805f81e790ff1ff414cb1db062c23f8cf68bc136f9e2176abc140c3895ba1d2f3612939f06a5974686c6ca1673ccbc9bc785 SHA512 d27f48b31bcbad863d7fb4f58dafb1793e50c8afec88c96e42d5973ecbd6ae6aecde47a0640d4d5cef659356bc2f4326b8a0403ac694cbdcc7a866fa686b4d33
 DIST genpatches-4.14-220.extras.tar.xz 3336 BLAKE2B 3641a778efd8776ee3702ee4da9ad55521f53bf9260c0d8712af3e3bef19b51a7a54ba7708db64d27b1a18003a1dee98594819680ea84980aa5bb174675cc76e SHA512 ef25506c1ddde134a1b95c16450b06e4d9c576e807b5ab9859d8a169d475fc12d1d4181f712b96356a1547c58faa652066a9173b8ec9915a71e548b3bc11abe5
+DIST genpatches-4.14-221.base.tar.xz 4750680 BLAKE2B aeb5571c47653ede67e1d67ed9e1ff7c0b17fea0f441bf8e629f54433efe846ad5974b47fddf63ae811a0741544e80de28eaf834a652b59eddbdfa116bb589cf SHA512 be47d6254f62558ac6809b207d2608bc9cb1da26a85d0c029edd92b8fe8e185d4095ff3bd405ae9e1f778fb445b72297e92ec003fffb93b6376efd906a976abe
+DIST genpatches-4.14-221.experimental.tar.xz 6088 BLAKE2B 99e0b83c166a1ec9aea2b95f3a5436598b8208b394f82a59a1f7bacf4266425669f5d409831a8c56a229572450f71a41b4dd9648fc5d8c09449b1c1e36f7f8e5 SHA512 da0125d15a8a51f66ff81d996cc06bb2a9c302d2c2558379ce34a1705b2eb691706e475da22ce98b22fc8022182a265015fe8e99c281d8954a228c7682bfde3d
+DIST genpatches-4.14-221.extras.tar.xz 3340 BLAKE2B 79c2c05b9c4076c50206e6b518599ddb74ebdbfa9dbdf23d63c255745a2d399129a5501e72012f3b8d6982db55a91ddfc14e590d5e9c5feb95a113f6df46881a SHA512 a969f85e6a6fc7b55f426138738759805cb19a8df3e27c0d1c5b1e6235c61fe3ccff95cd98dbfa2aeca94008673a83be4bd3c1acb693ae3802560b87b1e47d6b
 DIST genpatches-4.19-151.base.tar.xz 4004372 BLAKE2B ab830d3f5ae37f48d4aa71e6b9913498397c00fe17630184b7283b42415ed55b2a3fe0d9d3c619923f43c8e244b476ed28916f0dc2e44c53dc8022a21ad152f8 SHA512 0b7d374b9dbd90f99ae73537e543d19c253d219ffea77e56a1c6825516d94f5bf4e2d85323f5a7318e0b8b5233e8b7363fbb2962e60c09b5c9825b1718bc7ae9
 DIST genpatches-4.19-151.experimental.tar.xz 6976 BLAKE2B 136a9a1f5de573917000f3b41f28a6bf84b61588cc8d61824d43df5fd191feb4608a55e5418633f18df9002dde899670a03b9713feaddf6b60b64c207005c256 SHA512 1650b33e6a3a431d91c3d9f054bcfe6a3bf3a93d2eda87beb23af93846f4b04ff8b67f31e71361584bd8963e2cacdecea7c33ad15e273c3b708aa353467afce8
 DIST genpatches-4.19-151.extras.tar.xz 3316 BLAKE2B fd6adfc4ce72c3a84b4821c6adcc79cf421e30609c1556dd9534b851faec4b5eb92210a48d2cf5e3c4a34781fefd4101ee6ede03808bbccd5aeb5875cc9d4515 SHA512 288a504278449d0646377e9e6b5191787fc218d5912a2298b7243a0cf8cddb21a7108449e9868f36c6e97e43081e8eafa880093ad1d87673f670042e31467e59
@@ -40,6 +43,9 @@ DIST genpatches-4.19-159.extras.tar.xz 3312 BLAKE2B 480dfb15464c46ff0cad7447476e
 DIST genpatches-4.19-160.base.tar.xz 4190068 BLAKE2B 9239276be20d03962b0d823c7cc1a83167ca3fa4f6367268ceca8cc597740ce1883fcf08cc78e5b2298bca41854f8524ce9504b0ef4d8548096b953eab94e7f5 SHA512 921de33214f912555a93e07f4703bb46cf20e5f566ea5cba5fcb6bdce6e0f671a94c5dc17b89582e8938e1f1a6e6e59954105ffa6e01e1dd141e21eaca658a7e
 DIST genpatches-4.19-160.experimental.tar.xz 6976 BLAKE2B 083754458a1585098c4831b954c041226fe49459a9aa06f79b16292994d2b2a796451f9f337508733ad14bea411b623c67f3950ce36aa7d04dc0da2211b27678 SHA512 9b0723f60de46805681fd57d167a4fcfdd7826e8479f5bbda449727e96aaae8242a2a275ae8f71b04eb4af998b6726830b9c66d2305f438c9165de4979066902
 DIST genpatches-4.19-160.extras.tar.xz 3320 BLAKE2B daafc306f8f634acd3dccd2726340b0e52e53ffd94f6baec5ad15f7c2ad4a908bbb6690c6b188141d587998d7d3d8dc1141d48475f4b9d15890f834f026a917d SHA512 da7e4dc03410ee8342a493f5ea3e74eeaabd81db667e3d46c641a0bb0ca8d124b324d5f4fe921987f38e2c4bfc35bdc16b6772e4e43410497f2d862a9270c209
+DIST genpatches-4.19-161.base.tar.xz 4197272 BLAKE2B 4302320718b7c1f64afbd03cd6c234217c50c56f19047a5822fa3d7ed0462dd65f83768cb933a4034308eb16573bf406ba8bc5742e0cfc5dbc1e6a2f0aed3c3b SHA512 cfb81ffd4bdfe26aa8f49ea627f99427b0ef49a121d2f657c40012a75b1ddda164e5e551609eb4b032ad950eb670515fa6373ba997bf030ff727cb353dda9da9
+DIST genpatches-4.19-161.experimental.tar.xz 6976 BLAKE2B a9bc282f1a37effce76f5abd110c933d4bbdea27792f32b9bcd73d4bc43b3348b8b993574b500622819d681df59f0b3539bae1a981ab49bae09f1e4202d6b062 SHA512 c032968d4db4eb6efd522a4f67f5917ad457a99ebfde9c8eee5f47ffbabd7be6d9b391c9581ee73808b6c1965b3011c87085d2f5c221289ab025ebbcce390a43
+DIST genpatches-4.19-161.extras.tar.xz 3316 BLAKE2B d59666d9996383eb96958aa4ab299583196023a61d97071e86ad1b51a428b349b610d07845e2d8ce6563981d8d512dfe726d2f183ec1bcad47e9995a1ce9e599 SHA512 6d2bc20cde1896fa4c8bf9c276f58f9981d84b79baf1729c1a32fd7afb2a6a30b0b64f88fe17c87cd6de29ce891028245b6d388c0ebe95bf6f8f46ce64ce3ee3
 DIST genpatches-4.4-242.base.tar.xz 3875244 BLAKE2B 68290360fa72bdf29eb6233ac762cb74d3cd8839f4e46d972e86c85944468f15ebc183efba6f8e28d8e64b1dd5568ab81f1b42178cc3606ccccda82566fdf817 SHA512 daa0026c97721043963dd02b9996c6a84ffc82e046533ab20b70520b3d7711288816ae3a98bbea671ae0d06b675d727dc508a38d82de3ea126ba8dd797c5d680
 DIST genpatches-4.4-242.experimental.tar.xz 83280 BLAKE2B 1af36c13ce2967a172436a3ebacee54e46a49478a5ef01aec66c428a9d885b638dbce2eb15276a602dc9d90866175baee5b04f3e8ba6e0478c9a10e23a2062cf SHA512 e9a0ebd1016b170e89889c59d0020c6e3a28fb0576a13f65b5adf764c950df65d64f2cf8a75d8e5c09131c8429612e112a4a452aeead3e74c96ebd0a8b12039b
 DIST genpatches-4.4-242.extras.tar.xz 1788 BLAKE2B f511bd0b8c25664b89951a7c990e1649ba765043ef6f6b37e0f5a7b63a4c234f0366319323cf8c463faf592190f226b17958a8cf515c307262f93af1e4d62085 SHA512 2822691dc7ed45753fc4fa972e1941bad589448c450f6948678c64e4078f50dc24abb0bdb9323e0e02c82e3dfb88174376f8f02cb54bcf52b0b283a905c6b4ca
@@ -109,6 +115,9 @@ DIST genpatches-5.4-82.extras.tar.xz 1772 BLAKE2B 8eff7ca01490badd5dad15497f77bf
 DIST genpatches-5.4-83.base.tar.xz 2815436 BLAKE2B 5bf3a971d5c14baca0b21a8aad8ffc4e470f91b179b5e03779be4f588b43a671fd2f261325ca0525139c3c7e9c2b7c1020a803045eb809b2857c61134d919db2 SHA512 96735cb1c2107eee8a7d475f6558e418264dc1aba7f2f803b59db5ed7a9a249d5d0b79689a539b46e8922ce1b278b578d4194b20f20962c2b3aae83ac58954e3
 DIST genpatches-5.4-83.experimental.tar.xz 6696 BLAKE2B a56f189a5b55da43e244c64df106c02655bdbb40014d999c01039ca953d8b17ec5227230de2fb53f774536f57e2d77e66c5aa94c0bb5045fabe04c815118843e SHA512 9876ace02d7a4da2642aa46bd096f6dfd1c59efc8d5ccd39157d0628724f3d20d52f49c81bc702d1990a0cb475baf1eafec7cab3be2b3fbc2164f290b8469566
 DIST genpatches-5.4-83.extras.tar.xz 1772 BLAKE2B 9bccf13ea0eb0aae0d0b84302b9e9c82986bd60de4e85ee3703c570a5338474b08580095a952749d43104b53d3c07dbb558473e707a13ae12f7da5e5020ddf3e SHA512 0b536e4f8961513f181c5d9c4c01b51656c1e53707cf19c26d858e1a40bb1e8bc9e0bd0b314f82252047fe45a8df3e306e06abdb88f67a6116736e89236bbbcf
+DIST genpatches-5.4-84.base.tar.xz 2822596 BLAKE2B c3cc3d6435b084e911d1ce12028fb43f986061556db53eb703290cdf2058076a4b670a472b5e53c7cba733d5ecf552b8df12421004b8f36ff69b147b828d4418 SHA512 fcd469482cce45c537e0977a23ef7d8c668bcae585ecbdb33b003173dd601d3dd8666535072bc9caa0ed0cbd954fa3f42deabdad82e5310e5c83cd745a78787c
+DIST genpatches-5.4-84.experimental.tar.xz 6704 BLAKE2B 3f727923c782ecdcf5f412da1c63431d464bd1323aa6ac04802d6913bcc8f9f9a0cfd6e2e6f7cbceca74b6013af35112c140f19584dc2bbfba741f2f7c972f82 SHA512 00fd24ff264d46d8fa3407a88dfc0ff1acc7bed3706416f90c0e97b65c479384d34d0b02539a89cb8bde9b8fc32dd80786fd3ec6eaa27fe7d028f569d8c71737
+DIST genpatches-5.4-84.extras.tar.xz 1772 BLAKE2B 3951ecd7d506fce8c59b3699a132365c06262fb9b02622123ffd8961fd7b39cd07896f8cb701452fbb5bfdc5d80011ad06c0537957ea0fb8b99cab16743b2e80 SHA512 d3450ca9ed556251e9922ad96356696434ba3d9b4ae9e46c908522803bb48368e167dab77abe8e53767ddcf89ca1516c04334ed1cb182d1bb932325dd1b7b2ae
 DIST genpatches-5.8-21.base.tar.xz 783528 BLAKE2B 8b4e64de64d97f069014d353e45aab7900b37f508ed8e99eb469797df4780f715e0c038fbeff4b8ebb34e81c935dfd7df3eb63324121e31c1dd07591b3159a3a SHA512 4485056f47723e14f5248854edcd4353562c5ec6cb95c926310815e5bf5514d5d8edce16a241dc3d881c57832333f950562b092c21f2555a6838b9106ff329a4
 DIST genpatches-5.8-21.experimental.tar.xz 6060 BLAKE2B 42cc1a6c5a7cbe3086321ab4a6616f0cbc758b34061a82898c8d4745f9550e9bb60ec3e76b176c95962834358052794e9bd4ebbccbd891031b3cdce12a62c2e0 SHA512 c98a560c0b564ae565ab1dbc2421827593568be5010b4b0fa017def4b2401d737c89499f7b9558b6c8700b2dca4bf0e0bb86e172b43c3092cc7a867775a8fe8f
 DIST genpatches-5.8-21.extras.tar.xz 1768 BLAKE2B 238c16ed6628c2fd379fa46cf700038c08358e26af5fd4e7f1037626e2057fcbf224df72a6bd1df4b95fa896793539108294d3523118ee7a6cb7e39604e91112 SHA512 c14b718bf292707472edff04b022c722f45330b7750dd4b7b507347b0a9a29ebd236e16f01c03b6aa85bacc9220b420f5108f7728e88e6566dbb888efdbce714
@@ -121,6 +130,9 @@ DIST genpatches-5.9-11.extras.tar.xz 1764 BLAKE2B 51e216b1f4970b10e89fdea37bbe56
 DIST genpatches-5.9-12.base.tar.xz 628408 BLAKE2B 6dbb2c992971cf3ee1c0a0c7a7b70876bcc41e93dd6def0fe87e2a4ddaf62ebfe808487ac117b79eb629c34e66ef1a02bf7adc2191c3273bf77ea384260a5bd3 SHA512 bde0614ff1eb3dc9f681fa8a5f8207c8d2f9a959984fd3a0c8bc4da8ca432d6e1a32992735a8c59074de738a6d1341aa688efc75eaca6cb575f41e694f333d7f
 DIST genpatches-5.9-12.experimental.tar.xz 6088 BLAKE2B e6773b615967443b961e498e50ce50c48608b71f0373bbf8c68d2aac4906c18dcca3e1578157ab0413c700ac2f67140fc47901c757d8292e1d1051f6ef77c21b SHA512 bf21c813045ecd51d2fef01f15269eb77c9c672e3133dcbb60461190e6c5b5f7f3bacf557b7d48f4bed702ba3135a665d319ed218cce1b8319ee83d93d1eeb19
 DIST genpatches-5.9-12.extras.tar.xz 1764 BLAKE2B 8bfbde759342d00f10d6fe12e313d449de35aba13a5ba3564043d0489205eafa709a6481e7249bb79f54c84c759f50ca7f630e2e2bbfebc71942f72b3c8ea6e8 SHA512 274a2d2fce2f446503c4540d30daa3c3d6a86e6e6c206f0a2e1e89ee1ebd496f6ce2706add35ca6fc39df2c0758719faf332a230db18dfa9f81dab787f24eb3d
+DIST genpatches-5.9-13.base.tar.xz 638532 BLAKE2B 758f41192c8075719abe2ffb7756d3a0a4424623b9f99667a7ba19c6311e8e15dbda735076566843cace115059a8e7adb24bfcbc2a1271e230bd96328e1856b7 SHA512 723867c07a238b9a79b748a2b0fc8716614cc2e520d6ceda58e256f99a837f85c1a64885f8d3dc7904f1d3f8f1b8c8e990a12238dabff2c07fb095c56c44518b
+DIST genpatches-5.9-13.experimental.tar.xz 6092 BLAKE2B d242fa30772a993f885f4b4d9c075c4c76c83e6c07f907ac203c42613c91512dd803ee66194dd5db19bd215869d970d2241e663a57dbe347cacd65a5d505f2e2 SHA512 9471ae9fbcc79f8efec64bd05269ee7be97f9e40e20a9737d2bb262bcd17540ee9266009bb60ef60b0ad5f7de577c86ca0912f31b9ffec421eddb90a53f64b40
+DIST genpatches-5.9-13.extras.tar.xz 1768 BLAKE2B dc4a89f09c4a771f7b6011c3b5bd31dfc7a6254b09c48308eb8d3f13b21996e76b2893660e80a6f4a6116f06b3ba74834d8112d4eacd4b53a88a26ce1330dd52 SHA512 07d75cbbb25dd4d51cf3fbe24fe5c5e6430ffc3422c3335fc6916e18903922b8d22cd6d422c4bb38d233200d59971442b0ee64bdc27ecb257f9acb0124df6d3e
 DIST genpatches-5.9-6.base.tar.xz 406744 BLAKE2B 79052b91967819329a94b796ad72d6b7eec43d2e83615333abb7b9e0f3c7b737687de05e4ed8ebdb1db064ee16c2b45786ee3652f6f4b107b7e64ee309d9bb1a SHA512 2ae6a445936221337035b9d38336285c8dd2cd9cf2686bdfdd7dc229efb8f61d3088b834c8c63ee633ea197cd48455dffb24dcf11aef0955c42e4e271da76f42
 DIST genpatches-5.9-6.experimental.tar.xz 5828 BLAKE2B 6315137049438fca8a3835858321311dcf1a3ab374eb7c1cc0ec77847891112490ebc8427896381da78b2415855a73b444a69c5a521438f09df55219d96a9a77 SHA512 81bb35477a6e6180b08776b0a27fed4703e8796a54110959869b8ed86100c6e9c71b8ea523e5f905099ef64f8b99a8c5f699e0ce32d4c76dead9bf2121feb1b6
 DIST genpatches-5.9-6.extras.tar.xz 1764 BLAKE2B 3ea79d40f67a97fe14c5adc7c0f5bab19ab28bf37778a334c50852cbbdd91f32ff696e65e9a8f703c8573be7714447a75913c1783118d7b8acaaedab8518075b SHA512 d0f470637202283ae8295bf822b86609f426023fa6f0c00b1a3c0cce461d005c3804bfc7cdbcf965ef9d6a2e68917c2fdbcd30329e551b91d50055106c4f5cc8
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild
new file mode 100644
index 000000000000..661b8d4c3137
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.211.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="221"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild
new file mode 100644
index 000000000000..0e20d16a8654
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.162.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="161"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild
new file mode 100644
index 000000000000..3398c022f79c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.82.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="84"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild
new file mode 100644
index 000000000000..3cf5734a28e2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.9.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="13"
+K_NODRYRUN="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index eb0757cb32f6..7ea96eda94d9 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,9 +4,9 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST patch-4.14.210.xz 4041652 BLAKE2B cd52ea48f1f78d46b0946caa75e0f00fe7a07240e1c2fcb7e54bde4cb8fd7d7d1bd3ed8ccfb1667cbdbe24ef80238905ace25dcb9c1cb823cf413964554bd6ed SHA512 91802c8d4a86a9c97396d4b3349619754011ef1a38cc09982d66bb9376aae82c38045a52ca1aa70dcb2f4dc9f5026cfc04c73f970fe135ea882ed5bbf69d0dd4
-DIST patch-4.19.161.xz 3649928 BLAKE2B d9208f6b07a59c14e9f46acca1b1456bc02e8afd64b2c634a8376d28bdd5df61de66e7cfd42a9482e986d8fb822518b3dbbac9bde4f2e0257fa73b4dba59c51d SHA512 6483da5d53e4660515fd053c3e6ee3083b222db199d8de3b00a80fe7d2414f61e4bfc2abb88d8186943c8aa01e16bf29ef38e352c32e0ccac29ba6555523ae00
+DIST patch-4.14.211.xz 4044992 BLAKE2B 8d7a79b6fe4e0eac89b90581ae62d6cbb81fb6632da338641014826645e48e992031ae7aeab8f39b3121a7fa5229599fc44f172a0293e6a8a9d99ac7304bcab0 SHA512 21f3061ca131e17f6cab857568dcd605570685c8d59c9892165e98492e8261931017df33f43e8f2b0a191e582ddb60060f12dc54f1a164b3088c2e5758fdb6bc
+DIST patch-4.19.162.xz 3655396 BLAKE2B 92b492899306eee4dd88a3c893d0d234da99c24b5f9642bada1d6f2df0ef28db3374277492441a06fcaaed3d6e04d367a09ec127cfce20f04174f0e6c8e27a91 SHA512 231959d1fcbb07faac4b40599b6aec6cc46aad8f89debbdddb1003bdf742abc9e2afa43e70c9baf40949aaf6c23d6aa10c1ba0cb5137268b443081faa3b77c20
 DIST patch-4.4.247.xz 3404480 BLAKE2B 5095d7353b56c11ac42c56640dd6223c5f5418aeb367ecfefb103ab8c94eb20e88bc5dc9fbba5722d2f1cbcf733b8b0133943213d8b0f2550ce3d41863d546c7 SHA512 353eb02080153a651faa50aec7bfd36ace06e683699ffafd1161addac6bb9a5d1eb73ad8259becfa0607f75ea6f761bea807d88d5ecc15808413026f74f03825
 DIST patch-4.9.247.xz 3788468 BLAKE2B a866ac523f2612b384794cf07a18ed1a414c8d34c501fb02a7e40792e73bdc576c65e7ec77fab3f04cee4dbd4534f45811c729a6bc17f044ed2196a0fe6877a8 SHA512 4af0e2c93e70af1119f28ea68f3ed1a56226fc0e00d0ec8d12e42498623afe74cfbcd44db3087bfb7748b7148deb3836c7924369e6e6102809a40084bf242a1d
-DIST patch-5.4.81.xz 2396180 BLAKE2B 3a42b28cb5fb9cdc83171df46854805cc39e83f122f47b00eb823a05c0663880e688d7c44dfd2c21875fdbb0f02e494396df69ce07cc4ca76d03cee521d48ece SHA512 f97b6d8d58d43449491d543dd0c3afe8e4c7f7ea4527c4712b0bb6b7a4817daba61f507e8518a4f72254042472d7b5f8095e5df1c131fd010f4c0453c9d8cde5
-DIST patch-5.9.12.xz 612468 BLAKE2B babdf390cba9ede83b9056c90f769b98d58d86b168b8666035bf17e3e7d5f942d45a7392e56b6acd0423d0a4e8a1b3fa629a40ba12ba4a8ced4719b7218cef70 SHA512 eef914d5124dae25d0d5c6162cf0d19cfe6adabd3da5594609275527ac7bca9b8b3c9bdd8ae5cbc061cb93a4559c30daed3f104f789b31caa2596f3da371f2aa
+DIST patch-5.4.82.xz 2402752 BLAKE2B ce62e0fd0898f369d9bd39e1ff69a8bf75e8c7e6dc7e4eafc48d0f943295ebb1d7ad8d3c02a9352344ebf76a2db39771ca5727589eacbb204cc44d8541a05b31 SHA512 8455d7a0c88f6b764ce4061cf50f00d505c8d1ddcefa97ad7f826290b981b54a6025a982881dc16cc6c58ff76247186c7a520ed9c488df9e1b86f5b0625eda94
+DIST patch-5.9.13.xz 621916 BLAKE2B b72d57e43df1c753440de453fadc365378f1369c1ff19e0861dabd024feb2ccbc3b7bbaf9358ce96cab5a1249b1e0f3abab694a1f5569be924a5e932d6ce6a73 SHA512 404d7d703f5190bcd08da5aaf55d1b6a82efb5c9a168334b6a372500534e23fe53b9ec2d2dec5a8acf96f2c367fcf701bf1ba33746948a0719e1cc2b2061bfc8
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.211.ebuild
index 4ffca0e91d5d..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.14.210.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.14.211.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.162.ebuild
index 4ffca0e91d5d..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.19.161.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.19.162.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.82.ebuild
index 4ffca0e91d5d..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.4.81.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.4.82.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.9.13.ebuild
index 4ffca0e91d5d..4ffca0e91d5d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.9.12.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.9.13.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 94a269445e5b..79e4bdb3399d 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1 +1,2 @@
 DIST microsoft-edge-dev_88.0.705.15-1_amd64.deb 87945596 BLAKE2B a770aa4edc4f11d350b7ff77dcc7d953115c815caebac5d9858f8ed5e24ec14d4f407ae3ad7f97d32f78849f024c91b75278c21eecdd8197f0c375253fcca653 SHA512 ad388d4b784e71db4f7e30f2f5ee36d3e8abcd7e2c3cac351e68d1a81476017d1c3e784fda2aaf59ec98b537d6ab3ee90aeb8e77597c3204122c6770149b427e
+DIST microsoft-edge-dev_89.0.723.0-1_amd64.deb 89214260 BLAKE2B 9cf78e3e6e77e7efbe78e830e84fcb767508e3f6d2872846b48525d50445d468b53351b1837387a803226f94785eec06360df305bb27e8bee378ee813d085516 SHA512 699e9a2005dcc5363921b05b077d34094550e543cf960f1ee531c9c3f16c77971945c380a4e200451ab95c41ddd484d525b8e50934f5c25df8d3e5e499f440f6
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
new file mode 100644
index 000000000000..41108ab2bece
--- /dev/null
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-89.0.723.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit chromium-2 desktop pax-utils unpacker xdg-utils
+
+DESCRIPTION="The web browser from Microsoft"
+HOMEPAGE="https://www.microsoft.com/en-us/edge"
+
+if [[ ${PN} == microsoft-edge ]]; then
+	KEYWORDS="-* amd64"
+	MY_PN=${PN}-stable
+else
+	KEYWORDS="-* ~amd64"
+	MY_PN=${PN}
+fi
+
+MY_P="${MY_PN}_${PV}-1"
+
+SRC_URI="https://packages.microsoft.com/repos/edge/pool/main/m/${MY_PN}/${MY_P}_amd64.deb"
+
+LICENSE="microsoft-edge"
+SLOT="0"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-misc/ca-certificates
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-fonts/liberation-fonts
+	media-libs/alsa-lib
+	media-libs/mesa[gbm]
+	net-misc/wget
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+QA_DESKTOP_FILE="usr/share/applications/microsoft-edge.*\\.desktop"
+S=${WORKDIR}
+EDGE_HOME="opt/microsoft/msedge${PN#microsoft-edge}"
+
+pkg_nofetch() {
+	eerror "Please wait 24 hours and sync your tree before reporting a bug for microsoft-edge fetch failures."
+}
+
+pkg_pretend() {
+	# Protect against people using autounmask overzealously
+	use amd64 || die "microsoft-edge only works on amd64"
+}
+
+pkg_setup() {
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm _gpgorigin || die
+
+	rm -r etc usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+
+	gzip -d usr/share/doc/${PF}/changelog.gz || die
+	gzip -d usr/share/man/man1/${MY_PN}.1.gz || die
+
+	local suffix=
+	[[ ${PN} == microsoft-edge-beta ]] && suffix=_beta
+	[[ ${PN} == microsoft-edge-dev ]] && suffix=_dev
+
+	local size
+	for size in 16 24 32 48 64 128 256 ; do
+		newicon -s ${size} "${EDGE_HOME}/product_logo_${size}${suffix}.png" ${PN}.png
+	done
+
+	pax-mark m "${EDGE_HOME}/msedge"
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
index 2a2e3dcfc3ab..56773605690f 100644
--- a/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
+++ b/x11-themes/elementary-icon-theme/elementary-icon-theme-2.7.1-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit gnome2-utils
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-09 00:52:45 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-09 00:52:45 +0000
commit	5a8162b6453bc0ab4cf7f20fc528a88da2a28137 (patch)
tree	ca1783d1585eec52d84773b9151d5daf3ab54ae2
parent	7ec39a79bef58709b3729177b36483ab7609e0b2 (diff)
download	baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.tar.gz baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.tar.xz baldeagleos-repo-5a8162b6453bc0ab4cf7f20fc528a88da2a28137.zip