diff --git a/net-misc/wayback_machine_downloader/Manifest b/net-misc/wayback_machine_downloader/Manifest
deleted file mode 100644
index 5288839a4f..0000000000
--- a/net-misc/wayback_machine_downloader/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST wayback_machine_downloader-2.3.0.gem 10752 BLAKE2B 6f6feeca8871800b5299da982ee24ce070fdf80075996a2c18bd7d20a8231c5ca195367d34fc2e2893c664c480aa4ae9876a594b319248c74fbb8aa8cd28e04f SHA512 f3723b9cb32473f14bfae4dd2fcd3b2470710ec34690ae93e4c66c6146eaa626e7e1275098895e74dfb0b30a12b1f567a89b4fdc5496b6eaaf52de8ff0ddbd44
-DIST wayback_machine_downloader-2.3.1.gem 10752 BLAKE2B a368d528fe9f0f09ccd6a34f10990239a2e162b092862d3212989103e7e9e4838bf9466705cdfb43ffda53eb18b47d49a18d56b28f7a3103855e24396d17a47e SHA512 382a2646323554d1409594bcb447b25459d37bb9bb6675f77db94304936cb8ebfa1d3492a81acbc59a192d1d676ee8b076e0ca5e0ebdfb1b3f2ae2fdddab0635
diff --git a/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.0.ebuild b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.0.ebuild
index f48acb9908..eb1784369f 100644
--- a/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.0.ebuild
+++ b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.0.ebuild
@@ -5,8 +5,6 @@ EAPI="7"
USE_RUBY="ruby26 ruby27 ruby30"
-inherit ruby-fakegem
-
DESCRIPTION="Download an entire website from the Wayback Machine"
HOMEPAGE="https://github.com/hartator/wayback-machine-downloader"
diff --git a/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild
index c8c52a93bb..5357630d1f 100644
--- a/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild
+++ b/net-misc/wayback_machine_downloader/wayback_machine_downloader-2.3.1.ebuild
@@ -5,8 +5,6 @@ EAPI=8
USE_RUBY="ruby26 ruby27 ruby30"
-inherit ruby-fakegem
-
DESCRIPTION="Download an entire website from the Wayback Machine"
HOMEPAGE="https://github.com/hartator/wayback-machine-downloader"
diff --git a/sci-electronics/dsview/dsview-1.12-r1.ebuild b/sci-electronics/dsview/dsview-1.12-r1.ebuild
index 7bd5217be6..19027631a0 100644
--- a/sci-electronics/dsview/dsview-1.12-r1.ebuild
+++ b/sci-electronics/dsview/dsview-1.12-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9} )
GITHUB_PN="DSView"
-inherit autotools cmake python-r1 toolchain-funcs udev xdg
+inherit cmake python-r1 toolchain-funcs udev xdg
DESCRIPTION="An open source multi-function instrument"
HOMEPAGE="
diff --git a/sci-electronics/dsview/dsview-9999.ebuild b/sci-electronics/dsview/dsview-9999.ebuild
index 7c15a685a0..86010bfb17 100644
--- a/sci-electronics/dsview/dsview-9999.ebuild
+++ b/sci-electronics/dsview/dsview-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9} )
GITHUB_PN="DSView"
-inherit autotools cmake python-r1 toolchain-funcs udev xdg
+inherit cmake python-r1 toolchain-funcs udev xdg
DESCRIPTION="An open source multi-function instrument"
HOMEPAGE="
diff --git a/sci-mathematics/frama-c/frama-c-23.1.ebuild b/sci-mathematics/frama-c/frama-c-23.1.ebuild
index 8da5ca0024..075df641b5 100644
--- a/sci-mathematics/frama-c/frama-c-23.1.ebuild
+++ b/sci-mathematics/frama-c/frama-c-23.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools findlib toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="Framework for analysis of source codes written in C"
HOMEPAGE="https://frama-c.com"
diff --git a/sys-fs/gfs2-utils/gfs2-utils-3.3.0.ebuild b/sys-fs/gfs2-utils/gfs2-utils-3.3.0.ebuild
index 7baee126d0..e349ae899e 100644
--- a/sys-fs/gfs2-utils/gfs2-utils-3.3.0.ebuild
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools toolchain-funcs linux-info
+inherit autotools linux-info
DESCRIPTION="Shared-disk cluster file system"
HOMEPAGE="https://pagure.io/gfs2-utils"
diff --git a/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild b/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
index b631eb7871..53961ea87b 100644
--- a/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
+++ b/sys-fs/gfs2-utils/gfs2-utils-3.4.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools toolchain-funcs linux-info
+inherit autotools linux-info
DESCRIPTION="Shared-disk cluster file system"
HOMEPAGE="https://pagure.io/gfs2-utils"
diff --git a/sys-libs/nss-tls/nss-tls-1.0.ebuild b/sys-libs/nss-tls/nss-tls-1.0.ebuild
index 2fce63e82c..a7522faaf1 100644
--- a/sys-libs/nss-tls/nss-tls-1.0.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A DNS over HTTPS resolver for glibc"
HOMEPAGE="https://github.com/dimkr/nss-tls"
SRC_URI="https://github.com/dimkr/nss-tls/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-inherit meson ninja-utils systemd
+inherit meson systemd
LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~x86"
diff --git a/sys-libs/nss-tls/nss-tls-1.1.ebuild b/sys-libs/nss-tls/nss-tls-1.1.ebuild
index 4e43581fac..3ea2542991 100644
--- a/sys-libs/nss-tls/nss-tls-1.1.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A DNS over HTTPS resolver for glibc"
HOMEPAGE="https://github.com/dimkr/nss-tls"
SRC_URI="https://github.com/dimkr/nss-tls/archive/${PV}.tar.gz -> ${P}.tar.gz"
-inherit meson ninja-utils systemd
+inherit meson systemd
LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~x86"
diff --git a/sys-libs/nss-tls/nss-tls-9999.ebuild b/sys-libs/nss-tls/nss-tls-9999.ebuild
index 50f024fc7d..c1b7c4467c 100644
--- a/sys-libs/nss-tls/nss-tls-9999.ebuild
+++ b/sys-libs/nss-tls/nss-tls-9999.ebuild
@@ -7,7 +7,7 @@ EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git"
DESCRIPTION="A DNS over HTTPS resolver for glibc"
HOMEPAGE="https://github.com/dimkr/nss-tls"
-inherit git-r3 meson ninja-utils systemd
+inherit git-r3 meson systemd
S="${WORKDIR}/${PN}-9999"
LICENSE="LGPL-2.1"
diff --git a/sys-power/gwe/gwe-0.15.3.ebuild b/sys-power/gwe/gwe-0.15.3.ebuild
index 0b602b5483..54f1d38920 100644
--- a/sys-power/gwe/gwe-0.15.3.ebuild
+++ b/sys-power/gwe/gwe-0.15.3.ebuild
@@ -4,7 +4,8 @@
EAPI=7
PYTHON_COMPAT=( python3_{8..9} )
-inherit xdg gnome2-utils meson python-single-r1
+
+inherit xdg meson python-single-r1
DESCRIPTION="NVIDIA settings alternative with overclocking, fan control, and information"
HOMEPAGE="https://gitlab.com/leinardi/gwe"
diff --git a/x11-libs/libadwaita/libadwaita-1.0.0.ebuild b/x11-libs/libadwaita/libadwaita-1.0.0.ebuild
index e8d09cbeba..72d1c56450 100644
--- a/x11-libs/libadwaita/libadwaita-1.0.0.ebuild
+++ b/x11-libs/libadwaita/libadwaita-1.0.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
VALA_USE_DEPEND="vapigen"
-inherit vala meson gnome2-utils xdg
+inherit vala meson xdg
COMMIT="f5932ab4250c8e709958c6e75a1a4941a5f0f386"
diff --git a/x11-libs/sdl-fakeqwerty/sdl-fakeqwerty-0_pre20191217.ebuild b/x11-libs/sdl-fakeqwerty/sdl-fakeqwerty-0_pre20191217.ebuild
index 3c31b100f2..2341ffebc5 100644
--- a/x11-libs/sdl-fakeqwerty/sdl-fakeqwerty-0_pre20191217.ebuild
+++ b/x11-libs/sdl-fakeqwerty/sdl-fakeqwerty-0_pre20191217.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit multilib-minimal
+
+inherit multilib-minimal toolchain-funcs
DESCRIPTION="Fixes non-QWERTY keyboards on Prison Architect (and maybe other SDL games)"
HOMEPAGE="https://github.com/micolous/sdl-fakeqwerty"
diff --git a/x11-misc/gammy/gammy-0.9.64.ebuild b/x11-misc/gammy/gammy-0.9.64.ebuild
index f159cd6cec..c225e26cad 100644
--- a/x11-misc/gammy/gammy-0.9.64.ebuild
+++ b/x11-misc/gammy/gammy-0.9.64.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop qmake-utils xdg
+inherit qmake-utils xdg
DESCRIPTION="Adaptive screen brightness/temperature"
HOMEPAGE="https://getgammy.com/"
diff --git a/x11-misc/i3status-rust/i3status-rust-0.14.1.ebuild b/x11-misc/i3status-rust/i3status-rust-0.14.1.ebuild
index 142e324d1c..19f81f39bd 100644
--- a/x11-misc/i3status-rust/i3status-rust-0.14.1.ebuild
+++ b/x11-misc/i3status-rust/i3status-rust-0.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -104,7 +104,7 @@ winapi-util-0.1.5
winapi-x86_64-pc-windows-gnu-0.4.0
"
-inherit cargo eutils
+inherit cargo
DESCRIPTION="A feature-rich and resource-friendly replacement for i3status, written in Rust."
HOMEPAGE="https://github.com/greshake/i3status-rust/"
diff --git a/x11-wm/leftwm/leftwm-0.2.9.ebuild b/x11-wm/leftwm/leftwm-0.2.9.ebuild
index 176e8e0de8..cc5b019035 100644
--- a/x11-wm/leftwm/leftwm-0.2.9.ebuild
+++ b/x11-wm/leftwm/leftwm-0.2.9.ebuild
@@ -146,7 +146,7 @@ SRC_URI="
$(cargo_crate_uris)
"
-# License set may be more restrictive as OR is not respected
+# License set may be more restrictive as OR is not respected
LICENSE="
|| ( Apache-2.0 MIT )
|| ( Apache-2.0 MIT )
diff --git a/x11-wm/phoc/metadata.xml b/x11-wm/phoc/metadata.xml
index d495e34d97..52a95ab63f 100644
--- a/x11-wm/phoc/metadata.xml
+++ b/x11-wm/phoc/metadata.xml
@@ -5,9 +5,6 @@
gjdijkman@gjdwebserver.nl
Gerben Jan Dijkman
-
- Wayland compositor for mobile phones like the Librem 5.
-
https://source.puri.sm/Librem5/phoc
https://source.puri.sm/Librem5/phoc/-/issues