Merge updates from master

author: Repository mirror & CI <repomirrorci@gentoo.org> 2020-12-16 23:52:55 +0000
committer: Repository mirror & CI <repomirrorci@gentoo.org> 2020-12-16 23:52:55 +0000
commit: 4e836cf99bf44a8d306176b87a96e1fb55fdbb8c (patch)
tree: ffe6daedc72bbcf3d651881570d87b0cd23e7f1e
parent: 2020-12-16 23:05:17 UTC (diff)
parent: dev-db/redis: Stabilize 6.0.9 ppc, #753701 (diff)
download: gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.tar.gz
gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.tar.bz2
gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.zip
97 files changed, 531 insertions, 1366 deletions
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 42ee29ba83c7..7e62a5baddfd 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
deleted file mode 100644
index 7a2da33f0339..000000000000
--- a/app-text/goldendict/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
deleted file mode 100644
index 6e6d03675a4f..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Fri, 30 Mar 2018 22:53:24 +0300
-Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
-
----
- ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 6 deletions(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index ed1172bd..56e8f788 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -91,6 +91,7 @@ struct DecoderContext
-   QByteArray audioData_;
-   QDataStream audioDataStream_;
-   AVFormatContext * formatContext_;
-+  AVCodec * codec_;
-   AVCodecContext * codecContext_;
-   AVIOContext * avioContext_;
-   AVStream * audioStream_;
-@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
-   audioData_( audioData ),
-   audioDataStream_( audioData_ ),
-   formatContext_( NULL ),
-+  codec_( NULL ),
-   codecContext_( NULL ),
-   avioContext_( NULL ),
-   audioStream_( NULL ),
-@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
-   unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+#else
-+  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-+#endif
-   if ( !avioBuffer )
-   {
-     errorString = QObject::tr( "av_malloc() failed." );
-@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
-   // Find audio stream, use the first audio stream if available
-   for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
-   {
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-     if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-+#else
-+      if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-+#endif
-     {
-       audioStream_ = formatContext_->streams[i];
-       break;
-@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
-     return false;
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
-   codecContext_ = audioStream_->codec;
--  AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
--  if ( !codec )
-+  codec_ = avcodec_find_decoder( codecContext_->codec_id );
-+  if ( !codec_ )
-   {
-     errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
-     return false;
-   }
-+#else
-+  codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-+  if ( !codec_ )
-+  {
-+    errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
-+    return false;
-+  }
-+  codecContext_ = avcodec_alloc_context3( codec_ );
-+  if ( !codecContext_ )
-+  {
-+    errorString = QObject::tr( "avcodec_alloc_context3() failed." );
-+    return false;
-+  }
-+  avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
-+#endif
- 
--  ret = avcodec_open2( codecContext_, codec, NULL );
-+  ret = avcodec_open2( codecContext_, codec_, NULL );
-   if ( ret < 0 )
-   {
-     errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
-     return false;
-   }
- 
--  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
-+  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
-           codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
-   return true;
- }
-@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
- 
-   // Closing a codec context without prior avcodec_open2() will result in
-   // a crash in ffmpeg
--  if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
-+  if ( audioStream_ && codecContext_ && codec_ )
-   {
-     audioStream_->discard = AVDISCARD_ALL;
--    avcodec_close( audioStream_->codec );
-+    avcodec_close( codecContext_ );
-+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
-+    avcodec_free_context( &codecContext_ );
-+#endif
-   }
- 
-   avformat_close_input( &formatContext_ );
-@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
-     if ( packet.stream_index == audioStream_->index )
-     {
-       AVPacket pack = packet;
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-       int gotFrame = 0;
-       do
-       {
-@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
-         pack.data += len;
-       }
-       while( pack.size > 0 );
-+#else
-+      int ret = avcodec_send_packet( codecContext_, &pack );
-+      /* read all the output frames (in general there may be any number of them) */
-+      while( ret >= 0 )
-+      {
-+        ret = avcodec_receive_frame( codecContext_, frame);
-+
-+        if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+          break;
-+
-+        playFrame( frame );
-+      }
-+#endif
-     }
-     // av_free_packet() must be called after each call to av_read_frame()
- #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
-@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
- #endif
-   }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
-   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
-        codecContext_->codec->capabilities & CODEC_CAP_DELAY )
-   {
-@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
-       playFrame( frame );
-     }
-   }
-+#else
-+  /* flush the decoder */
-+  av_init_packet( &packet );
-+  int ret = avcodec_send_packet(codecContext_, &packet );
-+  while( ret >= 0 )
-+  {
-+    ret = avcodec_receive_frame(codecContext_, frame);
-+    if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+      break;
-+    playFrame( frame );
-+  }
-+#endif
- 
- #if LIBAVCODEC_VERSION_MAJOR < 54
-   av_free( frame );
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
deleted file mode 100644
index 247ec52931b9..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
-From: Abs62 <ottomann@yandex.ru>
-Date: Tue, 10 Apr 2018 18:44:43 +0300
-Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
-
----
- fulltextsearch.hh | 1 +
- initializing.cc   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/fulltextsearch.hh b/fulltextsearch.hh
-index da7e2943..adf9619f 100644
---- a/fulltextsearch.hh
-+++ b/fulltextsearch.hh
-@@ -6,6 +6,7 @@
- #include <QRegExp>
- #include <QAbstractListModel>
- #include <QList>
-+#include <QAction>
- 
- #include "dictionary.hh"
- #include "ui_fulltextsearch.h"
-diff --git a/initializing.cc b/initializing.cc
-index 0db6909b..59e605d6 100644
---- a/initializing.cc
-+++ b/initializing.cc
-@@ -1,6 +1,7 @@
- /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
-  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
- 
-+#include <QIcon>
- #include "initializing.hh"
- #include <QCloseEvent>
- 
-From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
-From: Perfect Gentleman <perfect007gentleman@gmail.com>
-Date: Wed, 11 Apr 2018 00:04:12 +0700
-Subject: [PATCH] Update groups_widgets.hh
-
-fixes https://github.com/goldendict/goldendict/issues/991
----
- groups_widgets.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/groups_widgets.hh b/groups_widgets.hh
-index ce442fa2..2064e3bb 100644
---- a/groups_widgets.hh
-+++ b/groups_widgets.hh
-@@ -8,6 +8,7 @@
- 
- #include <vector>
- 
-+#include <QAction>
- #include <QListWidget>
- #include <QSortFilterProxyModel>
- 
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
deleted file mode 100644
index 01fdb3b2a297..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/goldendict.pro
-+++ b/goldendict.pro
-@@ -36,7 +36,8 @@
- QT += sql
- CONFIG += exceptions \
-     rtti \
--    stl
-+    stl \
-+    qtsingleapplication
- OBJECTS_DIR = build
- UI_DIR = build
- MOC_DIR = build
-@@ -632,5 +633,3 @@
- TS_OUT ~= s/.ts/.qm/g
- PRE_TARGETDEPS += $$TS_OUT
- 
--include( qtsingleapplication/src/qtsingleapplication.pri )
--
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
deleted file mode 100644
index d8de78923963..000000000000
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV^^}
-MY_PV=${MY_PV/_/-}
-inherit desktop qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg "
-
-RDEPEND="
-	app-arch/bzip2
-	>=app-text/hunspell-1.2:=
-	dev-libs/eb
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+),X]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/libvorbis
-	media-libs/tiff:0
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-	ffmpeg? (
-		media-libs/libao
-		media-video/ffmpeg:0=
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
-	"${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
-	"${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# disable git
-	sed -i \
-		-e '/git describe/s/^/#/' \
-		${PN}.pro || die
-
-	# fix installation path
-	sed -i \
-		-e '/PREFIX = /s:/usr/local:/usr:' \
-		${PN}.pro || die
-
-	# add trailing semicolon
-	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
-	local myconf=()
-	use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-
-	eqmake5 "${myconf[@]}"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu redist/${PN}.desktop
-	doicon redist/icons/${PN}.png
-
-	insinto /usr/share/apps/${PN}/locale
-	doins locale/*.qm
-
-	insinto /usr/share/${PN}/help
-	doins help/*.qch
-}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
deleted file mode 100644
index 54e5ea46ce69..000000000000
--- a/app-text/goldendict/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">goldendict/goldendict</remote-id>
-		<remote-id type="sourceforge">goldendict</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
index ba450049d43e..bbfba1ff0074 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${PN}-${P}"
 
diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index 4248e34c7462..992380fb720c 100644
--- a/dev-db/redis/redis-6.0.9.ebuild
+++ b/dev-db/redis/redis-6.0.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc luajit tcmalloc test"
 RESTRICT="!test? ( test )"
 SLOT="0"
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild
index ebcbe22a152d..96ab96cf4a88 100644
--- a/dev-lang/python/python-2.7.18-r5.ebuild
+++ b/dev-lang/python/python-2.7.18-r5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild
index 4c7fac525533..d5d14b5159e1 100644
--- a/dev-lang/python/python-3.6.12-r1.ebuild
+++ b/dev-lang/python/python-3.6.12-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild
index 703bf64b042a..cead9f2ee000 100644
--- a/dev-lang/python/python-3.7.9-r1.ebuild
+++ b/dev-lang/python/python-3.7.9-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild
index 03450250d593..9b5c3e9dea22 100644
--- a/dev-lang/python/python-3.8.6-r1.ebuild
+++ b/dev-lang/python/python-3.8.6-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.0-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild
index e8fa8ab2c6f0..4c1442bcad7b 100644
--- a/dev-lang/python/python-3.9.0-r1.ebuild
+++ b/dev-lang/python/python-3.9.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
deleted file mode 100644
index a655a289fb5b..000000000000
--- a/dev-python/backports-csv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
diff --git a/dev-python/backports-csv/backports-csv-1.0.7.ebuild b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
deleted file mode 100644
index d9cce4776ba6..000000000000
--- a/dev-python/backports-csv/backports-csv-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3's 'csv' module"
-HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/backports-csv/metadata.xml
deleted file mode 100644
index 51ed615faef8..000000000000
--- a/dev-python/backports-csv/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>grknight@gentoo.org</email>
-    <name>Brian Evans</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ryanhiebert/backports.csv</remote-id>
-    <remote-id type="pypi">backports.csv</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
deleted file mode 100644
index c248a5bc8d54..000000000000
--- a/dev-python/backports-os/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
deleted file mode 100644
index b7480cb7421c..000000000000
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of new features in Python's os module"
-HOMEPAGE="https://github.com/PiDelport/backports.os"
-SRC_URI="https://github.com/PiDelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/backports[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P/-/.}"
-
-src_prepare() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install
-	# main namespace provided by dev-python/backports
-	rm "${D}/$(python_get_sitedir)"/backports/__init__.py* || die
-	rm -rf "${D}/$(python_get_sitedir)"/backports/__pycache__ || die
-}
diff --git a/dev-python/backports-os/metadata.xml b/dev-python/backports-os/metadata.xml
deleted file mode 100644
index 5f0a9236cf18..000000000000
--- a/dev-python/backports-os/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-		<name>Pacho Ramos</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">backports.os</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 86f720cbe78d..2c52b9578c12 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,4 +12,5 @@ DIST boto3-1.16.29.tar.gz 340743 BLAKE2B 1ef74d98aecf8dfd46bc340984d65e5dc2a70f3
 DIST boto3-1.16.30.tar.gz 340801 BLAKE2B fcf87b43d2c18ecf1e9d7f0c8c423143e44777a6249a9893d0ebb4016703a9d87a157ed71fca98c8bd73419e6dd2bd2621d42406220e67e6dd462e1088837334 SHA512 66d3e4ae6296b1fbd31187228246c99e472ccfba756d6ca304eca134271d43dd80d1bc35af1fb63336a7c63f2341212329dde307cbbb2dce25e2aa0705c6a436
 DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c002f6f5d992fe49c93528d59d5740de6c8782af71d94461ea704a36d8ed46ccadfbf83982504ab507aab9b058 SHA512 06d9c6e721d1ab529e6a598b14ba6f740bec32a8165582853149b9aa294f0a272d0da4222f0dc7ef83055d91b4b0a0176e65bb34784990aca43e44db43650a2d
 DIST boto3-1.16.37.tar.gz 341684 BLAKE2B 4c9e7389ae4620edbb9cee2accfe6e7b520998b0a1110444d137387a098ed027a281e69a9bf6b2d3383a51b60b6dac16695b867ee27f44a9180459dd8a4b55b4 SHA512 1105b00d6aed4ebd36b77b21c6a3370dd1f34669df2621cd13dd776788d7fdd469086fd6956920632bf33a5291b14514518046983afd95441d54b35dc68347c2
+DIST boto3-1.16.38.tar.gz 341739 BLAKE2B 75cad4c53ae951b8f913e533dc73f6b5e0bfebe416cb28b7a7700b848a39f0e46e225a5d9c926a3343412d0ea90405c2f22ee6e2ba996c42fab3c62bc77cf5e6 SHA512 9f9edd5a9b3b9695c453e86d29b33271134d297772b0d1e6bc440bb6a87918144c4fee16a629d67be174b756392fa7417374e12dc866d19da24174ebbf31e368
 DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
diff --git a/dev-python/boto3/boto3-1.16.38.ebuild b/dev-python/boto3/boto3-1.16.38.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.38.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 955630b3e554..9b2ca3c38fd0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,4 +12,5 @@ DIST botocore-1.19.29.tar.gz 7219708 BLAKE2B c5468be09300edf1acfb82780ad026ad785
 DIST botocore-1.19.30.tar.gz 7224700 BLAKE2B 50712be7e6e4a8a22607d567a8d227bbc6d9a7156c245a9faa5adf0e94364d5e5738dd558534e072d071e88315fd79555454fd5f36dfb5d309effca6a39f2247 SHA512 8d9a0becad072ac01e04c1709e8851344bbcd35ecb6c269cace7c229e3b2e48b8fd91ca31be96c67831030a75a63027e8700772601a65eb529bcfd8a58434b6c
 DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1f300fc9bdbc0b215a3630adb70c29a951c6dff2a6ebfde42872cbc3af4c442d09fa0233b2c957521e6a5e05816c60 SHA512 420ad7c59496b2b74ba6ecde8dc40ac3e47c5676335f7471448fcdde5b70bda3bd7516963788d8a7a940aaa9cf488b6529e6fbd2842806f58520cd8e2dc15a60
 DIST botocore-1.19.37.tar.gz 7335789 BLAKE2B 3df00ad1f0d34f8f8408741b503fafdf9bdaacd9f5b0c52ffbc0b3172e7b0d01e741a076430268c55c39f1fe050a9b8bcc2d183eb54830886c7f3f050a22c408 SHA512 53ff17dcba3e72910709de7fe4504a04a507a708c2674039cfb682276ea7f8f46d3afeadbb41103d02141183d6216aab5964b0df98033cd12946ed1c83373aaf
+DIST botocore-1.19.38.tar.gz 7358201 BLAKE2B 16dee2bd0d27996fd761b19918c36de0475c827cb27d0c1505e438436872337f0a5b0ddceb3c4ffb3b5c15592a2aa328f8eec94e2e6ab55aa705299ea847c465 SHA512 51a6c7a0ab950c4a7f0d7859d90c39f30f4be2789b55f520f5318a00878c62a2f5eaa9741e53953d3226a23137415fc4318ca09d37d690e71b8f2078b2662cfe
 DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
diff --git a/dev-python/botocore/botocore-1.19.38.ebuild b/dev-python/botocore/botocore-1.19.38.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.38.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
deleted file mode 100644
index 188a60e4e3fa..000000000000
--- a/dev-python/diff-cover/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
diff --git a/dev-python/diff-cover/diff-cover-2.3.0.ebuild b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
deleted file mode 100644
index 61931388f524..000000000000
--- a/dev-python/diff-cover/diff-cover-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically find diff lines that need test coverage"
-HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
-SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
-	dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-
-MY_PN=${PN/-/_}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
-	# TypeError: test_parse_range_notation() takes exactly 2 arguments (1 given)
-	sed -e 's|test_parse_range_notation|_\0|' \
-		-i "${MY_PN}/tests/test_diff_cover_main.py" || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/diff-cover/metadata.xml b/dev-python/diff-cover/metadata.xml
deleted file mode 100644
index a6669b8f3c23..000000000000
--- a/dev-python/diff-cover/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">diff_cover</remote-id>
-		<remote-id type="github">Bachmann1234/diff-cover</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index a97a14a81fc5..ac904baef6b8 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1 +1,2 @@
 DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
+DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
diff --git a/dev-python/fasteners/fasteners-0.16.ebuild b/dev-python/fasteners/fasteners-0.16.ebuild
new file mode 100644
index 000000000000..47dad5e809dc
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+	>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
deleted file mode 100644
index 07d79033be2a..000000000000
--- a/dev-python/funcsigs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
diff --git a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch b/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
deleted file mode 100644
index f4ecec3b6137..000000000000
--- a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/tests/test_inspect.py b/tests/test_inspect.py
-index 98d6592..3a2a1f2 100644
---- a/tests/test_inspect.py
-+++ b/tests/test_inspect.py
-@@ -8,6 +8,7 @@ import unittest2 as unittest
- 
- import funcsigs as inspect
- 
-+import platform
- 
- class TestSignatureObject(unittest.TestCase):
-     @staticmethod
-@@ -409,7 +410,7 @@ def test_signature_on_decorated(self):
-                       Ellipsis))
- """)
- 
--    if sys.version_info[0] > 2:
-+    if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy":
-         exec("""
- def test_signature_on_class(self):
-     class C:
-@@ -493,41 +494,44 @@ def test_signature_on_class(self):
-                       Ellipsis))
- """)
- 
--    def test_signature_on_callable_objects(self):
--        class Foo(object):
--            def __call__(self, a):
--                pass
-+    if platform.python_implementation() != "PyPy":
-+        exec("""
-+def test_signature_on_callable_objects(self):
-+    class Foo(object):
-+        def __call__(self, a):
-+            pass
- 
--        self.assertEqual(self.signature(Foo()),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    self.assertEqual(self.signature(Foo()),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
- 
--        class Spam(object):
--            pass
--        with self.assertRaisesRegex(TypeError, "is not a callable object"):
--            inspect.signature(Spam())
-+    class Spam(object):
-+        pass
-+    with self.assertRaisesRegex(TypeError, "is not a callable object"):
-+        inspect.signature(Spam())
- 
--        class Bar(Spam, Foo):
--            pass
-+    class Bar(Spam, Foo):
-+        pass
- 
--        self.assertEqual(self.signature(Bar()),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    self.assertEqual(self.signature(Bar()),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
- 
--        class ToFail(object):
--            __call__ = type
--        with self.assertRaisesRegex(ValueError, "not supported by signature"):
--            inspect.signature(ToFail())
-+    class ToFail(object):
-+        __call__ = type
-+    with self.assertRaisesRegex(ValueError, "not supported by signature"):
-+        inspect.signature(ToFail())
- 
--        if sys.version_info[0] < 3:
--            return
-+    if sys.version_info[0] < 3:
-+        return
- 
--        class Wrapped(object):
--            pass
--        Wrapped.__wrapped__ = lambda a: None
--        self.assertEqual(self.signature(Wrapped),
--                         ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
--                          Ellipsis))
-+    class Wrapped(object):
-+        pass
-+    Wrapped.__wrapped__ = lambda a: None
-+    self.assertEqual(self.signature(Wrapped),
-+                     ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+                      Ellipsis))
-+""")
- 
-     def test_signature_on_lambdas(self):
-         self.assertEqual(self.signature((lambda a=10: a)),
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
deleted file mode 100644
index 0a8b618ac413..000000000000
--- a/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
-HOMEPAGE="https://pypi.org/project/funcsigs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# This patch disables some tests for pypy as they do not work as expected.
-	# This has been reported upstream
-	# https://github.com/testing-cabal/funcsigs/issues/10
-	"${FILESDIR}/${P}-fix-pypy3-tests.patch"
-)
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/funcsigs/metadata.xml b/dev-python/funcsigs/metadata.xml
deleted file mode 100644
index bb74f00502a5..000000000000
--- a/dev-python/funcsigs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">funcsigs</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
deleted file mode 100644
index 2d74781ebfa6..000000000000
--- a/dev-python/gitdb2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
deleted file mode 100644
index c55332a897fd..000000000000
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!dev-python/gitdb[${PYTHON_USEDEP}]
-	>=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb2/metadata.xml b/dev-python/gitdb2/metadata.xml
deleted file mode 100644
index 005b63ca8056..000000000000
--- a/dev-python/gitdb2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gitdb2</remote-id>
-    <remote-id type="github">gitpython-developers/gitdb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 2d38719ecc65..b4efee90259d 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,4 @@
 DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
 DIST mongoengine-0.21.0.tar.gz 320173 BLAKE2B 6c53c8dd967209039a3c2b6e279e6a27cf7073a6284b0df70aff25004c8499e88088d934eadf2e23dc3f43cd2ebc0d3c202cfbee618772b8a794a6ef933a9a75 SHA512 37642e9c9333fb4480262e916d678ef04a1f839b62e7d58528485b7df7cb9b22d3cb0b093084fcb92e331698c7d5bf2411df5d0c6e6b9324748189b9084c3f54
 DIST mongoengine-0.22.0.tar.gz 319893 BLAKE2B dc58cad3a93b5c391012fcbc7f0f9cc372bae970847c629bbe6dd158b8d6d9b032b26c118a7931f51f6754333fdbd890904699417076a84ff295233e33daa48c SHA512 293cf0124c18d4c67ecd70e129ab51a0a29a919fecddffbf24619275012534d7c5cb7ee97a65d933654cd582554a276772dc933b1fba357ddac8d3a295f4fda8
+DIST mongoengine-0.22.1.tar.gz 321227 BLAKE2B 933850eb85623a33b1f8e124b6c8375a9e0448c39f5cf44a3aa5b281746933043873d6ac32997121b15c611b9c1a50a1194fa8f364bae3009339d50f5ca98bb8 SHA512 a5188e854aede8feddc01c2d7cbaedd0af4faf5ac03d28f8df9d6dd2f7ae58d9de81eb9d4f3bb02daafb85b7fdf8d54ba38994af07bb338af2b27940cc3413ed
diff --git a/dev-python/mongoengine/mongoengine-0.22.1.ebuild b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
new file mode 100644
index 000000000000..bcf7043f3db3
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_covered_index:_&:' \
+		-i tests/document/test_indexes.py || die
+	# no $eval
+	sed -e 's:test_exec_js_field_sub:_&:' \
+		-e 's:test_exec_js_query:_&:' \
+		-e 's:test_item_frequencies_normalize:_&:' \
+		-e 's:test_item_frequencies_with_0_values:_&:' \
+		-e 's:test_item_frequencies_with_False_values:_&:' \
+		-e 's:test_item_frequencies_with_null_embedded:_&:' \
+		-i tests/queryset/test_queryset.py || die
+	# TODO: investigate (wrong order? bad comparison?)
+	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+		-i tests/queryset/test_queryset.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
deleted file mode 100644
index d821cf07cf10..000000000000
--- a/dev-python/parametrized/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
diff --git a/dev-python/parametrized/metadata.xml b/dev-python/parametrized/metadata.xml
deleted file mode 100644
index 4ee04ac6121b..000000000000
--- a/dev-python/parametrized/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">parametrized</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/parametrized/parametrized-0.1.ebuild b/dev-python/parametrized/parametrized-0.1.ebuild
deleted file mode 100644
index dd09c7ae337b..000000000000
--- a/dev-python/parametrized/parametrized-0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
deleted file mode 100644
index 40c2846be911..000000000000
--- a/dev-python/pytoml/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
-DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
diff --git a/dev-python/pytoml/metadata.xml b/dev-python/pytoml/metadata.xml
deleted file mode 100644
index 0b02f1b3ec21..000000000000
--- a/dev-python/pytoml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">avakar/pytoml</remote-id>
-		<remote-id type="pypi">pytoml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
deleted file mode 100644
index 9894d88cc6a2..000000000000
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
-
-DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
-HOMEPAGE="https://github.com/avakar/pytoml"
-SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
-	${EPYTHON} test/test.py || die
-}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 1466b6610d0b..4123a69f944b 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,2 +1,3 @@
 DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
 DIST requests-2.25.0.tar.gz 101897 BLAKE2B 5de8f4f5059915f929ebb71d8209bfefbe95bb381544ed0b6875cc01cb958e6fe8861cd8321143463da5dd872ad4ff8c828008bcd6409b41857c4d2037db3f67 SHA512 dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74
+DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
diff --git a/dev-python/requests/requests-2.25.1.ebuild b/dev-python/requests/requests-2.25.1.ebuild
new file mode 100644
index 000000000000..ca3637585050
--- /dev/null
+++ b/dev-python/requests/requests-2.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-5[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-3[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.27[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip tests that require some kind of network
+	sed -e 's:test_connect_timeout:_&:' \
+		-e 's:test_total_timeout_connect:_&:' \
+		-i tests/test_requests.py || die
+	# probably pyopenssl version dependent
+	sed -e 's:test_https_warnings:_&:' \
+		-i tests/test_requests.py || die
+	# doctests rely on networking
+	sed -e 's:--doctest-modules::' \
+		-i pytest.ini || die
+}
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
deleted file mode 100644
index e9ab9098a19a..000000000000
--- a/dev-python/smmap2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
diff --git a/dev-python/smmap2/metadata.xml b/dev-python/smmap2/metadata.xml
deleted file mode 100644
index 8c3e7214bd47..000000000000
--- a/dev-python/smmap2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">smmap2</remote-id>
-    <remote-id type="github">gitpython-developers/smmap</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
deleted file mode 100644
index f526711c7d97..000000000000
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of a sliding window memory map manager"
-HOMEPAGE="
-	https://pypi.org/project/smmap2/
-	https://github.com/gitpython-developers/smmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	!dev-python/smmap[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
deleted file mode 100644
index 27009a0fbd21..000000000000
--- a/dev-util/eric/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
deleted file mode 100644
index f766811e82e4..000000000000
--- a/dev-util/eric/eric-18.03.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		|| (
-			dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}]
-			dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}]
-		)
-		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
-	')
-	!dev-util/eric:4
-	!dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage || die
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	if ! has_version dev-python/enchant; then
-		elog "You might want to install dev-python/pyenchant for spell checking."
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-util/eric/eric-19.11-r1.ebuild b/dev-util/eric/eric-19.11-r1.ebuild
deleted file mode 100644
index bb8cee447042..000000000000
--- a/dev-util/eric/eric-19.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg
-
-MY_P=${PN}6-${PV}
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
-		spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
-
-src_prepare() {
-	default
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
-}
-
-src_install() {
-	yes n | "${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-	einstalldocs
-}
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
deleted file mode 100644
index 11e69dd891df..000000000000
--- a/dev-util/eric/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">eric-ide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index 19a378e0b061..6fabc530e2ea 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -31,6 +31,11 @@
 # - RDEPEND if it is needed at install time (e.g. you 'fowners' files
 #   in pkg_preinst) or run time.
 
+# @VARIABLE: _ACCT_GROUP_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_ACCT_GROUP_ECLASS} ]]; then
 _ACCT_GROUP_ECLASS=1
 
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index 56a4e83e8bfc..3aa7a1cfe0f0 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -39,6 +39,11 @@
 # - RDEPEND if it is needed at install time (e.g. you 'fowners' files
 #   in pkg_preinst) or run time.
 
+# @VARIABLE: _ACCT_USER_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_ACCT_USER_ECLASS} ]]; then
 _ACCT_USER_ECLASS=1
 
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 07f2cd6af875..40877e89b023 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -87,7 +87,12 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 # This variable needs to be set in the ebuild and contains a list of available
 # built-in modules
 
+# @VARIABLE: IUSE_MPMS
+# @DESCRIPTION:
+# Combine IUSE_MPMS_FORK and IUSE_MPMS_THREAD
+
 IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
+
 IUSE="${IUSE} debug doc gdbm ldap libressl selinux ssl static suexec threads"
 
 for module in ${IUSE_MODULES} ; do
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index d633d991c5e5..d6b85565a10c 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -42,6 +42,11 @@ esac
 
 EXPORT_FUNCTIONS src_configure src_install
 
+# @VARIABLE: _ASPELL_DICT_R1
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_ASPELL_DICT_R1} ]]; then
 
 # aspell packages have an idiosyncratic versioning scheme, that is
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 3fcaa79f80ab..13d2f653a972 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -113,6 +113,11 @@ esac
 # Note that dependencies are added for autoconf, automake and libtool only.
 # If your package needs one of the external tools listed above, you need to add
 # appropriate packages to DEPEND yourself.
+
+# @VARIABLE: AUTOTOOLS_AUTO_DEPEND
+# @DESCRIPTION:
+# Please document me
+
 [[ ${AUTOTOOLS_AUTORECONF} ]] || : ${AUTOTOOLS_AUTO_DEPEND:=no}
 
 # eutils for eqawarn, path_exists
@@ -192,6 +197,12 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
 # cases only.
 
 # Determine using IN or OUT source build
+
+# @FUNCTION: _check_build_dir
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _check_build_dir() {
 	: ${ECONF_SOURCE:=${S}}
 	# Respect both the old variable and the new one, depending
diff --git a/eclass/base.eclass b/eclass/base.eclass
index 0f9a2e576b78..4682890b3dc3 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -28,12 +28,22 @@
 # @DESCRIPTION:
 # The base eclass defines some default functions and variables.
 
+# @VARIABLE: _BASE_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_BASE_ECLASS} ]]; then
 _BASE_ECLASS=1
 
 inherit eutils
 
+# @VARIABLE: BASE_EXPF
+# @DESCRIPTION:
+# Please document me
+
 BASE_EXPF="src_unpack src_compile src_install"
+
 case "${EAPI:-0}" in
 	0|1) ;;
 	2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 636371df9d6b..e3981438fd9f 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -61,10 +61,11 @@ _bash-completion-r1_get_bashcompdir() {
 	_bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions
 }
 
-# @FUNCTION: _bash-completion-r1_get_helpersdir
+# @FUNCTION: _bash-completion-r1_get_bashhelpersdir
 # @INTERNAL
 # @DESCRIPTION:
 # Get unprefixed bash-completion helpers directory.
+
 _bash-completion-r1_get_bashhelpersdir() {
 	debug-print-function ${FUNCNAME} "${@}"
 
diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index 854b740db4f2..493e2d4593d6 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -24,6 +24,11 @@ case "${EAPI:-0}" in
 		;;
 esac
 
+# @VARIABLE: _BAZEL_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_BAZEL_ECLASS} ]]; then
 
 inherit multiprocessing toolchain-funcs
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 7f7a681f6f52..d1e968b4e9ce 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -9,10 +9,18 @@
 # @SUPPORTED_EAPIS: 6 7
 # @BLURB: common functions and variables for cargo builds
 
+# @VARIABLE: _CARGO_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_CARGO_ECLASS} ]]; then
 _CARGO_ECLASS=1
 
+# @VARIABLE: RUST_DEPEND
+# @DESCRIPTION:
 # we need this for 'cargo vendor' subcommand and net.offline config knob
+
 RUST_DEPEND=">=virtual/rust-1.37.0"
 
 case "${EAPI:-0}" in
@@ -35,7 +43,16 @@ fi
 
 IUSE="${IUSE} debug"
 
+# @VARIABLE: ECARGO_HOME
+# @DESCRIPTION:
+# Adjust the working directory
+
 ECARGO_HOME="${WORKDIR}/cargo_home"
+
+# @VARIABLE: ECARGO_VENDOR
+# @DESCRIPTION:
+# Vendorize the working directory
+
 ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
 
 # @ECLASS-VARIABLE: CARGO_OPTIONAL
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 77b9d6ceb209..4481eaa1dd9b 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -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
 
 # @ECLASS: cdrom.eclass
@@ -14,6 +14,11 @@
 # eclass will require RESTRICT="bindist" but the point still stands.
 # The functions are generally called in src_unpack.
 
+# @VARIABLE: _CDROM_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_CDROM_ECLASS} ]]; then
 _CDROM_ECLASS=1
 
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 51115e7de4fa..e512c1bb23a0 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -38,6 +38,11 @@
 # These checks should probably mostly work on non-Linux, and they should
 # probably degrade gracefully if they don't. Probably.
 
+# @VARIABLE: _CHECK_REQS_ECLASS_
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
 
 # @ECLASS-VARIABLE: CHECKREQS_MEMORY
diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index b3d63f302d05..d8225f983e2f 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -43,6 +43,11 @@ chromium_suid_sandbox_check_kernel_config() {
 # @DESCRIPTION:
 # List of language packs available for this package.
 
+# @FUNCTION: _chromium_set_l10n_IUSE
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _chromium_set_l10n_IUSE() {
 	[[ ${EAPI:-0} == 0 ]] && die "EAPI=${EAPI} is not supported"
 
@@ -100,6 +105,10 @@ chromium_remove_language_paks() {
 	done
 }
 
+# @FUNCTION: chromium_pkg_die
+# @DESCRIPTION:
+# Various reasons to die
+
 chromium_pkg_die() {
 	if [[ "${EBUILD_PHASE}" != "compile" ]]; then
 		return
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 62fa02715700..384556fd7d14 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -17,6 +17,11 @@
 # out-of-source builds (default), in-source builds and an implementation of the
 # well-known use_enable function for CMake.
 
+# @VARIABLE: _CMAKE_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_CMAKE_ECLASS} ]]; then
 _CMAKE_ECLASS=1
 
@@ -135,7 +140,10 @@ _cmake_banned_func() {
 	die "${FUNCNAME[1]} is banned. use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
 }
 
+# @FUNCTION: _cmake_check_build_dir
+# @DESCRIPTION:
 # Determine using IN or OUT source build
+
 _cmake_check_build_dir() {
 	: ${CMAKE_USE_DIR:=${S}}
 	if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
@@ -268,8 +276,12 @@ cmake-utils_use() { _cmake_banned_func "" "$@" ; }
 # Banned. Use -DNOFOO=$(usex !foo) instead.
 cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
 
+# @FUNCTION: _cmake_modify-cmakelists
+# @INTERNAL
+# @DESCRIPTION:
 # Internal function for modifying hardcoded definitions.
 # Removes dangerous definitions that override Gentoo settings.
+
 _cmake_modify-cmakelists() {
 	debug-print-function ${FUNCNAME} "$@"
 
diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass
index b1da77c69dda..cfc42a859495 100644
--- a/eclass/cuda.eclass
+++ b/eclass/cuda.eclass
@@ -25,6 +25,11 @@ esac
 # @EXAMPLE:
 # inherit cuda
 
+# @VARIABLE: _CUDA_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ -z ${_CUDA_ECLASS} ]]; then
 
 inherit flag-o-matic toolchain-funcs
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 01c2f9d9f1fc..743a9c78e83b 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -16,6 +16,10 @@ DEPEND="test? ( >=dev-lang/tcl-8.4 )"
 
 RDEPEND=""
 
+# @FUNCTION: db_fix_so
+# @DESCRIPTION:
+# Please document me
+
 db_fix_so() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
 	LIB="${EROOT}/usr/$(get_libdir)"
@@ -69,6 +73,10 @@ db_fix_so() {
 	fi
 }
 
+# @FUNCTION: db_src_install_doc
+# @DESCRIPTION:
+# Please document me
+
 db_src_install_doc() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# not everybody wants this wad of documentation as it is primarily API docs
@@ -83,6 +91,10 @@ db_src_install_doc() {
 	db_src_install_examples
 }
 
+# @FUNCTION: db_src_install_examples
+# @DESCRIPTION:
+# Please document me
+
 db_src_install_examples() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	if use examples ; then
@@ -102,6 +114,10 @@ db_src_install_examples() {
 	fi
 }
 
+# @FUNCTION: db_src_install_usrbinslot
+# @DESCRIPTION:
+# Please document me
+
 db_src_install_usrbinslot() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# slot all program names to avoid overwriting
@@ -116,6 +132,10 @@ db_src_install_usrbinslot() {
 	done
 }
 
+# @FUNCTION: db_src_install_headerslot
+# @DESCRIPTION:
+# Please document me
+
 db_src_install_headerslot() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	# install all headers in a slotted location
@@ -123,6 +143,10 @@ db_src_install_headerslot() {
 	mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ || die
 }
 
+# @FUNCTION: db_src_install_usrlibcleanup
+# @DESCRIPTION:
+# Please document me
+
 db_src_install_usrlibcleanup() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
 	LIB="${ED}/usr/$(get_libdir)"
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 5aa552542680..46bf93461bc0 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -127,6 +127,11 @@ APACHE2_4_DEPEND="=www-servers/apache-2.4*"
 # INTERNAL FUNCTIONS
 # ==============================================================================
 
+# @FUNCTION: _init_apache2
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _init_apache2() {
 	debug-print-function $FUNCNAME $*
 
@@ -148,11 +153,21 @@ _init_apache2() {
 	esac
 }
 
+# @FUNCTION: _init_apache2_late
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _init_apache2_late() {
 	APACHE_BASEDIR="/usr/$(get_libdir)/apache2"
 	APACHE_MODULESDIR="${APACHE_BASEDIR}/modules"
 }
 
+# @FUNCTION: _init_no_apache
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _init_no_apache() {
 	debug-print-function $FUNCNAME $*
 	APACHE_VERSION="0"
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 7d5c0f0f9a26..20b4d1797305 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -6,6 +6,11 @@
 # base-system@gentoo.org
 # @BLURB: support for desktop files, menus, and icons
 
+# @VARIABLE: _DESKTOP_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
 if [[ -z ${_DESKTOP_ECLASS} ]]; then
 _DESKTOP_ECLASS=1
 
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 33c66c4872e5..d626d816369c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -95,6 +95,11 @@ esac
 # It needs to be set before the inherit line.
 : ${DISTUTILS_USE_SETUPTOOLS:=bdepend}
 
+# @VARIABLE: _DISTUTILS_R1
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
 [[ ${EAPI} == [456] ]] && inherit eutils
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index c763957bf893..1d6d08e72a7d 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -20,6 +20,11 @@
 # This eclass's phase functions are not intended to be mixed and matched, so if
 # any phase functions are overridden the version here should also be called.
 
+# @VARIABLE: _ECM_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ -z ${_ECM_ECLASS} ]]; then
 _ECM_ECLASS=1
 
diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index 7d13f194eb7a..b260cd2736bb 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -35,6 +35,11 @@
 #
 # Defaults to the upstream name of the module.
 
+# @VARIABLE: _EMBOSS_R2
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_EMBOSS_R2} ]]; then
 
 case ${EAPI:-0} in
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index fbb4f0b5bc0d..921647e257a6 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -11,6 +11,11 @@
 # An eclass providing epatch and epatch_user functions to easily apply
 # patches to ebuilds. Mostly superseded by eapply* in EAPI 6.
 
+# @VARIABLE: _EPATCH_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ -z ${_EPATCH_ECLASS} ]]; then
 
 case ${EAPI:-0} in
diff --git a/eclass/estack.eclass b/eclass/estack.eclass
index 3f444ee3b70b..37a2994283ce 100644
--- a/eclass/estack.eclass
+++ b/eclass/estack.eclass
@@ -8,6 +8,11 @@
 # @DESCRIPTION:
 # Support for storing values on stack-like variables.
 
+# @VARIABLE: _ESTACK_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ -z ${_ESTACK_ECLASS} ]]; then
 
 # @FUNCTION: estack_push
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 4bef00d40ac7..107a519892dc 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -28,6 +28,11 @@
 # )
 # @CODE
 
+# @VARIABLE: _FCAPS_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ -z ${_FCAPS_ECLASS} ]]; then
 _FCAPS_ECLASS=1
 
diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
index 475b182843a5..23f14692d5ce 100644
--- a/eclass/fixheadtails.eclass
+++ b/eclass/fixheadtails.eclass
@@ -8,6 +8,11 @@
 # Original author John Mylchreest <johnm@gentoo.org>
 # @BLURB: functions to replace obsolete head/tail with POSIX compliant ones
 
+# @FUNCTION: _do_sed_fix
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _do_sed_fix() {
 	einfo " - fixed $1"
 	sed -i \
diff --git a/eclass/font.eclass b/eclass/font.eclass
index e9e448a8155b..10f4bf61e8d7 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -13,6 +13,11 @@ case ${EAPI:-0} in
 	*) die "EAPI ${EAPI} is not supported by font.eclass." ;;
 esac
 
+# @VARIABLE: _FONT_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_FONT_ECLASS} ]]; then
 
 EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 6049b03b8f14..45f26a83c2b0 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -36,6 +36,11 @@ esac
 
 EXPORT_FUNCTIONS pkg_setup
 
+# @VARIABLE: _FORTRAN_2_CLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 if [[ ! ${_FORTRAN_2_CLASS} ]]; then
 
 # @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
@@ -282,5 +287,10 @@ fortran-2_pkg_setup() {
 	fi
 }
 
+# @VARIABLE: _FORTRAN_2_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
 _FORTRAN_2_ECLASS=1
 fi
diff --git a/eclass/games.eclass b/eclass/games.eclass
index a2a5ce066a57..cdd40a222572 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -26,6 +26,10 @@
 # is needed. For more details, see the QA team policies page:
 # https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games
 
+# @VARIABLE: _GAMES_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
 
 if [[ -z ${_GAMES_ECLASS} ]]; then
 _GAMES_ECLASS=1
diff --git a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild b/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
deleted file mode 100644
index 4eae0ce5c410..000000000000
--- a/media-gfx/argyllcms/argyllcms-2.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multiprocessing toolchain-funcs udev
-
-MY_P="Argyll_V${PV}"
-
-DESCRIPTION="Open source, ICC compatible color management system"
-HOMEPAGE="http://www.argyllcms.com/"
-SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa x86"
-IUSE="doc libressl"
-
-RDEPEND="
-	media-libs/tiff:0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-libs/libXScrnSaver
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# Make it respect LDFLAGS
-	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
-
-	# Evil hack to get --as-needed working. The build system unfortunately lists all
-	# the shared libraries by default on the command line _before_ the object to be built...
-	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
-
-	append-cflags -DUNIX -D_THREAD_SAFE
-
-	sed \
-		-e 's:CCFLAGS:CFLAGS:g' \
-		-e "s:ar rusc:$(tc-getAR) rusc:g" \
-		-i Jambase || die
-
-	tc-export CC RANLIB
-
-	jam -dx -fJambase "-j$(makeopts_jobs)" || die
-}
-
-src_install() {
-	jam -dx -fJambase install || die
-
-	rm bin/License.txt || die
-
-	pushd bin > /dev/null
-	local binname
-	for binname in * ; do
-		newbin ${binname} argyll-${binname}
-	done
-	popd > /dev/null
-
-	dodoc log.txt Readme.txt ttbd.txt notes.txt
-	if use doc;  then
-		docinto html
-		dodoc doc/*html doc/*jpg doc/*gif
-	fi
-
-	insinto /usr/share/${PN}
-	doins -r ref
-
-	udev_dorules usb/55-Argyll.rules
-}
-
-pkg_postinst() {
-	elog "If you have a Spyder2 you need to extract the firmware"
-	elog "from the CVSpyder.dll of the windows driver package"
-	elog "and store it as /usr/share/color/spyd2PLD.bin"
-	echo
-	elog "For further info on setting up instrument access read"
-	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
-	echo
-}
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index e88d93954061..ff88b5ffff46 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="emf imagemagick plotutils pptx"
 
 BDEPEND="
diff --git a/net-dns/unbound/unbound-1.13.0.ebuild b/net-dns/unbound/unbound-1.13.0.ebuild
index e5e0abe66891..a63ec2835321 100644
--- a/net-dns/unbound/unbound-1.13.0.ebuild
+++ b/net-dns/unbound/unbound-1.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 x86"
 IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 libressl python redis selinux static-libs systemd test threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/net-news/quiterss/Manifest b/net-news/quiterss/Manifest
deleted file mode 100644
index 82e93830fa5a..000000000000
--- a/net-news/quiterss/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quiterss-0.19.4.tar.gz 3771775 BLAKE2B d1515a13b4b26a9bfae1760d25e1ab28b1ca797806dc49f2826631764755ad61f5ed887a1c17f6728f45b0fd33271f06157acb1a529a628e0a0f5acb436bee23 SHA512 117a83f7ef61907b8625b0da1fbe069974fa06a434040e54c9c90d8ca572dc60aa96c1081dbe3d7110d0c9304fe47dafe1faeedcc45e32bbf638b793eede96da
diff --git a/net-news/quiterss/metadata.xml b/net-news/quiterss/metadata.xml
deleted file mode 100644
index 0aa296acab08..000000000000
--- a/net-news/quiterss/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">QuiteRSS/quiterss</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-news/quiterss/quiterss-0.19.4.ebuild b/net-news/quiterss/quiterss-0.19.4.ebuild
deleted file mode 100644
index d77a928c2f35..000000000000
--- a/net-news/quiterss/quiterss-0.19.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/net-news/quiterss/quiterss-9999.ebuild b/net-news/quiterss/quiterss-9999.ebuild
deleted file mode 100644
index 2563e58e165a..000000000000
--- a/net-news/quiterss/quiterss-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Qt-based RSS/Atom feed reader"
-HOMEPAGE="https://quiterss.org"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/QuiteRSS/quiterss.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/QuiteRSS/quiterss/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-db/sqlite-3.11.1:3
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[X,qt5(+)]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e "s/exists(.git)/0/" -i QuiteRSS.pro || die
-}
-
-src_configure() {
-	local myqmakeargs=(
-		PREFIX="${EPREFIX}/usr"
-		SYSTEMQTSA=1
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 1e297b56875b..01c98857df57 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -311,65 +311,6 @@ sci-misc/mendeleydesktop
 # Removal in 30 days.  Bug #755266.
 dev-python/s3fs
 
-# Zac Medico <zmedico@gentoo.org> (2020-11-17)
-# Unit tests fail. No revdeps.
-# Removal in 30 days.  Bug #723674.
-dev-python/diff-cover
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Discontinued upstream.  No revdeps.  Use dev-python/toml instead.
-# Removal in 30 days.  Bug #755125.
-dev-python/pytoml
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# A drive-by package with one release in 2015, no revdeps and no tests.
-# The same purpose is served e.g. by dev-python/parameterized.
-# Removal in 30 days.  Bug #755122.
-dev-python/parametrized
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old dependencies of dev-python/GitPython.  The current versions (3)
-# have been renamed back to dev-python/{gitdb,smmap}.
-# Removal in 30 days.  Bug #755080.
-dev-python/gitdb2
-dev-python/smmap2
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Old backport package with no revdeps.
-# Removal in 30 days.  Bug #755074.
-dev-python/funcsigs
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Fail to build with gcc-10.  No recent activity upstream.  Seems that
-# Exherbo is dead and buried.
-# Removal in 30 days.  Bug #708528.
-sys-apps/sydbox
-sys-libs/pinktrace
-
-# Michał Górny <mgorny@gentoo.org> (2020-11-17)
-# Both packages provide backports that are only meaningful to Python 2
-# and have no reverse dependencies.
-# Removal in 30 days.  Bug #754984.
-dev-python/backports-csv
-dev-python/backports-os
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, needs dedicated maintainer and version bump
-# to 20.11 with new dependency dev-python/PyQtChart.
-# Bugs #607130, #701318 and #709862. Removal in 30 days.
-dev-util/eric
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream has no capacities to port away.
-# Bugs #508160, #654968 and #687840. Qt-based alternative: net-news/rssguard
-# Removal in 30 days.
-net-news/quiterss
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2020-11-17)
-# Depends on deprecated QtWebKit, upstream did not make a release in 10 years
-# (current RC2 is from 2016). Bugs #653100 and #734880. Removal in 30 days.
-app-text/goldendict
-
 # Jonas Stein <jstein@gentoo.org> (2020-11-12)
 # Adobe will stop distributing Flash Player after 2020-12-31.
 # Masked for removal after 2020-12-31
diff --git a/sys-apps/sydbox/Manifest b/sys-apps/sydbox/Manifest
deleted file mode 100644
index f49739f1b240..000000000000
--- a/sys-apps/sydbox/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sydbox-1.0.7.tar.bz2 480350 BLAKE2B d0e079148c997d6d452017a374d7795a79a8519cdf2c2f5f6f30c9fe4bd3cc8a579881de7bd1611615f18a8fc0bbd88e519cfbabc8e0e05009705a41ab6822f5 SHA512 b14d0cc6929aa705380dc2710e772054e07ca52c2990a71cac42d1111c90baf22253e168e1fe20eaf94ccde4d1ea1a3c1c26e4b9dd292f20a1028dc78a4e80d5
diff --git a/sys-apps/sydbox/metadata.xml b/sys-apps/sydbox/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/sys-apps/sydbox/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/sydbox/sydbox-1.0.7.ebuild b/sys-apps/sydbox/sydbox-1.0.7.ebuild
deleted file mode 100644
index 20a823ec7181..000000000000
--- a/sys-apps/sydbox/sydbox-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ptrace-based sandbox"
-HOMEPAGE="https://git.exherbo.org/sydbox-1.git"
-SRC_URI="http://distfiles.exherbo.org/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/pinktrace:=
-	debug? ( sys-libs/libunwind:= )"
-DEPEND="${RDEPEND}
-	test? ( !<sys-apps/sandbox-2.13 )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable seccomp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# unload the Gentoo sandbox
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-
-	emake check
-}
diff --git a/sys-libs/libunwind/libunwind-1.5.0.ebuild b/sys-libs/libunwind/libunwind-1.5.0.ebuild
index 70ee498e619b..42ee07e1b350 100644
--- a/sys-libs/libunwind/libunwind-1.5.0.ebuild
+++ b/sys-libs/libunwind/libunwind-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/8" # libunwind.so.8
-KEYWORDS="~amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs zlib"
 
 RESTRICT="test" # some tests are broken (toolchain version dependent, rely on external binaries)
diff --git a/sys-libs/pinktrace/Manifest b/sys-libs/pinktrace/Manifest
deleted file mode 100644
index f8b68e36db08..000000000000
--- a/sys-libs/pinktrace/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pinktrace-0.9.3.tar.bz2 405153 BLAKE2B b627f7696acf9e1a0300c4731ecdcc63e490a80277f6ec47f5c5bab62f7dc874534855ad8efaaa47e63b865cd5c3c8770f0c12668da34324c2f12cd356cbde75 SHA512 8250699d5c7c48b0d8c7df795a81f0aea724471bc32d81aeea1163b8c763028c36905b812e9c3eeb8d7642583bd32200d659d019edafb146835232f9736b6591
diff --git a/sys-libs/pinktrace/metadata.xml b/sys-libs/pinktrace/metadata.xml
deleted file mode 100644
index 0319eec4c8be..000000000000
--- a/sys-libs/pinktrace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild b/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
deleted file mode 100644
index 5a6bc3e8662f..000000000000
--- a/sys-libs/pinktrace/pinktrace-0.9.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ptrace() easy wrapper library"
-HOMEPAGE="https://dev.exherbo.org/~alip/pinktrace/"
-SRC_URI="http://distfiles.exherbo.org/distfiles/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/0.9"
-KEYWORDS="~amd64"
-IUSE="ipv6"
-
-src_configure() {
-	local myconf=(
-		$(use_enable ipv6)
-		--disable-doxygen
-		--disable-python
-		--disable-python-doc
-		--disable-static
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index fd1ad7920690..9952695c545b 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,2 +1,3 @@
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 DIST libxfce4ui-4.15.7.tar.bz2 807676 BLAKE2B 0280d0e35244740d016fc4cd8afebb5a70348226011473117c3b7124abcc597baf8015754bb8aaa2fa3f0560d1a98d68f319c5b5870e1c8f5543c0a9458eb541 SHA512 0fd05bbaa42d3f3a0df552fb7419ebc390e6292f4bae58d4c9d6137421cdd55f17756e51c3adcd5ad6e7c92f277b9485ea1d791ef1295ac3d65d86201fc33a6a
+DIST libxfce4ui-4.15.8.tar.bz2 817242 BLAKE2B f0d85fd6e35f65ed416085fbd5da4a1624d8ea9eb90b692463f41e840cea943dbf25a9d057db6101288000fad46468efa4417be87ef24b02f2f73c0a6d11c144 SHA512 a6ea4b6fc1542f6bbc2a2003e1836f1e24ea8c36460460e9e7eddafc7c3c36206fe94a9ccdc17b3b488e857d11a1f1b21ff248349a9820fe9a584bb9dcc1a90f
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
new file mode 100644
index 000000000000..5ec78d67a32b
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade introspection startup-notification system-info vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.50:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
+	>=xfce-base/xfconf-4.12:=
+	glade? ( dev-util/glade:3.10 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	startup-notification? ( x11-libs/startup-notification )
+	system-info? (
+		dev-libs/libgudev
+		gnome-base/libgtop
+		>=media-libs/libepoxy-1.2
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable system-info glibtop)
+		$(use_enable system-info epoxy)
+		$(use_enable system-info gudev)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable glade gladeui2)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
author	Repository mirror & CI <repomirrorci@gentoo.org>	2020-12-16 23:52:55 +0000
committer	Repository mirror & CI <repomirrorci@gentoo.org>	2020-12-16 23:52:55 +0000
commit	4e836cf99bf44a8d306176b87a96e1fb55fdbb8c (patch)
tree	ffe6daedc72bbcf3d651881570d87b0cd23e7f1e
parent	2020-12-16 23:05:17 UTC (diff)
parent	dev-db/redis: Stabilize 6.0.9 ppc, #753701 (diff)
download	gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.tar.gz gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.tar.bz2 gentoo-4e836cf99bf44a8d306176b87a96e1fb55fdbb8c.zip