gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-misc
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
65 files changed, 475 insertions, 1132 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7821ad852fd1..a7252ded6be9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/brewtarget/Manifest b/app-misc/brewtarget/Manifest
index ebce77bd9185..73341b62455f 100644
--- a/app-misc/brewtarget/Manifest
+++ b/app-misc/brewtarget/Manifest
@@ -1,3 +1,5 @@
+AUX brewtarget-2.3.1-no-compress-docs.patch 907 BLAKE2B a499cb28522e16199e42fa72421f17bb676116d6ae96b26a456f2b3a0f1baa343d782e4a51f88b6b37b50ac8be26909dbdd64ad8243a284d1be65cd8da995be7 SHA512 4c746583fa5e5e37e1a03b657115dd992aa44f8cffcf181e79c1321abd782d557906dbb5f5d2c9fbdee13c823597cf3403ea42e3fb5317922f97c925a0909ccf
+AUX brewtarget-2.3.1-no-qtwebkit.patch 4904 BLAKE2B f3040fa2a08467154a7e664107eb957775b75e3ecfb5c62476c068f95c5f773226ebad9e9afcb9b793066aeb1f98c2511c0c627ac92573896840718bf70cc063 SHA512 eb476d7558f35448e77019dd66e966b652b04f5acca370e45638ed78ba9ff374fd69e498e294cc843d2e8d264469dc891d8f8bac7aeb20792bd0e513542540d4
 DIST brewtarget_2.3.1.orig.tar.xz 9449200 BLAKE2B 00eda709c6665b2353380d013d55a59068d79f70368e843296f43d2f947c741ed526d4f6820f18c4d5e96866274bce76b2235cc50595882f58f397f651858bf3 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086
-EBUILD brewtarget-2.3.1.ebuild 1246 BLAKE2B 401e5003db8a39362ea5206563236c45addadfa5922571dd3d0a74bc7e8ca8b62a48ad74d6b63ae7a8a4f56235e100132c36014ad5f86c7f431fbe1f680852dc SHA512 b6409e126ed6e94d0511f08749c56e5a4e774ddacdc6ccf64ca5ce68c27502a5a8b6eb37118301bec44396664b2754d2e76c072879623d2f675d2cc12e0bcc30
+EBUILD brewtarget-2.3.1-r1.ebuild 1347 BLAKE2B 4af5828ad8d0f8c10dc03ac1ec1dfc9635224b3b1820452f105c97de260d993fbb2c3741337f20745b21e44177bb26be516f1855cd288d0b6353d689965b9d58 SHA512 3f12d16ee2c379b0700ed7a3466d4567446ad6eb7a00fe1b7755a33d3a4c314ba729e5802ea9eb6ab7107c238fc85d0e73ec77bced8f3479c017a1ceb8a9fe3f
 MISC metadata.xml 333 BLAKE2B 610f70294511d47c0df2cbd259fbe558b6f90350f619984e732bc1d3b3977c22fff55ab110da945164baa76ccc4c39bcbf347e29fea175ce3f390c41f4fbc86e SHA512 e51f8f143455d51148898350c95b321226c7bd931a585234bce000cf1b2f2762b465f2af764288cc4ddde13abf825f8571e4a6ed7f9e73fbb315030d51cb45aa
diff --git a/app-misc/brewtarget/brewtarget-2.3.1.ebuild b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
index 320d5b9daa7c..03780974f84b 100644
--- a/app-misc/brewtarget/brewtarget-2.3.1.ebuild
+++ b/app-misc/brewtarget/brewtarget-2.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+EAPI=7
 
-inherit cmake-utils l10n
+PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
+inherit cmake l10n
 
 DESCRIPTION="Application to create and manage beer recipes"
 HOMEPAGE="http://www.brewtarget.org/"
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
@@ -24,33 +27,36 @@ RDEPEND="
 	dev-qt/qtprintsupport:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-qtwebkit.patch"
+	"${FILESDIR}/${P}-no-compress-docs.patch"
+)
 
 remove_locale() {
 	sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
 }
 
 src_prepare() {
-	l10n_find_plocales_changes "${S}/translations" bt_ .ts
+	cmake_src_prepare
+
+	l10n_find_plocales_changes translations bt_ .ts
 	l10n_for_each_disabled_locale_do remove_locale
 
 	# Tests are bogus, don't build them
 	sed -i -e '/Qt5Test/d' CMakeLists.txt || die
 	sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
 		-DDO_RELEASE_BUILD=ON
 		-DNO_MESSING_WITH_FLAGS=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
new file mode 100644
index 000000000000..f437a72e5917
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-compress-docs.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt	2020-02-17 02:07:48.201051509 +0100
++++ b/CMakeLists.txt	2020-02-17 02:10:26.790061722 +0100
+@@ -176,18 +176,7 @@
+ ENDIF()
+ 
+ #=========================Changelog custom target==============================
+-FIND_PROGRAM( GZIP_CMD gzip )
+-IF( GZIP_CMD )
+-   SET( CHANGELOG_UNCOMPRESSED "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+-   SET( CHANGELOG "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
+-   ADD_CUSTOM_COMMAND(
+-      OUTPUT ${CHANGELOG}
+-      COMMAND ${GZIP_CMD} -9 -n -c ${CHANGELOG_UNCOMPRESSED} > ${CHANGELOG}
+-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-      MAIN_DEPENDENCY ${CHANGELOG_UNCOMPRESSED}
+-   )
+-   ADD_CUSTOM_TARGET(changelog ALL DEPENDS ${CHANGELOG})
+-ENDIF()
++SET( CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
+ 
+ #=========================Detect Debian======================================== 
+ IF( EXISTS "/etc/debian_version" )
diff --git a/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
new file mode 100644
index 000000000000..ec149c8f4108
--- /dev/null
+++ b/app-misc/brewtarget/files/brewtarget-2.3.1-no-qtwebkit.patch
@@ -0,0 +1,164 @@
+From 761bb3882c4c243a49279b67e53c87e5e5d2928f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:01:54 -0400
+Subject: [PATCH 1/2] Closes #127 - TravisCI can't find webkit
+
+Qt 5.6 did away with the web kit, but none of our build environment have the
+replacement yet. This patch replaces all the WebDocs with TextBrowser, which
+seems to work and should compile.
+
+I removed the webkit requirement from the CMakeLists file, but I wasn't sure
+if the webkitwidgets needed axed as well. Although writing it out makes the
+answer somewhat obvious.
+---
+ src/BrewDayScrollWidget.cpp | 2 +-
+ src/BrewDayScrollWidget.h   | 4 ++--
+ src/BrewDayWidget.cpp       | 4 ++--
+ src/BrewDayWidget.h         | 4 ++--
+ src/CMakeLists.txt          | 2 --
+ src/RecipeFormatter.cpp     | 2 +-
+ src/RecipeFormatter.h       | 4 ++--
+ 7 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp
+index 760d2dc5..0846d791 100644
+--- a/src/BrewDayScrollWidget.cpp
++++ b/src/BrewDayScrollWidget.cpp
+@@ -35,7 +35,7 @@
+ #include "mash.h"
+ 
+ BrewDayScrollWidget::BrewDayScrollWidget(QWidget* parent)
+-   : QWidget(parent), doc(new QWebView())
++   : QWidget(parent), doc(new QTextBrowser())
+ {
+    setupUi(this);
+    setObjectName("BrewDayScrollWidget");
+--- a/src/BrewDayScrollWidget.h
++++ b/src/BrewDayScrollWidget.h
+@@ -27,7 +27,7 @@ class BrewDayScrollWidget;
+ #include "ui_brewDayScrollWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QPrinter>
+ #include <QPrintDialog>
+ #include <QFile>
+@@ -90,7 +90,7 @@ private slots:
+    
+    Recipe* recObs;
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+    //! Internal list of recipe instructions, always sorted by instruction number.
+    QList<Instruction*> recIns;
+ 
+--- a/src/BrewDayWidget.cpp
++++ b/src/BrewDayWidget.cpp
+@@ -37,7 +37,7 @@
+ 
+ // NOTE: QPrinter has no parent? Will it get destroyed properly?
+ BrewDayWidget::BrewDayWidget(QWidget* parent) :
+-   QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QWebView(this))
++   QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QTextBrowser(this))
+ {
+    setupUi(this);
+ 
+@@ -291,7 +291,7 @@ void BrewDayWidget::pushInstructionPrint()
+    QString pDoc;
+    QPrintDialog *dialog = new QPrintDialog(printer, this);
+ 
+-   /* Instantiate the Webview and then connect its signal */
++   /* Instantiate the TextBrowser and then connect its signal */
+    connect( doc, SIGNAL(loadFinished(bool)), this, SLOT(loadComplete(bool)) );
+ 
+    dialog->setWindowTitle(tr("Print Document"));
+--- a/src/BrewDayWidget.h
++++ b/src/BrewDayWidget.h
+@@ -27,7 +27,7 @@ class BrewDayWidget;
+ #include "ui_brewDayWidget.h"
+ #include <QWidget>
+ #include <QSize>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QMetaProperty>
+ #include <QVariant>
+ 
+@@ -70,7 +70,7 @@ public slots:
+    
+    Recipe* recObs;
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+ 
+    QString cssName;
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -424,7 +424,5 @@ SET( QT5_USE_MODULES_LIST
+    Sql
+    Svg
+    Xml
+-   WebKit
+-   WebKitWidgets
+    )
+ 
+diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp
+index bb6a9295..f8a1ab4c 100644
+--- a/src/RecipeFormatter.cpp
++++ b/src/RecipeFormatter.cpp
+@@ -52,7 +52,7 @@ RecipeFormatter::RecipeFormatter(QObject* parent)
+    docDialog->setWindowTitle("Print Preview");
+    if( docDialog->layout() == 0 )
+       docDialog->setLayout(new QVBoxLayout(docDialog));
+-   doc = new QWebView(docDialog);
++   doc = new QTextBrowser(docDialog);
+    docDialog->layout()->addWidget(doc);
+    /*
+    // Add a print button at the bottom.
+--- a/src/RecipeFormatter.h
++++ b/src/RecipeFormatter.h
+@@ -28,7 +28,7 @@ class RecipeFormatter;
+ #include <QObject>
+ #include <QPrinter>
+ #include <QPrintDialog>
+-#include <QWebView>
++#include <QTextBrowser>
+ #include <QDialog>
+ #include <QFile>
+ #include "recipe.h"
+@@ -114,7 +114,7 @@ public slots:
+    Recipe* rec;
+ 
+    QPrinter* printer;
+-   QWebView* doc;
++   QTextBrowser* doc;
+    QDialog* docDialog;
+    QString cssName;
+ 
+
+From 3e0223a3b95c0e1169115cd14d0ede7f17c4f30f Mon Sep 17 00:00:00 2001
+From: Mik Firestone <mikfire@gmail.com>
+Date: Sat, 19 Mar 2016 23:09:41 -0400
+Subject: [PATCH 2/2] Missed a few edits.
+
+Missed some entries in the CMakeList files.
+---
+ CMakeLists.txt     | 6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,12 +153,6 @@ INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
+ FIND_PACKAGE(Qt5Svg REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
+ 
+-FIND_PACKAGE(Qt5WebKit REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS})
+-
+-FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
+-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
+-
+ FIND_PACKAGE(Qt5Xml REQUIRED)
+ INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
+ 
diff --git a/app-misc/cfiles/Manifest b/app-misc/cfiles/Manifest
index 2040fc904c31..3383f1840bb1 100644
--- a/app-misc/cfiles/Manifest
+++ b/app-misc/cfiles/Manifest
@@ -1,5 +1,5 @@
 DIST cfiles-1.5.tar.gz 237333 BLAKE2B 26eaa9f6d96bbcf07047a0c7f5cc941bdf8417c53a766f2340a8109d8a9333da509840bc928588976bb9a8c416fd138798abd57053162024fcac20299b30cf6d SHA512 b13141ea128e4095d095474917091770cbc66a18178aee9369434beb8102d8102fc530823b40d4c44fa8f00e17e28de5626b55986f878a393c1b59fa2f491145
 DIST cfiles-1.8.tar.gz 237966 BLAKE2B b2c0783ac4d5e5b9950b574f635b8d4adbe332178e09cd89966e2a44a941a34806332222fa606a097fbe21453bfe9a49f4718575c6fdae5f5b9b9433181e8fd5 SHA512 14880c71bcc6dc0b6433be722bdd75d30859556fae30754c668a9dacf8a1b8e4758cca3572de034a1e8fb4e947d38739351969139fe72f59a7af3dcb158aaa86
-EBUILD cfiles-1.5.ebuild 584 BLAKE2B 0a9c44e2665b8a67c3d61ba0a70fcf1cea5c8d15abaacd265aedcfcce6cfcf3813ecbbdcf53a393dc2898f5e97ae9cf34b228701cd9ef66d77c204425efb9de6 SHA512 62c4f4e6357788127a514e54b5f55cab373012beb69f836d343f0902e2efe194c75ead39a82d6490434a9e27ec33980f4cbc59d81dbf48e3c19d950cc84dc01c
-EBUILD cfiles-1.8.ebuild 584 BLAKE2B 0a9c44e2665b8a67c3d61ba0a70fcf1cea5c8d15abaacd265aedcfcce6cfcf3813ecbbdcf53a393dc2898f5e97ae9cf34b228701cd9ef66d77c204425efb9de6 SHA512 62c4f4e6357788127a514e54b5f55cab373012beb69f836d343f0902e2efe194c75ead39a82d6490434a9e27ec33980f4cbc59d81dbf48e3c19d950cc84dc01c
+EBUILD cfiles-1.5.ebuild 590 BLAKE2B f8aebac3dc2e61c9a3046217696b7db7641ba757b05f1addfd2faf6d55da157536bb507f0e1e68ab5f65b19b27e028b6036ed5960730b86755cf279be5cd9d8e SHA512 1eaa00ca187d6cb1670cde62d25eb2ba62931d4675212e5d98243b378a25a74d12d578e11fe8dddeec7bca96b4cecfb3667ac592ecd1fca9bc3c0216411cd767
+EBUILD cfiles-1.8.ebuild 590 BLAKE2B f8aebac3dc2e61c9a3046217696b7db7641ba757b05f1addfd2faf6d55da157536bb507f0e1e68ab5f65b19b27e028b6036ed5960730b86755cf279be5cd9d8e SHA512 1eaa00ca187d6cb1670cde62d25eb2ba62931d4675212e5d98243b378a25a74d12d578e11fe8dddeec7bca96b4cecfb3667ac592ecd1fca9bc3c0216411cd767
 MISC metadata.xml 590 BLAKE2B 1aa0b35129da61cf18a1512af1ca77561b35608d72974aa4d82c99ed9b218443ae118f6f72a362409b4f9d3e34a0781333494724be6d8ca88fd59fe7980de711 SHA512 6bb1ae35d085057ff824fb1e0cf6922c9ff5e631e80814923e42d95c117a06c2d9f66511d1fafe4fbff72fe5fbf889b5a74378b6441bbf94ad9f944040bf7f3f
diff --git a/app-misc/cfiles/cfiles-1.5.ebuild b/app-misc/cfiles/cfiles-1.5.ebuild
index 9c770c677606..4c793131b9da 100644
--- a/app-misc/cfiles/cfiles-1.5.ebuild
+++ b/app-misc/cfiles/cfiles-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_install(){
+src_install() {
 	dobin cfiles
 	dobin scripts/displayimg_uberzug
 	dobin scripts/clearimg_uberzug
diff --git a/app-misc/cfiles/cfiles-1.8.ebuild b/app-misc/cfiles/cfiles-1.8.ebuild
index 9c770c677606..4c793131b9da 100644
--- a/app-misc/cfiles/cfiles-1.8.ebuild
+++ b/app-misc/cfiles/cfiles-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_install(){
+src_install() {
 	dobin cfiles
 	dobin scripts/displayimg_uberzug
 	dobin scripts/clearimg_uberzug
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
index 4e6bd8082b98..d2f933542a45 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,3 @@
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 647 BLAKE2B ac1ec87df8e08fe380648f6ff9afa17621c0570a6fc7c72e9188c701411459a0e3105b66e7a6f39bc1857de6dab0f37cb56147a7f6b10416416181402a5cef6f SHA512 cf4684cfedc4445345cba50a5875d5f67b2b5492de99b527b4af461c8ab289e64098a56684b20fb483236d0cd1c8f11c8a23db8f0ede560cf56c624da1486468
+EBUILD cpipe-3.0.3.ebuild 644 BLAKE2B c29c211536ec43791fcad22570821d96e1bd57900e9c7fbd2037cf331246d877f19fb5acbe760029fc28f5190984288dd49372f8750ff5bfbc8d658471d379ab SHA512 dc9b5aa72edc885a9c904a86dc56a7dc17c22e861334ed0632a52fc54ca808bab8e0b054550f66c5a8aa1f50d99ea15cb82c890dddbe1656d0e416c08cf3c54a
 MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
index 6c512482572b..ff2b6594a3f6 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-src_prepare()	{
+src_prepare() {
 	default
 
 	sed -i \
@@ -26,7 +26,7 @@ src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
-src_install()	{
+src_install() {
 	dobin "${PN}"
 	doman "${PN}.1"
 }
diff --git a/app-misc/crunch/Manifest b/app-misc/crunch/Manifest
index 71ccabea75cd..64a447ed11bc 100644
--- a/app-misc/crunch/Manifest
+++ b/app-misc/crunch/Manifest
@@ -1,3 +1,3 @@
 DIST crunch-3.6.tgz 38635 BLAKE2B 987fc0fddbc9330c2f196b5914c535e3c81a0cbd30bd2121d05ccb937c9ba9f3f9296dd20a638efad8219cc5555203dc8b75b2fa6aa3e497a3da665b4c51fbeb SHA512 85a2a12bb481988ab27a19602122abc29bb307de0af279132dcc0565dfc4ba44ab9f7ca15d876001f2e6dcf7be77ed50168cb066fc6a65bf06ec5cf9d798e81f
-EBUILD crunch-3.6.ebuild 545 BLAKE2B d11fd859562d85cd4b6171ca4f82bc4a2d04bdac490f6f717c1cac5a5c7c15e8d53ed6b64f6c4f1d1b518b5bca5b062af7183d25f81b943a9a1a84bd23fd0638 SHA512 c83c126094ee74ac88229b3abcef02a81f722eee51605e0e9be8233faffb11a4c3a9c3aa5219b7d915de01f31fca160d6c285f6e847fa4af34f7d3ca2722d01f
+EBUILD crunch-3.6.ebuild 543 BLAKE2B 3d2bcc2de15414c2bc8975675affb85dff49e08cd2f014922cf930abec7a2f24aaadad4f025f523671ba2a67014d6c8305544a5815cbfc6bccc413e3a499092c SHA512 972dd123031d54a3e112a0610b471257d180b13af11d746134c19241a36b7e9f27a007e97e3e3069b6e71d22de1abfed448864d7164635ca624d696d8695a8e6
 MISC metadata.xml 332 BLAKE2B 1bd91ecbe54c77bdf8880d306081fea018c7508f12d5b508b915150978e907e831ce9dda40f199472a6360067b69d15d2f022a223c69a9c7d2ac649e57ef44ea SHA512 b537452a244bd1d52508d75606efc72d276f6cc502e3bf1840758cb73d9fa907aed0d97545504a67bc49ff72e700c6a487e4d874560698db4850af66b4184b68
diff --git a/app-misc/crunch/crunch-3.6.ebuild b/app-misc/crunch/crunch-3.6.ebuild
index 7488fad701ea..68517dd07322 100644
--- a/app-misc/crunch/crunch-3.6.ebuild
+++ b/app-misc/crunch/crunch-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install(){
+src_install() {
 	dobin crunch
 	doman crunch.1
 	insinto /usr/share/crunch
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index 572f130e65a8..6a253fd127da 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,3 +1,3 @@
 DIST dateutils-0.4.6.tar.xz 640552 BLAKE2B 7f1b5bef1465063f46a7bc4b64ed1d645b3bf827aa17b7c962bf3e2731a031f8cf074970aad618157283f0303222413c7be80a72bdcc65bd0918120216542295 SHA512 014e8411774250d2862943bbbdd69cc7ec2ca934349272ae7c44b136a57ef30c23f841018cc38f86d49e2348b2199848076db224e3653d6d7337a3f17709c8cb
-EBUILD dateutils-0.4.6.ebuild 600 BLAKE2B 5b24705fc637e8f137a5a012179a3bf0c03b432975168ed605e3c55d93b19a21cf7b02b78d023a619e7bdd3704d226301945389757d7cc737e0b18dd291687e6 SHA512 fdf5501d24b1f1a31441d99cd66542fdbb47f76b1ea3196fee2246b8ac083f2e25462de78a2a6c94f7169f45e6bd75591831b80bb93d77532e5d2ecaa5c74a5f
+EBUILD dateutils-0.4.6.ebuild 542 BLAKE2B 2189e685ce1d741a5f7a4b57f703a725d4c4eaacbcdc6a69c7018485c5933b456b2e0bff7bc6c0212415778ad15a13230bd46239c99f86f6a356237696f16706 SHA512 94d5cc23635f114afe23c25a45a9e3f56bb77eced55945e71c7858f6d0aee79a1d283d8ca62c169b1764fe781bb8650d558e3f3b481e9ba8b13024b254aca23b
 MISC metadata.xml 254 BLAKE2B d95972610e33fb3ea47a13570a20c2f807ee9a8110a0450e45461649c4d61ef723abeccacae55feb4c7d4c31f0808e750de98549eaa880f043b4ebce26aa0bd6 SHA512 3537bb9cb6329ac910efed6898ac049d4591904d1fc1955992ab527874af0c69ab872c293a4b042bf6b0ff61d59938442321aa9fc4b0049877a4b348139cb465
diff --git a/app-misc/dateutils/dateutils-0.4.6.ebuild b/app-misc/dateutils/dateutils-0.4.6.ebuild
index 56f3fe7bcb2a..0c4b76cb20e9 100644
--- a/app-misc/dateutils/dateutils-0.4.6.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,10 +17,6 @@ DEPEND="app-arch/xz-utils
 # bug 429810
 RDEPEND="!sys-fabric/dapl"
 
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index e060d6900e93..fed9ae4bf7ed 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1,3 @@
 DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 BLAKE2B 558af647f21839f6df8a19cb84237aeb8ad5d023b1373de3180b9a88fcf7425d17797348cc0e2d44a4d5d1d715a429475873b82d0d8c728d8177b17d77b9cc42 SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80
-EBUILD ddccontrol-db-20061014_p20121105.ebuild 788 BLAKE2B 2a786c6a164e37cef20302b79ffbbb960ba62605c2701eb71ab1f34b89082f2e0ba188fbb71e05cba73ea6697ff2bd9482f0c6660ab4addf0dad8364d2122a0e SHA512 8ccbdb0f3b5e5449fd07f8b6f76f362388479c7ab11ef4e10a20846eea003f0c7a85696f65ca40dd845b7535eab4f66360fa0cb54e8182f687ebd53201dd79ce
+EBUILD ddccontrol-db-20061014_p20121105.ebuild 786 BLAKE2B 68f4b40d77ea7394256781c0b34eda18d25d07ff76146cb5afc8bd7d21cd168e690ccdeb7c75ad6993ebb07eee3f8ed9292e80761b96b33cdb527e898a78a102 SHA512 939b8614ec2fbaa26b21c6f4fdef1d72e401e52c6ceeb27cfa78eb8227687986f53889065c70f79e29d79e8d238c46dfaa5d19450de6a34cdcdf67653d1e0a3c
 MISC metadata.xml 318 BLAKE2B 7d2751717a71de1512a92f653a63ace19241e11dff6e2a0b982a87f3631757450b5c2430bf273c5d441e649569bd6612e5c199b37ac8da3f14b5f4440719eeaf SHA512 3ea6d2450579fd400199cc8c06193b9a0070c0efd4ed8016268d7e097ad35f5e0987fb1b6326076b736094df0c5976e33f1e4ef94ccccd789de6662f547d46ed
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
index aa4bd4bb42ea..79ee7d4da0ba 100644
--- a/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20061014_p20121105.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 		dev-util/intltool
 		dev-perl/XML-Parser"
 
-src_prepare(){
+src_prepare() {
 	touch db/options.xml.h ABOUT-NLS config.rpath || die
 	eautoreconf
 }
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e9884ca68fde..6a71f7033e2e 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -16,18 +16,21 @@ DIST elasticsearch-6.8.4.tar.gz 148628251 BLAKE2B 09f7a18a1ee6f40154f2181bf354c1
 DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
 DIST elasticsearch-7.3.2-no-jdk-linux-x86_64.tar.gz 140098396 BLAKE2B bb2eb1e69b459533ed785f244ebbdf06032f8115f298e4151164fa27c913c6cff674dc8e75d96734185ffe47c2dd16dff11f3f7447a21bd0020fd45e58abf5d4 SHA512 9d73f6fce0b5321099393c69b1ba8544f9fc919f5a850bac3eb5a77af50f392e8eeb20ff34ba85283649a19d9bee33351a4ffd363cda848d4d53cde91632e335
 DIST elasticsearch-7.4.1-no-jdk-linux-x86_64.tar.gz 140407217 BLAKE2B 5bf378d66a199de45375e9e07e650e9cdd8fbdd8868c8a81928571be4aaf2d2b1bacf6cde8e216a98b448d1d6ef0db89b2b410d5b2d0bd5e0b40309b7e68f7e6 SHA512 7714a0bd8a69bf921075b2020863469e9d44896e73b383ca073cb243eadd29dc9a76936530c33304fb2e8505dfdc88b7591ddca9543ee1cf11e74df3bebd5b25
-DIST elasticsearch-7.5.1-no-jdk-linux-x86_64.tar.gz 141737287 BLAKE2B 2a32f0574023a10b3657cd9f9d2f5544f0191405bafba58e41d2d5ba953d6f546273a44c8bd7d9b4cd1122518312471f7b276588c513557bafbb0a40e4b91f55 SHA512 7b5f49b2ea4edd0f5289a28e4015322cb4549493c02d707f3b74fe0bc7f415dc1cdfeeb16a7129bb8b4e60e7e8b2694d6b6498919653ae8fd7baa10891d29a98
+DIST elasticsearch-7.5.2-no-jdk-linux-x86_64.tar.gz 141758515 BLAKE2B 67b6a844c671ce5d33e16282c34ba9cb82d19511612f775e6e238854c1074fef33d03e0a001a111ffd514a3397413ab335c53a1d947cfa43c3a1221da3de065c SHA512 64d6b3f1d30869f53f26a7fc60b8ff7f6e06457bcd437404cb157801a9faeb6a61b890c52eadd614fac1fa18692a07383d01e539d52371cf84f23b5b1dbc73bd
+DIST elasticsearch-7.6.0-no-jdk-linux-x86_64.tar.gz 147868801 BLAKE2B d298db386433c2965e449089d03dafcc2c4b61e32f2fd0613c49113291b1b35c01bbd72bade0f71bc4b08b18c5e9d420b00bd5330c33eaf5ecbddafd056f4a26 SHA512 643dc0aa1fc6a51604c783a9de6c23423e6b25d2d524804c9995d3d8dd447195ce52dc2e3251956b688da0b534da8b023b12dc8b187ca23620165d2ec53223f5
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
 DIST elasticsearch-oss-6.8.4.tar.gz 68444348 BLAKE2B 812180686f1082607c4c75679d591cb2d3517d16212c29b8f81b5792a2331b8faa5245540e1acea998b385eca6e4b06419c172b5d520913b8b31842dddcc4757 SHA512 d55ebb56bd13dbccf633f51a5d8cf5b0eee7d1e8954fe106e44286d5498dcffdcdf98117b42d8601ec987699a25d88a27dce7fdedd4612efd52bc18c561dc5ca
 DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
 DIST elasticsearch-oss-7.3.2-no-jdk-linux-x86_64.tar.gz 69289138 BLAKE2B 2ab3658a2acf1899f44fb29252932862759dd134ffe4872daac15092f9a08b536492197b9cd44287ec48a7aaee1c3f78edf2957f807aaebac866bc835972a592 SHA512 abb183a05db25a877d4e5a8f8b75fba517444008f34e35e82806a6239c3ccec1c32dc787313b899be55caefdab8343a62db31f9491bffbabefaecccaba1210d0
 DIST elasticsearch-oss-7.4.1-no-jdk-linux-x86_64.tar.gz 68527811 BLAKE2B d8965b429d4ee9b7becdb0ff407ac1ae03322a5c17ab7e793569fdd4ebffa302d95772e7ba0f4ae505fd07b62c2e6983d57db9feec7fd4da42676166287b460b SHA512 a652905b130ace0097b5f51df1d2ef5977d0eda8b551acaf7b3d7015397b054f83a868874fdc96b95e2c780c65552001ee2a90cb7b9f88f43b5ea813d0b078dd
-DIST elasticsearch-oss-7.5.1-no-jdk-linux-x86_64.tar.gz 68713211 BLAKE2B 67d7b1e60c3f38d0de55aaed6bd6ef37dd64b4c288fbd695974b33b7565197861c4bfcaee7476251cda7683021d6adb1ab6b6f67e2c2b6b91f29e1b4d4bb39d5 SHA512 26ea962f6fcb8ead1d05fc91e30ec10193849a4fb8b826753d591a249b04deb4dd3705f73dc6fa41334112a01b76babfa15e5fe706033dd4eb55638defc3455f
+DIST elasticsearch-oss-7.5.2-no-jdk-linux-x86_64.tar.gz 68711865 BLAKE2B 01a456d3965c83fe2a94e87b0f19dfbc89666f01fade36cff1b7733b24c91580bc95b9e0acf0d9134078715be890bfacdc6c0091cf56dfb9dc43e71bf387806c SHA512 ea494dfb743e5ea12dbbc269d8103fa08644c580291eb88b25000743d272aa87c8709ac9fb2939ad387d5d335f0795c943114b8471074bba7d583494bbc6d100
+DIST elasticsearch-oss-7.6.0-no-jdk-linux-x86_64.tar.gz 72554604 BLAKE2B 34cf380ccdf4521f0d08c239b9b34bd88bb171210612a5df38cf4a536321702b1105c6047b1f22569483c2daf50c75e27c48af28c385f09cfc885512e92bb214 SHA512 521f3b7b3f4624f0039b7e7ba75d811f5d79fb91112c0eca261e2693327f75047be13d147536a33192cacdc5c9c84f94a6090e4678c915a1d59b0b89235eb8a5
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.4.ebuild 2539 BLAKE2B bbf97b9bfd59a523d6a15a1ce94b5143faf011ebfb62e89d07424bb56bef16f172d3770516d7b170d7469d67f0b3462251778c60621f3472fe3d966bddc3f778 SHA512 dcd7a9909aee6c957e53154e34308e0df6ca3f7b02d815a9df7ea861fbe8753dbba46bd32c63c819dbb13f194eba909058ba18b7e3a6a6cce24cb1e50b2d9b70
 EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
 EBUILD elasticsearch-7.3.2.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
 EBUILD elasticsearch-7.4.1.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
-EBUILD elasticsearch-7.5.1.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.5.2.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
+EBUILD elasticsearch-7.6.0.ebuild 2438 BLAKE2B 5d1a2238fde509ebb732488bf84c4a8dd39a2edb7a4362967ee80efe703115909710b64a34e475c5e8bf23380b3ef64948adb7cac7c497988fd98f9ee98d7a6e SHA512 d99accc6cc99c9e1dbc78f12dbebb4c337d4330fb76a3feeb4ff04fd4af8e0007a7d36bfff61c8b7fa1fa65dc513c5761be642494c6fee3efc285a87889854d9
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.5.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.5.2.ebuild
index 2155270debec..2155270debec 100644
--- a/app-misc/elasticsearch/elasticsearch-7.5.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.5.2.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.6.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.6.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.6.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/enum/Manifest b/app-misc/enum/Manifest
index adfda6e76a0d..9870144464e1 100644
--- a/app-misc/enum/Manifest
+++ b/app-misc/enum/Manifest
@@ -1,3 +1,3 @@
 DIST enum-1.1.tar.gz 59849 BLAKE2B fdccdf3a362b3a6f7727c76eb50e4d568b2c6be85fdb62af6f095655865708102e578bb3e4988fdcbb542b2397aff5ad024b89c0cacb120d676aed518bbfcaa5 SHA512 4d2885ea8d3d24d04360b32241517152ab25480c5346917e1bfb483dd0f50ae5a6cb8b4ca3552c04bdb0d5960b1e83502ce4d154fa8316b0e0ff5eae8aac3648
-EBUILD enum-1.1-r1.ebuild 704 BLAKE2B d4fa649149cdf3ed7c545b2d6e7104a42ec6a0c064f9f4a7f2fc40e7f226fc6101e801a9d29790c941fb2241c69361339140e126f5aefec1df2bb290f2d512ad SHA512 4b1dee70108b9f5fc5a6159292a68764bfe55f2c728e6b4a9c562ff63acfb4115bcfbb55b054f35417edc3ba4a4e7c8411503c4608d1d9b52b82fab70be6fe9e
+EBUILD enum-1.1-r1.ebuild 666 BLAKE2B fb657e233f8adf4199a73da3cc5f6dc349253ff823c5653048c16ff18b44ee5dd3361f9596795fca97041c7fde83e476addf727aa1538dee57c34204a6e60ef8 SHA512 c117bc15d0c70d7212f3862e7a5ff74245eb2d760d894becb85333709b0b0ddd6f365d4d3669c133b852ab2e8da8feef7e98e6d85acad7fb6040abab18c39093
 MISC metadata.xml 327 BLAKE2B c4c87de1c4b70265f16d5e78197870b902605cf9cc334a4e0064fdfd3e15a6e01cb9013ca296b8e7ecd805d536dd375925ddcee49f80b1b4125762f971035a04 SHA512 e76ec4d0ea0a8a0c914f41578a52cd0a31942e75f13c3b0f3bd290a86c989f93cae9f5d76ab085acca6a5bc16cfb52429478034a48b9daadc4c95162b11f40ee
diff --git a/app-misc/enum/enum-1.1-r1.ebuild b/app-misc/enum/enum-1.1-r1.ebuild
index b18fabf94a6a..7ab9728f2923 100644
--- a/app-misc/enum/enum-1.1-r1.ebuild
+++ b/app-misc/enum/enum-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--enable-doc-rebuild \
-		--disable-dependency-tracking
+	econf --enable-doc-rebuild
 }
diff --git a/app-misc/flirc/Manifest b/app-misc/flirc/Manifest
index 838c92682a88..3ee0221d44e1 100644
--- a/app-misc/flirc/Manifest
+++ b/app-misc/flirc/Manifest
@@ -7,7 +7,7 @@ DIST flirc-3.24.0_x86.deb 8992950 BLAKE2B 2435d65371cf4209a16862e2f18b3bfa24af6b
 DIST flirc-3.25.2_amd64.deb 9059418 BLAKE2B fc08c69defdbaff0c5b387855b6e9eee42ceb3e710fa398b7f32f694b978d5ffd6e49d942e8d94bb41b68bba05d44d8fa8fe88854ff4dafd0a607809ca229167 SHA512 75056d86912add575c5540bce59061fee949462d2011f601b3234abd3f058e0285f4e57a1151c59604250398cc868c7baf0fbc257d960c68f56409eece872245
 DIST flirc-3.25.2_arm.deb 9023232 BLAKE2B 527b51e09d52a56e2aaa3f23ca3ed52bf25651b649cf7bedbe0e21d693efc81a14821648ebc965217956c022af30cf23db3e6c07304cadd4234eec8b6ecd48c6 SHA512 325d569e05e4f4574e942a1b2e93bd462fa947ebafe6345adf38f07c0d6c3d4dbfebec106cc7034c737073fe6a82ad5e1fd38208f7a9432ad3479d0082180156
 DIST flirc-3.25.2_x86.deb 9029446 BLAKE2B 8efaf2fe21f04b4af0cf76c0c440d75724e47021c69e7c754ac46dcc4d7e808894a7cc6ef1a3f8dbfc929c53391f2697add079690019d81c6822113b9220bde8 SHA512 aef30713d0df41a1b0c964b4fbbd4aaac9cd75875926fd646a6f9fa3cf6688714cb148d5ab7750a8d182943c1980af3233a324ab8d7deb48b35753f2acf43128
-EBUILD flirc-3.22.4.ebuild 1139 BLAKE2B 7c5ea57b5ceb92346c1c137690eccf54d808bbb70c37d9f1b12cecb0ef2e8038db91fdd4addfa149203d229e44d829471b0afb7e08747ea05b1d74de78102c8d SHA512 b54e2a8014bd550a3913c61d1f093d3b9893d29c82cbd774538b7b31be22ca4f3973f34f267b1cc3ba0f023d4f2826728428f6ce6dbd3aa4afd243baa84b0edf
-EBUILD flirc-3.24.0.ebuild 1136 BLAKE2B 7c48b0b65f5643ddcb16b5b5d7898784848d140a82c72abe6d82df0709b56f224a261df49b5d1069642ebf3e540a572bf229c71c8e6e252b0e7a81d89e266b8f SHA512 62717f284bdfa73f2315a3815c12184ccbb91adb13a9b5fcee3d60a97843045de810a2df6e399cf68f430ccf45c27160d9cc0914b9e5d7c0bea7c3a7028fd850
-EBUILD flirc-3.25.2.ebuild 1136 BLAKE2B 7518ecb349a65afa372845415ecfb65035f392a2772628586ed6a344b20d0a139923530567ce37f20051dbe0f4fe5a4a1f42c02689a253c89dbbabe9a1bfcf1f SHA512 ce034fac95f2b4823718012a06d6309478312f34b5c67ab7a84dbc3621351ef0ed9e03835a2fcf16a98512897913251982efccbfb722655c0fcdca8d34f57a84
+EBUILD flirc-3.22.4.ebuild 1138 BLAKE2B 9d4d35721c2a42dfe40ffb8286d105d498aa17be3946cb59d88d903fd874979d6b4fece661da2b7e6181e280cc730679486ed5a2681ca176e0a8354542b4a7c0 SHA512 15dec737b0a2eb272397ba5269c8fb23f53e47943f47285387258bb283b67992dc8f3be8aa696bd038bab0cc805c31e455db8eb5b397635688a3a95afd6ea995
+EBUILD flirc-3.24.0.ebuild 1135 BLAKE2B d562f9afdb4296500a8f06158046c45bf3f17034d8fd9f6a5f26c61008473148f4c07b7ea40cb2e6633683659f1a305f9cd86b3bd6e609df5ad7caa3b0595867 SHA512 4fe456c3d183a0482b73e1b013a16459a1995f2273eb2f6ed8812189a7bdac855bfa5caf4bcf99db10e3ba93eac5983c804b7934de8e69965fa08e823e016c12
+EBUILD flirc-3.25.2.ebuild 1135 BLAKE2B d562f9afdb4296500a8f06158046c45bf3f17034d8fd9f6a5f26c61008473148f4c07b7ea40cb2e6633683659f1a305f9cd86b3bd6e609df5ad7caa3b0595867 SHA512 4fe456c3d183a0482b73e1b013a16459a1995f2273eb2f6ed8812189a7bdac855bfa5caf4bcf99db10e3ba93eac5983c804b7934de8e69965fa08e823e016c12
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/app-misc/flirc/flirc-3.22.4.ebuild b/app-misc/flirc/flirc-3.22.4.ebuild
index 12b9e1c6f9bf..487445f6ea37 100644
--- a/app-misc/flirc/flirc-3.22.4.ebuild
+++ b/app-misc/flirc/flirc-3.22.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ RDEPEND="virtual/libusb:1
 
 QA_PREBUILT="/usr/bin/*"
 
-src_install () {
+src_install() {
 	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
 	dobin usr/bin/flirc_util
 	doman usr/share/doc/flirc/flirc_util.1
diff --git a/app-misc/flirc/flirc-3.24.0.ebuild b/app-misc/flirc/flirc-3.24.0.ebuild
index 0db412357a0f..770c51abbc35 100644
--- a/app-misc/flirc/flirc-3.24.0.ebuild
+++ b/app-misc/flirc/flirc-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ RDEPEND="virtual/libusb:1
 
 QA_PREBUILT="/usr/bin/*"
 
-src_install () {
+src_install() {
 	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
 	dobin usr/bin/flirc_util
 	doman usr/share/doc/flirc/flirc_util.1
diff --git a/app-misc/flirc/flirc-3.25.2.ebuild b/app-misc/flirc/flirc-3.25.2.ebuild
index d0279f48d691..770c51abbc35 100644
--- a/app-misc/flirc/flirc-3.25.2.ebuild
+++ b/app-misc/flirc/flirc-3.25.2.ebuild
@@ -36,7 +36,7 @@ RDEPEND="virtual/libusb:1
 
 QA_PREBUILT="/usr/bin/*"
 
-src_install () {
+src_install() {
 	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
 	dobin usr/bin/flirc_util
 	doman usr/share/doc/flirc/flirc_util.1
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
deleted file mode 100644
index b6831a823301..000000000000
--- a/app-misc/gourmet/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gourmet-0.17.4-pyglet.patch 1664 BLAKE2B 1d995fab691dffcb654bb6da7960cb66340a1b3ad72d3caaaba957b04a39d41b5215df2318d2727332c537c35a4d1839471c288fdfea6d0d84bca9a9644d23fd SHA512 162b6b80b09326b15a1cbc8e045ba1fea36bfc106a6f1182659c890e0c100c0820b4f42f24f154be2f8fe2f457e212ace9c989002f33ea26523b1000b888c66e
-AUX no-docs-0.17.0.patch 338 BLAKE2B fae9f389c8ea29c275ac917358a572d2b7aabb98f114cf2a69a7ab84e9be8de501114ea0d471181bba8dbfce77768654f179ee9cbe34b3db14dc4a3823e535df SHA512 0e8f3c35411ee7f895490762acca7da2eff6e498de6c35511c90c2dd91dc6872f405b8a73465dd411eb193cbf0c8a37b75a5dd06e89e8601e268bffbe6f674ba
-AUX tostring-to-tobytes.patch 988 BLAKE2B 05dad2fbf164fa5cc13bcdb831bd05444829c712fa3930a0221a3b47ee21e2c32ae30858d2d06b84f20ba3d7764c402605ce89496c6c5b5d33078eed1f3fdd77 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c
-DIST gourmet-0.17.4.tar.gz 8487830 BLAKE2B 511da1ae85a788fdce622cb9eb1822e6f264daffc76f25ceb8148de0a4658d9a2307278e6e981073d1aed0fa6e96d543386ed7357e0c9a3c1b511bd107dee62d SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e
-EBUILD gourmet-0.17.4-r2.ebuild 2312 BLAKE2B 817f9e8f3b3cc8609eba941a3406b7ee4dfd8e3ee789337cb36fe1b6d14c734d0f20243d32d4dded941f3e7c8c9502ad6cd10431411c66ed4889d455c36a1e99 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c
-MISC metadata.xml 1480 BLAKE2B f96a09ee6b4b64d8590ac2223f816f5c646ca9c0bd0877798764e85f5c0f59102187a298a6ba94b249e11b39b76128f309cb6e03e9e81ff309b76aa84dc51885 SHA512 f0733d15e836ec241f4a73feca814856f6f02bac52026acfdbad2445a02eb0c0e8d1d5b7dfc959ce3c2d0329a4c5d81395d5a4164fc53cffbf0b86c159881186
diff --git a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch b/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
deleted file mode 100644
index 1547cde8f00d..000000000000
--- a/app-misc/gourmet/files/gourmet-0.17.4-pyglet.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git a/gourmet/sound.py b/gourmet/sound.py
-index 2dea6bb7..c232d258 100644
---- a/gourmet/sound.py
-+++ b/gourmet/sound.py
-@@ -1,15 +1,19 @@
- try:
--    from sound_gst import Player
-+    from sound_pyglet import Player
- except ImportError:
--    print 'No gst player'
-+    print 'No pyglet player'
-     try:
--        from sound_windows import Player
-+        from sound_gst import Player
-     except ImportError:
--        print 'No windows player'
--        import sys
--        class Player:
--            """Fallback player"""
--            def play_file (self,path):
--                print 'No player installed -- beeping instead'
--                for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
-+        print 'No gst player'
-+        try:
-+            from sound_windows import Player
-+        except ImportError:
-+            print 'No windows player'
-+            import sys
-+            class Player:
-+                """Fallback player"""
-+                def play_file (self,path):
-+                    print 'No player installed -- beeping instead'
-+                    for n in range(5): sys.stdout.write('\a'); sys.stdout.flush()
- 
-diff --git a/gourmet/sound_pyglet.py b/gourmet/sound_pyglet.py
-new file mode 100644
-index 00000000..41da613a
---- /dev/null
-+++ b/gourmet/sound_pyglet.py
-@@ -0,0 +1,16 @@
-+import pyglet
-+
-+class Player:
-+    def __init__ (self):
-+        pass
-+
-+    def play_file (self,path):
-+        self.source = pyglet.media.load(path,streaming=False)
-+        self.source.play()
-+
-+    def stop_play (self,path):
-+        pass
-+
-+if __name__ == '__main__':
-+    p = Player()
-+    p.play_file('../data/sound/phone.wav')
diff --git a/app-misc/gourmet/files/no-docs-0.17.0.patch b/app-misc/gourmet/files/no-docs-0.17.0.patch
deleted file mode 100644
index 9002a2ef3384..000000000000
--- a/app-misc/gourmet/files/no-docs-0.17.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py	2014-03-02 14:56:56.090600468 -0500
-+++ setup.py	2014-03-02 14:57:00.184465687 -0500
-@@ -141,7 +141,6 @@
- 
-     files.extend(data_files)
-     files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
--    files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
- 
-     return files
- 
diff --git a/app-misc/gourmet/files/tostring-to-tobytes.patch b/app-misc/gourmet/files/tostring-to-tobytes.patch
deleted file mode 100644
index e42c59403d51..000000000000
--- a/app-misc/gourmet/files/tostring-to-tobytes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py
-index 0e01735..efa6463 100644
---- a/gourmet/gtk_extras/ratingWidget.py
-+++ b/gourmet/gtk_extras/ratingWidget.py
-@@ -135,7 +135,7 @@ class StarGenerator:
-         if is_rgba: rowstride = 4
-         else: rowstride = 3
-         pb=gtk.gdk.pixbuf_new_from_data(
--            image.tostring(),
-+            image.tobytes(),
-             gtk.gdk.COLORSPACE_RGB,
-             is_rgba,
-             8,
-diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py
-index 61c772c..2e7b08b 100644
---- a/gourmet/plugins/browse_recipes/icon_helpers.py
-+++ b/gourmet/plugins/browse_recipes/icon_helpers.py
-@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image):
-     if is_rgba: rowstride = 4
-     else: rowstride = 3
-     pb=gtk.gdk.pixbuf_new_from_data(
--        image.tostring(),
-+        image.tobytes(),
-         gtk.gdk.COLORSPACE_RGB,
-         is_rgba,
-         8,
diff --git a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild b/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
deleted file mode 100644
index 0e0dd28ffa97..000000000000
--- a/app-misc/gourmet/gourmet-0.17.4-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Recipe Organizer and Shopping List Generator for Gnome"
-HOMEPAGE="https://thinkle.github.com/gourmet/"
-SRC_URI="https://github.com/thinkle/gourmet/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="-i18n -ipython pdf print spell sound web"
-
-RDEPEND=">=dev-python/pygtk-2.22.0:2[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.7.9-r1[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	i18n? ( dev-python/elib-intl[${PYTHON_USEDEP}] )
-	ipython? ( >=dev-python/ipython-0.13.2[${PYTHON_USEDEP}] )
-	pdf? (
-		>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-		>=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
-	)
-	print? (
-		>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-		>=dev-python/python-poppler-0.12.1-r4[${PYTHON_USEDEP}]
-	)
-	spell? ( >=dev-python/gtkspell-python-2.25.3-r1[${PYTHON_USEDEP}] )
-	sound? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	web? ( >=dev-python/beautifulsoup-3.2.1-r1:python-2[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	>=dev-python/python-distutils-extra-2.37-r1[${PYTHON_USEDEP}]"
-
-PATCHES=( ${FILESDIR}/no-docs-0.17.0.patch \
-	${FILESDIR}/tostring-to-tobytes.patch \
-	${FILESDIR}/${PN}-${PV}-pyglet.patch )
-DOCS=( ChangeLog CODING.md FAQ README.md TESTS TODO.md )
-
-python_prepare_all() {
-	# Modify these lines before copying them out
-	sed -i "s:base_dir = '..':base_dir = '/usr/share':" gourmet/settings.py || die
-	sed -i 's:data_dir = os.path.join(base_dir, "gourmet", "data"):data_dir = os.path.join(base_dir, "gourmet"):' gourmet/settings.py || die
-	sed -i 's:\(icon_base = os.path.join(data_dir,\) "icons",:\1 "gourmet",:' gourmet/settings.py || die
-	sed -i 's:\(locale_base = os.path.join(base_dir, "gourmet",\) "build",:\1:' gourmet/settings.py || die
-	sed -i 's:\(plugin_base = os.path.join(base_dir,\) "gourmet", "build", "share",:\1:' gourmet/settings.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	distutils-r1_python_prepare
-	sed -i "s:\(lib_dir = \)'../gourmet':\1'$(python_get_sitedir)':" gourmet/settings.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman gourmet.1
-}
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
deleted file mode 100644
index 78a34f757c57..000000000000
--- a/app-misc/gourmet/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription>
-		Gourmet Recipe Manager is an application to store, organize
-		and search recipes. Gourmet also makes it easy to create
-		shopping lists from recipes. Gourmet imports recipes from a
-		number of sources, including MealMaster and MasterCook
-		archives and several popular websites. Gourmet can export
-		recipes as text, MealMaster files, HTML web pages, PDF, and
-		a custom XML format for exchange with other Gourmet users.
-		Gourmet supports linking images with recipes.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>Thomas_Hinkle@alumni.brown.edu</email>
-			<name>Thomas Mills Hinkle</name>
-		</maintainer>
-		<maintainer>
-			<email>ockham@raz.or.at</email>
-			<name>Bernhard Reiter</name>
-		</maintainer>
-		<bugs-to>https://github.com/thinkle/gourmet/issues</bugs-to>
-		<remote-id type="github">thinkle/gourmet</remote-id>
-	</upstream>
-	<use>
-		<flag name="i18n">
-			Enable support for i18n through elib.intl
-		</flag>
-		<flag name="ipython">
-			Enable support for the interactive Python console plugin
-		</flag>
-		<flag name="pdf">Enable export to PDF</flag>
-		<flag name="print">
-			Enable pretty Python printing
-		</flag>
-		<flag name="spell">
-			Enable support for the spell check plugin
-		</flag>
-		<flag name="web">
-			Enable support for the web import plugin
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index f67b7426583c..7b64aef31c35 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,3 +1,3 @@
 DIST joy2key-1.6.3.tar.bz2 70545 BLAKE2B 6e2d14f5a348cdd684e947685ca73735d4c6580d49296486ee79bc68c5f5d08d07c42f79370a75b5cf629001a5c89c6d334a6f6ed7e845209ac1d8f008e66b1c SHA512 33767058cb32aa18a418d37f48d80200a99ce12b765ec758bde7efdda575ffc78af3039584fe3ef267baaacc3724b3203d858017c945824cc949b9cd6fe97bec
-EBUILD joy2key-1.6.3-r1.ebuild 635 BLAKE2B 2964b3c159537bc07ee1b97317dffac59233df77ca405c1166e7462368443380f1c7d07d3ecf80f1aaf7426a695201623daf2ba5faa58417d2f9c99a49ab4e84 SHA512 960a68afb4f4166041b9c91e1446faf1f4dfa5e49ca10082c38a9f6e3fed324c288d6e36f87f32798dbbd1351ea14dfb3f7d88e13076c39bae2542eaa6bc156e
+EBUILD joy2key-1.6.3-r1.ebuild 602 BLAKE2B a23dfc88a1dfeeebf0b2d26f2774df9081e69d0a3af7bf87df23cecd35ea5db8bbd63061d2973f515c132ed1a23bd37cd677658fc6cd8aac2ee20c505158f885 SHA512 eb1a5ef3b33aaab45c95ad986e85724f6064ac6a8971b5c7665eef8eff7b811e6783c72dad70d5cc50ef2de2e715fdb7fa34df7341cdc52e27db539af281caf1
 MISC metadata.xml 244 BLAKE2B 743fbbe02778ebafa1c27c9ab5648a3b84111b49d19e939f937f03788164c6409a19c284162e75f210d306b1bd616bd63195df501c8819a4fa7b611bab36f878 SHA512 4bb71014a1a32d8f334488977c78efe9058b5246c77ce6e60c099ad3e56b931cba7b95a3535f7c0a5f030cbac3efaeff8811a9fb43a9bf77eca0afaf0117f182
diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
index 00ef6ed03b4b..ecdf4fe1429b 100644
--- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ DEPEND="
 DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
 
 src_configure() {
-	econf --disable-dependency-tracking $(use_enable X)
+	econf $(use_enable X)
 }
 
 src_install() {
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 33a615e2b82b..ae3779d04be6 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -6,8 +6,8 @@ AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851
 AUX mc-4.8.23-vfs-gc-SEGV.patch 1249 BLAKE2B 8620f1f9dda92ea431ed31d82e72b9e81e2687d2f7ec454f11a8e7e39a05677e2ba317bc989b26258f58596da609869b902c596e9f47346cdbf9f003189a2cbe SHA512 32edbd42eeb4de93fc472ed864cf091d55b0a4c5643aa12224f8fa6068c2037a32c348b7b1aafa7bb3bee75ddec8deb571ff16010d9182c19d4c763e9d94b220
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
-EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d
-EBUILD mc-4.8.23-r2.ebuild 3133 BLAKE2B 52af62374b33308491d8b2347d0fcc328e05098aef31dceed2c8252ff7f6ed57b3a3c93d0044ee163cad9429799c6ca2f2c8d7741d5854224c234b40f6823a22 SHA512 892d490e3ffd936d80db87c4f2f2a28c7439a326a9ded4c79225d00b9332b467c221bfa93e3ff737f0a0ba7bc0a130f065ef8c49fc2c3255da664ee41ae0eb61
-EBUILD mc-4.8.24.ebuild 2870 BLAKE2B ddc4ca916a85e9b2855a74859fe5dca45cc91c03a83db1aa71f9d48e4d0ec15c3583b9b72cac0f52a09eb9b96e487a697236b272a78d2a9ec175a3bc90470e76 SHA512 51dbeab090160c41f573c7d1d9950ebd7bf3f92f648e6eea8e5a208b33d9f13caab191a53f9395511ae7d616c56347990819b2d7f82ccc8bf736badd036d26cb
-EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40
+EBUILD mc-4.8.23-r1.ebuild 2988 BLAKE2B 2bdf15061eb42b0fccae2665c897ba90c920b35f39fa894387d9f3dd1c98fd2830e9d613461203dec31e0b11bfc8c52ec06a6421bc0b9e649d854fb91f5336ef SHA512 c8294e20915ffee373bdc52f5a69b46e21c41751ad40b41bf883bc9d3304396681bc18593be9dac37344582a28736519b6ab3c58d2cc1744fca6677ebaea2c62
+EBUILD mc-4.8.23-r2.ebuild 3076 BLAKE2B 5e4913c549a67ccd042586e9bcdecdc5e6e6bf4e01e96c8ce7ce16db0bed52d41e2b468bdfe6b6a32f5e8c4040c7b94cb0859b8842acc623a1da618be784a342 SHA512 3525a814ac3605f47c83182a576d26d016b77a5fcabe03ebf7942b923b230c9b2bbc1c8b559e2a819842b71f86958a2da4dcd59c85ff85c791f6a4dbffcf4a7f
+EBUILD mc-4.8.24.ebuild 2813 BLAKE2B 3d54ce8cb639f1e90bd82572f85fd3ae390eea4d58a4769d33c58589fdce02141d755d23e32f963025576560d56cda83c38837f7fa0c59e1775f7c1712cf8d3b SHA512 69db600b74c8523fd9c6f3736271c397c2858ba6f7c3c8ab2578f73d798301ca08e5b3c8506c1263c9c1b0ffeaafbdb7e1b6b72ee214269d231653c181e377bd
+EBUILD mc-9999.ebuild 3072 BLAKE2B 48eaec7ceff05561dc1ce593fedff0127a34b1ae49d04b6cd31b495f32d0400f0353b7ff7f6da374c1b57b291634a449fbf24d1020ba49e5d1b1a7868bc4832d SHA512 13824093eabdf4a1162870895a4034c1ba1e1894eab646ee4e1f5b0cd24dafbc8c37f6329d56da23b8fc6c4b8696d7da966afb25f6f3e3c38a00ddf600ddd62d
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
index 7791376a19da..b904bd1d2cc6 100644
--- a/app-misc/mc/mc-4.8.23-r1.ebuild
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,8 +59,6 @@ src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
 	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
diff --git a/app-misc/mc/mc-4.8.23-r2.ebuild b/app-misc/mc/mc-4.8.23-r2.ebuild
index aa4702844356..8de901785a39 100644
--- a/app-misc/mc/mc-4.8.23-r2.ebuild
+++ b/app-misc/mc/mc-4.8.23-r2.ebuild
@@ -61,8 +61,6 @@ src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
 	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
index 679bc5a975b6..2fff74e2efc5 100644
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ b/app-misc/mc/mc-4.8.24.ebuild
@@ -52,8 +52,6 @@ src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
 	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 336a555d2aba..8366ea02b85e 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,8 +65,6 @@ src_configure() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
 	local myeconfargs=(
-		--disable-dependency-tracking
-		--disable-silent-rules
 		--enable-charset
 		--enable-vfs
 		--with-homedir=$(usex xdg 'XDG' '.mc')
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 8c8e2b8e692a..a05720525f1e 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,4 +2,4 @@ AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca60
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
-MISC metadata.xml 762 BLAKE2B 81753b278d8724a15874fec9c3d28c64702687f0ea0e4cf066124e6d80ef78ecb1245b982ee4cdc7d0d616885a09b30a7158d95a7499509f689cf7f15f703fa0 SHA512 d52f55a22638892ca718224f913b795524aecfb3f4e5937133735c294ec50678416cd468746d405a8706f1ee2034d40273aaf74c942df16b04c3c42b8655749a
+MISC metadata.xml 529 BLAKE2B 187efacd7021f27ea4f656fb0424bccdc55a84a8493ceb2c68decc308126f47005917c39c39dd151d0134fded0d30f52450a6bacb5e5f3a118813007a004099f SHA512 24bdebf455dbb65d1bc0f4c80a96ea2f49a2a30610a6524e4cec851b0e6c54fa032eaa135df47ee18f8563009514b3be617b497fd63c41de9fa51772e7f42197
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index 821a61e21436..3dda59ac8d5d 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -5,14 +5,6 @@
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>ramage.lucas@protonmail.com</email>
-		<name>Lucas Ramage</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="bridge">Enable bridge support in the MQTT broker.</flag>
 		<flag name="persistence">Store messages and subscriptions to a file.</flag>
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index e43419dd61a8..d3094fd8cc28 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -9,6 +9,7 @@ DIST nnn-2.6.tar.gz 78668 BLAKE2B 5ac152e7a401d215ef0d833ecd6e67f193392ddb98f249
 DIST nnn-2.7.tar.gz 78047 BLAKE2B 9187663f59b26edcafb5b467e071a4810de465f944b97aa3e05be1875e7eb7eeedaf2efcd6b2efc29084599994984a0212f055f23903b5a6e736822971bac8f0 SHA512 432d268caf501349cf2ed95b7b889d373c43d8efba3ca72dabcab579b1f39546bcef55dff07b1d2d56b9a0b56da6c4461d37c66db6e66895b051c616b9b77ccb
 DIST nnn-2.8.1.tar.gz 91069 BLAKE2B 3dd7d794edec4d2a648201c9ed2182bddc597e1663bb4ce22f76e40653cc21d20c143ed84f21971d709916cec8695c7b66832cdbc6a9cb34e87a608369db1b77 SHA512 b669136c1a0e1f0346e86430acb59af8328eda83b0c1a9d8079b886d632556aac9a19a362dc8373f2558cc54c7f4bedb3e56cb16a3a08d560b9ccd14ada36bd8
 DIST nnn-2.9.tar.gz 97998 BLAKE2B 4affc609e2fa6c21547c6f9b97778a4c5d6f9dcfac3d3eb8c08c76362dd18c163aec1d2a72c4450bbdab26abf9a4dd1da7e0a74bd6be8cdab87e21046270ed6b SHA512 7bc64901a317de79cb9e29502cda70b59ca681ddde53385521a08e49cbc32fa10bb76ceef2e911838c0bb7be4f5018dce4a1906e77c0ca9f1ec8164c82da7bb2
+DIST nnn-3.0.tar.gz 102636 BLAKE2B 7756fa859198b61dacea5fade8d89f7903d012fac40034d544dc6d1b044362e3d1cce01f014af274cdc13ca40c6b95ce72f735b33053c553772aab6a4c16138a SHA512 a8092e1e5970e1f48baf04a3f9f7064b2efd61bc54bf993b0545c1c2148d775c29328b8e51d5b3f94340de82a468be8547bdd6bb40023811bbcfb755d611435f
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
@@ -20,4 +21,5 @@ EBUILD nnn-2.6.ebuild 850 BLAKE2B 7b6263289c1dc43792eb29dc73fedeac07b4e588f1bf85
 EBUILD nnn-2.7.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 EBUILD nnn-2.8.1.ebuild 850 BLAKE2B fd14ce9e17a83c505bcfb5a1909e66c18e47a8820c3d09539ac65715b123e15246109d8f159876bc960d334494316b3c85d2bd679ccf4abb50ca0ea897d779da SHA512 928592c3bc539ae2a181d5e5cef191e83d300c24190200cc97dfaded520bba5f1d3dd193d94dcb8733f2b4552cadcb5f2aae50f84a40b3fb0f2b27782b77f3c7
 EBUILD nnn-2.9.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
+EBUILD nnn-3.0.ebuild 850 BLAKE2B 2cc716b70f5a35362a3ee8ce835d4c699b99801053b8fc4435e1912ad96448131ed3d629e7f34d9aa61d8145a406f6deaa75e1c8e973f8410b923f71a1da80e8 SHA512 374b54d829fd6a654ddb50f8d67f851eeca2f93593eb003b8a40fe87f454c1cdf8f81343ec4c061cfc74b2982d6b8d161dc45b6085c2639633bdd45f1775790d
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-3.0.ebuild b/app-misc/nnn/nnn-3.0.ebuild
new file mode 100644
index 000000000000..88ef20531476
--- /dev/null
+++ b/app-misc/nnn/nnn-3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins misc/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index f94b223d6d89..5faaabc45248 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,3 @@
-AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
 EBUILD pax-utils-1.2.4-r1.ebuild 1764 BLAKE2B e67d2008503858e90a8f77ac15b6c685eb30f19b715fcc7de55ac81053b6f04de046ef76cf91ce27eb326f3b80933d0fc8f1e3476ccaea1eee085f33a53ca7b5 SHA512 7e6a9cdf23494fbc179438f5fcb91012798f30c3284946b1f087e709ae6901ba39311ddf7d413cbd7838fb734e966cea0b2e19949432468b6aef44786a9e6bfe
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch b/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch
deleted file mode 100644
index 40fff21c022c..000000000000
--- a/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2acc5c3278354f56c70f9f48e66eb0203d5e8370 Mon Sep 17 00:00:00 2001
-From: Oleksandr Natalenko <oleksandr@natalenko.name>
-Date: Sat, 17 Nov 2018 15:43:09 +0100
-Subject: [PATCH] lddtree.py: use errno properly
-
-os.errno interface is removed [1], thus should not be used. In fact, it
-is not used in other places of lddtree.py, so fix this one too, because
-it breaks --copy-to-tree on systems with Python 3.7.
-
-[1] https://bugs.python.org/issue33666
-
-Bug: https://bugs.gentoo.org/671522
-Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- lddtree.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lddtree.py
-+++ b/lddtree.py
-@@ -122,7 +122,7 @@ def makedirs(path):
-   try:
-     os.makedirs(path)
-   except OSError as e:
--    if e.errno != os.errno.EEXIST:
-+    if e.errno != errno.EEXIST:
-       raise
- 
- 
--- 
-2.19.2
-
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 15785b51c611..87920f7e9b7c 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,5 +1,5 @@
 DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
 DIST pdfpc-4.3.2.tar.gz 107504 BLAKE2B 5fe9ee096aab205365f93374b8ffe3990cf1aec818bcb36d2f35d572854348087f07f7e99df1c71dfc1b40c1c3c1e9e4e666a698020398416b59d151c74805d4 SHA512 e1e198c4cad996e7818dac10c07133e5c6cccf0333506eecb1090091b5c1de36f27e08178c648587e68816cc7e7d7f1666181c09a01780ea6d620c4c9820674d
-EBUILD pdfpc-4.3.0.ebuild 1013 BLAKE2B b9e65e5107ffe73c3b5b0695b1c212ba69d8c8862ec96155b5fb10bd83fcb3887076f429aa465a0ac31e1c1fce13e7b4fe487765d743cdfabb3b355290e63265 SHA512 1fb3bb7bd72df39347026613db652405dc074629a04284bab4165899b7a3a1d689c5f5429d84259c022021a079000f45bd3fa3c60b385b5189ef2bad308bf85b
-EBUILD pdfpc-4.3.2.ebuild 1022 BLAKE2B 5f9bcf26ba071e6c2672b632377fc1e6c51e7b26309ce85234b16339fe4c87895584b7b4c1b8a1ddf6b9c1b176a7059ab84e0632813d3260406ed63103076a79 SHA512 82f70b40ead93d89f504207e5b042613816d9689801476973ac467044708f3a2435a7ce595738d98be409ad2f92fde6fbedbc1b7d4750bb10f1031bcae1cd25d
+EBUILD pdfpc-4.3.0.ebuild 1014 BLAKE2B 5865c6ddb7f777d0e6f0882dd9198030b101c934c6bb2bda06e7b6766225a43e717ec8462db1e1018292862fe5ba05380c7f6223fd83486a1c6189b8eb1824d7 SHA512 34473475f604b45312884eaed52ecafe727499d2bb81f6c857dd4b3ee380dcc06e5130fbbb3cdd329395652008902a4cd07fa3882474103fa1e60a0a0f4119ed
+EBUILD pdfpc-4.3.2.ebuild 1023 BLAKE2B b23262a3b0079f471fb386b84e9d549a4832f11333c92b22b333b24a3d0841fe430c1099df0ee6d987c2bff7586a08cf259e3bc3e89ba6ac66ce25bac89ec9f1 SHA512 6e63b3f17bdd5eab4148e5bca0dbfcdd6b40942163fbcd32ac065a343cb86a5e2be4ae13f74137a2ad3df65599202c061f60c4864a8be5575ee80542bd94e0a2
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-4.3.0.ebuild b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
index 2268d0460d91..1d5e52835d67 100644
--- a/app-misc/pdfpc/pdfpc-4.3.0.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ src_prepare() {
 	vala_src_prepare
 }
 
-src_configure(){
+src_configure() {
 	local mycmakeargs=(
 		-DSYSCONFDIR="${EPREFIX}/etc"
 		-DMOVIES=$(usex gstreamer on off)
diff --git a/app-misc/pdfpc/pdfpc-4.3.2.ebuild b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
index 39321e79f29e..14c6cd543088 100644
--- a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
 	vala_src_prepare
 }
 
-src_configure(){
+src_configure() {
 	local mycmakeargs=(
 		-DSYSCONFDIR="${EPREFIX}/etc"
 		-DMOVIES=$(usex gstreamer on off)
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 54f48ebd4e88..6d1d3be21986 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -1,25 +1,20 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
-DIST arrayvec-0.4.12.crate 26551 BLAKE2B 45514f09f0fd1fae7afb7dc812142ac8d88d1f4b81901db405c79dbeba2d29fea13ec22cb08a43433321931295a9f14456a300e814431b8fb14037d2f47529e9 SHA512 c03972056ab8fa30fc53fdc2bfc5e501f7644223998eccb73fdc2e737f7e25f4bb0e531f3eec38f7f3514760fb385fafd06c3d38531d13d92faf841820d4ed2b
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
-DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
 DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.8.crate 33581 BLAKE2B 491545f71cd215f6fe92b172c25ac3773dc1dadb87b16d764d91b30630251f6132981be7779756b2a1fec00d4afc83ae9d042cd6a1e6e6a7822efd303a3f1d6d SHA512 6c92941e411f957b5f2c02f1905380f55ed0f0313e22dd9d29fbbc85ba18accd06e2a8e7de01809e5fa7258a960f9545d3410613836b1dd3a26f0719d01d3bd2
 DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
-DIST cc-1.0.46.crate 49453 BLAKE2B 0d98a50251b69b0f11516f41bd638972f4f1e9cfe2bfe16c0a1a165e6e9baaee476652fc65f5261e73e6b15335c3e73135b40261c9633386223749f24400b966 SHA512 322a27decd36810120e923883d1acdcaf008a88b1ecbfad8e081e115b2c8fbc07efc85411682aa15ee9106b200e1a05750fcdc77d3961dc2a2c3c849880c5c88
 DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
@@ -29,60 +24,38 @@ DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7b
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
-DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
 DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_distr-0.2.2.crate 40805 BLAKE2B 9c4ff7770da3e04798c5de17a43e7943cffbc3adce334e7bd8ed3720787ad029c5127523bc3128b54736e4071d2ccf7b699bbf00d9ff9c1d39d47a988e5b22b4 SHA512 15c710f3ec4e06fb4c356ef1016431c8b7e6fd6d7f03f2fe56b7ffd34cfffd728d3b3a9c92ddca36fb4920154f92589dc9c91b1735bb32d5b61eaedb24d702cc
-DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
-DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
 DIST rand_pcg-0.2.1.crate 11291 BLAKE2B f8837f3f3dcd7ecfc90f88bb6464b9f79f7c1975ecc68289fd10a5c97323de9c1106de9847fc798f50d96044e46cca9d41f1635130be40bc789492bfaf999de9 SHA512 612c0d1cdc591f80733bf8097e251f02ef7a7e71cafb74e37b63ac68043558045c0c96196200ad07ce7aa9f2d373640c20e598ae5774935c8b52350ec20958ba
-DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
-DIST rpick-0.4.0.crate 21810 BLAKE2B 5c7115be4d74302aa791337356278367f139a2033475b29ffc381c770d06e42f5aa1f21dd3e0182b553421af48c6669ed36b4f2bde1af78e75f4f5e5e0b9d993 SHA512 3560698aa2a917b320334ce2414b71f324731548850baf96ebed520240706eca1e57e4b02d79b01e67beaa89c7dd281cb6bccce361c7e8b5bbfce4eed1d2709a
 DIST rpick-0.5.0.crate 28232 BLAKE2B 878848091caa1906129d17ff601ebd41539791d2dba25b7c8e6eb8e463f9a7e2fc33d3bf37a515bad9dcb4f2fbde30c1c4f2772f9979f4d8cb1ba8a3a3f6a1b8 SHA512 c11b63081216071e74b655eaf72830ea3f154431bc12b84a23d4e2b2aa0c64ae0bb4ed7bb184b92cbe70747bac3ec28a6976a9690684821c34851a31e805b6fc
 DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST serde-1.0.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
 DIST serde-1.0.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
-DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
 DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
 DIST serde_yaml-0.8.11.crate 35772 BLAKE2B 5b88c2df37c8e5f06847db307debc2e6800a25aebd8435c066c79f2a10b38a4b8f33499561511b6f70257aeb2f272a2c99294da1d1fbc77eb85d4b077a8ea027 SHA512 8baea9692990370e92415aadfb410c17e99f4d5b4bc09bdae13ffe438ba2be536152a68dd183e5c6a00e04a386472a7e081beb5fad6ba5231c39da794be2efa2
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.2.18.crate 26373 BLAKE2B 88a5570ac97493e4324fecd2e93851ea162de3bea583eaa0b4d4d4879bf11b1ee0bc69a7ba67c2599c05efe38c5967058b58c6458f3a830aece831958477d820 SHA512 fafa9cea1a99950d1ef8bde53ab5a18daabd5cf131f3c2bacf25786f057b2d0169fe6f5d6e96761a74b6e9cf72a9d6b7dfee53edfe0018a19260ee66ba9b5f97
 DIST structopt-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
-DIST structopt-derive-0.2.18.crate 13088 BLAKE2B 022ecef6b8a341bec3f557b1f4c961d2e4a0555e3528abe9dab635f7476b48ccd0cc75e8f0bb9fb02de676742e36eb62eecb01851cd929ccae56da3128965c0a SHA512 b3bb2a2c1b28aa275ae25d60ca0a3878b715293950748fdd4ce5c791bc5e7fbf066db3bf4678b7a6fb3a61b2b2703ff14503f87db3659281c7b201b427c59965
 DIST structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
-DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
-DIST syn-1.0.7.crate 191626 BLAKE2B e97eeaea0d88cf87acf1ca9cbac0ed9a93357cf78aa1eb1fdac594c2f8a004a7b292f25e9af76ae119253279202a4b06eb99b1358e1048dd6f5b5ce4506f3848 SHA512 ce4bd04bbc231875b53b2c02a25b2594415ff0f0f886eb529da0686ad5bea60cf3a91d02edeebc26865f648aa6d2ce74189ffaa7d42920e6b8d13eff0b2b45e2
-DIST synstructure-0.12.1.crate 17424 BLAKE2B 59fde7b3cc83a6b8f1a829d813d96a299da7a2e48fc9305d6f48fd0e1edf3a699f8629a89b5f77caecf4d802584a58b6779457136218c5b8f13f79cc4cdd5ac8 SHA512 63cf2546f8b3e490ab50b710f133701d2915d81c3e66ffea446af8244695bfeb5c137c37e066ae5540b1ecd4139d62e59ecdcc29b19696d512ecad85846020db
 DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST unicode-segmentation-1.5.0.crate 90262 BLAKE2B d13421cfca9e7de0d538dbbc3e44be67abcc3147b847db90d473bbccbfb813788b1cb7ada4f8acfd5646cf83c82bbc47832da893aa06313250ce5f483bffa8b0 SHA512 9f9dfaa6692fbf8dc3f2c22815f79a0eb887eb4706dda9469999826a46999942eec44a608a27858221642fad1591ea9cd5162857c0cc673b45bf648d9ea9b7c4
 DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
-DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
@@ -90,6 +63,5 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
-EBUILD rpick-0.4.0.ebuild 1721 BLAKE2B 99bf4ac06651352a6566ca819f2affacf3fc5177931347d08205e0b6c0f1124564e378c5fbf7ac318310d16948b5c751d10f1268adc43878ea3eadb4fbf92d13 SHA512 f8c81a153fe04392b0c42556cb15b4e62046e50a96c20f9d6621d6c3b8f9589e4a26773a58b0d77eaf4e2b620c58e9f7ace3017f4af6705f1f1e8d1b60042afb
 EBUILD rpick-0.5.0.ebuild 1828 BLAKE2B c24e1c4ee0cab50b58e1d7d7b36993e888bdc3c20fca7a00ab35d48eb006ae368fb68cf25a2b0cc7ccba8da7a9c4fab888cc49595c09a7734b44a1c262e90282 SHA512 8fb1124d11afef641088dd34f3b3bfe086e4abca40556776bbb998e4047e7ee8bc2e29d9cd0d6a068d7d8a5d74da5b5b9dcbfff223e7a4469fd4f06f77c7debc
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.4.0.ebuild b/app-misc/rpick/rpick-0.4.0.ebuild
deleted file mode 100644
index 8c6d2ac42816..000000000000
--- a/app-misc/rpick/rpick-0.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.2.0
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-arrayref-0.3.5
-arrayvec-0.4.12
-atty-0.2.13
-autocfg-0.1.7
-backtrace-0.3.40
-backtrace-sys-0.1.32
-base64-0.10.1
-bitflags-1.2.1
-blake2b_simd-0.5.8
-byteorder-1.3.2
-cc-1.0.46
-cfg-if-0.1.10
-clap-2.33.0
-cloudabi-0.0.3
-constant_time_eq-0.1.4
-crossbeam-utils-0.6.6
-dirs-1.0.5
-dtoa-0.4.4
-failure-0.1.6
-failure_derive-0.1.6
-fuchsia-cprng-0.1.1
-heck-0.3.1
-lazy_static-1.4.0
-libc-0.2.65
-linked-hash-map-0.5.2
-nodrop-0.1.14
-proc-macro2-0.4.30
-proc-macro2-1.0.6
-quote-0.6.13
-quote-1.0.2
-rand-0.6.5
-rand_chacha-0.1.1
-rand_core-0.3.1
-rand_core-0.4.2
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_jitter-0.1.4
-rand_os-0.1.3
-rand_pcg-0.1.2
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.1
-rpick-0.4.0
-rust-argon2-0.5.1
-rustc-demangle-0.1.16
-serde-1.0.102
-serde_derive-1.0.102
-serde_yaml-0.8.11
-strsim-0.8.0
-structopt-0.2.18
-structopt-derive-0.2.18
-syn-0.15.44
-syn-1.0.7
-synstructure-0.12.1
-textwrap-0.11.0
-unicode-segmentation-1.5.0
-unicode-width-0.1.6
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-vec_map-0.8.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-yaml-rust-0.4.3
-"
-
-inherit cargo
-
-DESCRIPTION="Helps you pick items from a list by various algorithms"
-HOMEPAGE="https://gitlab.com/bowlofeggs/rpick"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=( CHANGELOG.md README.md )
-
-# Rust packages ignore CFLAGS and LDFLAGS so let's silence the QA warnings
-QA_FLAGS_IGNORED="usr/bin/rpick"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-}
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index c4602138fa2c..ed791d994818 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,20 +1,13 @@
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
-AUX screen-4.4.0-utmp-musl.patch 1762 BLAKE2B 10244e1f2a13a3ffa9833ae16b9d58508bbc6cce62b1971b2b0f967e9642fe12fcf96b48cf79e20db186d92cf0b41c2870640f90f25a62d71e4e9fc7e3b390e3 SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314
-AUX screen-4.5.1-texinfo.patch 436 BLAKE2B bba167b64c504219a8ef893c4e2761b7fba607ce4801bf751ee900abf9be3884d2e6df753979762043faca03af2e590edd4d851b792b99c58fabe3a3836113bb SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
-DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
-DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
-DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
 DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
-EBUILD screen-4.4.0.ebuild 3958 BLAKE2B 19e3599d59d4260191d46f6ee1be6a7447605d1c4b13addc7e437b6fb9661fb21c2732cd806a63c35e96fa32b8e64c40affd912375948676fc057f03103b4ad6 SHA512 4bf33c8a9dee06501b1f502297a8930e483fee203e6b25e06e9386596c3b6b13217c160d369d6ff86c326410d0db250cc53a9bba96cf2286df01151e806d855a
-EBUILD screen-4.5.1.ebuild 4104 BLAKE2B 7315316224044a673dcf0d6c9d467e62d1cf2f729c5fbcea612f3a50096112141546506b020537e3a96ab766550d7cc65e73ad08cb6cb68d3a6064add9f65f9c SHA512 08f1eea6126c4f9b818a60e28139df7a7d16aa7fad52019d08e8e48be2c5d8ffc4a1e43347fe1881fa9953176f59ab95d510fafe94ffaf32385306b0abab2249
-EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c647444a724f99040f6730278fad5e86eadb7b79b6b1af7a9e4ab414e213525c59ba76d303238b170b370ed29a3d98 SHA512 d04600a469600dcfa8eb5f7bd4ddb6f0847bd84e3221743e36af22bb1d60246fecd51b74f06929442d47d28895260543a7fb6efca420ff1c22f95ea23eac0ef7
+DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
 EBUILD screen-4.6.1.ebuild 4159 BLAKE2B d90781ff6d2ecf5091a771d8667901fb39dc1b747c278a8e1c41981de7f7ea7ddfdeeb96d5c793bc5ee1f573d5a1de4159c393314ea9bc7bd1a6480f57ee51cd SHA512 724cfb1f3ae5e355384983d21566f594853af99fda7ab5d8e357af96bcd9f886985a35df4e95a574827a457e9d04124b1b189837f8c3887e928aca2411bbc0c3
 EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
-EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
 EBUILD screen-4.7.0.ebuild 4204 BLAKE2B 8de1201b0885d0a4e83230d4b6d0d695f0c28f511e69ba926beb48f3599644ecd47416a463042bd751ad28f15049722eee7adbb2ccbc00d22684a3d5f3df335c SHA512 395d0188d6257d6531a3ea5740f2b9fb84f41a1f96e35ec32428e3cedd4f7045283c3216d54dae1c53a07851da88b41858a7d879ebb94d148e9c8820f6153028
-EBUILD screen-9999.ebuild 3984 BLAKE2B 6f68715e21470703626383ba4eee1871584b6dde2fa5dfa3e9cfae86ba8c7e3ce0496eecc2ecf4a091c53f19e1ea026547269a78b0e223805933d35ea7a692a4 SHA512 99f171c2963978b3a20a3c0637959a7fd0949163dcaf5a8693d8b9bd1a02a588d1d5c9ca16edf97724c2a2cbb6875caeaa8cd40c3988978dcf241f8c7a8ede87
-MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
+EBUILD screen-4.8.0.ebuild 4116 BLAKE2B 9d3d56bbd086abb59800a1689a3e28eee4a0680d0d71000394861f14c22cf190cde4cb384a081391f133c6a72ea182278db038411bf050a1b81a522889e1cb5d SHA512 dd5c6aa516fd76f79bb8cb48a2dd3d79365c5276ac77262a9e56c8e48ae924ecd96e808548a149a143a2d5535b88ff75c8789fac8cb9aaf7d65ef6b63d486199
+EBUILD screen-9999.ebuild 4213 BLAKE2B bf7a89626438437018f9422eb04fcd6a89fe1e9d03a3b441289caf37bf1542e39283339c8ff42c0732fc438a58a055875981a582e9e59b2cee3a4e1e18601b0c SHA512 51e1830220b543ced9844f3d79223f753ab9f3175583bef83e96e6b3520a71657087ebd6680b1c5d858a3d8f835b30d01eb806f80dd3ddef87dbd4cef23bc8e0
+MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
deleted file mode 100644
index 990c73042cd0..000000000000
--- a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Sat, 13 Jun 2015 17:52:46 +0200
-Subject: [PATCH] change checks for utmp/utmpx in header
-
-linuxes should've working utmpx, so this check was bit weird
-commit 2b1bdf96 mentions some "linux workaround", but nothing specific
-
-fixes build with musl libc
----
- os.h   | 7 ++++---
- utmp.c | 4 ++--
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/os.h b/os.h
-index 55de249..e827ac9 100644
---- a/os.h
-+++ b/os.h
-@@ -250,9 +250,11 @@ extern int errno;
- #endif
- 
- #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
--# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
-+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
- #  include <utmpx.h>
--#  define UTMPFILE	UTMPX_FILE
-+#  ifdef UTMPX_FILE /* GNU extension */
-+#   define UTMPFILE	UTMPX_FILE
-+#  endif
- #  define utmp		utmpx
- #  define getutent	getutxent
- #  define getutid	getutxid
-@@ -260,7 +262,6 @@ extern int errno;
- #  define pututline	pututxline
- #  define setutent	setutxent
- #  define endutent	endutxent
--#  define ut_time	ut_xtime
- # else /* SVR4 */
- #  include <utmp.h>
- # endif /* SVR4 */
-diff --git a/utmp.c b/utmp.c
-index fa8b87b..f5d7db8 100644
---- a/utmp.c
-+++ b/utmp.c
-@@ -631,7 +631,7 @@ int pid;
-   /* must use temp variable because of NetBSD/sparc64, where
-    * ut_xtime is long(64) but time_t is int(32) */
-   (void)time(&now);
--  u->ut_time = now;
-+  u->ut_tv.tv_sec = now;
- }
- 
- static slot_t
-@@ -743,7 +743,7 @@ int pid;
-   strncpy(u->ut_line, line, sizeof(u->ut_line));
-   strncpy(u->ut_name, user, sizeof(u->ut_name));
-   (void)time(&now);
--  u->ut_time = now;
-+  u->ut_tv.tv_sec = now;
- }
- 
- static slot_t
diff --git a/app-misc/screen/files/screen-4.5.1-texinfo.patch b/app-misc/screen/files/screen-4.5.1-texinfo.patch
deleted file mode 100644
index 8d7a5e527175..000000000000
--- a/app-misc/screen/files/screen-4.5.1-texinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/doc/screen.texinfo
-+++ b/doc/screen.texinfo
-@@ -5796,8 +5796,8 @@
- ============
- 
- @example
--     Thomas Renninger <treen@suse.com>,
--     Axel Beckert <abe@deuxchevaux.org>,
-+     Thomas Renninger <treen@@suse.com>,
-+     Axel Beckert <abe@@deuxchevaux.org>,
-      Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
-      Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
-      Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index 85dc556e636e..b10032bfdd9d 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -27,9 +27,7 @@ run when their window is currently not visible and even when the whole screen
 session is detached from the users terminal.
 </longdescription>
   <use>
-    <flag name="multiuser">Enable multiuser support (by setting correct
-    permissions)</flag>
+    <flag name="multiuser">Enable multiuser support (by setting correct permissions)</flag>
     <flag name="nethack">Express error messages in nethack style</flag>
-    <flag name="utmp">Include utmp support</flag>
   </use>
 </pkgmetadata>
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
deleted file mode 100644
index 4dd24d59cee1..000000000000
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-# Patches:
-# - Don't use utempter even if it is found on the system.
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${P}-utmp-musl.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	# Apply patches.
-	epatch "${PATCHES[@]}"
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local tmpfiles_perms tmpfiles_group
-
-	dobin screen
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen
-		fperms 2755 /usr/bin/screen
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		> "${ED}"/etc/tmpfiles.d/screen.conf
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-	insinto /usr/share/screen/utf8encodings
-	doins utf8encodings/??
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-
-	dodoc \
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
-	doman doc/screen.1
-	doinfo doc/screen.info
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
deleted file mode 100644
index f5c5c519dea8..000000000000
--- a/app-misc/screen/screen-4.5.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	# @ => @@
-	"${FILESDIR}"/${PN}-4.5.1-texinfo.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	default
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		> "${ED}"/etc/tmpfiles.d/screen.conf
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
deleted file mode 100644
index 3e1c3a55ab8c..000000000000
--- a/app-misc/screen/screen-4.6.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-
-if [[ "${PV}" != 9999 ]] ; then
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
-	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-	pam? ( sys-libs/pam )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
-	sys-apps/texinfo"
-
-PATCHES=(
-	# Don't use utempter even if it is found on the system.
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-)
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
-src_prepare() {
-	default
-
-	# sched.h is a system header and causes problems with some C libraries
-	mv sched.h _sched.h || die
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
-	# Fix manpage.
-	sed -i \
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
-	fi
-
-	# reconfigure
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# enable msg_header by upping the feature standard compatible
-		# with c99 mode
-		append-cppflags -D_XOPEN_SOURCE=600
-	fi
-
-	use nethack || append-cppflags "-DNONETHACK"
-	use debug && append-cppflags "-DDEBUG"
-
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
-		$(use_enable pam)
-}
-
-src_compile() {
-	LC_ALL=POSIX emake comm.h term.h
-	emake osdef.h
-
-	emake -C doc screen.info
-	default
-}
-
-src_install() {
-	local DOCS=(
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-	)
-
-	default
-
-	local tmpfiles_perms tmpfiles_group
-
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0755"
-		tmpfiles_group="root"
-	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
-		tmpfiles_perms="0775"
-		tmpfiles_group="utmp"
-	fi
-
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		> "${ED}"/etc/tmpfiles.d/screen.conf
-
-	insinto /usr/share/screen
-	doins terminfo/{screencap,screeninfo.src}
-
-	insinto /etc
-	doins "${FILESDIR}"/screenrc
-
-	pamd_mimic_system screen auth
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]
-	then
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
-		elog "applications. Please check /etc/screenrc for information on these changes."
-	fi
-
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
-	if [[ ! -d ${rundir} ]] ; then
-		if use multiuser || use prefix ; then
-			tmpfiles_group="root"
-		else
-			tmpfiles_group="utmp"
-		fi
-		mkdir -m 0775 "${rundir}"
-		chgrp ${tmpfiles_group} "${rundir}"
-	fi
-
-	ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.8.0.ebuild
index 245a4135f542..84d601a1f28e 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.8.0.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
 
 DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
 HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
-	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
 	S="${WORKDIR}"/${P}/src
 fi
@@ -28,6 +26,7 @@ CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
 	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
+	acct-group/utmp
 	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
 	sys-apps/texinfo"
@@ -35,14 +34,9 @@ DEPEND="${CDEPEND}
 PATCHES=(
 	# Don't use utempter even if it is found on the system.
 	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-	"${FILESDIR}"/${P}-utmp-exit.patch
+	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
 )
 
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
-
 src_prepare() {
 	default
 
@@ -57,8 +51,7 @@ src_prepare() {
 		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
 		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
-		doc/screen.1 \
-		|| die
+		doc/screen.1 || die
 
 	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
 		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
@@ -83,15 +76,17 @@ src_configure() {
 	use nethack || append-cppflags "-DNONETHACK"
 	use debug && append-cppflags "-DDEBUG"
 
-	econf \
-		--with-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-rxvt_osc \
-		--enable-telnet \
-		--enable-colors256 \
+	local myeconfargs=(
+		--with-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-rxvt_osc
+		--enable-telnet
+		--enable-colors256
 		$(use_enable pam)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -108,33 +103,32 @@ src_install() {
 		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 	)
 
-	default
+	emake DESTDIR="${D}" SCREEN="${P}" install
 
 	local tmpfiles_perms tmpfiles_group
 
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
+	if use multiuser || use prefix ; then
+		fperms 4755 /usr/bin/${P}
 		tmpfiles_perms="0755"
 		tmpfiles_group="root"
 	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
+		fowners root:utmp /usr/bin/${P}
+		fperms 2755 /usr/bin/${P}
 		tmpfiles_perms="0775"
 		tmpfiles_group="utmp"
 	fi
 
-	dodir /etc/tmpfiles.d
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
-		> "${ED}"/etc/tmpfiles.d/screen.conf
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
 
-	insinto /usr/share/screen
+	insinto /usr/share/${PN}
 	doins terminfo/{screencap,screeninfo.src}
 
 	insinto /etc
 	doins "${FILESDIR}"/screenrc
 
 	pamd_mimic_system screen auth
+
+	dodoc "${DOCS[@]}"
 }
 
 pkg_postinst() {
@@ -147,7 +141,7 @@ pkg_postinst() {
 
 	# Add /tmp/screen in case it doesn't exist yet. This should solve
 	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
+	local rundir="${EROOT}/tmp/${PN}"
 	if [[ ! -d ${rundir} ]] ; then
 		if use multiuser || use prefix ; then
 			tmpfiles_group="root"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 29951514a764..aa12bdddbbb4 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
 
 DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
 HOMEPAGE="https://www.gnu.org/software/screen/"
@@ -15,42 +15,40 @@ else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
-	S="${WORKDIR}"/${P}/src
+	S="${WORKDIR}/${P}/src"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug nethack pam selinux multiuser utmp"
+IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
 	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	utmp? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-"
+	acct-group/utmp
+	selinux? ( sec-policy/selinux-screen )"
 DEPEND="${CDEPEND}
 	sys-apps/texinfo"
 
-RESTRICT="test"
-
-pkg_setup() {
-	# Make sure utmp group exists, as it's used later on.
-	enewgroup utmp 406
-}
+PATCHES=(
+	# Don't use utempter even if it is found on the system.
+	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+	"${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+)
 
 src_prepare() {
-	default
+	if [[ "${PV}" != *9999 ]] ; then
+		default
+	else
+		eapply_user
+	fi
 
 	# sched.h is a system header and causes problems with some C libraries
 	mv sched.h _sched.h || die
-	sed -i \
-		-e '/include/ s:sched.h:_sched.h:' \
-		screen.h winmsg.c canvas.h sched.c || die
-	sed -i -e 's:sched.h:_sched.h:g' Makefile.in || die
+	sed -i '/include/ s:sched\.h:_sched.h:' \
+		screen.h winmsg.c window.h sched.c canvas.h || die
+	sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
 
 	# Fix manpage.
 	sed -i \
@@ -58,10 +56,15 @@ src_prepare() {
 		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
 		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
 		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
-		-e 's:/local/screens/S\\-:'"${EPREFIX}"'/tmp/screen/S\\-:g' \
-		-e 's:/usr/tmp/screens/:'"${EPREFIX}"'/tmp/screen/:g' \
-		doc/screen.1 \
-		|| die
+		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+		doc/screen.1 || die
+
+	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+	fi
+
+	# disable musl dummy headers for utmp[x]
+	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
 
 	# reconfigure
 	eautoreconf
@@ -70,19 +73,24 @@ src_prepare() {
 src_configure() {
 	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
 
-	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
 
 	use nethack || append-cppflags "-DNONETHACK"
 	use debug && append-cppflags "-DDEBUG"
 
-	econf \
-		--enable-socket-dir="${EPREFIX}/tmp/screen" \
-		--with-system_screenrc="${EPREFIX}/etc/screenrc" \
-		--with-pty-mode=0620 \
-		--with-pty-group=5 \
-		--enable-telnet \
-		$(use_enable pam) \
-		$(use_enable utmp)
+	local myeconfargs=(
+		--enable-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-system_screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-telnet
+		$(use_enable pam)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
@@ -98,25 +106,24 @@ src_install() {
 		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
 	)
 
-	emake DESTDIR="${D}" SCREEN=screen-${PV} install
+	emake DESTDIR="${D}" SCREEN="${P}" install
 
 	local tmpfiles_perms tmpfiles_group
 
-	if use multiuser || use prefix
-	then
-		fperms 4755 /usr/bin/screen-${PV}
+	if use multiuser || use prefix ; then
+		fperms 4755 /usr/bin/${P}
 		tmpfiles_perms="0755"
 		tmpfiles_group="root"
 	else
-		fowners root:utmp /usr/bin/screen-${PV}
-		fperms 2755 /usr/bin/screen-${PV}
+		fowners root:utmp /usr/bin/${P}
+		fperms 2755 /usr/bin/${P}
 		tmpfiles_perms="0775"
 		tmpfiles_group="utmp"
 	fi
 
 	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
 
-	insinto /usr/share/screen
+	insinto /usr/share/${PN}
 	doins terminfo/{screencap,screeninfo.src}
 
 	insinto /etc
@@ -137,7 +144,7 @@ pkg_postinst() {
 
 	# Add /tmp/screen in case it doesn't exist yet. This should solve
 	# problems like bug #508634 where tmpfiles.d isn't in effect.
-	local rundir="${EROOT%/}/tmp/screen"
+	local rundir="${EROOT}/tmp/${PN}"
 	if [[ ! -d ${rundir} ]] ; then
 		if use multiuser || use prefix ; then
 			tmpfiles_group="root"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 9e59ca3cb323..5c30eb0f0598 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,4 @@
-DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
 DIST screenfetch-3.9.1.tar.gz 77350 BLAKE2B 10852e63c9ad615cea9a5e53374f16e2f3ac40074bc247c144c91b5e96e0040c6b6623d2a79300e859cef0d8eeb2e935aad585c73d668676dda388d5af6693b3 SHA512 e186901480dcad57b765052b1b156b7706a196ce0e08b6b88264912a5d2a1250e5014923312353a82ccabd8129d4d2421891f13fd34f0ed76c50ce9633207df0
-EBUILD screenfetch-3.8.0-r1.ebuild 698 BLAKE2B 19c4dc1b59b17d0857be792b7b4e853fb1a9e8c16740336a21c0d08dbe42d3aff0c3bb992b3fcb0fa03e6bf0476ccc0409cef440e74ec5faaccd99e4ea303774 SHA512 c446d204d054e4cb78aa0f2e6927b0bad2ed83304f825b37e433f22c0ec3f6f4dc0281048b99244cfe5a0b3310bddf10cc5adac54a166e2e2377be2d5b052bbe
-EBUILD screenfetch-3.9.1.ebuild 699 BLAKE2B 5baf55c9f76ae1774bec30a4e35be688dd3cc4dff368f8c1e03d38c98ec13b67aad556c3aec5b532e6c5a9255ad77197c304f8eb53d7bc1fd6b1152072dd8e9e SHA512 ee56b6991c3d9453e24fcfa174aaeed6173e5e5e51408c4c1822df4eb589554daed3890877cca8b38b3d12e14a384a8780c008e19a3c2f866aea3c23b7e11a6d
+EBUILD screenfetch-3.9.1.ebuild 698 BLAKE2B 19c4dc1b59b17d0857be792b7b4e853fb1a9e8c16740336a21c0d08dbe42d3aff0c3bb992b3fcb0fa03e6bf0476ccc0409cef440e74ec5faaccd99e4ea303774 SHA512 c446d204d054e4cb78aa0f2e6927b0bad2ed83304f825b37e433f22c0ec3f6f4dc0281048b99244cfe5a0b3310bddf10cc5adac54a166e2e2377be2d5b052bbe
 EBUILD screenfetch-9999.ebuild 700 BLAKE2B 13008f0c79a4b427033b78d372455448d45bba1dc422ae3e1169e7aec4b50c67a58885d0242581f21b9bf6b0473758417b12f5cdc41e4c52adfec00c556ab6ae SHA512 d14d09879a624d86ba79dbae445210d1226c9c780a3406b44386eaa92bed24650048caa034d0e96e0e5d483aa569828f56459eeb5269f5deaec37ced133e414c
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild b/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
deleted file mode 100644
index 5a74091728ce..000000000000
--- a/app-misc/screenfetch/screenfetch-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/f/F}"
-
-DESCRIPTION="Bash Screenshot Information Tool"
-HOMEPAGE="https://github.com/KittyKatt/screenFetch"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
-	inherit git-r3
-else
-	KEYWORDS="amd64 ~arm x86 ~x64-macos"
-	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="curl X"
-
-DEPEND=""
-RDEPEND="
-	curl? ( net-misc/curl )
-	X? (
-		media-gfx/scrot
-		x11-apps/xdpyinfo
-	)"
-
-src_install() {
-	newbin ${PN}-dev ${PN}
-	einstalldocs
-}
diff --git a/app-misc/screenfetch/screenfetch-3.9.1.ebuild b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
index 033502d0a56c..5a74091728ce 100644
--- a/app-misc/screenfetch/screenfetch-3.9.1.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/screenFetch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/slmon/Manifest b/app-misc/slmon/Manifest
index ee96f8d60341..bab12fcc7d4e 100644
--- a/app-misc/slmon/Manifest
+++ b/app-misc/slmon/Manifest
@@ -1,5 +1,5 @@
 AUX slmon-0.5.13-invalid-free.patch 383 BLAKE2B 1eb7d8b010aa10c795ca4f5114191a9c97de4e638bf2625d9492bcd258767108c9e801a0f43c442933ac95d61446ec939f809d64adf6a12f77ac220fc8d4a22b SHA512 6cad6d249367e4f2fda9d70d61bab64b6e083da727e1f23fe709c7579efaa3e460c5cf2f01c900517e126b2e9cda069ae8ef1239f731c72ea5728beeabfd522b
 AUX slmon-0.5.13-make-382.patch 243 BLAKE2B 5c926acf2ca9378cb860d70f57b2759b78421022027b9a33bccc20137953c42087f3e3115f6a2d275422680cfbc79926b1f1884e16308c439c2fcbde47350697 SHA512 613388513e5cd7e71b7ec45d1ea5db320f247d74024b52bc9e244c463e22103a165757939527837960aabddeb4feea958d772dca1a2d56747386c8a195beb832
 DIST slmon-0.5.13.tar.gz 103826 BLAKE2B 091e688773043872ec3df0c5dd4acb435ab4a99308e9a13bacae20baa0edf721cf9baed2fb3c33c2ec05085631a0cf858e1ca25b8c557d2aec8ea736c9bfa9a8 SHA512 84bf1e3eda9c05c7029630802b6853cba1c1220fd210c2a8f26f6ffafff3aa5a8bf9945b74ca508fbf4a9038b5df26ebed529d6377fab1df4dd778cccfd74f75
-EBUILD slmon-0.5.13.ebuild 768 BLAKE2B 977d03c38f12c6874454a795555a4f6a7965c5db5741b566db9509ee040f28806499fbba1e290340092e7b42735b532a0e872d841f4df6d0e8adb95b0d1c23e4 SHA512 067b9dd185a9021d7956954e4029fde6a8d4f36b52087b68240e7e5c207d51988817dc0db035a890afa9b2047f56b916b28eebd4ebfa7691b48e978fe97ee60c
+EBUILD slmon-0.5.13.ebuild 727 BLAKE2B 1e0b36cd6e4292c7119dfb04777f5fe34fdc12a8ee5ba91b73342cd557f8fa24143386fafa617b22716d76cd1ecbd0f896104eb512a228b1715cc7ecf0f7ceee SHA512 c8aa85232587f3cddd74ae0ec25dbf9797fd4d4aeae78c0ad34dcf7412c882c3c731a40c28a2abacfff5ea974065f57a76c5bd283af8e91a155fbec972690660
 MISC metadata.xml 242 BLAKE2B 896a9044e8610aae2f30f8782352a32c8765672389ef80eb61eb815c0a70b58a06a991be3700219411c5bcc0b84fd81ffd9d677133d8312c5f265b7a011c57c5 SHA512 8a2bdc32c50597dc61771f9bfcc3d01ddb46cca9cdea7dcc831aca2eafb0746867b49b90885a24e8b8aba0c33a7c174da8955486a9843e50b3e6dc1c9720fd3f
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
index d6edcbdd9074..2a3c8e65ff9b 100644
--- a/app-misc/slmon/slmon-0.5.13.ebuild
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,9 +29,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable debug)
+	econf $(use_enable debug)
 }
 
 src_install() {
diff --git a/app-misc/ttysnoop/Manifest b/app-misc/ttysnoop/Manifest
index b95c4b4f26bb..d201b6423922 100644
--- a/app-misc/ttysnoop/Manifest
+++ b/app-misc/ttysnoop/Manifest
@@ -1,5 +1,5 @@
 AUX pinkbyte_masking.patch 1028 BLAKE2B 8aaeb707d1ff8ec5325bfd27636fdcfdb78d486b8f9c1213ee0578762017468748239adc54d7f1c27f1feb8f076137bddc701ef4f1356f965b25b158ef7c9a0c SHA512 a4adede6ceeea84ccf760805fb4f7044fa06fcc00291556bcaf61b8be81256d10751e3efd7e35c8b26897d98878da6dc17d526cd335aee5bb91762cd129225f1
 AUX ttysnoop-makefile.patch 1004 BLAKE2B b0233a65382023260cb78d095be0ca298c2d43365f9488fd3c6f255acca10d3f9c9ffd2d9e3af5f711baa86da8932fac5b19909dd7437a1a049a95c226bf6ca2 SHA512 f5e8f5764ecfd7174646801650f63ed5608dd5ce1d5e321419ff5318946ed03b61f2e25108d9d5c9dbce95eb4b788c74543cc57b0ba57d430e6ddc519e73321d
 DIST ttysnoop-0.12d.k26.tar.gz 9376 BLAKE2B 114c260de72c4909b97fb47d3ec8b22cf2406df433f708299098df7a7b1315ada8babd81c62ae3a12775fb2393c6548d24457df85523663223960390bb2891c1 SHA512 9ac90ce08e170442718ca4871b7cb569acd8a594e63a56a6889ff0852be93a6ae8e7a212ba1064e74286043dad5a27af5d8588cb3b1ea297db4bf7fa10c66665
-EBUILD ttysnoop-0.12d.ebuild 834 BLAKE2B cfcada90e6fa406289464b3cb4dc658ac3fc83beb0de26e49da40d62a025bdedd92564186bb3a3f27d7d0ff82181b39227a6edacf5fea40d6508dc8ffd5e2591 SHA512 c7672eafd3450c4e8f7cb1d089f33064400b4075d78d49d9a11aca68e61e45bb4de75fd6ff7709d80f98f0024c1981405275031a6bc79dd6ad1cb082df0c273f
+EBUILD ttysnoop-0.12d.ebuild 833 BLAKE2B 3bd50bd067edc0105d8c52dbe6bc5753f846096b682a5146a911237ebc37160591ce10a841013b15397fc884418552b3478e5a35e0fbed23dd8470262d1c947e SHA512 cdebbedcedf584bbbdb4d24a80b97deaff7c60b47ef5f6dfcc518acef7c03fd410d8015b092cd322e74f6f718d4fdb717430dca4b64a3859106c5ed65da23f86
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
index f458720b20b4..400e1e6c2c64 100644
--- a/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
+++ b/app-misc/ttysnoop/ttysnoop-0.12d.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -23,12 +23,12 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="README snooptab.dist"
 
-src_prepare(){
+src_prepare() {
 	epatch "${FILESDIR}"/pinkbyte_masking.patch
 	epatch "${FILESDIR}"/"${PN}"-makefile.patch
 }
 
-src_compile(){
+src_compile() {
 	emake CC="$(tc-getCC)"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /app-misc
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)