diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
deleted file mode 100644
index 7048da480d..0000000000
--- a/app-crypt/mkp224o/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mkp224o-1.5.0-src.tar.gz 1378324 BLAKE2B 19d38fbf23328607fa428ec9329cdc909b210b4235d85e14ff372347c9b408ecf22d41dac7122bdae06725d7bca0c3d53c81cc27272c47517e714e9b8e0625dd SHA512 aa5adc91e695dbfd8ece5fdfe3ca370056d4390a5186326b35ee37402040fa24675ede5389c48b79a1e57b624b86024ff72957741fef175602f7721f20c5cc14
diff --git a/app-crypt/mkp224o/metadata.xml b/app-crypt/mkp224o/metadata.xml
deleted file mode 100644
index 7b5ca183a7..0000000000
--- a/app-crypt/mkp224o/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
-  <use>
-    <flag name="amd64-51-30k">Use x86_64 amd64-51-30k SUPERCOP implementation</flag>
-    <flag name="amd64-64-24k">Use x86_64 amd64-64-24k SUPERCOP implementation</flag>
-    <flag name="besort">Force intfilter binary search case to use big endian sorting; useful if your filters aren't of the same length</flag>
-    <flag name="binsearch">Enable binary search algo; much faster if there are a lot of filters</flag>
-    <flag name="donna">Use portable ed25519-donna implementation</flag>
-    <flag name="donna-sse2">Use x86 + SSE2 ed25519-donna implementation</flag>
-    <flag name="pcre2">Enable the regex engine and use pcre2</flag>
-    <flag name="ref10">Use portable ref10 SUPERCOP implementation</flag>
-    <flag name="statistics">Collect performance statistics</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">cathugger/mkp224o</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
deleted file mode 100644
index f277cfce61..0000000000
--- a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Vanity address generator for v3 Tor hidden service addresses"
-HOMEPAGE="https://github.com/cathugger/mkp224o"
-SRC_URI="https://github.com/cathugger/mkp224o/releases/download/v1.5.0/mkp224o-${PV}-src.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="amd64-51-30k amd64-64-24k besort binsearch +donna donna-sse2 pcre2 ref10 +statistics"
-REQUIRED_USE="
-	^^ ( amd64-51-30k amd64-64-24k donna donna-sse2 ref10 )
-	besort? ( binsearch )
-"
-
-DEPEND="
-	dev-libs/libsodium
-	pcre2? ( dev-libs/libpcre2 )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( OPTIMISATION.txt README.txt )
-
-my_use_enable() {
-	use "${1}" && echo "--enable-${1}"
-}
-
-src_configure() {
-	# Passing arguments like --enable-ref10 --disable-donna breaks the
-	# configure script.  Instead, only one ed25519 implementation should
-	# be --enable'd and the others left unspecified.
-
-	local myeconfargs=(
-		$(my_use_enable amd64-51-30k)
-		$(my_use_enable amd64-64-24k)
-		$(my_use_enable donna)
-		$(my_use_enable donna-sse2)
-		$(my_use_enable ref10)
-		$(use_enable besort)
-		$(use_enable binsearch)
-		$(use_enable pcre2 regex)
-		$(use_enable statistics)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dobin "${PN}"
-	einstalldocs
-}
diff --git a/app-emacs/idris-mode/metadata.xml b/app-emacs/idris-mode/metadata.xml
index d99760071a..b12f2a1ff6 100644
--- a/app-emacs/idris-mode/metadata.xml
+++ b/app-emacs/idris-mode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     This is an emacs mode for editing Idris code.
 
diff --git a/app-emacs/prop-menu/metadata.xml b/app-emacs/prop-menu/metadata.xml
index 273d31169f..01aae35727 100644
--- a/app-emacs/prop-menu/metadata.xml
+++ b/app-emacs/prop-menu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">david-christiansen/prop-menu-el</remote-id>
   </upstream>
diff --git a/dev-lang/gleam/metadata.xml b/dev-lang/gleam/metadata.xml
index 2dd94ab13a..85ced36850 100644
--- a/dev-lang/gleam/metadata.xml
+++ b/dev-lang/gleam/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Gleam is a statically typed functional programming language for
     building scalable concurrent systems. It compiles to Erlang and
diff --git a/dev-vcs/git-cu/metadata.xml b/dev-vcs/git-cu/metadata.xml
index 3e944869f7..0771ae323c 100644
--- a/dev-vcs/git-cu/metadata.xml
+++ b/dev-vcs/git-cu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>matt@offtopica.uk</email>
-    <name>Matt Smith</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     git-cu helps keep your local git repositories organized by cloning
     them into a directory structure based on their URL.