Updating liguros repo

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-12 12:49:09 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-12 12:49:09 +0000
commit: 8d7804efbd907eec22d8470e8200dcfd3c5bdd93 (patch)
tree: bd9889fb4bcc4925235ffdfa2e3bb64096c5edca
parent: 3d8bd01b0127a0a6b488b28e2a68b44942a971f4 (diff)
download: baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.tar.gz
baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.tar.xz
baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.zip
126 files changed, 623 insertions, 2653 deletions
diff --git a/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
new file mode 100644
index 000000000000..33115f1df480
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.2.0-cleaner-werror.patch
@@ -0,0 +1,40 @@
+-Wall -Wextra compains about unused arguments,
+causes safe-stack to be mis-detected.
+--- a/configure
++++ b/configure
+@@ -2293,7 +2293,7 @@ fi
+ cat > $TMPC << EOF
+ #include <stdint.h>
+ #include <stdio.h>
+-int main(int argc, char *argv[]) {
++int main(void) {
+     return printf("%zu", SIZE_MAX);
+ }
+ EOF
+@@ -4911,7 +4911,7 @@ fi
+ 
+ if test "$safe_stack" = "yes"; then
+ cat > $TMPC << EOF
+-int main(int argc, char *argv[])
++int main(void)
+ {
+ #if ! __has_feature(safe_stack)
+ #error SafeStack Disabled
+@@ -4933,7 +4933,7 @@ EOF
+   fi
+ else
+ cat > $TMPC << EOF
+-int main(int argc, char *argv[])
++int main(void)
+ {
+ #if defined(__has_feature)
+ #if __has_feature(safe_stack)
+@@ -5283,7 +5283,7 @@ static const int Z = 1;
+ #define TAUT(X) ((X) == Z)
+ #define PAREN(X, Y) (X == Y)
+ #define ID(X) (X)
+-int main(int argc, char *argv[])
++int main(void)
+ {
+     int x = 0, y = 0;
+     x = ID(x);
diff --git a/app-emulation/qemu/qemu-5.2.0.ebuild b/app-emulation/qemu/qemu-5.2.0.ebuild
index 516092e2e4d2..b2533ebb260d 100644
--- a/app-emulation/qemu/qemu-5.2.0.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0.ebuild
@@ -223,6 +223,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+	"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch
 )
 
 QA_PREBUILT="
diff --git a/dev-embedded/esptool/esptool-3.0.ebuild b/dev-embedded/esptool/esptool-3.0.ebuild
index 166fadfe0191..7e02d833b1b0 100644
--- a/dev-embedded/esptool/esptool-3.0.ebuild
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index cbef149096ed..c1568bd6205f 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1 +1,2 @@
 DIST inih-51.tar.gz 16258 BLAKE2B 91a5aee6e0ecadf949fbf0b58bd2596bcb985c76fc9000a671d65cb5325c51dbb8bd945ccd7721b72dafafd11c70a9c84ad910768d0fc479e5491db8b7aacbd8 SHA512 eb2f58979d93e51a09326e6c187828643887ac1a239d4b12205567c7d87a671c9c49ca99db376c031d366bc680e579c30dcea9f3eb130ec802597411b2cb3cf4
+DIST inih-52.tar.gz 16808 BLAKE2B 12d4078ad7b6a4013ea77239c486fb7b5e9165252d4a67ee57d60fc72a98f15ca537b610c7b22841cc660e46bb424aa5c9b7ed1cf2462600a2aa58d40447ba90 SHA512 14c0d0dbd78efc99bec8df12067107d130eef8b124e0616f7d83dc4e14530b57f0c8fcf0b8862d425b5a0b84d6c6a6bff7b3c852c9b2e2364ef56c8f64a1f339
diff --git a/dev-libs/inih/inih-52.ebuild b/dev-libs/inih/inih-52.ebuild
new file mode 100644
index 000000000000..643c90ef2a42
--- /dev/null
+++ b/dev-libs/inih/inih-52.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson multilib-minimal
+
+DESCRIPTION="inih (INI not invented here) simple .INI file parser"
+HOMEPAGE="https://github.com/benhoyt/inih"
+
+SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+LICENSE="BSD"
+SLOT="0"
+
+S="${WORKDIR}/inih-r${PV}"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=shared
+		-Ddistro_install=true
+		-Dwith_INIReader=true
+	)
+
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	local DOCS=(
+		LICENSE.txt
+		README.md
+	)
+	einstalldocs
+}
diff --git a/dev-libs/inih/metadata.xml b/dev-libs/inih/metadata.xml
index fc50c0784ce4..7234830692b5 100644
--- a/dev-libs/inih/metadata.xml
+++ b/dev-libs/inih/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>hurikhan77+bgo@gmail.com</email>
 		<name>Kai Krakow</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/benhoyt/inih/issues</bugs-to>
 		<remote-id type="github">benhoyt/inih</remote-id>
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
index b29f5ae7ff86..b7fa9612498f 100644
--- a/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20201021.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.t
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="sdl static-libs"
 
 # Tests require internet access
diff --git a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild b/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
deleted file mode 100644
index 06221aeebc06..000000000000
--- a/dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.140.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=PLICEASE
-DIST_VERSION=1.14
-inherit perl-module
-
-DESCRIPTION="A Module::Build subclass for building Alien:: modules and their libraries"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Alien-Build for Alien::Base::PkgConfig
-RDEPEND="
-	>=dev-perl/Alien-Build-1.200.0
-	dev-perl/Archive-Extract
-	>=virtual/perl-Archive-Tar-1.400.0
-	>=dev-perl/Capture-Tiny-0.170.0
-	>=dev-perl/File-chdir-0.100.500
-	>=virtual/perl-HTTP-Tiny-0.44.0
-	>=dev-perl/Module-Build-0.400.400
-	>=dev-perl/Path-Tiny-0.77.0
-	>=virtual/perl-Scalar-List-Utils-1.450.0
-	dev-perl/Shell-Config-Generate
-	dev-perl/Shell-Guess
-	dev-perl/Sort-Versions
-	>=virtual/perl-Text-ParseWords-3.260.0
-	dev-perl/URI
-	virtual/perl-parent
-	dev-perl/HTML-Parser
-	virtual/perl-JSON-PP
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-# Test2-Suite for Test2::Require::Module and Test2::V0
-BDEPEND="
-	${RDEPEND}
-	test? (
-		>=dev-perl/Test2-Suite-0.0.60
-	)
-"
diff --git a/dev-perl/Alien-Base-ModuleBuild/Manifest b/dev-perl/Alien-Base-ModuleBuild/Manifest
index ace0d5575108..fe0d077f0127 100644
--- a/dev-perl/Alien-Base-ModuleBuild/Manifest
+++ b/dev-perl/Alien-Base-ModuleBuild/Manifest
@@ -1,2 +1 @@
-DIST Alien-Base-ModuleBuild-1.14.tar.gz 62072 BLAKE2B 64a94621b36b13ad32861c228e787ca44ae8fbec5f1a2fcd65ade8188c44021dbca45fc7f62aa390d10920f670779511ceb96f214b41c4cce2a6424a0f72b47e SHA512 6fcfb7e5525972d5ca565441717143b036ed9c4079700426df2e96d76a91baeaf103ac406a8fa86dfd820929041525d7bb66c32762258cfb7752fb7634171fbf
 DIST Alien-Base-ModuleBuild-1.15.tar.gz 63870 BLAKE2B dc89d63c31cfe618db58cc11c17190b8e881efa3b245c5bb81a99f4c4263a621747579ea5313f646b171bf7446261b01aa2eda45b81ee0a6ef6cb16c5c4092d2 SHA512 6aa366c9748c8470abef2597684bdd68edb952ec9e8f36e31741a3376bd96aea7cd62caeea47a5ff0fb205f6d2087a63a20baf4767f87321fd54dda2727e1a70
diff --git a/dev-perl/Alien-Build/Alien-Build-2.280.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.280.0.ebuild
deleted file mode 100644
index 2a7aaf87c327..000000000000
--- a/dev-perl/Alien-Build/Alien-Build-2.280.0.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
-
-DIST_AUTHOR=PLICEASE
-DIST_VERSION=2.28
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Build external dependencies for use in CPAN"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test zip"
-RESTRICT="!test? ( test )"
-
-# No, pkgconfig is not suspect, it actually uses it at runtime, and this module
-# is somewhat a wrapper for pkgconfig :/
-RDEPEND="
-	zip? ( dev-perl/Archive-Zip )
-	virtual/perl-Archive-Tar
-	>=dev-perl/Capture-Tiny-0.170.0
-	virtual/perl-ExtUtils-CBuilder
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	>=virtual/perl-ExtUtils-ParseXS-3.300.0
-	>=dev-perl/FFI-CheckLib-0.110.0
-	>=dev-perl/File-Which-1.100.0
-	dev-perl/File-chdir
-	virtual/perl-JSON-PP
-	>=dev-perl/Path-Tiny-0.77.0
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-	>=virtual/perl-Test-Simple-1.302.96
-	>=virtual/perl-Text-ParseWords-3.260.0
-	virtual/pkgconfig
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-perl/Devel-Hide
-		>=dev-perl/Test2-Suite-0.0.60
-	)
-"
diff --git a/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
deleted file mode 100644
index 8abba72db046..000000000000
--- a/dev-perl/Alien-Build/Alien-Build-2.290.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=PLICEASE
-DIST_VERSION=2.29
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Build external dependencies for use in CPAN"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="minimal test zip"
-RESTRICT="!test? ( test )"
-
-# No, pkgconfig is not suspect, it actually uses it at runtime, and this module
-# is somewhat a wrapper for pkgconfig :/
-RDEPEND="
-	zip? ( dev-perl/Archive-Zip )
-	virtual/perl-Archive-Tar
-	>=dev-perl/Capture-Tiny-0.170.0
-	virtual/perl-ExtUtils-CBuilder
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	>=virtual/perl-ExtUtils-ParseXS-3.300.0
-	>=dev-perl/FFI-CheckLib-0.110.0
-	>=dev-perl/File-Which-1.100.0
-	dev-perl/File-chdir
-	virtual/perl-JSON-PP
-	>=dev-perl/Path-Tiny-0.77.0
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-	>=virtual/perl-Test-Simple-1.302.96
-	>=virtual/perl-Text-ParseWords-3.260.0
-	virtual/pkgconfig
-"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-perl/Devel-Hide
-		>=dev-perl/Test2-Suite-0.0.60
-		!minimal? (
-			dev-perl/Alien-Base-ModuleBuild
-			dev-perl/Sort-Versions
-		)
-	)
-"
-src_prepare() {
-	unset LD
-	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
-	perl-module_src_prepare
-}
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index a82fa9dd6e77..804363a03833 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1,5 +1,3 @@
 DIST Alien-Build-2.23.tar.gz 310744 BLAKE2B 3bf3ce08be1e508a5eb695cc3ee71ccb70230c3fa0feb3e4378bbba35b7429ab3b852692ea4492e9aa80fdb962ef1fef7e82b654bbf8e8ca2428aa8f999944b8 SHA512 78a9b710dde488ce0852266340104f7b540e94ea58e8715d27e1e303a67956f862110bbd305119ac08fe9c5a20c0e5cc6fa5b6982abf830910f2d3a1ed9963fa
-DIST Alien-Build-2.28.tar.gz 314626 BLAKE2B c37bf00f937a1390ba3e35b1a26b676d72b20e0849cbad954e54c04693f1d677aa225be790cd4c68a7df3042c4b2759f8d3a097cbf8480170f1e93327876f765 SHA512 3fe1b0536bce723b925345dad2993b4d8a128d873476ab307d4f06d5ee6ac28f96f07a85345deda2af6cee2f4305f4ff7886ca97bf2ffe1ff05a7e1098784966
-DIST Alien-Build-2.29.tar.gz 313997 BLAKE2B 2a72d07efa899f5d2314db5fffadfbc304db4105dcca1f0f30557d4bbe292c902deca3d064f7909fc84cf9df9f88c6eb6d3b51225ad6d8ccae0cd1e7dbf52ba0 SHA512 7e6ad1695fcfc9ff98764e77a87014a6617c0e27f427d26f70a7fe0daa379963f73fe16e9993de87540e71070e696345bec41fc21c0e7003a144d94413a8522d
 DIST Alien-Build-2.32.tar.gz 327696 BLAKE2B 9f0f2d31f6d3b2660ae4001ce1285bdf0a4eab6f542ad7e9165652302c645b5444e75aae65de2c24d79eb293615fd00fc61691d4db76be13dc8d48466a93a7ba SHA512 5c9c66076c7c6f30535401aea588a85ca51282df74f1bb4f4b21bff1aaea0d74220b278a123a00adc74c21a1aa528966db01a77f4783bd8aeea894fe97349d43
 DIST Alien-Build-2.33.tar.gz 328283 BLAKE2B 2b793a65fdf08bb767cf96fd4e8eac2d56a7db46d15c87815c30247e26a2ce9bc44f5cf0f3ccf3c335e43b58182539a2b9858013fa32b37fc53c7c7a789e1219 SHA512 a3ce1f15480ef3bec902d7833651d618f0e8676b36ab65f034eb0699a44cc8376aeb2e32f1dac97f7c499aacd2f6464f21d3edc4b00301e8bef4235f9f4fd572
diff --git a/dev-perl/BZ-Client/BZ-Client-4.400.200.ebuild b/dev-perl/BZ-Client/BZ-Client-4.400.200.ebuild
deleted file mode 100644
index 7942e5f1e9a4..000000000000
--- a/dev-perl/BZ-Client/BZ-Client-4.400.200.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DJZORT
-DIST_VERSION=4.4002
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="A client for the Bugzilla web services API."
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/DateTime-Format-ISO8601
-	dev-perl/DateTime-Format-Strptime
-	dev-perl/DateTime-TimeZone
-	virtual/perl-Encode
-	virtual/perl-File-Spec
-	dev-perl/HTTP-CookieJar
-	virtual/perl-HTTP-Tiny
-	virtual/perl-MIME-Base64
-	dev-perl/URI
-	dev-perl/XML-Parser
-	dev-perl/XML-Writer
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-CPAN-Meta-2.120.900
-		dev-perl/Clone
-		virtual/perl-Data-Dumper
-		dev-perl/DateTime
-		dev-perl/IO-Socket-SSL
-		dev-perl/Test-RequiresInternet
-		virtual/perl-Test-Simple
-		dev-perl/Text-Password-Pronounceable
-	)
-"
-
-src_test() {
-	has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}} && export TEST_AUTHOR=1
-	perl_rm_files t/author-* t/release-*
-	perl-module_src_test
-}
diff --git a/dev-perl/BZ-Client/Manifest b/dev-perl/BZ-Client/Manifest
index 24108cace5e9..f69988498d56 100644
--- a/dev-perl/BZ-Client/Manifest
+++ b/dev-perl/BZ-Client/Manifest
@@ -1,2 +1 @@
-DIST BZ-Client-4.4002.tar.gz 83998 BLAKE2B 8e18709a8996d036cf64a3f3dd735ed1c0bce00b0ef4e1e930f2d6c09c14fd02b28c92803c98c8d17c27f6287ee03b4b0f9c28df800ed57988d16a1bef570dc9 SHA512 7027554b423c114396d338a6f477f5f8c36077735e3586ee293ce1a4beed189479b9c33554f8af1532e096b5b3b9a0720efbe4390392ebd503af70ce2ec3844d
 DIST BZ-Client-4.4003.tar.gz 85579 BLAKE2B d9310fd594d3a0a19ee9e08b047efbc89ee36e1d0c8a25f79f9dd3f4de661f7cfd1de27d1017a6cabcb356362b27ba2c9cc5c908dc43c6e43b52b7eeb16e3b15 SHA512 d4b8bb4de96ca40f37f0ab6576095341cd3c7be41d6d4bdfd88f7b25de8ce77130a1736ea4e577f57186191cee2eeff6131fe107a0cb56e9439f4258fb560432
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r2.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r2.ebuild
deleted file mode 100644
index 8a644c1a2e6f..000000000000
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=PMQS
-DIST_VERSION=0.63
-inherit perl-module db-use multilib
-
-DESCRIPTION="This module provides Berkeley DB interface for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# Install DB_File if you want older support. BerkleyDB no longer
-# supports less than 2.0.
-
-RDEPEND="
-	>=sys-libs/db-2.0:=
-	<sys-libs/db-7:=
-"
-DEPEND="
-	>=sys-libs/db-2.0:=
-	<sys-libs/db-7:=
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker"
-
-PERL_RM_FILES=(
-	"t/meta-json.t"
-	"t/meta-yaml.t"
-	"t/pod.t"
-	"scan.pl"
-	"mkconsts.pl"
-)
-# parallel really broken
-DIST_TEST="do"
-src_prepare() {
-	local DB_SUPPORTED=(
-		6 5 4 3 2
-	)
-	# on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
-	# as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
-	# include path
-	local dbdir="$(db_includedir "${DB_SUPPORTED[@]}" )"
-	local dbname="$(db_libname "${DB_SUPPORTED[@]}" )"
-	einfo "DB Include Dir: ${dbdir}"
-	einfo "DB library: ${dbname}"
-
-	rm -f "${S}/config.in" || die "Can't remove packaged config.in"
-
-	printf "INCLUDE = %s\nLIB = %s\nDBNAME = -l%s\n" \
-		"${dbdir}" \
-		"${EPREFIX}/usr/$(get_libdir)" \
-		"${dbname}" > "${S}"/config.in || die "Can't write config.in"
-
-	perl-module_src_prepare
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/BerkeleyDB/Manifest b/dev-perl/BerkeleyDB/Manifest
index 7932e263230a..53bbe9454e6a 100644
--- a/dev-perl/BerkeleyDB/Manifest
+++ b/dev-perl/BerkeleyDB/Manifest
@@ -1,3 +1,2 @@
 DIST BerkeleyDB-0.55.tar.gz 203318 BLAKE2B 65118bacdb7b597a7f006a341916b21cd4b4d4602e56854fc4d04aa53f995365b4da44ea95a6e0472f5540f74eab46b83c56bb1c9cf8a51779260a6f4746ddd5 SHA512 a9bee92b0168918eaf6fb38b7b66005cfbb360ce89a9ae9feeb022e3d27fa7e627412b5c19233840571ed60568729d4bd83d279f84a0c7db921b8eed9f73afea
-DIST BerkeleyDB-0.63.tar.gz 208324 BLAKE2B e13f9e4a7993a09ff60378cf19c7baba925850b1996873727f7659787111a9b437b022653329e18e94dead7c29ff0da9ee79d3a67adf2afcc8cdaa02d689c127 SHA512 43edf4eb3650e7b03dfc45ead834ea766d458cf3bc9b6405646142ad0ab223bdb3267815be5a92ddbf3958e5507d39f193d749d9ff6fe83a3beb9e02e8f6c66b
 DIST BerkeleyDB-0.64.tar.gz 259656 BLAKE2B 5136c632a7385a7d7866b59b75ba32d3bcd6fc660d7c1d54edba868db831bee2ce5162117d7941793cda1e31b22fa17d624a84ae377348d8dc2c5255016bf714 SHA512 368f89bb12e209ed6f0d1367875739813bfec85f4c10f0ffd7260d5be97bbd758af517133977f1e8f43c1d9b04d6b5dd9696ae1de1d544d9682b1f6bacfe3e85
diff --git a/dev-perl/CGI/CGI-4.500.0.ebuild b/dev-perl/CGI/CGI-4.500.0.ebuild
deleted file mode 100644
index b6385de63a0b..000000000000
--- a/dev-perl/CGI/CGI-4.500.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=LEEJO
-DIST_VERSION=4.50
-DIST_EXAMPLES=("examples/*")
-inherit perl-module
-
-DESCRIPTION="Simple Common Gateway Interface Class"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	virtual/perl-Encode
-	virtual/perl-Exporter
-	>=virtual/perl-File-Spec-0.820.0
-	>=virtual/perl-File-Temp-0.170.0
-	>=dev-perl/HTML-Parser-3.690.0
-	virtual/perl-if
-	>=virtual/perl-parent-0.225.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-IO
-		>=dev-perl/Test-Deep-0.110.0
-		dev-perl/Test-NoWarnings
-		>=virtual/perl-Test-Simple-0.980.0
-		>=dev-perl/Test-Warn-0.300.0
-	)
-"
-PERL_RM_FILES=( "t/compiles_pod.t" "t/changes.t" )
diff --git a/dev-perl/CGI/Manifest b/dev-perl/CGI/Manifest
index 55cf9dee5a74..43f570de860e 100644
--- a/dev-perl/CGI/Manifest
+++ b/dev-perl/CGI/Manifest
@@ -1,3 +1,2 @@
 DIST CGI-4.47.tar.gz 204940 BLAKE2B fa0c4492b19543061403ff65be0d304fe166ece4cdfdb19c9c55de391001add2c03bd4c99019ddeae1b2fc70009a5419de8baa7159548f237351572d11c9c004 SHA512 1f46c15071254a691781a93cfdaed62da01486bb32d68ef6999ad1aa6f8b631452fad4aa95fdf8ce63a7314023853f01fddfb9aabf3f49460d174d118136822d
-DIST CGI-4.50.tar.gz 205316 BLAKE2B 7b6fe005545e2a3f9a0218f4bb3fc7f6acea879c87118675f72db5f7db78b0bd84788493199e94d2bfadcd07650dfed72c85d0db69ba1210bd3b372e19fb2cab SHA512 c8f898404ef8fb341ea741229939748b82ca94b231591b67f29ca2f06cfbab363653753289a795a2eb0b0a145eafc8e8a303e92fd90795071b123e0fb8cb79c6
 DIST CGI-4.51.tar.gz 205366 BLAKE2B 1fd76c82610ad1b017f19bd055bbf4a533f96e385891c53832a7e43f4c8d5fc74ed81a6e86e4e44443ce666bf30a7354b06f808d2c68e65c0fea75b2ce5fb7b8 SHA512 1ff69bf78c346142f0355e816fae18c69eb57504c2fc06738f2d26b97adee7cee1df2b4b2246ae72532e769a613aea6d6f7027956066a0c12354658e62a98e5d
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.8.200.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.8.200.ebuild
deleted file mode 100644
index aa5a3fef128f..000000000000
--- a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-5.202.8.200.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=5.20200820
-inherit perl-module
-
-DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-IO
-		>=virtual/perl-Test-Simple-0.470.0
-	)
-"
-PERL_RM_FILES=( "t/author-pod-coverage.t" "t/author-pod-syntax.t" )
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index bdab0ee26eb4..807299b180e5 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -1,3 +1,2 @@
 DIST CPAN-Perl-Releases-5.20200428.tar.gz 23709 BLAKE2B 0ef30b30e482884d6a18d78402a7ead872ff8a0100723921e8b1e39d851af7c2dc432d5033b7524afa44cfdca87fdd8d8d9f5cc70d88df723a8bbd2962571079 SHA512 44ea58bd29d3db8715c92a1d1e5953a5a185669a08d5f01bd36a695ef8687c9fcf08a399a2d52a84c214f0b4dceaf829030fc17d29b6663bc50f9abb89378c9b
-DIST CPAN-Perl-Releases-5.20200820.tar.gz 23732 BLAKE2B 2064dfd1260e990361c9f7bf9ad43c579e01480c994c6e2d654a9d9e262b1fbad77bf809e0bc58d8e6e92f889af6564e3d95f783bbc5833bae7faa90bb73b3d4 SHA512 1fbfdf32cc261803a435825320672736a906e8d4dc1997e8c424931c04fd686e162cf368bf9ed7d9c4cefc2140569357fe8e30c10733f8a7694a56aec16d5d22
 DIST CPAN-Perl-Releases-5.20200920.tar.gz 23596 BLAKE2B abb354f1ff2f0e761223a2df39513abd10b9c409522b2f006ab8469db4d54df90d5dbed13496a907e3cb087a0a5bb01174ecd7ef3ee9d4be9614c4df1a1c3d50 SHA512 b6d28721e3941fba74eb3a377b9d25a896865b9b3aebc7ee476cebf894db999de79bcbad9091d5763c2e82594c9d5cc5c4dfae075d0525f085d7a5026f1db31a
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild
deleted file mode 100644
index f9e0bd5971af..000000000000
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.318.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=REHSACK
-DIST_VERSION=0.318
-
-inherit perl-module
-
-DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/Capture-Tiny
-	virtual/perl-Carp
-	virtual/perl-Exporter
-	>=virtual/perl-ExtUtils-CBuilder-0.280.220
-	dev-perl/File-Slurper
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	>=virtual/perl-Scalar-List-Utils-1.180.0
-	virtual/perl-Text-ParseWords
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( >=virtual/perl-Test-Simple-0.900.0 )
-"
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index c4647872da47..b6069eaa0cd4 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,3 +1,2 @@
 DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
-DIST Config-AutoConf-0.318.tar.gz 51016 BLAKE2B 816c74e2abc3087b5a89327e462092b6cd11005545510adc76c11ad84348a8f7f8b1fe7af37d10b79769d80ca35f44791b16658dbe4aca128b831898c26d009d SHA512 b125fb1c708a518a251695450ae4208d84c7b0de7e34081e22659bf2b93699868f14867d824805e1162fa99d8e15ed1072caf503d20b3c2cf0e27642b4213077
 DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
diff --git a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.230.0.ebuild b/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.230.0.ebuild
deleted file mode 100644
index f07651db958f..000000000000
--- a/dev-perl/Cpanel-JSON-XS/Cpanel-JSON-XS-4.230.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=RURBAN
-DIST_VERSION=4.23
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="cPanel fork of JSON::XS, fast and correct serializing"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-Math-BigInt-1.160.0
-	virtual/perl-Carp
-	>=virtual/perl-Encode-1.980.100
-	virtual/perl-Exporter
-	virtual/perl-XSLoader
-	>=virtual/perl-podlators-2.80.0
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Data-Dumper
-		virtual/perl-Test
-		virtual/perl-Test-Simple
-		virtual/perl-Time-Piece
-	)
-"
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
-src_test() {
-	ewarn "Comprehensive testing may require manual installation of dependencies"
-	ewarn " See: https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Tests"
-	perl-module_src_test
-}
-pkg_postinst() {
-	ewarn "This package provides 'cpanel_json_xs' in PATH, which includes optional features"
-	ewarn "otherwise not automatically made available yet. If you desire to use these,"
-	ewarn "please consult:"
-	ewarn " https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/${CATEGORY}/${PN}#Optional_Features"
-}
diff --git a/dev-perl/Cpanel-JSON-XS/Manifest b/dev-perl/Cpanel-JSON-XS/Manifest
index 1929fcf3d558..6a84a41bf90b 100644
--- a/dev-perl/Cpanel-JSON-XS/Manifest
+++ b/dev-perl/Cpanel-JSON-XS/Manifest
@@ -1,3 +1,2 @@
 DIST Cpanel-JSON-XS-4.19.tar.gz 251461 BLAKE2B fa22192d017fc41327e71b84f47e3939765b0c48586cc31876f744c2a51a93b36f6d41b8c9f92bba04875123604efe3fed6a486839dbfb39623cb2a4a4064087 SHA512 c67b62e8f95900cb3626357cfa9976f1553f84ffd10a977d47839ca3b317014473c3a6e48f6680478b89bbdc2ac177b22441ad5e49e7e8eb0344ef14a3c52b10
-DIST Cpanel-JSON-XS-4.23.tar.gz 253594 BLAKE2B e9cb66c58015f6b83f00f588e9afc7c360182b67ceffcb90a76c2ebb1ad922250a5f2cec1049a79aea03789248d89669b4c787017bfdb6710f8576ab1e5b2948 SHA512 1c0d70ff85a2217c2b326c8002766e237966e0fcdac447fbb5108a5ba98b2771db17731853f2f7bedf85c337c7f6e18333c2c235830a17e152e7838bd168d0f9
 DIST Cpanel-JSON-XS-4.24.tar.gz 254008 BLAKE2B 4449d0d562388c547ab26e87048b49d2e77e7508c8bc2c4db4af562ecfed768452cea1daca60e8ce59ed464b9d4ceca17d73326a16bec3e3a6d42bd6e13df7fe SHA512 311746bd6d686f758db4507c1219675b262205a8d798662b8f5521d3f9c7d76678580a30e26281b461647763d552cb76fdbbcf4aa1737dc7c7416364179741bb
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0-r1.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0-r1.ebuild
deleted file mode 100644
index 26733862f2ff..000000000000
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.140.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=LEONT
-DIST_VERSION=1.14
-inherit perl-module
-
-DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-Test-Simple
-	)
-"
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/Curses/Curses-1.360.0-r1.ebuild b/dev-perl/Curses/Curses-1.360.0-r1.ebuild
deleted file mode 100644
index 684145194e60..000000000000
--- a/dev-perl/Curses/Curses-1.360.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=GIRAFFED
-DIST_VERSION=1.36
-DIST_EXAMPLES=("demo" "demo2" "demo.form" "demo.menu" "demo.panel" "gdc")
-inherit perl-module
-
-DESCRIPTION="Curses interface modules for Perl"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~x86-solaris"
-IUSE="+unicode test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5:0=[unicode?]
-	virtual/perl-Data-Dumper
-"
-DEPEND="
-	>=sys-libs/ncurses-5:0=[unicode?]
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( virtual/perl-Test-Simple )
-"
-
-src_configure() {
-	myconf="${myconf} FORMS PANELS MENUS"
-	mydoc=HISTORY
-	export CURSES_LIBTYPE="$(usex unicode ncursesw ncurses)"
-	local nc_tool="${CURSES_LIBTYPE}$(has_version 'sys-libs/ncurses:0/6' && echo 6 || echo 5)-config"
-	export CURSES_LDFLAGS=$( ${nc_tool} --libs )
-	export CURSES_CFLAGS=$( ${nc_tool} --cflags )
-	perl-module_src_configure
-	if ! use unicode ; then
-		sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
-	fi
-}
-src_compile() {
-	mymake=(
-		"OPTIMIZE=${CFLAGS}"
-	)
-	perl-module_src_compile
-}
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.820.0.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.820.0.ebuild
deleted file mode 100644
index c5231a528e89..000000000000
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.820.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=0.82
-inherit perl-module
-
-DESCRIPTION="Create DateTime parser classes and objects"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-1.0.0
-	>=dev-perl/DateTime-Format-Strptime-1.40.0
-	>=dev-perl/Params-Validate-0.720.0
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-parent
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-PERL_RM_FILES=(
-	t/99pod.t
-)
diff --git a/dev-perl/DateTime-Format-Builder/Manifest b/dev-perl/DateTime-Format-Builder/Manifest
index 6c86b8f0b00a..da8a11c53952 100644
--- a/dev-perl/DateTime-Format-Builder/Manifest
+++ b/dev-perl/DateTime-Format-Builder/Manifest
@@ -1,3 +1,2 @@
 DIST DateTime-Format-Builder-0.81.tar.gz 39933 BLAKE2B a9e692f584e02bf09609c5a666064de2dcef368a86518b77266bf9176a748f0b009687fb07831196e93adeedcf75123539519e1664a7caaa3e05bb5d46431b27 SHA512 617cf72e900d9bb17fd5c3cfbfa1874bf1c34de144514ea4cabd7b66eb682696b9c9501e66db1073da59c5e8278e6878b893876a1a7f11a9c011dbae44ebdd57
-DIST DateTime-Format-Builder-0.82.tar.gz 63465 BLAKE2B ee030678837e11fc2af0cc7d3ad00856b92b25cac23ea5a8a4468fef48f7cb60d09b59277bcf44a73d83920441e16a4c130cf0b8982ed4cd280cbbd9c0f10e01 SHA512 e89becd9875f84df8f83ea2081bf6b08cad4a62af6f8d193ce6735ae8442881ca826e68c894879d3c5e90d1fcc60b7b5fa5ba4b7f9dbba92a4c2e26fc54dca1e
 DIST DateTime-Format-Builder-0.83.tar.gz 63355 BLAKE2B 795a7cab7e837b45d4d509c06f99b7192e85f17dbf57988fa8bf07b0ed5af602135baa9c6b131ce81800ff1144ed3ffbc246119364d162fcfa30bf2956d23c07 SHA512 eb0601dce7bc9adb0b4b6df2058b5f126e36738a9fc1e18c6e09ecf2787fbe7cd9b8ae9a5772590d6fa0df271b5a7fde0f3ab6f2be68e182adaac48ca3ae3837
diff --git a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.100.0.ebuild b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.100.0.ebuild
deleted file mode 100644
index 6858938e2fdc..000000000000
--- a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.100.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=SCHUBIGER
-DIST_VERSION=1.10
-inherit perl-module
-
-DESCRIPTION="Parse informal natural language date/time strings"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	dev-perl/Clone
-	dev-perl/Date-Calc
-	dev-perl/DateTime
-	dev-perl/DateTime-TimeZone
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	dev-perl/List-MoreUtils
-	>=dev-perl/Params-Validate-1.150.0
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Term-ReadLine
-	dev-perl/boolean
-"
-DEPEND="
-	dev-perl/Module-Build
-"
-BDEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.420.0
-	test? (
-		dev-perl/Module-Util
-		dev-perl/Test-MockTime
-		virtual/perl-Test-Simple
-	)
-"
-PERL_RM_FILES=(
-	t/pod-coverage.t
-	t/pod.t
-)
diff --git a/dev-perl/DateTime-Format-Natural/Manifest b/dev-perl/DateTime-Format-Natural/Manifest
index 185566c12543..80a91dfff8a0 100644
--- a/dev-perl/DateTime-Format-Natural/Manifest
+++ b/dev-perl/DateTime-Format-Natural/Manifest
@@ -1,3 +1,2 @@
 DIST DateTime-Format-Natural-1.05.tar.gz 80675 BLAKE2B 7495309aecc2aca50dcbcbbd7732cffac593a1455a438ada473c9cd0b4c068d4ac5f7dd59632d63e07b3b4c05d6d2cb8826996a047a618eb4a3f4f3fb4a29f85 SHA512 d6c07a7e6345321dfffbf608fbd0ef8b050761b612f76ebb0cf06b9e883ca83863b71f846868c8323d6d0c428c9ec93a988bcb53f883045bd1de94926cba9e7e
-DIST DateTime-Format-Natural-1.10.tar.gz 80958 BLAKE2B 1d1fc1b4f1aae0e9bc359768960896d3d7da548051886789c21993854a2d550dc1c85e202dc714708a99aa09d26823773c6311f5fd33d91ec1844d5226c6e37d SHA512 41d51364efe242733945bca061fe67562fe24f069788d14962aeb2a5d0589e9078f81212d0fde78e950050853eaed5e1a0cc3868f409b82c7b054849c9dc2600
 DIST DateTime-Format-Natural-1.11.tar.gz 82424 BLAKE2B 454b6c525f3bdee31ad077ba3445b307e175f023dcee3309b7b9f05eced9d9424bde28700dbf22b210910bd056b21293e026290c3a9bf7b47ac3f73d2ac1ccfb SHA512 1e89fe7ea05eec620f453cde4874bba6ced5d4055944e9e396226041c1d2efaa9b5a4852b88484b7dc00d792d2842a5c74f5eb86e70b220a3a8afbc7e1111c80
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.700.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.700.0.ebuild
deleted file mode 100644
index 47dee685809e..000000000000
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.700.0.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
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=1.70
-inherit perl-module
-
-DESCRIPTION="Parse and Format DateTimes using Strptime"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x64-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-1
-	>=dev-perl/DateTime-Locale-0.450.0
-	>=dev-perl/DateTime-TimeZone-0.790.0
-	virtual/perl-Exporter
-	>=dev-perl/Package-DeprecationManager-0.150.0
-	>=dev-perl/Params-Validate-1.200.0
-	dev-perl/Try-Tiny
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Fatal
-		dev-perl/Test-Warnings
-	)
-"
diff --git a/dev-perl/DateTime-Format-Strptime/Manifest b/dev-perl/DateTime-Format-Strptime/Manifest
index 79fac14625a5..4ecaf67af4bc 100644
--- a/dev-perl/DateTime-Format-Strptime/Manifest
+++ b/dev-perl/DateTime-Format-Strptime/Manifest
@@ -1,3 +1,2 @@
-DIST DateTime-Format-Strptime-1.70.tar.gz 105460 BLAKE2B 6dc4ec11cf57b44f4ad7b03d55c1ba58e6f76b4f133e5c0feba22ebed8d8ba7fa67c2005cbf34457ac9900f1e8c7494f6b9f6a432fe83156cbe6c39243dd93da SHA512 a4f01f0032beb94d2bf359c2aab4050c2b321a6da236deec1ce198e88b657fb70b7328304f51fb12a9edf61035cb581c8a9a85c62a0ce8ff94c1ec5d22510d09
 DIST DateTime-Format-Strptime-1.74.tar.gz 105317 BLAKE2B 997a76591b710f61e003998fc97ec26a8c5ce43dff83e42dd9cab5b13238c21e40f327afe46a0258b9f8e725abfc35d0d9957cf4e89936aa17cf79b1f7d111d9 SHA512 3b2b640f93956e82aff47f068c596018700615414c9b9ccf8d6bf68ad7b626ec86a831ec2b68807d7f137c10d4b8cfa5d2d50a6304252f3dfecbe9ff94e59617
 DIST DateTime-Format-Strptime-1.77.tar.gz 114321 BLAKE2B e942f79b4d54aac70b922f4c4b0649bef65a4b80a1aeb784409186c74a8e9dc3cf878460a9282ae947ce6a354da964a67403c5f0c2dd83e33ec2f36f07555497 SHA512 d6f997831ffe054b6052dc7d9a783fa64fb2dd90babbd97ea2dd11eacc0e6d1a6718c2dc877c444863be502482f6fc856f02f0feae8abb36220b60f417ee87ec
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
deleted file mode 100644
index fe77ed4f2548..000000000000
--- a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.46
-inherit perl-module
-
-DESCRIPTION="Localization support for DateTime"
-
-LICENSE="|| ( Artistic GPL-2 ) unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/Dist-CheckConflicts-0.20.0
-	dev-perl/List-MoreUtils
-	dev-perl/Params-Validate
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Storable
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild b/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
deleted file mode 100644
index 538fa0c43fb4..000000000000
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.30.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=1.03
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Localization support for DateTime"
-
-LICENSE="|| ( Artistic GPL-2+ ) unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/Dist-CheckConflicts-0.20.0
-	virtual/perl-Exporter
-	dev-perl/List-MoreUtils
-	dev-perl/Params-Validate
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.960.0
-		dev-perl/Test-Warnings
-	)
-"
diff --git a/dev-perl/DateTime-Locale/Manifest b/dev-perl/DateTime-Locale/Manifest
index 3f0600c4c508..148123d81a76 100644
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@@ -1,4 +1,2 @@
-DIST DateTime-Locale-0.46.tar.gz 2556441 BLAKE2B 122c6d0a3b2ce4c9db79cb03255c817c298b019fab9ae57c5ec506be586c3c156bf4e41dd60aab79a49da745f55c6f068d826cc33e36ac85232e048f9ba3c8d4 SHA512 36a13c10efca1299f4705a98bedd640d235df7478554f398648e124a3ecccfcd72b16b18882836d6e415e2114feb2dda4260f24774c6f741a705b1ba63b4363f
-DIST DateTime-Locale-1.03.tar.gz 959190 BLAKE2B 025075d0606c83afacc0b21309068b23e6aa3d84f81e9942a847dedfeac3b2ce876b51872df2a0a931de3f135055f53960f430d061c6286f2e2dcd336e7b6585 SHA512 c86f338c40bbc4a0459999314a3a84871ff963495c788ae68b15f747ce896f9ea9ded8e037238870b0831727b6fc578739318897d04c753ff113b33d57f9a0f9
 DIST DateTime-Locale-1.16.tar.gz 1228443 BLAKE2B 43b9bc0439d269dd29856538c87ff866337dc989b85d7e677e62ececf93a194b65cfb99eae07c17a97e8d7c2c917cf533e751856e09c1d63684c70de99aac4a9 SHA512 66b09f2f2d9cbb9ed969c6e881dd68a48957d69d5d4cd8a998b7a79538050807d862813eae677ef28ec2ce645c8fc15b9b5de2b15ed077e936d63a44e072a145
 DIST DateTime-Locale-1.28.tar.gz 1391000 BLAKE2B ec19047a6d0e55db0235db480e96d49d3ef091df8a3b37acd87fc54936923298cb70b55480b048ac64376e28784f6995ce5f42793f626b5e8022078b03c98eee SHA512 5c6349e9115bd8d6dba0b33809f9d8544f0d40802bbf0111005fda4990d3d815b236c44f60a1b5fe8d28d3f2f19343627df2d7ac87158be07e7de4f05c19a763
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
deleted file mode 100644
index 0f6dbc216bc7..000000000000
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.93
-inherit perl-module
-
-DESCRIPTION="Time zone object base class and factory"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-Singleton-1.30.0
-	virtual/perl-File-Spec
-	dev-perl/List-AllUtils
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Module-Runtime
-	>=dev-perl/Params-Validate-0.720.0
-	dev-perl/Try-Tiny
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
deleted file mode 100644
index 733794991f1c..000000000000
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-2.10.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=2.01
-inherit perl-module
-
-DESCRIPTION="Time zone object base class and factory"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/Class-Singleton-1.30.0
-	virtual/perl-File-Spec
-	>=virtual/perl-Scalar-List-Utils-1.330.0
-	dev-perl/Module-Runtime
-	>=dev-perl/Params-Validate-0.720.0
-	dev-perl/Try-Tiny
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Path
-		virtual/perl-File-Temp
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.960.0
-	)
-"
diff --git a/dev-perl/DateTime-TimeZone/Manifest b/dev-perl/DateTime-TimeZone/Manifest
index 79909212fa52..fa34e8d9d5fe 100644
--- a/dev-perl/DateTime-TimeZone/Manifest
+++ b/dev-perl/DateTime-TimeZone/Manifest
@@ -1,4 +1,2 @@
-DIST DateTime-TimeZone-1.93.tar.gz 891870 BLAKE2B 8bbdafa35a882277ec069f2d88fa58987e0f105272ef752c0d80637a4d5c8ce766b815d86d1eca633d77254065500a36c31c55ff4d27c33def2430d89a7a1c9c SHA512 8b9d136dadcbbac0de624e091a19fdeb4b12b62c01d1a550dd32670c841a2c7b7b51066bd1e297010cacda24522b37f23b931535b67859b58b0760ba85f5f7c6
-DIST DateTime-TimeZone-2.01.tar.gz 929462 BLAKE2B 2a21bbc69e5df5cfb459bfaa93af937d4eec2cea0e20cd14726ee77d62605df320f92647a94357ec763619442a83c5d2ce02cf55f02c46c18b94407ad98bb782 SHA512 57c98bbf25cd0aedb8cae72ea9b15042f75d74c776d125c53bdf487202d7fbb643367be3e0ddfb3080661ecec584e0a08b5ec0854f67bc50321da47a699999cf
 DIST DateTime-TimeZone-2.13.tar.gz 945446 BLAKE2B cbc715cdea59098c1cb6994a99b93785769b0a97c32260fd2c00a0caa48682cbb0280db02e68e7d9dea97d5a557baa9a37cad86d9518a30a7d760bc0f44447b6 SHA512 6003b2b6044c35a7c75840cf550d1f68500c1d762dc0ebdcf22e1714b68804382d2d969512d183c460fe89fe2fdbd8037463594536d6c3acee0ccf79734ac654
 DIST DateTime-TimeZone-2.39.tar.gz 993595 BLAKE2B 164fd56d2d5296fab711220ae159f0da67a3f6f9761db41c4895206c58e3cc44ea31cf36b844fdd7d9103cd98c018f70b16c14daae867820befd2108693b9356 SHA512 6f7580aa873a66d1892cd9201b5b2efd088842ffc2696e94c59c5532935be7eecea067fa979465046e0eeb35ca34e73bc49006e176445eaed91ac179beacc13b
diff --git a/dev-perl/DateTime/DateTime-1.200.0.ebuild b/dev-perl/DateTime/DateTime-1.200.0.ebuild
deleted file mode 100644
index 9021b61b99e0..000000000000
--- a/dev-perl/DateTime/DateTime-1.200.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.20
-inherit perl-module
-
-DESCRIPTION="A date and time object"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-Locale-0.410.0
-	>=dev-perl/DateTime-TimeZone-1.740.0
-	>=dev-perl/Params-Validate-0.760.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Try-Tiny
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.280.0
-	test? (
-		virtual/perl-ExtUtils-MakeMaker
-		virtual/perl-File-Spec
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.880.0
-		>=dev-perl/Test-Warnings-0.5.0
-	)
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/DateTime/DateTime-1.280.0.ebuild b/dev-perl/DateTime/DateTime-1.280.0.ebuild
deleted file mode 100644
index 0211883144aa..000000000000
--- a/dev-perl/DateTime/DateTime-1.280.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=DROLSKY
-DIST_VERSION=1.28
-inherit perl-module
-
-DESCRIPTION="A date and time object"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/perl-Carp
-	>=dev-perl/DateTime-Locale-0.410.0
-	>=dev-perl/DateTime-TimeZone-1.740.0
-	>=dev-perl/Params-Validate-1.30.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Try-Tiny
-	virtual/perl-XSLoader
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.960.0
-		>=dev-perl/Test-Warnings-0.5.0
-	)
-"
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index 204b616f0115..c0626b64618b 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -1,4 +1,2 @@
-DIST DateTime-1.20.tar.gz 220697 BLAKE2B cf2c164725353c15caaf2079fc43af42c0e05892c0084aabbdcb8ac4ceeafde3aa5e5c745262f2d40e7c47b2df632207c1ab28fa40efa386e01a9750f5380c22 SHA512 b0374407683da3b68d0a127a2899deb8222f3bbd3e1f68481a000ca8c7fbde69bf4e43253b4cdd68f97b0a0ee7d8ed9d7a08fda8b5bf713b0f02ba722cd3aff9
-DIST DateTime-1.28.tar.gz 229774 BLAKE2B a23b6f0bb990b84e1d045efb7ff8098e531d9d2a9d2376c5eac954d9f862567ea8288066e8b644d79f474d4a279b5061488115a4d839c8eb864673ef4f812ca1 SHA512 cf2c883636073086101dc08596210e59af0cf301ae78e496358e6952f26104aa26c1fdc0784aa10e05ac0308a1ed7aef78a7682b803679481fa570f5de1c04a3
 DIST DateTime-1.44.tar.gz 239685 BLAKE2B 6d725244f1ef028a5860774b93c1e361e6cd14f6d6cff5a586ee8af6bd4c2fbb196b66884ec62878dbf585824d24e754092750e32cfaa57dc999307e4637e279 SHA512 a256efc26ad1f2859f3371b70e5edd0d962d2c19c54b746178e3945b1dc665621d09b7ac6be279c7e92b8aa91763c5df2d8ccbca1832ba69ac810feb8533ca71
 DIST DateTime-1.52.tar.gz 269535 BLAKE2B b8da6a8ca968fcceafed77465b7b25acf9a3438d0e8bbb209141d9a85eab415da54a874981ebcb1cfdac6a3e4edb1a617a1d4d45b58ece5a5ea8b6693aa0aec2 SHA512 c2e359f480396e0da16afbec362cb744f201f6c777fa916228f0adfd26a848b9451535feeda4e1531e5afb40a286e3b11a44e95dc0947dc4e2ba714973bb5ac4
diff --git a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild b/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild
deleted file mode 100644
index b657d4d559e5..000000000000
--- a/dev-perl/Devel-CheckLib/Devel-CheckLib-1.110.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=MATTN
-DIST_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="check that a library is available"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=virtual/perl-File-Temp-0.160.0
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? (
-		>=virtual/perl-Test-Simple-0.620.0
-		>=dev-perl/IO-CaptureOutput-1.80.100
-		>=dev-perl/Mock-Config-0.20.0
-	)
-"
diff --git a/dev-perl/Devel-CheckLib/Manifest b/dev-perl/Devel-CheckLib/Manifest
index c4849d805dc6..a7f73196bf05 100644
--- a/dev-perl/Devel-CheckLib/Manifest
+++ b/dev-perl/Devel-CheckLib/Manifest
@@ -1,3 +1,2 @@
-DIST Devel-CheckLib-1.11.tar.gz 15209 BLAKE2B 786931bfcd453ce8233a3984e97b76d2761654e967dffa00b53bec5b5eb053421b0ffe29355f519de5492930ecbf7a1958cca984c5ce4a226ff01cf3878a3112 SHA512 21a64cb2ec4f3769d604eba151074daa841d40d2073a93ec186e82d8496f5ca05728c5352a31c4f07765956b85cb3144225edb51b84245b0582267af55ef2e2f
 DIST Devel-CheckLib-1.13.tar.gz 15450 BLAKE2B edec53744f9f0982b94c5018907d0ea0793bbe12b64681a5b3f31818fa91e56889ff6f72d8f76e9df8ff7203afc8a2d782f610d1557da927a578f73cf256404c SHA512 2952b0ba75cc0099182aeef533749dd044518ae3df368956caa5d7d860f94658b8eadc1b1f8fabf2ba2dc3e0a3e05498f077e4cb6469609e57272b55a026cc46
 DIST Devel-CheckLib-1.14.tar.gz 15562 BLAKE2B f9e80b216dd6ee9a9949cc369e2d8f8d18f7cce8dd20f855f91ef18e6646d165c895567ad25e9b50a863e319e7320e785b1c3f5aa6cb3f65aec938786ddff01b SHA512 a5a310cd20e7bfa3c28718b0cba997e029ae0a422ed355d70774691521a3f5c2942eb39269dec1b09e706c1d124559313ab79e787430e0bb3ad43d8aa937539c
diff --git a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.520.0.ebuild b/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.520.0.ebuild
deleted file mode 100644
index 1482acf9ab51..000000000000
--- a/dev-perl/Devel-PatchPerl/Devel-PatchPerl-1.520.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BINGOS
-DIST_VERSION=1.52
-inherit perl-module
-
-DESCRIPTION="Patch perl source a la Devel::PPPort's buildperl.pl"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/File-pushd-1.0.0
-	virtual/perl-IO
-	virtual/perl-MIME-Base64
-	dev-perl/Module-Pluggable
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-PERL_RM_FILES=(
-	"t/author-pod-coverage.t"
-	"t/author-pod-syntax.t"
-)
diff --git a/dev-perl/Devel-PatchPerl/Manifest b/dev-perl/Devel-PatchPerl/Manifest
index 7c4ca84a7816..f34de6e07d37 100644
--- a/dev-perl/Devel-PatchPerl/Manifest
+++ b/dev-perl/Devel-PatchPerl/Manifest
@@ -1,3 +1,2 @@
-DIST Devel-PatchPerl-1.52.tar.gz 123142 BLAKE2B 627bde1f894fdcc55a2db1d42cad93da65359d88922417a661b7719eba7f7f710bf5c1f6dc66e78830244b34d070e062b48b6736cd21549ace544b51ed2b7a1c SHA512 c08783fa087a2f6e55cc25665e429373c46fdb97ba0f08a4f20f71e8970d188281b41c04ed3d39c6fe7ea4b642cd6c3c08116bdbe0c9de0d4ce9fe64971d767f
 DIST Devel-PatchPerl-1.92.tar.gz 172986 BLAKE2B 177a6f5becc9d23cceedbea4a7b611cc101fac18d155d75f73ebb8b4b18a4ead4bf652edc8a5f5660f02c9bb32e0aa8ab345629503a58bf0d31bd825f2501d8a SHA512 54c1528b17b70df1ab2719ba272f9fd3c2f1de7867839bea762501d3100bd63986547d8a9eb20e0ffe55e6b0c7aae0bf8812de916fd0945ccc1a02944af6b690
 DIST Devel-PatchPerl-2.00.tar.gz 176990 BLAKE2B 9bd0da93e108cd86d36cb5c2c5859b253f99898ca6380fb801ff1fb4d8178c0976bf5bc678f76c666cb0ee71d26530244624d0395eaaa109e3975ff281665fa9 SHA512 bb7fc6efdd636b462f9cb73331abc252dcfc015ee458152e8c5d86f7b6f939fefcfc1c6a7cf815c30a4d77eeacab7a681a583350f1eafa076101c9de5fa80a79
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
deleted file mode 100644
index bccadfe5e195..000000000000
--- a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=OLIMAUL
-MODULE_VERSION=0.21
-inherit perl-module
-
-DESCRIPTION="Generic CRC function"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Digest-CRC/Manifest b/dev-perl/Digest-CRC/Manifest
index c5dfb39126f9..666e477f7e9a 100644
--- a/dev-perl/Digest-CRC/Manifest
+++ b/dev-perl/Digest-CRC/Manifest
@@ -1,2 +1 @@
-DIST Digest-CRC-0.21.tar.gz 7924 BLAKE2B 5294ead3a8294e3eacfd92b0a2871a84be8c16c01248a53c3892b47a2c6178a9cec3e9e90fc3fecb114c27b2c96312f303d2721cdf09dd72be2d7abc568dc9f4 SHA512 65f81c6903a6bc41d0a2aaad000ba4827e919c5b3312e4bbf8de21f77ba79955f6fa5ff3827c1d9bd74b2a931d224795a443303248bb5e5d67b6e71b79da8d03
 DIST Digest-CRC-0.22.2.tar.gz 8175 BLAKE2B 6133b26782783d2676016697af75e772aa3aa0fa0d56c5cacbc510ed338fe7da2ddaacc21b359bf4823bfe7113710cd37b611549865af80542dd5b0f2470e8f1 SHA512 983dfb3a39ca054819906bd67251f0e275a55d4ab1873146a8bbe36dee3d979e67a36f3fc53ce18608873a1c68ba30d6de8c59b58ae57a7e36e6816551752875
diff --git a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
index 18953368ea78..78b2b02395cd 100644
--- a/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
+++ b/dev-perl/File-Copy-Recursive/File-Copy-Recursive-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="uses File::Copy to recursively copy dirs"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-File/Test-File-1.443.0.ebuild b/dev-perl/Test-File/Test-File-1.443.0.ebuild
index a706cb1d3cad..7ae75ee7bfc2 100644
--- a/dev-perl/Test-File/Test-File-1.443.0.ebuild
+++ b/dev-perl/Test-File/Test-File-1.443.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Test file attributes"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
index 602385db5c06..6659cd6e6c63 100644
--- a/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
+++ b/dev-perl/Test-utf8/Test-utf8-1.10.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Handy utf8 tests"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/bitstring/bitstring-3.1.7.ebuild b/dev-python/bitstring/bitstring-3.1.7.ebuild
index b76b5d8b6978..5da81118b07a 100644
--- a/dev-python/bitstring/bitstring-3.1.7.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.7.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index b5a068ee510b..9056064ad0ad 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,3 +1,4 @@
 DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
 DIST packaging-20.5.gh.tar.gz 75111 BLAKE2B b088b85fc042b48337878c0f663934f32f90eb792ba53257b1b0879a097ef042b67a9cff56b23f5e0187a3df0f89092e0210939382851f0ae917f6ef00ad73ff SHA512 ef3c4853c30d9635b9372d6861cc0df8f7fc5a1d784e5f3effe3f315da0f24662ac939e70f55c6e9bb8864da95b9f75bc0df093f12c0f5c2af654b5354a5f081
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
+DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
new file mode 100644
index 000000000000..fe26da3360d4
--- /dev/null
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
diff --git a/dev-python/py/files/py-1.9.0-cve-2020-29651.patch b/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
new file mode 100644
index 000000000000..af89fb14808c
--- /dev/null
+++ b/dev-python/py/files/py-1.9.0-cve-2020-29651.patch
@@ -0,0 +1,31 @@
+From 4a9017dc6199d2a564b6e4b0aa39d6d8870e4144 Mon Sep 17 00:00:00 2001
+From: Ran Benita <ran@unusedvar.com>
+Date: Fri, 4 Sep 2020 13:57:26 +0300
+Subject: [PATCH] svnwc: fix regular expression vulnerable to DoS in blame
+ functionality
+
+The subpattern `\d+\s*\S+` is ambiguous which makes the pattern subject
+to catastrophic backtracing given a string like `"1" * 5000`.
+
+SVN blame output seems to always have at least one space between the
+revision number and the user name, so the ambiguity can be fixed by
+changing the `*` to `+`.
+
+Fixes #256.
+---
+ py/_path/svnwc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/py/_path/svnwc.py b/py/_path/svnwc.py
+index 3138dd85..b5b9d8d5 100644
+--- a/py/_path/svnwc.py
++++ b/py/_path/svnwc.py
+@@ -396,7 +396,7 @@ def makecmdoptions(self):
+     def __str__(self):
+         return "<SvnAuth username=%s ...>" %(self.username,)
+ 
+-rex_blame = re.compile(r'\s*(\d+)\s*(\S+) (.*)')
++rex_blame = re.compile(r'\s*(\d+)\s+(\S+) (.*)')
+ 
+ class SvnWCCommandPath(common.PathBase):
+     """ path implementation offering access/modification to svn working copies.
diff --git a/dev-python/py/py-1.9.0-r1.ebuild b/dev-python/py/py-1.9.0-r2.ebuild
index 2c4b7bec6c47..96988edc26ed 100644
--- a/dev-python/py/py-1.9.0-r1.ebuild
+++ b/dev-python/py/py-1.9.0-r2.ebuild
@@ -14,6 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# This package is unmaintained and keeps being broken periodically.
+RESTRICT=test
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
@@ -21,6 +23,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.2-skip-apiwarn-pytest31.patch
 	"${FILESDIR}"/${PN}-1.8.0-pytest-4.patch
+	# https://bugs.gentoo.org/759547
+	"${FILESDIR}"/${P}-cve-2020-29651.patch
 )
 
 distutils_enable_sphinx doc
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
index 93186850f5dd..58d8800de07d 100644
--- a/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
new file mode 100644
index 000000000000..25671236c3cf
--- /dev/null
+++ b/dev-python/tree-sitter/Manifest
@@ -0,0 +1 @@
+DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
diff --git a/dev-python/tree-sitter/metadata.xml b/dev-python/tree-sitter/metadata.xml
new file mode 100644
index 000000000000..aa37069fde3b
--- /dev/null
+++ b/dev-python/tree-sitter/metadata.xml
@@ -0,0 +1,13 @@
+<?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">tree-sitter</remote-id>
+    <remote-id type="github">tree-sitter/py-tree-sitter</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
new file mode 100644
index 000000000000..861c4cfa2399
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.2.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.2.ebuild
deleted file mode 100644
index 00434362e33e..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.3.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.3.ebuild
deleted file mode 100644
index 00434362e33e..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index cbf0ae76d45e..bf3ccd014f9d 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,3 +1 @@
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.2.ebuild
deleted file mode 100644
index fda0608d401c..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.3.ebuild
deleted file mode 100644
index fda0608d401c..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.2.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.2.ebuild
deleted file mode 100644
index 9de7bbb7b27e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.3.ebuild
deleted file mode 100644
index 9de7bbb7b27e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
index c90f763ca990..82275986ee8f 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
deleted file mode 100644
index b9f96b9946de..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.3.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.3.ebuild
deleted file mode 100644
index b9f96b9946de..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index cbf0ae76d45e..bf3ccd014f9d 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,3 +1 @@
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.2.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.2.ebuild
deleted file mode 100644
index 81ba03261fc8..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild
deleted file mode 100644
index a228d2e2d075..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/actionview/actionview-5.2.4.4.ebuild b/dev-ruby/actionview/actionview-5.2.4.4.ebuild
index e9beb5d5a203..619bae85ca3b 100644
--- a/dev-ruby/actionview/actionview-5.2.4.4.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.4.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-6.0.3.2-r1.ebuild b/dev-ruby/actionview/actionview-6.0.3.2-r1.ebuild
deleted file mode 100644
index a6b9c0c833ab..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.3.2.ebuild b/dev-ruby/actionview/actionview-6.0.3.2.ebuild
deleted file mode 100644
index 0e67c4aa83c1..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.3.3.ebuild b/dev-ruby/actionview/actionview-6.0.3.3.ebuild
deleted file mode 100644
index a6b9c0c833ab..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activejob/activejob-6.0.3.2.ebuild b/dev-ruby/activejob/activejob-6.0.3.2.ebuild
deleted file mode 100644
index e34fafaa96cd..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.3.3.ebuild b/dev-ruby/activejob/activejob-6.0.3.3.ebuild
deleted file mode 100644
index e34fafaa96cd..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
index 2f56044a1591..7a9cd885fe20 100644
--- a/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.2.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.2.ebuild
deleted file mode 100644
index 1494c493a78d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.3.ebuild
deleted file mode 100644
index 1494c493a78d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild
deleted file mode 100644
index 9080f8111e8c..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild
deleted file mode 100644
index 1194b35b4808..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.2.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.2.ebuild
deleted file mode 100644
index 6181b336ee05..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.3.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.3.ebuild
deleted file mode 100644
index 6181b336ee05..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
index d7716eddc9c5..d3a60061e699 100644
--- a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.2.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.2.ebuild
deleted file mode 100644
index bf4536107f91..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.3.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.3.ebuild
deleted file mode 100644
index bf4536107f91..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 3404608d5fdc..61ed97dba6b9 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,2 +1,3 @@
 DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
+DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3a43f9dbef29c3dce651974a4c9bde200085632cc7f4fb0957aae42a7cbaae28c8cab91986dacf1f52f1deb SHA512 bbee12a30362d1dfd8a7de4258d6623d08df91a38ba1e869f9a5878871d8fd145221f8eaa99fcb72e0c1404c9c31df37a5a1dbf4a94610cb3381566cc6c45516
diff --git a/dev-ruby/bundler/bundler-2.2.0.ebuild b/dev-ruby/bundler/bundler-2.2.0.ebuild
new file mode 100644
index 000000000000..831e415cdc5f
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="man"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index e0dfbe7ba8bc..80b96e739030 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.gem 6656 BLAKE2B 36519aed8bc34ed303125857ebcc4cbc860b530f6de1a7e311c878533b69a2c7026ca39c7979e45411bd3e68256835abead35e4336a0130894c88115e030fcba SHA512 856b7a73bccba7ddc5f10d5acba025da0c7546a70f484d685f009adcda79f0f40c5cc21d1a99edfcb6114cc7643e806240d545fe6fcc6e8d97abf4d79644a695
 DIST rails-5.2.4.4.gem 6656 BLAKE2B 232562c858d2f487cec1916d1c8afa229028262c7c58cb1f8e021f90ec4f4a309b1cb3c4e91d22f1cad3ea83a78ec7a3e16d83c623060da48545c49f9a87a2f6 SHA512 01c2ae7537afef84a583d42b610791a6c1bfecf3f45b9dcf1295f60978fe60a4cbc286a3f091430144c7fc5e4c89d3c3616fba9045188d53010abf199cee869b
-DIST rails-6.0.3.2.gem 6656 BLAKE2B 080846459db9ad58650852acb60eab1474cb8eefb7f4720dc83ac0562dd1bfecd4c98ea0c9165d3c6d578edfed6a45088ee4c223e33fb02d26510ad9ccfd74ff SHA512 288f48bd20f4a5ed485a127ddb9e307a69d3ee00198a168ed1d2581b0e200e0fa14b02811b4c72cc20eedf616b10cd46b38dbbed5fcf44125bda25e1aae41b44
-DIST rails-6.0.3.3.gem 6656 BLAKE2B ea87053cb20859b63a2c4f33e9454bc618b9b213a6c983f1bdff1c6c19e0d3406d99265bcd729163fbd9a3f0ca4cb617280386714059f07fae2661ccba7c897a SHA512 b50b690bc89638d9f22bdcf57f6fb68595f1d19e2dc8b380e9519e0266087eaaa258d5bd1f3692d0a4437bef8b92552aa01a0913cbab4ba460be6d3e5f1c2dfd
 DIST rails-6.0.3.4.gem 6656 BLAKE2B c2b1d1573a6555073441baa02bd7f06a3151ea39e4b4845a6323efe9834236e1ac1f4731014f8fce7563300917449f3d1c92d5ff169b951164b8a17c4ca16e53 SHA512 6206864e3d70870a6b9a31e63cc05d7d58eb5eaa3df78ad96de7adbf1c884c2f28bf62291a8cc628d8d702c67b4080ea7389fd7518f1bc59b72ae403824bf83b
diff --git a/dev-ruby/rails/rails-6.0.3.2.ebuild b/dev-ruby/rails/rails-6.0.3.2.ebuild
deleted file mode 100644
index 3be9b73306e0..000000000000
--- a/dev-ruby/rails/rails-6.0.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.3.3.ebuild b/dev-ruby/rails/rails-6.0.3.3.ebuild
deleted file mode 100644
index 3be9b73306e0..000000000000
--- a/dev-ruby/rails/rails-6.0.3.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index fddc7b5d96ab..212a487f099a 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,5 +1,3 @@
 DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
-DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
diff --git a/dev-ruby/railties/railties-5.2.4.4.ebuild b/dev-ruby/railties/railties-5.2.4.4.ebuild
index c38afb4bdeae..f63f0925afbc 100644
--- a/dev-ruby/railties/railties-5.2.4.4.ebuild
+++ b/dev-ruby/railties/railties-5.2.4.4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/railties/railties-6.0.3.2.ebuild b/dev-ruby/railties/railties-6.0.3.2.ebuild
deleted file mode 100644
index ac2c8ddd992c..000000000000
--- a/dev-ruby/railties/railties-6.0.3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.3.3.ebuild b/dev-ruby/railties/railties-6.0.3.3.ebuild
deleted file mode 100644
index ac2c8ddd992c..000000000000
--- a/dev-ruby/railties/railties-6.0.3.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index f493b4e8bd68..a2dc9e208cf2 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,8 +1,8 @@
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
+DIST rubygems-2.7.11.tgz 861642 BLAKE2B 6632296d8bcd47d52d92db3c09a0d95118c72877c712a9bfa01f4d4c8aff1bc62ee7e663f763a73b2c2e3dfd2d261ea965ff932a77b84f70e63fab1445d19d8a SHA512 83592f4089a768f6d58be975995855ad3aa6b481de5e2d31789d1c8d96a33f5347a914e5d7450819bb2e8e434ee65c4d3f5c978965ccaefad6c167a29801b7bd
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
-DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db197bf266ef4c51e48e6f97c08d85a8923b0c6fd72b3fd6ecb584533ff8ca56515c555e9c5b786b0d99ad2a16e SHA512 887c64226ec0b32d33f2ea331936683406d54dc74d19e658a23521e25ab50aa23534fe9eecaf696154247ad1df1d24c233d8900b9aabc79096eebd6afef3f775
-DIST rubygems-3.0.6.tgz 887156 BLAKE2B 685cfb108cc684ecbbcee6fe341baa429ac28f331b3db444c5ed3557bc169147dddc8d226780a85842bf1de2e24f6a60b0464820afa2a6838221c22543a36daa SHA512 1ef1822a2b19790a36a6d242b7d4584222617baa27787ec58961a9cfeb2733f19f9085490ffc72ee375d3153c7114e050c42e68fc8039e727fe5961b09365ee5
 DIST rubygems-3.0.8.tgz 888058 BLAKE2B e5cf7985fb67f2d4647fffa7679241a8722d5b7c3262432cfb06ba36716d8acaca6df3704a85e24d2f14c56f260f507067f31c3ccdd9321b922e8f13d085398c SHA512 ac8906360bea6e089c987308b1ee661d2f1c68e1ed66dcb7c5afd7ebfe5bef81c5a01ab6113c5eb5b0738129105f3176e0c595a0883a952082a048b7f20a5dbf
-DIST rubygems-3.1.2.tgz 995386 BLAKE2B bddf5dfc3568402257a2218642e6a15fe904b837114b9ce3a1aad155b235e42d96b1b0d4c6be1ee2e71712b8f1876902c343afdcb6d191ae0a6560f582cb282c SHA512 707525a98d14d46e69922e1deecd3b6c4caa090ee8113ba43b3912dc615cd2b1e0a083ecd0876a08b69c209bc05bba67d179f70d65aca45a92ac543170f13d39
-DIST rubygems-3.1.3.tgz 996881 BLAKE2B 0dd3bad8420de742f5ce76db977bee800f1abf2beb48b9d8f32332c4d06814d5febb8df0a2e70f6c4f26a1aa6adbf802e041019ff1d15e2c1f8f9d2ab65974d0 SHA512 8ca0c869a53c4b99072f220bca3455edee6126effb2bc5abb9265758083688b523303e8d2ca0e6d612fbc40140c06570f990fff50cce104f443d86458b190c3b
+DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
 DIST rubygems-3.1.4.tgz 997835 BLAKE2B 21b8060f28e2228b7400533fa1d9fa1ae8bcaff3ebf9354e64f7d70ae35366147805a6f169986c956766bf41f34ce458d30c326c2b6f996620b14761fdf224b3 SHA512 86bb42736ccf320929eb12c83b3ce55fe95053ce5b38434902604d8d61d78c3f3cd8f20858d0fed66c473ef9fd70d7cb596c077cd06506caeac3e62ee6812ad2
+DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d44338eff9008cc0bc62e1477498f3e04044fa41d5f45ec0f132ca55dccb420f031b9e4945f3299c8618e2b94 SHA512 0eb2c4d18dc9304142d7d06badfd6bc1a72ba67c3b8a70f608dd127d0f7b016bc004af8dae67897685d43ddf87e468668bc89cec00b969da2f2dd67bee61a261
+DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
diff --git a/dev-ruby/rubygems/rubygems-2.7.11.ebuild b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
new file mode 100644
index 000000000000..76142cd3b513
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.7.11.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		>=dev-ruby/minitest-4:0
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+		test/rubygems/test_{gem_installer,require}.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	rm -f test/rubygems/test_gem_indexer.rb || die
+	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
+	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+	# Avoid test requiring obsolete TLS versions
+	sed -i -e '/test_do_not_allow_invalid_client_cert_auth_connection/askip "requires obsolete TLSv1"' test/rubygems/test_gem_remote_fetcher.rb || die
+
+	# Avoid test requiring file system permission changes
+	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>4.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:' || die)
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(23|24|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
deleted file mode 100644
index 35ab109bb28d..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-RESTRICT="!test? ( test )"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
-			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
-}
-
-all_ruby_install() {
-	dodoc History.txt README.md
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
index bbd9d9d9b186..239ef3fa3eff 100644
--- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
@@ -20,6 +20,8 @@ RESTRICT="!test? ( test )"
 
 PDEPEND="server? ( =dev-ruby/builder-3* )"
 
+ruby_add_depend "virtual/ruby-ssl"
+
 ruby_add_bdepend "
 	test? (
 		dev-ruby/json
@@ -36,6 +38,7 @@ all_ruby_prepare() {
 
 	# Disable broken tests when changing default values:
 	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_env_shebang_flag/askip' test/rubygems/test_gem_commands_setup_command.rb || die
 }
 
 each_ruby_compile() {
diff --git a/dev-ruby/rubygems/rubygems-3.1.2.ebuild b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
index 54e32ae28236..83d91f198951 100644
--- a/dev-ruby/rubygems/rubygems-3.1.2.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-ng prefix
 
diff --git a/dev-ruby/rubygems/rubygems-3.1.3.ebuild b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
index 54e32ae28236..000adfc00ba2 100644
--- a/dev-ruby/rubygems/rubygems-3.1.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-ng prefix
 
@@ -40,7 +40,7 @@ all_ruby_prepare() {
 	# Disable broken tests when changing default values:
 	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
 	# Avoid test that won't work as json is also installed as plain ruby code
-	sed -i -e '/test_realworld_default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
 
 	# Update manifest after changing files to avoid a test failure
 	if use test; then
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index e3b927447eee..de25bb0a9d5e 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -17,7 +17,7 @@ fi
 DESCRIPTION="pkgcore-based QA utility for ebuild repos"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="BSD"
+LICENSE="BSD MIT"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
@@ -35,6 +35,7 @@ RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
+	dev-python/tree-sitter[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
index 88eaee74aaf0..e1f4867ac62c 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1-r100.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils lua-single xdg-utils toolchain-funcs
+inherit desktop python-any-r1 eutils lua-single xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -54,7 +54,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -70,8 +71,14 @@ PATCHES=(
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 
+	python-any-r1_pkg_setup
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."
@@ -83,6 +90,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources
diff --git a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
index e694a435b6b9..2bf34b50cc64 100644
--- a/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.25.1.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 VIRTUALX_REQUIRED="manual"
-inherit desktop distutils-r1 eutils xdg-utils toolchain-funcs
+inherit desktop python-any-r1 eutils xdg-utils toolchain-funcs
 
 MY_P="stone_soup-${PV}"
 DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -53,7 +53,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-lang/perl
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	sys-devel/flex
 	tiles? (
 		sys-libs/ncurses:0
@@ -69,8 +70,14 @@ PATCHES=(
 	"${FILESDIR}"/rltiles-ldflags-libs.patch
 )
 
+python_check_deps() {
+	has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 
+	python-any-r1_pkg_setup
+
 	if use !ncurses && use !tiles ; then
 		ewarn "Neither ncurses nor tiles frontend"
 		ewarn "selected, choosing ncurses only."
@@ -82,6 +89,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	default
+	python_fix_shebang "${S}/util/species-gen.py"
+}
+
 src_compile() {
 
 	# Insurance that we're not using bundled lib sources
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index eb25f7e430ae..21000abd033a 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,2 +1,2 @@
-DIST 3.2.0.tar.gz 1162843 BLAKE2B 79c864f4d74e2e8d382185abd16c873b64e745ac176a2aa162db37a86a3644d3f0d8ff83c6f2e2a1986d35dba18b5ce0769926a81afd8a193cf35c443f3a1097 SHA512 961aafd1f48033e538b6da2ceee11f98e4319944709b874ad78416790e7d42fd1a82e94a1625fbcd1dbf1fac52f7734be1f58684476e97a66ca63b13ccd7a626
-DIST 4.4.0.tar.gz 790589 BLAKE2B 655edfcfb99baf2b36cc8fea4ee12a1d2f6ed9740bbae0231d8e4daacbf8e2117cbcc12420c0d6eac56eb45dd91dd632e5544581b72063d7095ed6a4dc784c8c SHA512 5ca2cf57950986fdc0f3ed5962fa8ee914ac34bf46c702a0fe0323169060ae8f300406bcb5194fbf88b50aa41e6deb8fa2ee32fdf14eedb7fd9553b10240a2c9
+DIST nemo-extensions-4.6.0.tar.gz 754433 BLAKE2B 83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987 SHA512 b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32
+EBUILD nemo-fileroller-4.6.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
deleted file mode 100644
index 83a06b536884..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="File Roller integration for Nemo"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/file-roller
-	>=gnome-extra/nemo-${PV}[introspection]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die
-	fi
-}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
deleted file mode 100644
index a35d1af48b05..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="File Roller integration for Nemo"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/file-roller
-	>=gnome-extra/nemo-${PV}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if [[ ! -e configure ]] ; then
-		./autogen.sh || die
-	fi
-}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
new file mode 100644
index 000000000000..06de99fc4051
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Nemo file-roller integration"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="gnome-extra/nemo"
+RDEPEND="${DEPEND}
+	app-arch/file-roller"
+
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/net-im/zoom/zoom-5.4.56259.1207-r1.ebuild b/net-im/zoom/zoom-5.4.56259.1207-r2.ebuild
index 7387cd5dde5d..6150b8810934 100644
--- a/net-im/zoom/zoom-5.4.56259.1207-r1.ebuild
+++ b/net-im/zoom/zoom-5.4.56259.1207-r2.ebuild
@@ -64,8 +64,9 @@ src_prepare() {
 	default
 
 	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom >zoom.svg \
-		&& [[ -s zoom.svg ]] || die "Extraction of icon failed"
+	bbe -s -b '/<svg width="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
+		>zoom-videocam.svg && [[ -s zoom-videocam.svg ]] \
+		|| die "Extraction of icon failed"
 
 	if ! use pulseaudio; then
 		# For some strange reason, zoom cannot use any ALSA sound devices if
@@ -113,10 +114,10 @@ src_install() {
 	fi
 
 	make_wrapper zoom /opt/zoom{/zoom,} $(usex bundled-qt /opt/zoom "")
-	make_desktop_entry "zoom %U" Zoom zoom "" \
+	make_desktop_entry "zoom %U" Zoom zoom-videocam "" \
 		"MimeType=x-scheme-handler/zoommtg;application/x-zoom;"
-	doicon zoom.svg
-	doicon -s scalable zoom.svg
+	doicon zoom-videocam.svg
+	doicon -s scalable zoom-videocam.svg
 	readme.gentoo_create_doc
 }
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 2395f7ddd591..a6f99d22c472 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -3,3 +3,4 @@ DIST youtube-dl-2020.11.26.tar.gz 3218922 BLAKE2B 4e8ac926a7cef9d8a9f53de1002464
 DIST youtube-dl-2020.11.29.tar.gz 3222467 BLAKE2B 6b699689f55fb5b24d9a3fa9b500461076d9cac58a111fde5f07f4df45113d40cb2cfbec2b86777b92277fbe16467c1516fdd5bb49e30f8361dd7fe3479eca57 SHA512 e3b4e7e7a776a608d2ee34c5395108445ea43fc999b0364a686eddb5d5977591d2c625b2a97955fd565631da070921f3196cd98ce58cf9aebf4e504636645a3d
 DIST youtube-dl-2020.12.02.tar.gz 3225560 BLAKE2B 953de14c6801a853091625753c0f918e7c6f88b1631ed2d41427fc36cc615830161f860e043ca784b31b1845ecfd0f5a88afcaeca40dc797cd89d36d4762d637 SHA512 5e48e272d957be391cb18960e0b1864b0f2202e26a53491f5c15f6c40bc36e720d80e95955a5a2f889e05f11a999fd311d095b18e5082bb951739c63ffe7565a
 DIST youtube-dl-2020.12.05.tar.gz 3228845 BLAKE2B 6186a7d788bb839a7beceb708ddcc629bf111403ac003baa68422122a77d3793148769b0062f8ca2b1d24348d203ba7cd0b1841c2a16f95e0620423b881a83c2 SHA512 c58baa8a95a9bfc09a8f37299fd3061101d29a0662bd1c35f5b4d3d030ac1f06b47ec2f42fdec1759005556a81c43f7d067e9a43622ba06f8817b1a63c52c4a2
+DIST youtube-dl-2020.12.12.tar.gz 3225195 BLAKE2B da14fb941fd81f0596a590e7690c2f4786a57d9fbe057743ab2a4a4cabad9978df3352ae1389b89e42673c3ea99e43488741f2d22cbb6274f1fadc5cbb923a47 SHA512 388722cadf500cbcd97b8d92b1ae67d091a5fe79e6bdf19e3a3f94476ef926f7ab57b35ee6d14e2d7a7bf1c72db37535de6c9c6affd32f4c1403902b813d5530
diff --git a/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild b/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
new file mode 100644
index 000000000000..26f5106c1494
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2020.12.12.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+	sed -i -e '/flake8/d' Makefile || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	emake offlinetest
+}
+
+python_install_all() {
+	doman youtube-dl.1
+
+	newbashcomp youtube-dl.bash-completion youtube-dl
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+	elog
+	elog "youtube-dl works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
+	elog "On some sites - most notably YouTube - videos can be retrieved in"
+	elog "a higher quality format without sound. youtube-dl will detect whether"
+	elog "ffmpeg is present and automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 59f079c7efb0..eb25d6feb9ab 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2020-12-12)
+# Security issue with insecure use of /tmp, bug 743214
+# This slot masked for removal in 30 days, use slot 2 instead.
+dev-ruby/bundler:0
+
 # David Seifert <soap@gentoo.org> (2020-12-11)
 # Last MIT release in 2007, declared EOL by Intel in 2017.
 # Build and test failures, abandoned parallelism paradigm,
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e53b002bd386..d9781bf2181b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -23,6 +23,7 @@ DIST gentoo-kernel-5.4.82-1.amd64.xpak 61041603 BLAKE2B 8f9c2b745b070ca48d207ee0
 DIST gentoo-kernel-5.4.82-1.arm64.xpak 56304051 BLAKE2B ec9ec9c44f21405e1b5b8d179532b80f9d9d823ba36a9bb6c3bcd87e66b2515cd3844eef53b18ab106131f0ea46b1840b897aa6e6c77c5e532f4c3868c59237a SHA512 18cf7caadae3c6567110525cd7f96e7bc7f5911a04c1904cf4e3ddfb400afe97f44970cdb7ef43dfda4aaf2b728563385dd717486149b3cc4185597b98bb9c03
 DIST gentoo-kernel-5.4.82-1.x86.xpak 52869397 BLAKE2B 1c3cac750bbc617e354aa5be8f4da4cea4511c0825b10b8e2d153ade7e4c658c7f538ed01e3754ea5eed8ace127bec0c4d7c82890d7da8341229792e6a1a630e SHA512 2a779603b843f2e4e757f80bba6ddd31a878f13ddb2b174f87f4a2ae3784fbca05be36994a29377674996a627b3f878fd6d50dd98a648ba0e6b45d039fe62f70
 DIST gentoo-kernel-5.4.83-1.amd64.xpak 61015400 BLAKE2B 73527460e0c430a23c8221f8a736416ef6c3ff0ab93d017096456e72bd6c2c88e2a631bd18b2f995bc929f918e9b5a59aa033119a534a985ae1e33d39ff48790 SHA512 53dbb9fe6d940bd93eeb35c93bb869931f8f423f6c3997433030bede0b0c11dde478e391ff372ff252771a1bb32207cefbfb478f79715ba2ee3910016087bd87
+DIST gentoo-kernel-5.4.83-1.arm64.xpak 56245318 BLAKE2B 53e8e3e3bae66539622bf56c175fe2055905c8a39eb89ea084d0622fab366c0b0614a209d2063e7b44005d438c00759b2a5aca0147b83e9bc17b2a321f693d14 SHA512 657118b04169d9b2bf32fc11138573e0ecf16b27155b6f299e477b211885805bb6c9beab22a19d2d9f93c9a57f0d21759e6ff9b3747c9c7dd76a39867b04b1bc
 DIST gentoo-kernel-5.4.83-1.x86.xpak 52886754 BLAKE2B 2594b014c703f9f960d180bb6b2973027d238a2232ff8c358faf76a78d8ec8835e423fed19ad8afd30225c11e884a93411636407ca5a034c8abaa32635c21089 SHA512 70776892d7cd38d3bcd4cd797a14fb25f72bf0f29c2abd14a21b2361fac062c037b139588554b47727929ae60d331e6bd6ceec0c2f8e8f830adea4ed92279ba7
 DIST gentoo-kernel-5.9.10-1.amd64.xpak 62950591 BLAKE2B 032e27aaaf9f622ce16b3ee699752215fe7485052bebdafddf2155aed370b6316be07eb009da3e207a9b12f8c7865c70c7466451b205cc4b4f374c731a815fd5 SHA512 7f504e2f15319d60f464a4e45edee9503316a100eec8a6258e27ec7a00a4d2a5cbf9ead4e77ae5342ea05778572fc8ecda94c63b425b99b6ac3a5f183e377bbb
 DIST gentoo-kernel-5.9.10-1.arm64.xpak 60852046 BLAKE2B da0ee409eb47ae9bf570a08640bd060894974f5f09fb348b3d43c525f7d006f982a447ff9b17bc22969de929b05a316ee72668d40a20d8c3b8e2084588898416 SHA512 3ae82b223c97903a9c25abcad4a9f1f9e4ede68caf796833d9aa0c0cb23898c5b62e4023b8d3a00ff91cdd1f1ee8e82d51e9198454bf87ea16fed9c99147e202
@@ -37,6 +38,7 @@ DIST gentoo-kernel-5.9.13-1.amd64.xpak 62956495 BLAKE2B ded936faf3c8e2a0c8cf2a5c
 DIST gentoo-kernel-5.9.13-1.arm64.xpak 61119858 BLAKE2B 037e7ebbffb7ff2d143b3a6d1cbd95baf0dfe5b91430e2e7c92b7235123fde79f77326d519780e7a7e1d385e831f3088694fbb04cf36762b6735d4f5c010a453 SHA512 b50a1e5171b36479d0c2756ab819322d68f51df3222daa39e2362172cc4d622d5a9cafef2f2ab41bcb89dd533cf27ecd1eda6ce4783084ce4ab75777d5604279
 DIST gentoo-kernel-5.9.13-1.x86.xpak 56040088 BLAKE2B 436e6527da0120f6fa1829bdef7a20903c9bcce6113105831311d1fb0a62bc959866da6b1624063edadd509ce4d1cc88cdff03111a018ddec0038d960ab0435c SHA512 f9c3c24078fa8325488e69e74e39f1b7a46a8dc606e656029e706c4e0b7d5ad9c8ef9c318df9764d61fde429d37956002b4481f2c9207699f0804cd7d9a5cb3e
 DIST gentoo-kernel-5.9.14-1.amd64.xpak 62989867 BLAKE2B 28519bd6e0117c06d91532cac8cf21e3152ba7cdb8884a6bf4c768d33d3069d400343db9ff35f3b138ad037afc224d3248e824bcfce99b107cddd48eaca59ab5 SHA512 280cd5bcc7a65e648eb8e8bbfd29cc07b9838a1c214ed0244406b659e1824b925322d896498efaa1cf776b6fac2e89c09b2d68ac905b27a622f2c4b4d986ea4a
+DIST gentoo-kernel-5.9.14-1.arm64.xpak 61074437 BLAKE2B 1ebb3992c25477fc4627664639c5440b3daaa22eb50a91d1c0c517e54a44996b9a819fecfa0cd472830f5548c64009b8868de6b9d712c445a803bf674048e918 SHA512 13421595b475e38a938661ea785d3fc030f3d44041f2333c244de7b10e52f7edf46899dcd63a6f6b847caeb1af5d3b21f94a14317dfa5d9d09745101eb02f369
 DIST gentoo-kernel-5.9.14-1.x86.xpak 56038922 BLAKE2B 31b6c90a4ffc609afd84867cbc5ab427ec765e1d8fc50ae1bd86d342dbaa9eb8df164b6e2992b3f7bcc5767b050dd10ddc855544738a399787d52174d273918a SHA512 85ee1968fcfff870a683a9319fb3633108cef43b7d26b43c39a7ac4e516be56afdf42c155c03880b22a173f39c8bebeec8ce2717f842cd53f38689f4f49b80e2
 DIST gentoo-kernel-5.9.8-1.amd64.xpak 63386669 BLAKE2B 6ebe70d1085d0ea33361ab398d076ba5bb3cd21aab1769d8a106978d7b320b993878fd32a59800997a5832483a19b3bce2e396b09ed25c0f34d5786ae9b7f90d SHA512 61f4d150f8fb5cca735e09ca8021ae972d953b0297dc52d9d623d1ee3f3d4a3e5cd7f98d39f785e279891373c9719166a5dad624ea16a9300c7c3fa7b0777aaf
 DIST gentoo-kernel-5.9.8-1.arm64.xpak 61440507 BLAKE2B 4704fa85533e68763346f3b4ccd462473424404c1e8f0302a69300e48ccc265857c2911aa36b11b38a0fc908d5ba681c4d35038f5cee473172b83ab331075cff SHA512 0df3f58142b0015457de82134b4c3535f8826f6108ef8aa32e2097cc5294fab35a76135fd4a4fdaed50e2b52be149833bd3e9137546f5beca90c7861f3c0c579
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.83-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.83-r1.ebuild
new file mode 100644
index 000000000000..2378adc3f352
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.83-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.arm64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.14-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.14-r1.ebuild
new file mode 100644
index 000000000000..ad9181bc4960
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.14-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-12 12:49:09 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-12 12:49:09 +0000
commit	8d7804efbd907eec22d8470e8200dcfd3c5bdd93 (patch)
tree	bd9889fb4bcc4925235ffdfa2e3bb64096c5edca
parent	3d8bd01b0127a0a6b488b28e2a68b44942a971f4 (diff)
download	baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.tar.gz baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.tar.xz baldeagleos-repo-8d7804efbd907eec22d8470e8200dcfd3c5bdd93.zip