gentoo resync : 05.04.2019

187 files changed, 490 insertions, 965 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d5c635a2756f..4d2431c079f9 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/altermime/Manifest b/net-mail/altermime/Manifest
index dad21d067013..324dec771d21 100644
--- a/net-mail/altermime/Manifest
+++ b/net-mail/altermime/Manifest
@@ -2,4 +2,4 @@ AUX altermime-0.3.10-MIME_headers-overflow.patch 517 BLAKE2B 7068fe265834b345d7c
 AUX altermime-0.3.11-respect-flags.patch 606 BLAKE2B 7b5b364b5727fde682a4bd53c26e4fc3f490a43f37955d7cc53b39375fcdc1868340743ce6e811e926e5285e07ab82652f854f5a654551a8c82d32a00e2e7323 SHA512 d3160df483a57d7fad6070d4270d2741273a738e1afad3e8fa95d1c8af990ca304bfe4ad43f162799aa82b2162d88aaebad3285eada29a2fc118c595a771fa4a
 DIST altermime-0.3.11.tar.gz 90244 BLAKE2B 5acd29ee3e5927b67de41db4f7cfbe606814ef6476340f26509b1823fcbfa6269c15e1d7e7936e948a7cb0f81b9a17b9a63c2333697707525bc62fd350a55f2a SHA512 561e36398bafcd888e912b6291ec76ead881bac86a7d0b8072753012d4c4557e67f608a9d43c968c6521e5f35bdf7b98e2c73ab811dadaaf13dcefe35c2d9e68
 EBUILD altermime-0.3.11.ebuild 633 BLAKE2B 24405404b4ebc4efeca6ef66d2e22c214d79ac44c83819e22b60ea691a5b1b0fed19ea57f04cbe869a469c025a518204afac0a138264ce21bf022beacac7b0d9 SHA512 1f52184026958350e05c37360e72dd8db923639f2daa886b99917f1b279b9bf15e16cf288730437e9a6ce6bdeeaf7c0a02453b1784332b21260a52c1f1fedd11
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/altermime/metadata.xml b/net-mail/altermime/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/altermime/metadata.xml
+++ b/net-mail/altermime/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/archivemail/Manifest b/net-mail/archivemail/Manifest
index b90f0008377f..9938a72a3b04 100644
--- a/net-mail/archivemail/Manifest
+++ b/net-mail/archivemail/Manifest
@@ -1,3 +1,3 @@
 DIST archivemail-0.9.0.tar.gz 63482 BLAKE2B 46f497efde7ec906694c8ca1327853ef39d497ceecbac4346450aea4fb58a457633c05f1f14e058822949a13fdea4d97e25b5d74ef66aac422c10308388cbe96 SHA512 7c36108919be22f8cf71aea91435084495ceef54c251ede0aca9d981bb9c01119925d334c1d84eb2c53657170ac6bf0897fccd1f9df05c59fc46e1177194dfb2
 EBUILD archivemail-0.9.0-r1.ebuild 911 BLAKE2B fa3d4a3fd103ed0f78f209b94be47c5ff73bc62f8c3ff1ea2213591051523cc78ee54e8b017a2581ff2e197fe623a21ae57f4455ef414bc3f461ad5848a79b19 SHA512 d220df4d1115003fdfe93d99541eff93aa6fe8960d29f42394038dee64d0427bb872031c8ba55b9cf41b0f7484ac0e5c7645893507771d1417bcd7b9e4a31270
-MISC metadata.xml 325 BLAKE2B f3c751d98107e529bd163d716d5959f54ddaae8a1a1c2b1709efdbf4f9d07d8830a6b0090eca77944ccfd7ffa40c604656693a8f87a85842dac3f6bf36394fef SHA512 0725caf1503511e9a7ad14fbe52d2381753bf501cf9702dd16ee3cdb9132fc11318b0113f031f2d00eef8471e733113c4b1fa4ade25c9db3344fef5c3c29cab2
+MISC metadata.xml 248 BLAKE2B 96a9c5373a7fb856355e2f582c0e74785b8d297ab4024e1564d1420d72f34c04a16160fe3a29dffd6398c80cb0fff8159b5edcf29b3b5831a59c44d443eb084c SHA512 62290f257f7ca00db9c3c82a062af5c940d965744665c34ebac2e42a650df2e5b9d397a4e75b9f2368f114114623f3243e2abc6f5863fcff300c325a9ec16c9e
diff --git a/net-mail/archivemail/metadata.xml b/net-mail/archivemail/metadata.xml
index 6763be63b688..c1b730cb088f 100644
--- a/net-mail/archivemail/metadata.xml
+++ b/net-mail/archivemail/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">archivemail</remote-id>
 	</upstream>
diff --git a/net-mail/asmail/Manifest b/net-mail/asmail/Manifest
index 99e06a9d66a6..2636fc1f5e01 100644
--- a/net-mail/asmail/Manifest
+++ b/net-mail/asmail/Manifest
@@ -2,4 +2,4 @@ AUX asmail-2.1-ldflags.patch 584 BLAKE2B 58b53fadf6209149a74c65333d742f99c549aba
 DIST asmail-2.1.tar.gz 271164 BLAKE2B 00972dcdfd74c717a665425cad17c59b01ec631725b79ccc3ed537232e61c5aef231ec4146491335caf2beb451e686359cb196d01f199c33ed16cd66c625e99f SHA512 1251c9f386c01c23673a6798eafd6a518a103da6d2ab78bb4e22c1107939423c44f555e331f79d1b5b509f271582de285481022ef32375b4267b1f3e398f67d8
 EBUILD asmail-2.1-r1.ebuild 1032 BLAKE2B f67037d5cff4b12d6510d7105075f67e3687ad4e3f583de9bd1c9b1af7724650f5968f05941a01b717e38af36f7879f685fb69069be143897bed728b7221ae07 SHA512 1a36b78f1acb96e003196db060b56bbe1f4eeb6a58ef8061d850dfce7234d46286e63e06ace9f40f84cd9aace56eab7425bce1bb9d7070c4b29afcea3d955caa
 EBUILD asmail-2.1.ebuild 971 BLAKE2B f752c17cd9b25f2aa1a7518f10b8a2afc6ee8cc4554e6bdb489b725f8d0334012f7ec48af39de4222f8c08f5ece411a35e223572c6994ea244f5de621154237c SHA512 bf8b2a347aa20843334ef774f75ee313aacbc6ef2421364e645e85f714d79bdedab6cf287257b5c77e6e021523e7ea8ce85536db4f2e3c3343bbdc4d5cb7c135
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/asmail/metadata.xml b/net-mail/asmail/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/asmail/metadata.xml
+++ b/net-mail/asmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/autorespond/Manifest b/net-mail/autorespond/Manifest
index 071d5117c767..94532edb49d2 100644
--- a/net-mail/autorespond/Manifest
+++ b/net-mail/autorespond/Manifest
@@ -4,4 +4,4 @@ DIST autorespond-2.0.5.tar.gz 9707 BLAKE2B c0e9f85e23d2b3a5168a33695370583c9844a
 DIST autorespond_2.0.4-1.diff.gz 2637 BLAKE2B 6bb2e7567a9376296bd1e0b323e07892099d004ed3e2497d605b001486e1d3d33f7d3378bce48979c7b4dfa9a7a6aef863172ccb4e442ef1e837230f91b96220 SHA512 ef9ffc46c885d644b6f20107c03f0ed68ded577499d8b05ecae217fa43c6053de4a68666cd78a059d19ae1181b101a7de93f1d2ec0956dee7478e43c06b772b6
 EBUILD autorespond-2.0.4.ebuild 806 BLAKE2B 9515b9110652ec9c3844b322bf2c636c9214782ac97258b9ae648a48a78b6dfc9ac7c13888afc157d74d57ae65557819e6c37fed3cd438a144803c6c2ed39fcd SHA512 44f030930b33ccb1f22ce5e5ee66d9d69eb7821cd6c5779aeed5a4c7c53402192db716c44c4115cda392809df72eea5445b186c79b01fb610028ddf269d7d75a
 EBUILD autorespond-2.0.5.ebuild 869 BLAKE2B 35b06043c33c38667caafd767404354ce6d1e02dc37d062f3b396b447f6835e1a0d80fc922ba299df482a87214981517b7bd09a528b1188c1d6e8a17f2dc55bc SHA512 2233d3d697623bc90c6ce8dac54961f5634be5f41e4685e30944c7ddfe946573c1d84c5e4381ac5f7e0ddfbd901b70c472a08e8d43623be1a72b25ca7ff926cf
-MISC metadata.xml 417 BLAKE2B ad759adf0683d141487a7be474f3b57550902badf559439cb56599f8f0a4af388111de68bf4a777a0f781ac013acd406ac403a7b4ca28a835dde48906476971e SHA512 3c731894939bde8e8a168768342e54dff5a4a8dad799a0cae974d536cad501d9cb64d541474affa346779279fca82633077e779491b1f8b6664ead538242258e
+MISC metadata.xml 306 BLAKE2B d2773e404b4ba6a3ca9afaa342780161b8842710a844056970d9d57bfa36b245b8a711f529f5ceb61ee70dc0aa8cec33f8d52ce3b83ce6fc7ab0aabbe21df019 SHA512 c1a07f6fac6f13c3a0c9adacede02bb664a09d8e93e954dcb2cacaa3690ff93783e717019be0cdee715036f7aab179c18384163556ca28798a297efed70ebd5d
diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
index f46856f1a11c..6e7671295091 100644
--- a/net-mail/autorespond/metadata.xml
+++ b/net-mail/autorespond/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">qmailadmin</remote-id>
   </upstream>
diff --git a/net-mail/bincimap/Manifest b/net-mail/bincimap/Manifest
index 65ea3037e2f8..64786fd565b1 100644
--- a/net-mail/bincimap/Manifest
+++ b/net-mail/bincimap/Manifest
@@ -4,4 +4,4 @@ AUX bincimap-1.2.13-glibc-2.10.patch 469 BLAKE2B 179a077099266ffa4dc071562e2152c
 DIST bincimap-1.2.13final.tar.bz2 416152 BLAKE2B 7397442baa9c3668c59a17c99b3531fcc920675ff5a73a025be6f5785448874e42ee91ef7e5c1c318ca248db2422f2ff0b3c5494a8e832fe2522808189fd1e65 SHA512 06c0487d214581293b45a2f189979ceecae5e02b74a8d22381e51aef9fb1ad595628d2aa94e7dbdac0ad544747138735aa61b00c50d83090bed4c41e11c3d2dc
 EBUILD bincimap-1.2.13-r1.ebuild 2657 BLAKE2B b81b48b8d32f32e3d3f1775cbba859e1d12b2cc89872d72ff307b62f5ef1486387976c49a861db6fc7d30c8096d79b60d0cd7fa7995c75cc5c9a31f13ea45e23 SHA512 3baaa443d21071c57a57d88f87664b2791ddfcff1646ea531d71813fbf98454dec082a6cafd81a6d7fa1b489ab069878f22d0fdcdfde81ae82e04e1730275a52
 EBUILD bincimap-1.2.13.ebuild 2626 BLAKE2B 5a901000e06ba4457377a21bfd7cc2486c5767a323a3834fee6770663b6d18bc734117d778a05a79dcc4a348f70f524f793db47bdc5ae2530efcc780a851ec32 SHA512 bda7193543d6df8bb0bc3756ead6ed50908dce867fbb6f0f4b800b32ecd4aabedc530d40ec2893dd2705112b2c206515b043891cf6d0c8b4048dbd7e7a781fa2
-MISC metadata.xml 320 BLAKE2B 3125ad6269386f89d9059c94940b6953f61d609aecc0310c69588db8855b55ba10496adea3d0d4acf62459e7748150a40a7c50bbf2696c99b1ab99b55101a637 SHA512 fb29a8a6386b26019a9cf2c5204daf2cb89fe8bcb5484efb392bba821600cf1a56837aea9f42f7961c9a895060709e5723bd0bb0bca201548b401702ae04bfeb
+MISC metadata.xml 243 BLAKE2B 7b085d7d77a6d5399f878b273b007162200106638f41abd31d8d3ee2c5cb604dc28e86143d1e3bc6554bf9284becfe7e84937892647872113fdc96c3d15f663c SHA512 910e47d4d9c2919f57ee5af7f20859e8d9c3611707f7c33cc342b11c66a725c3e557836bb15d1605f1537129414fb1202f815ff540d793f115d7c17fd5bcc66c
diff --git a/net-mail/bincimap/metadata.xml b/net-mail/bincimap/metadata.xml
index cf6abec6e10a..63f42e644cf1 100644
--- a/net-mail/bincimap/metadata.xml
+++ b/net-mail/bincimap/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="freshmeat">bincimap</remote-id>
 	</upstream>
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index 5c1867f1dd6a..3d16ac3acc6d 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,3 +1,3 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
 EBUILD checkpassword-pam-0.99.ebuild 474 BLAKE2B 07431108a43b17de9db46cbe28830c726c1096b3fc17ce33efe936d25135e479cabd11136c8c11c873e7891a37409e7198a68f4682fe630956040cc7852f346e SHA512 f3a5e36289d14414fd64a0040265411f72b730fa5ae3e95d92118f7fba045470d9bb331c93bb0f7a2c5cce7ed95f3a2cfc9214f9e250546b5845388f1e8526df
-MISC metadata.xml 329 BLAKE2B c4c7e48e7fee568f8249fecf4e0ad16e06a2e6ab83571bf19ec3a990ba415ffea1293f993468426733bf7587bd9facab26857f4f7afd95f9fae5254e98225528 SHA512 298da051a42e121ea93b48010a68c140291f87fddf92c203f7d0f6273388184923d9e96cc6020f0b2a5c009845b032a61f36cda409ca0dbebfe61536bb00bb51
+MISC metadata.xml 252 BLAKE2B dbe9a6c6c10ec16a5261653effdb4d744c1c8e6477eae5ad220f9add922d1321f7c7101596283cd8e68b20b6d9d5ed969518afcaf64e3fc047144bc2731bbb63 SHA512 75e23f3cd2f7515225a9c07df4ed31b0b6519b055bd4d793b83783a32b4b9745f76ae17054a0b6a91ba16975538b92e603e94c4934c25c8cb753c38a72a8edf9
diff --git a/net-mail/checkpassword-pam/metadata.xml b/net-mail/checkpassword-pam/metadata.xml
index b22ef92dc18e..e121b0ff7d83 100644
--- a/net-mail/checkpassword-pam/metadata.xml
+++ b/net-mail/checkpassword-pam/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">checkpasswd-pam</remote-id>
 	</upstream>
diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest
index 92716e483a6d..5a29270224c7 100644
--- a/net-mail/checkpassword/Manifest
+++ b/net-mail/checkpassword/Manifest
@@ -4,4 +4,4 @@ AUX 0.90-head-1.patch 1201 BLAKE2B e9e0748772232855ed1ce0990d2b5438dca1b86a671a5
 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f
 EBUILD checkpassword-0.90-r2.ebuild 882 BLAKE2B 6177e356923eb86ac3cec6e65156d5da8130565ae287afbf7562641bbf92cb61bf6c6dfb75dc8b11640ad014701eb5e29a2e41a716f99a3a940560779b53df81 SHA512 e6eafd2032a99adb107c27be8a832b97d20592610e31df380e9aa98657dcf0800c0fabdb8c88d0bc2a81030c8e78c7b75167cf4313955a33c85981874b36a781
 EBUILD checkpassword-0.90-r3.ebuild 865 BLAKE2B 13744c934c9cb6246c5cf72621449962e5bdb846b8589e0a2fce6d55e05f99b70b8d4c7eddb9a05ebf46d27bb61b685989e361b66782e5260e32cc418b492cb3 SHA512 f25768e0eee923e2f622eedcf6947fd6cc2dee2da13351658b3f4d5dcabc856a2abc5e05a5c9714981bbddc5020e4948a29b518cee1c5062c682320b5c96daa3
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/checkpassword/metadata.xml b/net-mail/checkpassword/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/checkpassword/metadata.xml
+++ b/net-mail/checkpassword/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/cmd5checkpw/Manifest b/net-mail/cmd5checkpw/Manifest
index 5691fd223a57..8e1ddb9cbcf5 100644
--- a/net-mail/cmd5checkpw/Manifest
+++ b/net-mail/cmd5checkpw/Manifest
@@ -3,4 +3,4 @@ AUX poppasswd 84 BLAKE2B 0388cd039e50beb308e8791c3b490ca305bb6288f5971ed624fea1d
 AUX reloc.diff 2330 BLAKE2B bee7735ac6f8d5039bd0c87056ae3fbaf100118d3292297dce311faff1fb0555d5b08543a9ce79347f953bfeef5c6b6585edd5474c538a2323d3e47048444b26 SHA512 e18cab4bb02b2bac945d1857f70d6f5faa2296205f09c228d87d16dffb43de129a59ef0054dd6c54f1db7448b47f46a385dc81ffe769dc87d182d81031920369
 DIST cmd5checkpw-030_tgz.bin 25812 BLAKE2B d1ef48edd2ff0d88823656915a04a8f0893840a49022ed977c6d178cf70d179c44504512ad44d94ae33d48e523ae8cb98ff7b87357b6c8deee761ae9df163bc5 SHA512 c54792769097ac7e8a11c6a140a9eefdb090bad4a0336be9543549a232e4faa72f08baea7e746b9743e01ce40c0f7402f4584c53b5eedb3f2d1e457d1c8a45d5
 EBUILD cmd5checkpw-0.30-r1.ebuild 1691 BLAKE2B 44cde62fd8a67e245be82eb5bd59ec72339fd7297e94391121ad5984534bed4d826ad3489cb4fe49b4437e2ec1330e64c8b456b7e352c8f0bd0c432b18a0249f SHA512 894ae35b328b592e0ed390de95e434fe50e32e9b35fc875df049779376d323fcd2c72c2049a0e357b6e276aebaa03d8f68808606935dc03694022cf0f6117d48
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/cmd5checkpw/metadata.xml b/net-mail/cmd5checkpw/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/cmd5checkpw/metadata.xml
+++ b/net-mail/cmd5checkpw/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/courierpassd/Manifest b/net-mail/courierpassd/Manifest
index 62c2e1258cc7..099c6e301313 100644
--- a/net-mail/courierpassd/Manifest
+++ b/net-mail/courierpassd/Manifest
@@ -1,4 +1,4 @@
 AUX courierpassd 232 BLAKE2B b85e16144a2609524e4c4ad8dcf161c763f0bff16af9fca4d326bc8ab1e10cfd676ff85de8ea01d4258a7244bd19ad9aa9fa22a2fd973e84037ad9796bd51623 SHA512 c9251f6137f3fe6f58cad0fb5159359293e1e74dafcdd04d96da05f29b62fb5d5326f21fad358e98757df0808e5452246bcf4f732bb62cdf2214b9d209deb0f4
 DIST courierpassd-1.1.2.tar.gz 286929 BLAKE2B 04fa599f9cc09e288c0474393d3130f59f8502eb607eb6f394caaabf760fd04a936b773392969fa5e57643acfd8774d0b94c823861420d91179e0087691c3ee2 SHA512 0cca32b19f9ebded8e388fbb5571dced4c2b9b9d47ab8e40d6b4351d77e31157bd7b97b58766bf673c38766e833206572526e27fdf6ca2d6a40f0961ef8bc7dd
 EBUILD courierpassd-1.1.2-r1.ebuild 614 BLAKE2B b7b5daf1cdd8a15aaf131825b4389a58ff36ce62ba37d6b81b40c4c7fef8017823f8bebb04ca5e8944ada61f66c652a28d114eeb870d805a2c52a88eb99c3bc8 SHA512 61093737ef69e4f35921c38fe44ab1c95da825c25d04361d59ac2ec1bf938b652439f6d384a992a5ca74abd4c695e4b87672a1c9afe60651db0e975c7a66d4c4
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/courierpassd/metadata.xml b/net-mail/courierpassd/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/courierpassd/metadata.xml
+++ b/net-mail/courierpassd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 6ff87795b114..69a2cb86000d 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,27 +1,20 @@
-AUX cyrus-imapd-db.patch 2193 BLAKE2B 6b8b2601e4eb7fd124d8cfb1f6409a8f42a3b8b35781034d5258bc820e27da8b0a963cf7904b0d731ca614f1104550b9437d48005c26a174e2347da7e632bd3e SHA512 a756552c0f1dd548661b4402e170474977484f3a4b32e765f8648d02109dc131d313e924b07bb3ad704f34cab4aef079b206b6d1e8d97911657886bd2476910c
 AUX cyrus-imapd-fix-tests.patch 471 BLAKE2B b527a435ef74b42dc1e68ac0089dd2050a2cdfbdf11264fc7097b39c16db9a690000f397bf29cdd3e8003d3e15546e9f67c9c9aeb505d50976a3568404bafddd SHA512 ab967c8f493d902510f25268d3d63c3c60246cfd2661ae3a19e5a89cd238028ac3eac4369736b51fc2a0c27407958963ffb1e6f8ba19b5d19b53a680d3737fa0
 AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
 AUX cyrus-imapd-libcap-libs.patch 2251 BLAKE2B 2caa105c2f5608468e89f0c533cd0942ef286f93f941ab5163e53ab9302f3e68c7ba72969f4fcd13efa41e1d99a239f946f2970d0b34583e3a33331bfe3d4adb SHA512 c8f6676549f1e4e91be40da22a3061ae9b660d159c0d64e4848f0550214c190e7d1357dce20ba181ea2d8425e21552ce44faa04213b862740da62bf3f2f09b14
 AUX cyrus-imapd-sieve-libs-v4.patch 5751 BLAKE2B 016a21356199580e431f86b6a594576679dc8b586668fcf333d65ae570dd129fb8fb4174d26965e09d398729c7a8205bc89167442e4d43228942298bb402b844 SHA512 cd9f5c23f79720d768b3b8a089b3f5c078825465b3b0f28b7b629bc07415598f9195218e35bb7bebaca3499bdfdd30a137ea6a3a455a84386e9d02de41abba51
-AUX cyrus-imapd-sieve-libs.patch 2207 BLAKE2B f9d508fdc11d4309687e921d193f0c5b3ea0f6ae78d98623974d0decabcc685c5f05b105597896d59df5f44273090644086b3f936191d398048390ba201d848e SHA512 1d198945b8522f587a84f6241dffe7e3390b4904b187d4d7b121a509f6d5d47270c2609eb6f3ffc0aa5a792cb576fd8e5572884439337f05485ada3533f81484
 AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a
 AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
-AUX cyrus.rc6 460 BLAKE2B ea05165af565d6362ec23b08c80b03573ba8ef6aa72a17631dc2f795cafa96a7f992c00115cf3c438e6ff61138f245adedb614195ae51faf01281475d994335d SHA512 926aa90c5285ed05bbc0cef5c4351acef26e70772bb7a0e490c05a9a4ce9e808e250e19bac1640a61852fa394e42368d33f88ea9b0b8d1751224daef04350920
 AUX cyrus.rc8 699 BLAKE2B b1a7cca8f7ee5a23870108550c990dad79c76a729c82efc77713939a537141df8b1ace2bfc6f3a384c28e155bece1bec480bbaf90fcd1899af854d441b518eee SHA512 9340877dd83cd4d5770c12a7f107ee697b42736a57cf304695f03f9f673c5c53b4477f20832ee4815515b2e33e8b33335b298cf5dd48015a6a581b8ab4f4f240
 AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
-DIST cyrus-imapd-2.5.10.tar.gz 3103914 BLAKE2B 588764d47b3d458633e0ced2619cc1cccdf26c18d54effd38d4f9f6df12ad98f554efa632af9c7e4b43d7899b04a14a8a71fc152ea360a38cdab6a50685ddf5e SHA512 78b85e37c63f1dbb60898da229f70f45810326a01244067d23b1317e2c2ae3326e48b6944787d59024e44c48c441ed2b848d6a83c451c192a3bb95c8f37880fa
-DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a1571d405665694f735fb72b6de76058ea586172f2001babe280170f122c887374b1378f51fe9c89a522aaeb74b885c9 SHA512 bbb0e11f31d91d85037306321165e3608f8d5e2699b971fc4fbdd1630ec0a1485c8f6f17900142dec584ab41b0ec0c65c11cfaf8c5bbf1054b194a8f5f361538
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
 DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
 DIST cyrus-imapd-3.0.9.tar.gz 10771916 BLAKE2B cc483246c83ed55fa7d4e85aa8189852f2e6be23aff5bb478c2d2123e3d928cc8248e580c80c1474b2b3eea9aa1c0f8b3336f779e72e690d8d093e70993cd657 SHA512 d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738
-EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb
-EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
 EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
 EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
 EBUILD cyrus-imapd-3.0.8-r1.ebuild 5818 BLAKE2B 552068a64832e0576e3ec639b588ed572b97c5ba0f33c12bd06af54afde4dd274d96642d014ffeeff2e36ad71753c1968031ca6bda696cb33f05ae5baab30614 SHA512 6db81146d2a2930f7b73e975130e61ba9da1c9e511ab8ff838c79a834732191dcb61376bea6e4db557d6921daad8e58f1af106c4be3730c5c8d91d86c3386f75
 EBUILD cyrus-imapd-3.0.9.ebuild 5951 BLAKE2B 555fd5360af28bf6163302399727986d47e829148cc5e8f9ef88a7b703be4378928d82d4ecf4143c8d0cd80dd20546fc2e52f9020b72312e6c71e28363bc6342 SHA512 74d3e09860e5dd723e6f8952d3de8048318f248e701eb314962240b1940c39019968bb432513fb5c136b876264e04ab2618674f449cb895eddc89948912406e1
-MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
+MISC metadata.xml 793 BLAKE2B 9cc25eb60bf75328abe6d1e06ff11074a1234ab404b4886868c73a34b265bdc189e61d21686f6dce56cdde932ef5bbbcff3a6705689ad8c12cb7ea08fe9c8f79 SHA512 b371032c270fd20385959cfcb4356f0258fce84b5f4d35f499225ae81beba6e3933c09e180c9b482358ae3c8447d25b30bc87c1671e24d94018ecae71658f655
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
deleted file mode 100644
index 7d18d33ec917..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.10.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
deleted file mode 100644
index cbe960377731..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.5.11-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib pam ssl-cert user toolchain-funcs
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Cyrus IMAP Server"
-HOMEPAGE="http://www.cyrusimap.org/"
-SRC_URI="ftp://ftp.cyrusimap.org/cyrus-imapd/${MY_P}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="afs berkdb clamav http kerberos mysql nntp pam perl postgres \
-	replication +server sieve snmp sqlite ssl static-libs tcpd"
-
-# virtual/mysql-5.5 added for the --variable= option below
-DEPEND="sys-libs/zlib
-	dev-libs/libpcre
-	>=dev-libs/cyrus-sasl-2.1.13
-	dev-libs/jansson
-	afs? ( net-fs/openafs )
-	berkdb? ( >=sys-libs/db-3.2:* )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2 dev-libs/libical )
-	kerberos? ( virtual/krb5 )
-	mysql? ( >=virtual/mysql-5.5 )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-			virtual/pam
-			>=net-mail/mailbase-1
-		)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )"
-
-# all blockers really needed?
-RDEPEND="${DEPEND}
-	!mail-mta/courier
-	!net-mail/bincimap
-	!net-mail/courier-imap
-	!net-mail/uw-imap
-	!net-mail/cyrus-imap-admin"
-
-REQUIRED_USE="afs? ( kerberos )
-	http? ( sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewuser cyrus -1 -1 /usr/cyrus mail
-}
-
-src_prepare() {
-	eapply -p0 "${FILESDIR}/${PN}-db.patch"
-	# bug 604470
-	eapply -p1 "${FILESDIR}/${PN}-sieve-libs.patch"
-	# Fix master(8)->cyrusmaster(8) manpage.
-	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -i -e 's:master\.8:cyrusmaster.8:g' \
-			-e 's:master(8):cyrusmaster(8):g' \
-			"${i}" || die "sed failed" || die "sed failed"
-	done
-	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -i -e "s:MASTER:CYRUSMASTER:g" \
-		-e "s:Master:Cyrusmaster:g" \
-		-e "s:master:cyrusmaster:g" \
-		man/cyrusmaster.8 || die "sed failed"
-
-	# lock.h to afs/lock.h
-	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
-		ptclient/afskrb.c || die
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use afs ; then
-		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
-		myconf+=" --with-afs-incdir=/usr/include/afs"
-	fi
-	econf \
-		--enable-murder \
-		--enable-netscapehack \
-		--enable-idled \
-		--enable-event-notification \
-		--enable-autocreate \
-		--enable-pcre \
-		--with-service-path=/usr/$(get_libdir)/cyrus \
-		--with-cyrus-user=cyrus \
-		--with-cyrus-group=mail \
-		--with-com_err=yes \
-		--with-sasl \
-		--without-krb \
-		--without-krbdes \
-		--with-zlib \
-		$(use_enable afs) \
-		$(use_enable afs krb5afspts) \
-		$(use_with berkdb bdb) \
-		$(use_with clamav) \
-		$(use_enable nntp) \
-		$(use_enable http) \
-		$(use_enable replication) \
-		$(use_enable kerberos gssapi) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with perl) \
-		$(use_with sqlite) \
-		$(use_with ssl openssl) \
-		$(use_enable server) \
-		$(use_enable sieve) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		$(use_with tcpd libwrap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALLDIRS=vendor install
-
-	dodoc README*
-	dodoc -r doc
-	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
-	cp -r contrib tools "${D}/usr/share/doc/${PF}"
-	rm -f doc/text/Makefile*
-
-	insinto /etc
-	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-
-	newinitd "${FILESDIR}/cyrus.rc6" cyrus
-	newconfd "${FILESDIR}/cyrus.confd" cyrus
-	newpamd "${FILESDIR}/cyrus.pam-include" sieve
-
-	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
-		keepdir "/var/${subdir}"
-		fowners cyrus:mail "/var/${subdir}"
-		fperms 0750 "/var/${subdir}"
-	done
-	for subdir in imap/{user,quota,sieve} spool/imap ; do
-		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
-			keepdir "/var/${subdir}/${i}"
-			fowners cyrus:mail "/var/${subdir}/${i}"
-			fperms 0750 "/var/${subdir}/${i}"
-		done
-	done
-}
-
-pkg_preinst() {
-	if ! has_version ${CATEGORY}/${PN} ; then
-		elog "For correct logging add the following to /etc/syslog.conf:"
-		elog "    local6.*         /var/log/imapd.log"
-		elog "    auth.debug       /var/log/auth.log"
-		echo
-
-		elog "You have to add user cyrus to the sasldb2. Do this with:"
-		elog "    saslpasswd2 cyrus"
-	fi
-}
-
-pkg_postinst() {
-	# do not install server.{key,pem) if they exist.
-	if use ssl ; then
-		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
-			install_cert /etc/ssl/cyrus/server
-			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
-		fi
-	fi
-}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
deleted file mode 100644
index f720cf2cb127..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-db.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- configure.ac	2015-07-06 01:22:19.000000000 +0000
-+++ configure.ac	2015-07-22 11:18:33.000000000 +0000
-@@ -236,50 +236,29 @@
- dnl Berkeley DB Detection
- 
- AC_ARG_WITH(bdb,
--	[AS_HELP_STRING([--with-bdb=DIR], [use Berkeley DB (in DIR) [yes]])],
--	with_bdb=$withval, with_bdb="yes")
--
--dnl support old-style
--AC_ARG_WITH(dbdir,, with_bdb=$withval)
-+	[AS_HELP_STRING([--with-bdb], [use Berkeley DB [yes]])],
-+	[],
-+	[with_bdb="yes"])
- 
-+# On a properly installed system, we build
-+# by including <db.h> and by linking with -ldb
- case "$with_bdb" in
--  no)
--	use_berkeley="no"
--	;;
--  yes)
--	use_berkeley="yes"
--	with_bdb_lib=none
--	with_bdb_inc=none
--	;;
--  *)
--	use_berkeley="yes"
--	with_bdb_lib="$with_bdb/lib"
--	with_bdb_inc="$with_bdb/include"
-+  no)	;;
-+  *)	AC_CHECK_FILE([/usr/include/db.h],
-+  	[],
-+	  AC_CHECK_FILE([/usr/include/db/db.h]),
-+	  [BDB_INC="-I/usr/include/db"],
-+          AC_MSG_ERROR([No <db.h> include file is found.  Install the
-+	  appropriate db*-devel package first.]))
-+	BDB_LIB="-ldb"
-+	AC_SUBST(BDB_INC)
-+	AC_SUBST(BDB_LIB)
-+	LIBS="${LIBS} ${BDB_LIB}"
-+	CPPFLAGS="${CPPFLAGS} ${BDB_INC}"
-+	AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
- 	;;
- esac
--
--if test "$use_berkeley" != "no"; then
--  CYRUS_BERKELEY_DB_CHK()
--
--  if test "$dblib" = "no"; then
--    AC_MSG_ERROR([Berkeley DB 3.x or later was not found.  You may need to 
--    supply the --with-bdb-libdir or --with-bdb-incdir configure options.])
--  fi
--
--  if test "$with_bdb_lib" != "none"; then
--    CMU_ADD_LIBPATH($with_bdb_lib)
--  fi
--
--  BDB_INC=${BDB_INCADD}
--  BDB_LIB=${BDB_LIBADD}
--  AC_SUBST(BDB_INC)
--  AC_SUBST(BDB_LIB)
--
--  LIBS="${LIBS} ${BDB_LIBADD}"
--  CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
--  AC_DEFINE(HAVE_BDB,[],[Build in Berkeley DB support?])
--fi
--AM_CONDITIONAL([USE_BERKELEY], [test "$use_berkeley" != "no"])
-+AM_CONDITIONAL([USE_BERKELEY], [test "$with_bdb" != "no"])
- 
- dnl End Berkeley DB Detection
- 
-@@ -1800,7 +1779,7 @@
-    pcre:               $cyrus_cv_pcre_utf8
- 
- Database support:
--   bdb:                $use_berkeley
-+   bdb:                $with_bdb
-    mysql:              $with_mysql
-    postgresql:         $use_pgsql
-    sqlite:             $use_sqlite
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch
deleted file mode 100644
index 0bfdc1d31550..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-sieve-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/configure.ac	2016-10-17 23:01:04.000000000 +0200
-+++ b/configure.ac	2016-12-28 02:42:37.936610002 +0100
-@@ -400,6 +379,7 @@
-   fi
- 
-   LIBS="${LIBS} ${SQLITE_LIBADD}"
-+  AC_SUBST(SQLITE_LIBADD)
-   CPPFLAGS="${SQLITE_INCADD} ${CPPFLAGS}"
- 
-   AC_DEFINE(HAVE_SQLITE,[],[Build in SQLite support?])
-@@ -437,7 +416,9 @@
- 	fi
- 
- 	if test "$cyrus_cv_pcre_utf8" = "yes"; then
--		LIBS="$LIBS -lpcre -lpcreposix";
-+		PCRE_LIBS="-lpcre -lpcreposix"
-+		AC_SUBST(PCRE_LIBS)
-+		LIBS="$LIBS $PCRE_LIBS"
- 		AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?])
- 		AC_DEFINE(HAVE_PCREPOSIX_H, [], [Do we have usable pcre library?])
- 	else
---- a/perl/imap/Makefile.PL.in	2016-10-17 23:01:04.000000000 +0200
-+++ b/perl/imap/Makefile.PL.in	2016-12-28 02:42:04.559449967 +0100
-@@ -69,7 +69,7 @@
-     'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
-     'OBJECT'    => 'IMAP.o',
-     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
--    'LIBS'	=> [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"],
-+    'LIBS'	=> [ "@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
-     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
-     'INC'	=> "@BDB_INC@ -I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", 
-     'EXE_FILES' => [cyradm],
---- a/perl/sieve/managesieve/Makefile.PL.in	2016-10-17 23:01:04.000000000 +0200
-+++ b/perl/sieve/managesieve/Makefile.PL.in	2016-12-28 02:42:34.496490437 +0100
-@@ -52,7 +52,7 @@
-     'ABSTRACT'  => 'Cyrus Sieve management interface',
-     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
-     'MYEXTLIB'  => '../lib/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
--    'LIBS'	=> ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@"],
-+    'LIBS'	=> ["@BDB_LIB@ $LIB_SASL @SSL_LIBS@ @LIB_RT@ @LIB_UUID@ @ZLIB@ @PCRE_LIBS@ @SQLITE_LIBADD@"],
-     'CCFLAGS'	=> '@COV_CFLAGS@',
-     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
-     'INC'	=> "@BDB_INC@ -I@top_srcdir@/lib -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6
deleted file mode 100644
index 119de24c188c..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	use dns logger
-	after drac saslauthd
-}
-
-start() {
-	ebegin "Starting cyrus imapd"
-	start-stop-daemon --start --quiet --background \
-		--exec /usr/lib/cyrus/master -- ${CYRUS_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cyrus imapd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cyrus-master.pid
-	eend $?
-}
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 23dc96dc53ab..04d897e54055 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/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="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="replication">Enable replication support</flag>
     <flag name="sieve">Enable sieve support</flag>
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 932194155af6..b6270ef03979 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,4 +5,4 @@ AUX dbmail-timsieved.initd 1558 BLAKE2B 79990327315d5f61262f519f9236910fc1043cca
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 EBUILD dbmail-3.2.3-r1.ebuild 4680 BLAKE2B 97cf83e0334b3c9f595bdaf535b5033c2e98be7343631e3b6942d8ed83e540e77c03ca2aa60f1941ee6179dd51cf571554ec40bf9a969f28c920c2f3cf19fd34 SHA512 a6735361b215507ab298b9c7d1f701f10e90b9a6e79c5b73b7e0a4e11d630ddcd40de89d318359b0ad3cb84ebe270942290563b1b5dc87a60ede08a6da95f155
 EBUILD dbmail-3.2.3-r2.ebuild 4782 BLAKE2B d8f242f55ea4d9400e79d7d6c3ab3c8b91cb782b99c413c87358c53ad57edadb801fe71335ac7fbf14a7705972ae015b94ef8670f15a63ccbfa5a38f5efb95b2 SHA512 bc68b548a4ff3cfb0e10eac6da813fce88bf61a01854045797deac3e120384f3e08662fb0ade81bbe9bd70eb7b5c16d2262e84a726236dcd50f6068a4bf99717
-MISC metadata.xml 681 BLAKE2B 235beb3355fffb0d6508af4753088efa341d74a62b87481bb5012c2668ff79194796ede4e76960dd1aca3f2a4a576268a0e36eb8b83ad012418611db194cd2ce SHA512 905c493d1ec543b10a58a152a4ea78ce59e831eb477baebfef4e930c39f268f24bccacb06ebc9ddbe398da27bf222910004fc6b74712b48bc619f7dbb94c60e5
+MISC metadata.xml 570 BLAKE2B 5f2c04c5edfeba1166114d6b3d103abf9acd2bf312a359b4d25fc622b482b75b8660d2b3c48239a6cd8f87ed63bc591e9495346af944c8b853c74123ac67fb22 SHA512 b993fc2d7954a9afe0a5c53f84e3791a78c033abd64f3d279a54c34053bbe344ba4d0aa4456c9aca5ef9b2131db08698fecb717f5d7f130c501d659ec8fd59a8
diff --git a/net-mail/dbmail/metadata.xml b/net-mail/dbmail/metadata.xml
index 60981ee8e971..5cda74b26256 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -5,10 +5,6 @@
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
   <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
   <use>
     <flag name="sieve">Enable sieve filter support</flag>
diff --git a/net-mail/dot-forward/Manifest b/net-mail/dot-forward/Manifest
index 2a9b90d8f1cc..1a54f5bc2ae1 100644
--- a/net-mail/dot-forward/Manifest
+++ b/net-mail/dot-forward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.71-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
 DIST dot-forward-0.71.tar.gz 26352 BLAKE2B 9757d07adc796ad35c6426eed3c53eb87f784a1035ad6569a8130e62a04665bb9ac03c250be0e5cb22f122c7204197f736dfc748d468c980814d23bb7ad0069d SHA512 f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
 EBUILD dot-forward-0.71-r3.ebuild 884 BLAKE2B 9555fb039015c123533e97eced5749b853df9a8dae41cb4544e54ee720a8302e5dde044781d1f078e9a7737e9e21ea728665f7adfc31dfa68b7235ab3853c036 SHA512 8cd12f694e571b9ab46e29ab21acda8ef74470ddc676e7aab0049ea421ac1f63d16e82b66b2306df067d156c9d75be4c4b9d3c57e20db45bb7556f53200fe57a
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/dot-forward/metadata.xml b/net-mail/dot-forward/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/dot-forward/metadata.xml
+++ b/net-mail/dot-forward/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 1572dc7fbf5a..86c01f16a5c0 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -19,6 +19,7 @@ DIST dovecot-2.3.2.1.tar.gz 6797491 BLAKE2B 92b88fd0f0cb8ed6c418bf27c2e1fc4efe13
 DIST dovecot-2.3.3.tar.gz 6851107 BLAKE2B 87d6e11c8ff59cfe0b49d3561c307535efb09296af617530a4d5a89b4fc12055d006d1b283a4de076f27d59deb64324b96f28620958ad85c38197710c5decdf7 SHA512 8666c4f92f7df883067540f85be9d03dbe6815b58a7f5de55b4292e986e9a2a1ef52c7e0c72dde2bc781fe40d57488b78a99b6b813745b8e4683f1a2fdc1f2ff
 DIST dovecot-2.3.4.1.tar.gz 6925073 BLAKE2B d8143bad01c107b68525d0cfc110e5bf4e3ffa0af49e7cafdfef263374e146a7ef6ed7107a7c5216c4b52da3640d7a9a80931c01d125d3852fa265171e4d4e09 SHA512 ff21aa0f0cae17dfa66617291688856727412defa48bad2b6be057cb509fbec1c2e134afbfee69929d06b8692a0fcbd8451671ba02860e1673ae1c9483c2c17e
 DIST dovecot-2.3.4.tar.gz 6924178 BLAKE2B 13e52a1b04036d58e68d762c9330dd5efedbf2421d658a8b657ca59e311b899a9b4a84fd754678ee67cd5b60f47b5a5ccd6a3fa08fafca7413c8b1e6ecd2fb51 SHA512 9e97eb08c319c417e8abcb430b3e6c87ed5aa820d6288656fdfd958ff34664f67202a66e4846763bfc85b309b116cea8012e49dab98b478c57974cc178a37a5a
+DIST dovecot-2.3.5.1.tar.gz 6953150 BLAKE2B 04484325e7b87f78c0aa6e3c769bc921e9dc62562cd8705b99166b7291b794f434b088dcf6512bc21c96d8937475cafa4d49c6ac611cb07f74a0d20e15e185c7 SHA512 e87754461fb0b065acd0ff10dc955000a2fe5baffed69efaf328ce9268f90140e9de444bc68e0bd48b565c7622885a79b1f90ff3dd2335c0c2362d05d9e73e8a
 DIST dovecot-2.3.5.tar.gz 6970480 BLAKE2B 006f64ce87e3eff04f3df7689ba9caed0b6b4f83eef28ee8fc2bafcf4a90b0255bf3d0d5d6b32571de8eb339f720a4d7b6de7dd5e3bcf6d03ecc5d6fa679799c SHA512 10513c371aeadd52184daaf8dbb9a7559c6db55e34182bbb2c9539dae0897ddcc76f6fe2ce6a81c7ce0cb94c7f79438ae3bb0e7db8ed46615feb337b4078ecc6
 EBUILD dovecot-2.2.19.ebuild 9072 BLAKE2B 27ccb93298e73d91e8402b6fa0666a35d0cc4c59ff5ea5a5b5a8c1e421b75bb29d6ded7d0a8ae3128a59ab39c88ca89dffc383bb85353e4236174397e119a8a5 SHA512 46683dd02f04b8c03a6261983e89ac0b3bf1b80ba05e7a574c0275f0699ab6c85a0f44cb4106b1d967a83f8f92aa4b8a74eced4054e7e14ee128a08ee118c3d4
 EBUILD dovecot-2.2.34.ebuild 8652 BLAKE2B 473b843fa61c17b3ce4474175aca83e9b5c76641853475de27a87b4a84f8101a5dea4c22a6aac0eb21b253ba9dcc8e139eec3283629f2f672d350144f71d3fdd SHA512 0eed64f5d2841aa46c727ed75ba5ff7ac4da8b3bee056990d327e36a8e951e85b70822271dc30dbb3ba80b599dd5442c4ad5efe7cd00440795437ba7218b47dc
@@ -28,5 +29,6 @@ EBUILD dovecot-2.3.3-r1.ebuild 8836 BLAKE2B 214e3df6d39beb54d30fb794b97368bea755
 EBUILD dovecot-2.3.3.ebuild 8789 BLAKE2B 6ab8548635742ba2dc82fe4b06ee4438840ebcd1e2d4cbef4662e3fb42a74a10aed252e6e28ac6f56b60006f44c1fcd823373f86d4b06245e06a8ae3cb7b6cbd SHA512 466b7ef0098884c9ef885048337ac68aa9aa3f40ad9a2c5fa6231f3dfbc5909fa97128c2872c8e9fde6a9a2129a096cabb1e681e2dd5fa0ac3d9cf89912d2445
 EBUILD dovecot-2.3.4.1.ebuild 8799 BLAKE2B d5b1129e0f7c6563682e345a5d7575761b5a206caa2aca36c4e002b51e4357980a2f93ecbe3974b220b00b04dab49f141580d77825c2850fd2cc4ffe089c1fee SHA512 a164ab663313a9b8334112377349a2ae807140a27d5c618d5d69c30a926d2d2854696516a4f1d59f9d4b8154ccd116213ccf0f9aeb7e1ddc1ba6717e0c744978
 EBUILD dovecot-2.3.4.ebuild 8799 BLAKE2B c80a46f994df324b88f35b9e6514742d12b93aa49016c9b655d3ee90ac5d27d14d3e26da9dce440dd19b59f3dde9d115f9cc6fe90dc48f7800ecc9bfa3ae0987 SHA512 2d4f00a1ab7dcd716141df08002251f26571d153ef58036de0dba6f828f96b48c9402b91fd4dcb2f5310332ad9bd7b8596b334df348ab7365a75a957e82c8c57
+EBUILD dovecot-2.3.5.1.ebuild 8790 BLAKE2B 7934d5a974c8c1f1d238edb02fbaff82df00b740a5400057d1d4f4de505932c1e9ff245687a2742558c54b697ab35b9e366f2abbc9e1c528426c07766976d175 SHA512 3d5b366b16f8df9ba24902180eecffe4ef4b09a27186190dc8e5b81d7f14c9e54a9b0917cdaefe81ee80283b0784dd9474ab58a262fb0ae059d2364fb22a2fb9
 EBUILD dovecot-2.3.5.ebuild 8814 BLAKE2B 20510b5b6c93dcf98b396bba828d646e2957be0da1dd626fc8483fbfd5709ff5ce284bae6e2303c8441eb585a96f9656d0511fa288ce759dc959bd3ef8c90f0b SHA512 538968024f28527c502d6f4da58a46c938d65294f0191ff9af7237604db852f031fa1f6dd6cd81cd7e20d4eee401d536262618939d55ab6a887eaa0de4f2ba62
-MISC metadata.xml 1374 BLAKE2B 629969318c5bcbdf0521d2293c6ead5e735ba5a113db3166e4df82103a3a84cbc62f3a2843082c9d5bdb635f25353ac7d3a4fcdf80d45e07b11b98754e744506 SHA512 16bdf15120dd8c957cd6e4957910acf21440dd0b8774cac9d9c5a48635cd46c7093850974b592ebbcd49085607fff2051691a42112f4ab9df44c51b9fea6d180
+MISC metadata.xml 1233 BLAKE2B 2b9193a6d3a417f28ab0ac92ed03315f2f97a43102ab9744e227d5054919b2f6be1b7073dfd50bcc88760a6e4854a16f12ed4fdb962c56491f4ac2147b2216af SHA512 4b73eee6867e764bb94a30cd05ee7bcac75f97eb623bc457d811a71d12ed500ac198acaba784c200f103179a58beb804796bf048c220ad7fcef4dc4d28a0b026
diff --git a/net-mail/dovecot/dovecot-2.3.5.1.ebuild b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
new file mode 100644
index 000000000000..de094d57b6f8
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.3.5.1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# do not add a ssl USE flag.  ssl is mandatory
+SSL_DEPS_SKIP=1
+inherit autotools eapi7-ver ssl-cert systemd user
+
+MY_P="${P/_/.}"
+#MY_S="${PN}-ce-${PV}"
+major_minor="$(ver_cut 1-2)"
+sieve_version="0.5.5"
+if [[ ${PV} == *_rc* ]] ; then
+	rc_dir="rc/"
+else
+	rc_dir=""
+fi
+SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+	sieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	)
+	managesieve? (
+	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+	) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="argon2? ( dev-libs/libsodium )
+	bzip2? ( app-arch/bzip2 )
+	caps? ( sys-libs/libcap )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lua? ( dev-lang/lua:* )
+	lucene? ( >=dev-cpp/clucene-2.3 )
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4 )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+	selinux? ( sec-policy/selinux-dovecot )
+	solr? ( net-misc/curl dev-libs/expat )
+	sqlite? ( dev-db/sqlite:* )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	textcat? ( app-text/libexttextcat )
+	vpopmail? ( net-mail/vpopmail )
+	zlib? ( sys-libs/zlib )
+	virtual/libiconv
+	dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-userdb-passwd-fix.patch"
+)
+
+pkg_setup() {
+	if use managesieve && ! use sieve; then
+		ewarn "managesieve USE flag selected but sieve USE flag unselected"
+		ewarn "sieve USE flag will be turned on"
+	fi
+	# default internal user
+	enewgroup dovecot 97
+	enewuser dovecot 97 -1 /dev/null dovecot
+	# default login user
+	enewuser dovenull -1 -1 /dev/null
+	# add "mail" group for suid'ing. Better security isolation.
+	if use suid; then
+		enewgroup mail
+	fi
+}
+
+src_prepare() {
+	default
+	# bug 657108
+	# elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local conf=""
+
+	if use postgres || use mysql || use sqlite; then
+		conf="${conf} --with-sql"
+	fi
+
+	# turn valgrind tests off. Bug #340791
+	VALGRIND=no econf \
+		--with-rundir="${EPREFIX}/run/dovecot" \
+		--with-statedir="${EPREFIX}/var/lib/dovecot" \
+		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+		--without-stemmer \
+		--disable-rpath \
+		--without-libbsd \
+		--with-icu \
+		--with-ssl \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$( use_with argon2 sodium ) \
+		$( use_with bzip2 bzlib ) \
+		$( use_with caps libcap ) \
+		$( use_with kerberos gssapi ) \
+		$( use_with lua ) \
+		$( use_with ldap ) \
+		$( use_with lucene ) \
+		$( use_with lz4 ) \
+		$( use_with lzma ) \
+		$( use_with mysql ) \
+		$( use_with pam ) \
+		$( use_with postgres pgsql ) \
+		$( use_with sqlite ) \
+		$( use_with solr ) \
+		$( use_with tcpd libwrap ) \
+		$( use_with textcat ) \
+		$( use_with vpopmail ) \
+		$( use_with zlib ) \
+		$( use_enable static-libs static ) \
+		${conf}
+
+	if use sieve || use managesieve ; then
+		# The sieve plugin needs this file to be build to determine the plugin
+		# directory and the list of libraries to link to.
+		emake dovecot-config
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		econf \
+			$( use_enable static-libs static ) \
+			--localstatedir="${EPREFIX%/}/var" \
+			--enable-shared \
+			--with-dovecot="${S}" \
+			$( use_with managesieve )
+	fi
+}
+
+src_compile() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	fi
+}
+
+src_test() {
+	default
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		default
+	fi
+}
+
+src_install () {
+	default
+
+	# insecure:
+	# use suid && fperms u+s /usr/libexec/dovecot/deliver
+	# better:
+	if use suid;then
+		einfo "Changing perms to allow deliver to be suided"
+		fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+		fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+	fi
+
+	newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
+
+	rm -rf "${ED}"/usr/share/doc/dovecot
+
+	dodoc AUTHORS NEWS README TODO
+	dodoc doc/*.{txt,cnf,xml,sh}
+	docinto example-config
+	dodoc doc/example-config/*.{conf,ext}
+	docinto example-config/conf.d
+	dodoc doc/example-config/conf.d/*.{conf,ext}
+	docinto wiki
+	dodoc doc/wiki/*
+	doman doc/man/*.{1,7}
+
+	# Create the dovecot.conf file from the dovecot-example.conf file that
+	# the dovecot folks nicely left for us....
+	local conf="${ED}/etc/dovecot/dovecot.conf"
+	local confd="${ED}/etc/dovecot/conf.d"
+
+	insinto /etc/dovecot
+	doins doc/example-config/*.{conf,ext}
+	insinto /etc/dovecot/conf.d
+	doins doc/example-config/conf.d/*.{conf,ext}
+	fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+	rm -f "${confd}/../README"
+
+	# .maildir is the Gentoo default
+	local mail_location="maildir:~/.maildir"
+	sed -i -e \
+		"s|#mail_location =|mail_location = ${mail_location}|" \
+		"${confd}/10-mail.conf" \
+		|| die "failed to update mail location settings in 10-mail.conf"
+
+	# We're using pam files (imap and pop3) provided by mailbase
+	if use pam; then
+		sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+			"${confd}/auth-system.conf.ext" \
+			|| die "failed to update PAM settings in auth-system.conf.ext"
+		# mailbase does not provide a sieve pam file
+		use managesieve && dosym imap /etc/pam.d/sieve
+		sed -i -e \
+			's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update PAM settings in 10-auth.conf"
+	fi
+
+	# Disable ipv6 if necessary
+	if ! use ipv6; then
+		sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+			|| die "failed to update listen settings in dovecot.conf"
+	fi
+
+	# Update ssl cert locations
+	sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+		|| die "ssl conf failed"
+	sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+		-e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+		"${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+
+	# Install SQL configuration
+	if use mysql || use postgres; then
+		sed -i -e \
+			's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+			"${confd}/10-auth.conf" || die "failed to update SQL settings in \
+			10-auth.conf"
+	fi
+
+	# Install LDAP configuration
+	if use ldap; then
+		sed -i -e \
+			's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update ldap settings in 10-auth.conf"
+	fi
+
+	if use vpopmail; then
+		sed -i -e \
+			's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+			"${confd}/10-auth.conf" \
+			|| die "failed to update vpopmail settings in 10-auth.conf"
+	fi
+
+	if use sieve || use managesieve ; then
+		cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+		emake DESTDIR="${ED}" install
+		sed -i -e \
+			's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+			|| die "failed to update sieve settings in 15-lda.conf"
+		rm -rf "${ED}"/usr/share/doc/dovecot
+		docinto example-config/conf.d
+		dodoc doc/example-config/conf.d/*.conf
+		insinto /etc/dovecot/conf.d
+		doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+		use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+		docinto sieve/rfc
+		dodoc doc/rfc/*.txt
+		docinto sieve/devel
+		dodoc doc/devel/DESIGN
+		docinto plugins
+		dodoc doc/plugins/*.txt
+		docinto extensions
+		dodoc doc/extensions/*.txt
+		docinto locations
+		dodoc doc/locations/*.txt
+		doman doc/man/*.{1,7}
+	fi
+
+	use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+	# Let's not make a new certificate if we already have one
+	if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+		-e "${ROOT}"/etc/ssl/dovecot/server.key ]];	then
+		einfo "Creating SSL	certificate"
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+		install_cert /etc/ssl/dovecot/server
+	fi
+
+	elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-mail/dovecot/metadata.xml b/net-mail/dovecot/metadata.xml
index 9dc787609998..496575228ba5 100644
--- a/net-mail/dovecot/metadata.xml
+++ b/net-mail/dovecot/metadata.xml
@@ -5,10 +5,6 @@
                 <email>eras@gentoo.org</email>
                 <name>Eray Aslan</name>
         </maintainer>
-  <maintainer type="project">
-                <email>net-mail@gentoo.org</email>
-                <name>Net-Mail</name>
-        </maintainer>
   <use>
     <flag name="argon2">Add support for ARGON2 password schemes</flag>
     <flag name="cydir">Add cydir storage support</flag>
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index 82351acc58e0..25e01c603c7a 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,3 +1,3 @@
 DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
 EBUILD email-3.1.3.ebuild 558 BLAKE2B 47884a0b4af4c192ad593c6c43a422c308dc320e61c6b7494178657ecda9c0d0945b56406e18c63a99f996f21b93120a532099de451f3324fb049cfb74b2f24e SHA512 849dbb318fb20a479fe2c46fb8bd7fad9679d8983de5ec4c27040d75401d703c96073fea84e1b39474a07bc1e6d014175de0de3ea1429eb82fcdfc31aed33593
-MISC metadata.xml 341 BLAKE2B db81f48bf76969be24f09df0354f6fecd9e0ad9da358f5f47f8fe45d5cea0b478138e942ceac523a634bb4e7163f9d301a39ece513b75527c8d3c0c7e434fce8 SHA512 8f94720f124779c884470d421573bbf405a5cd82877a2487d3cb0231255a9052f8666f015b62c1ac895b82f2b4eb9ad57fa8cabced7e0fe78d2429f74dcebb24
+MISC metadata.xml 259 BLAKE2B 340db8ab484f8fe7b7a74af660d7ef8f4d99d98b2feaaa02836808ef6da6176f6c15ea5525a097b8556d434a4c8d6a6c49d97a1deb1376edac3220b4d9a07208 SHA512 be960a9ee308ff2013fbd23ae68a484a273afb04a49490859d0bd5f01e21d176937386bb2704b6dba5599ae3c71f5c91c995a46dbb162b0925c41a025567ed81
diff --git a/net-mail/email/metadata.xml b/net-mail/email/metadata.xml
index 94c164d89e8d..9fe279795832 100644
--- a/net-mail/email/metadata.xml
+++ b/net-mail/email/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Advanced CLI tool for sending mail.
   </longdescription>
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index 6ac41c8ca813..19c99e2422bc 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,3 +1,3 @@
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
 EBUILD eps-1.7-r1.ebuild 809 BLAKE2B 0b09b965c8d853375db7e6bfe9113665dd831db65fa4928ca045774577b2cb16ec0f6a3227097936e746af05ea3c94c032a9c50fcb870488720461ca0b42c7b3 SHA512 aa69fdadf60a454d7ddecb68cd8a290842e87d8f8bb5b1f5f9a821abab5b262e9e1afe80cffab5a75ea3cbcb7b223e371768c976b2897aef372e705243a582e9
-MISC metadata.xml 524 BLAKE2B 559a2dc92cb88aa4b3224bfff8ef871f20ae2c323da8a736f57c5f2de4dc7fb506b8d57f6419562120921573d9bbc9abbe3b8b9dd209e42a0d1c95aa6850e99f SHA512 a1432bfc8582f30d2a012452dbc686b10524abff01dba3aaef5a591eff74e3b3b0eddbe10a6c897dfd7e116fcd73c925bda598d81f7c37affc0444d0c9754ae8
+MISC metadata.xml 447 BLAKE2B 30f8317f4095ee7a5ed8a600490bc7301155dd104cef82870a10e39319026366c3f34c3f4db90c86b893dc5606e4f3d76571ebbade82398ef40b6943f2ccd4f1 SHA512 40a941eb593ad63194da271f682313ac5792ab0147f95a3cb9e5f68bde2dfe0bb138aaf941d861f96ee3803ef2d146728600372525002c070b832d393d35b490
diff --git a/net-mail/eps/metadata.xml b/net-mail/eps/metadata.xml
index 282fe23db404..fe4e21b0135b 100644
--- a/net-mail/eps/metadata.xml
+++ b/net-mail/eps/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
- </maintainer>
+ <!-- maintainer-needed -->
  <longdescription>EPS (Email Parsing System) is intended to give people the ability to write their own email processing tools. Whether you want to process incoming and outgoing emails, or just analyze a message, this package is intended to aid in that endeavor.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 1bfd2ab6bf09..ab5771687931 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -4,4 +4,4 @@ DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192
 EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
 EBUILD ezmlm-idx-7.0.0-r2.ebuild 1534 BLAKE2B aacca11db0ff7d161a0c4313385c6ed2f4e5d7ce71f689ee31196a05dcba132124ac87bf399983bfd8017bce0886c2f897dedc817dc09836916e40167df2a7c2 SHA512 3fed930045f3451e4efa6fbd88ffab8b1e98f8dd2b366fbc21655194f94e3b00794c2ce57bc0bf42c84de12025f7c4172370b5658dd9a3dffe9dad5808c25474
 EBUILD ezmlm-idx-7.0.0-r3.ebuild 1429 BLAKE2B 9e5641fbaee2a744019f1fbf0882b51f27193e926facf733bb6d769b054cf91270ad1ff88304f4cad09158a1e8338664296987be248358ef39320cfd260caa43 SHA512 235a676ea6da184741f0c6d7241ac91b6489b60744673a02acef534bce02796aae3c021e3f98692f6e5f88345ff023ddcc856c80c301787d38e8338cce17f93a
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ezmlm-idx/metadata.xml b/net-mail/ezmlm-idx/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/ezmlm-idx/metadata.xml
+++ b/net-mail/ezmlm-idx/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/fastforward/Manifest b/net-mail/fastforward/Manifest
index 7b0a4436ea01..ab149895680d 100644
--- a/net-mail/fastforward/Manifest
+++ b/net-mail/fastforward/Manifest
@@ -1,4 +1,4 @@
 AUX 0.51-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b001353b1f5cdc8b5f73d507a8edab3f525b4c1407c02c0c0d11e09e96eaa5d041217da23f92aaef6c03e1 SHA512 1d4c1abde8eb0b4d6dd2254be29b685c922265ededa02a19010bc487e2e2013ef2df9a86a5dd797e0d7a30567cc18ae72324f2a67558633aae76262b2a9681a1
 DIST fastforward-0.51.tar.gz 40659 BLAKE2B ec4fe86431fd2a6622f721cbb0c5417b36e2a12bd121e5138ed7b7a311e9359bb9a7866a8bc4515d370873c7c26a85d4f0a0400bf3692a2a6dc544c584bef688 SHA512 7206f72dc7bb42d7e0cc63980eda7bc2b93c7ca6639db810f6d28476ab58d3e4bb6e441f4eef2149c5fe933c2f9effe2f2b3101d02cf9f6e922a678e7466b132
 EBUILD fastforward-0.51-r1.ebuild 951 BLAKE2B b8f2c587ee9ccabea7d27163a36ace7347055694b1d2a8752b39378daff6436c9b4bf684683cac45fc578e3861888c58bd875da1cc8016afd6c925a25ed93589 SHA512 7b240425996a2954b9eeac481f1a56d084d979e1f0a006bf1ffb28c1117585e9eb70ce68ea6a728cc87b7d08ffb7ede97bdd261ab9a9fd5de2cab4eba7476cab
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/fastforward/metadata.xml b/net-mail/fastforward/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/fastforward/metadata.xml
+++ b/net-mail/fastforward/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index d61ee742ec41..4227d3bc9f28 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -10,4 +10,4 @@ DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa
 EBUILD fetchmail-6.3.26-r2.ebuild 2425 BLAKE2B 2494f8f8812c20bc39e158a40609e0095faae93b5b61ff2ffacbf09526243de134561364e17feab75d73ed4659b17a94b568b3048f7bf0a0ed4881e7b8823c93 SHA512 ce5b7f534479e4d10950bd86d8373f3cd0e3fb5429820f642ea17b1cefb9d954406560c3931f087c72f53925fef7f993e22e84366585117ff2932dcced7a1fb3
 EBUILD fetchmail-6.3.26-r3.ebuild 2492 BLAKE2B a3b72604373b946de64b233015db0cd1759fb7ff1fb395e83be755bde4fce0a591130f9d8bc2f66b88c6e06cda974585135b65a4225538b28d482dfe6c3cf56e SHA512 5fb98711761c9a2a7b720a3f46ba3b66d3a8371ec8229f5defa81d660a7984682a7e5beca026576fa507c14003ccbfecf613042b606cdeaaf7feafd01c48ddc5
 EBUILD fetchmail-6.3.26-r4.ebuild 2662 BLAKE2B dc7926562671e3fd0778398c8fa518b30853bc355749d2059c298ae4d1f3e7727b02605bbdeb6ed89428728e7d78083f512b281b22fcc1aecf54d18f033ea56e SHA512 edf9cdebd3142ca2cf2d494eda3c79189c55bd2201b02fe3b842c2d6432f58a23ad440fdfb0719bdca1267f5084fad4eb40a7a0d487902a125ba71392df0f7fe
-MISC metadata.xml 513 BLAKE2B 3a01d489154b5c2785b4a389788b7800be3b2ad986b2968174d6e7eb548d8483ff00889f306f3ff0bdbe58da947cc1f720783a96264e49579c7d5921cdb7f7aa SHA512 4ce4ca4fa4608213837f8fc1d67f9611247bdab8954afcfd4050292a8f1bfca3b6eb05e3ff85e5c0b217a4d3f7682690322537f03f29272b1f0d477d8093b6aa
+MISC metadata.xml 431 BLAKE2B b8d0c68ff6274dadbcee2c3e51fdd524d026b5b5fbb20307949a190b8ac219a444f555b6c5420459932792fd02b2968d9b59c3bfb41252740bc7a191ce96c68a SHA512 b011852712d3310d0b9dd052215b514b4f2032ebf13733c49da7499207264524bb28231ca5d3309867f5154162c8b2f6dacc1a324b5f3f41c58818e04d705d46
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index 33e5a03d1019..09694714ee2c 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
     <flag name="socks">Enable support for socks proxy</flag>
diff --git a/net-mail/gensig/Manifest b/net-mail/gensig/Manifest
index f3d3c088259a..ea8ffe25ce82 100644
--- a/net-mail/gensig/Manifest
+++ b/net-mail/gensig/Manifest
@@ -1,3 +1,3 @@
 DIST gensig-2.3.tar.gz 96744 BLAKE2B 11115494df5078ef34608115c29277010c4c5ec3642a0f32705719b3fda20c8a655c61589cdb0140bf14629c255cbeb163f7c2add4c29677eb2339b6085c4dd3 SHA512 2d54f85be472f94f0c5edccc1d84d3c140e8f91d8d9dd50f404ec3a9856c2a5a9f74e6f6e315243c4d5cc60c9a817c8c50501056c2327f65e3218952e6e44aec
 EBUILD gensig-2.3.ebuild 390 BLAKE2B 80af7c39df63085f1f258fb78263d606be8a6aff1ebd3c30fbcc8e48396b3daf6487e4203381616576a3fdd0e1304fbdbdc8879c7078de2966cefaf375e78d25 SHA512 d08e730520b0b71d217151d7ce86b1d2f23a6e386467da32e5c6d6080474c9e10e78e927bca0eee5c7faba53a61c015eef8c58cab219f7955f03c46a9ec9727f
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/gensig/metadata.xml b/net-mail/gensig/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/gensig/metadata.xml
+++ b/net-mail/gensig/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 1551cfd9bac3..aa578ef0bb45 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -2,4 +2,4 @@ DIST getmail-5.6.tar.gz 197360 BLAKE2B 0833933c4dd4b0b7962070dd3d6738b2c7336f359
 DIST getmail-5.8.tar.gz 197874 BLAKE2B d5d236c03f1ea5620e773ff47203fe707e7c96bd4267b0267afc8681c3ab4015b291b08967ed0c05a2a1c82bca904236be550bd95d14f781445daf86a9ab6a87 SHA512 8469bc81fb0df4eeb27620b2cc472919bd441cbcb860a0f56b6d2433d22c85a0a326c86e1f566cd2a9d0acc0680d03b84f62cdfd5b92ae0e5bf7293dfdfe466b
 EBUILD getmail-5.6.ebuild 633 BLAKE2B 993e160d1203a4c51f04aa9337ac125afc61cf71adf40fe2bb9937292d869249eae532ec12e0475c4ae48aa78b36e972e2efb585fb8ac6c784197e8dae1249a7 SHA512 92fca063b145200af0e14cc21005be897914688cfce32b34b82302e3e528f12675342fb565fc4ca6d8cab2b442c5246e6c7ec1f4c0adb0f5b0099fb343168bd5
 EBUILD getmail-5.8.ebuild 633 BLAKE2B abb61d6ba2f1b1a70a7c8cbd46aa0e1711a46187176d752cbba72013c826b875eb353612f8a1cace2241a1f8135abbd75b8f8894bc4fc7c9c5dce77b99947ad9 SHA512 2b55155917e7b0dd6f2f19ab8d05f9837b74a9017715cf86d86268c118fa34110feff10f3fc43bb3014955521a90b9b6eb9c6699079d8c759fdd60f2573f4409
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/getmail/metadata.xml
+++ b/net-mail/getmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 80d76bf07563..001f8929c55f 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -5,4 +5,4 @@ DIST gnubiff-2.2.15.tar.gz 851638 BLAKE2B dd6d8527664470497d0f7eccd5f435f06f6793
 DIST gnubiff-2.2.17.tar.gz 897817 BLAKE2B 5ee58828211eb7b85ab017129feec48c6d2b2df4de862f7791f15f361bda7919cbdc7aa37403130da044a1f9e2068154ddc5ae8629eb9f4d38956d759477fb80 SHA512 2fe715d584fb057255d4922275de152ff5b1167abcbdd27d33124921a4c659c3db301944a73d58622ecd22f62615d44b5bebb83838bbd53c67a2dd8286592d89
 EBUILD gnubiff-2.2.15-r3.ebuild 1059 BLAKE2B f0b824e9610600bafc9a3a634333d261c7ad080233eac7495804510c23c26daac1433a2efa373e65bd9cd40222050236594e56b7ccfd0a38b9065d724a739ca0 SHA512 d6ab12975a623075abd8ebdd479f0d43d51397166e585abe27f1987816bd48c9659fdb4ecac72e4e3a7eef94b07a8706d1e9631f69339dbe7e184ff9eee7bda0
 EBUILD gnubiff-2.2.17-r1.ebuild 1107 BLAKE2B 5b64af7022e16fa55167f4db3db0f7228157340a5d3eab9315b2f267b04866cc4ea47c991c892214471e4271b96346ea67729a9a6897a44d2530fb911bbf4863 SHA512 96e16c80e19b6c315d14d6b959356b51e30a7e116624074d36b5765b4666415bee238a52f9f3c83df8dd706d38966fba903f689e6b0db695dbeab65d8eb89cb8
-MISC metadata.xml 441 BLAKE2B 32d4e54f87f31b0c58ec3ed963923431c65507c9d8bb42607c2fab2a5e7ac4769c3c8211aa1167108f9ad2891fd64bc79c646af3b90b99055bcce4941cf176de SHA512 05e73c040168ab771d6b48e72ad1f24ff2e85fd6aef619f0bff8cc06b0f0ffd52816ee48ae2c3d7c58fab4630242c9d20945ea8a06698db7f768074328690a27
+MISC metadata.xml 359 BLAKE2B e503972d7cc44508b3f94842c9b57a15f3fdc4df89a2eed1ea968fb6033c96b56b59ec6bf5839fe7cb832a69b565c29f6b47552acb205fb9a030d5531ba22bfa SHA512 c1654b01e77115f9c8d3852da7f5951024d0f121a5b589197af6843e063df27dcec59457aec68babe6a8e14c81a307a78a0e34860799d5bec076e0c6bd0c18a1
diff --git a/net-mail/gnubiff/metadata.xml b/net-mail/gnubiff/metadata.xml
index 7e7f9569f9c5..10ff5076a328 100644
--- a/net-mail/gnubiff/metadata.xml
+++ b/net-mail/gnubiff/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="password">Enable save passwords to connect mail servers in user space</flag>
   </use>
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index f940d836dabc..ceb6ad80b3a1 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -2,4 +2,4 @@ AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1
 AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775
 DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f
 EBUILD grepmail-5.30.33-r2.ebuild 1015 BLAKE2B add2f2f4ad29f860dbc624906243604326a763fb044a170cdf870c041fed1a87b31e4ce687df0453cdc4e5c490a3d3cf3fa87c33445276e63172ef5fda298459 SHA512 6fb30c9cec98ed542e23cefde7a4083504cc8d218c03614b9aa08c6d04642095c10e0a2417ba39e2f57e234b98b037f8b3dda85e39ada685ba2002a7ecaa9f02
-MISC metadata.xml 322 BLAKE2B 0948eb88341b5543738ed3093f0d177778a89c04889bb5497c5149cae8078eb20701a21161a87c0b18ac7e46dfd3f990d9061466d03493a3e8d638a8a14ee124 SHA512 42a55218140e081081755001a07289fea9e57be5e8244163fc57a110958b9f1c0855dc4c82c79838ff4a695374c2308c355ffbafe9a13e7be2ebbe11e6f0ec5b
+MISC metadata.xml 245 BLAKE2B 19ec7bd1e78a5b18685dff3959c1abd4fe2a737141ef33877820a472c5f9e4a2655108429c0f524956f10c4abd50522be56b85115c1af62b3ac67ba6accc0574 SHA512 fbe7cff14777362e70e446a04fa791b26b45fdc4d8416fc8fc4a234120570bf5368b97a56c0c9c7c033b799848475ba71a19d4431241c002141ec10f96c5ca3e
diff --git a/net-mail/grepmail/metadata.xml b/net-mail/grepmail/metadata.xml
index 79af08c23865..063d7f9282fe 100644
--- a/net-mail/grepmail/metadata.xml
+++ b/net-mail/grepmail/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">grepmail</remote-id>
 	</upstream>
diff --git a/net-mail/hotwayd/Manifest b/net-mail/hotwayd/Manifest
index 3fb9498a37c4..4b3a0523e616 100644
--- a/net-mail/hotwayd/Manifest
+++ b/net-mail/hotwayd/Manifest
@@ -1,4 +1,4 @@
 AUX hotwayd.xinetd 787 BLAKE2B d2fc421cfc38281b81e8df0f93c474e27c7af8081b6997f02bf90492e987f1ee4b4070eaa3641ca8cb6f0de8e21a7a2b2530bd6756c5b7b506952b3358ae0b08 SHA512 04122ea44e1dc2eafae42b6203664085b8c2068cea7afdbff44478e4ed415a69a1490cd2679961fa477c1cb1d9ab639469bc5bb71673b1d500ffbd27cb6bd6bb
 DIST hotwayd-0.8.4.tar.bz2 161274 BLAKE2B 213b029a4b49332e748c8ec94e7a6860592c282c82e452e5bed285d568b38387cfca2bd305762934343a0b3140da14d98782d49e7715d1a388e8e0736d02e4ca SHA512 df965964c8186e51bd2b09f4a99919443efe1ee2e828d0bdd905383813069a45e4b6b321ace969b3071a0d83ad21a1b4f76cd4ba57f89e13a6569d8b65bd8efc
 EBUILD hotwayd-0.8.4.ebuild 2029 BLAKE2B 13f55bb5114e0c7506f2d531d30d927babd8a9f8809e324b7d22a49ce723d47cfc47e56a7738030c9172035940acac6124de5519855ab8bff5a6f43190f6ee15 SHA512 e7ad4ecac55678234cdf500b861aa29fcfd8133ec6af2c84619e823be9e13c49db52f0019df2d48f9ebe4cecd82d90837b5314e7434faa72e68887b76c802899
-MISC metadata.xml 405 BLAKE2B 247d9f2362a854299a84cd40286b181fe8f0f2d54f84b0c0b206deb3ff3c6b5486700e45d0839af98b63709a33aca757be9a746b5f0706ca1eaf8a1fed807d13 SHA512 1ae9c94ecb7beceb2c368982aae5c95ec04cc743764bb31ba7219f3ed4c8785133f39f253ab5c4b3de196fc06efef36bead869317c305af23d75d64a8779765f
+MISC metadata.xml 323 BLAKE2B 810b75fca91bd4075cb42cee5f4aa6096f0ec393781c6311227a8ea8d0e46289662b73f9fa63208b34e5a96b781fb7fbd680be0b9f4843a1153ea75f460180b0 SHA512 bea2b376842ee5ef92d5b4ed58cf7566e3e4e41886e4e34431a7ad8240158e65567381703af0c64856bee960736b7fbfe6903fd14cb08da8616a6b463e1cd5ae
diff --git a/net-mail/hotwayd/metadata.xml b/net-mail/hotwayd/metadata.xml
index 832def52da81..7ed5da265af3 100644
--- a/net-mail/hotwayd/metadata.xml
+++ b/net-mail/hotwayd/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="smtp">Build SMTP proxy (hotsmtpd)</flag>
   </use>
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 295ab987673a..f16456a7cb30 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -10,4 +10,4 @@ EBUILD imapsync-1.644.ebuild 784 BLAKE2B b29b0d59d6b6e91c3f90f56fa9553ccc49715e6
 EBUILD imapsync-1.684.ebuild 785 BLAKE2B 510b45d577026bad26eed137c20475fc86cf6bf205f2f454478464f36e718084d996556ec90b14844c8d88a8ba16d5af7bbed847e976121d84ed8867415c948a SHA512 0f38b8221b85c460ba9a149ee5cec573143e2413d1fabbe26469d169052f82eec1dff823a9775d2afc93efec961e8d521100c889db3b11f4706446258587e540
 EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481
 EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 09891b19c95241c592ea38f048728be00d65bb862cf960557805abfb56a8883e241a5f0d484c6436866c15480e1fc7ea13920f646c714c674f1d0f02acd86bfd SHA512 71b0698544d99be72aff2b6aa9a9063d3aca64b99e5dc247b77a65e9b57d37d988463d5e2fa9a3887658177e5854be4fa6c2ab2d610fbe4c5f1b54584fa4f44b
-MISC metadata.xml 326 BLAKE2B 5bc18c049b6907e1efa4ebd4bcf8d07346ca02ff93a48cd69df9461a44d3394167c110aadab2f90f1d721188c65c818477d6cf861306a3274fa1a1725111d499 SHA512 b16222d629a0208e627ab47284c4eec08f0598c5c12e1ed62b8dbe23727711b396b5764429c07f7b85ef035d04398a9233b400344fc72e974dcbae90d4e7d8b7
+MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce
diff --git a/net-mail/imapsync/metadata.xml b/net-mail/imapsync/metadata.xml
index f33498ee6d14..24d2137c3b42 100644
--- a/net-mail/imapsync/metadata.xml
+++ b/net-mail/imapsync/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">imapsync/imapsync</remote-id>
 	</upstream>
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index 760461203ddb..a9cdaa09d83b 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,4 +1,4 @@
 DIST isync-1.3.0.tar.gz 309459 BLAKE2B 852b37e1d9d5b0c4fc2f84305e88263adff5448ea355782da17f295a22e3265e68edcc049ce6172155ab0be7518a0431091d45f4e012f49b500fde7c28491ece SHA512 b5186f2afe97cab58ce55d3ec19ae7371676ae614448614a9e3e02d09662c34b74e559f0926661fa0300ab22dab9e2e9089b78ee38b94141ff3f8b4d75578ffa
 EBUILD isync-1.3.0.ebuild 707 BLAKE2B 187a92a7da6c4d8fa8ee0651b36fb209e7c1fa054f82ec6351c5ef16d044583ed6f7af0b31e32efd450e25f678679cc6d7d5a3edc264902f8d0de7a28a65395f SHA512 ae1539349cd2097bc69243900bd6920a72a49557272464eae0507a36c42564f6be240c2692c61396cb70e4b6147b3b182e42a569c8cc30b9a500b60d56db5d81
 EBUILD isync-9999.ebuild 836 BLAKE2B 40b42361c93c1cc350318e81c5cd4d6438f89eb64adf45fe65433c993df045322eef4466249375f583ab6da95e27797e9b2688f2ce1f274a017316dcd60b5425 SHA512 178cacd53cabcdddf89dfdb7ec3a0a84fde49d46c3fe260a43a3dd025771f90cacd9aa284d69e8fa99fb1448055c489c2a2799918e077a7d27fa46939c7eab95
-MISC metadata.xml 468 BLAKE2B e1d79a9299b8abba3f692bd43bed3d9860496d9efde30710b03e8583736327bd33e53fb09fb3c00258d7e0510418a5e5ccaaf22f8890859cae2c1dfd1e71774d SHA512 fa787ea7cb87f19bed04af3060b0c06135662baa65ae631d799e461dfc2e88aa52ad8998b5bd3074537d034fd566413bbf8055e678e12300f151701489e316fc
+MISC metadata.xml 363 BLAKE2B 6dec111933ae495659c17c49ecf8020fa2f202c3a2e45178b8ece570ffa8d4a15330c873d32cd2325f9f138528ae8e498b2b9b3e1de063f42a028cb4d302be6e SHA512 04a35386c0d3af6f95c57060fff261063ead761033c0f43f9cfa09afb65f6c708de90813d50a812c5be6c76aa869540757a7aef9296ba831136314f509e29e17
diff --git a/net-mail/isync/metadata.xml b/net-mail/isync/metadata.xml
index 78a5838560b5..eb327c5a181d 100644
--- a/net-mail/isync/metadata.xml
+++ b/net-mail/isync/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
diff --git a/net-mail/kuvert/Manifest b/net-mail/kuvert/Manifest
index 82a8d029986e..0ca37124ee00 100644
--- a/net-mail/kuvert/Manifest
+++ b/net-mail/kuvert/Manifest
@@ -1,3 +1,3 @@
 DIST kuvert_2.0.4.tar.gz 118352 BLAKE2B 424968de1fc915c3858acb9c86fc9e90578db676502d0beae0d4c36217a53427884b79c24ffe2ef4f9e80b07a07a8aebf02a1b57271e6fb0b251210f4e439323 SHA512 01421ca8cf86de935040ecb7312833190e97bd99d3d3ab32356b1249df4e11eefa02cd9f0784d2c6c9135d065ee184b508efa55e5865d0b586f3267956611f1f
 EBUILD kuvert-2.0.4.ebuild 844 BLAKE2B 6d814a30b201d2cc227aae2913af43a114543f64475d49d85585bff589172a693bf0c1b3830b59cf101b28c0451c63e82401a2dcb736e47b72471520c325cc2d SHA512 80c5bc623b10af52c2c8363a62dd54528cc750681e4353a315c60aea25a466f0f2bbc271f0488c14ae9d6483691f5c798db0a27ab967c6721aa76e23495f9d66
-MISC metadata.xml 250 BLAKE2B 47e4263bf8209ef978ab2559609029ad4952a71dc1ebb4a449c8f767fc20706eee5b68b1ee72dd05fc22176a34296cb11a4987dff3c4c61695da3a143f0d78f4 SHA512 64ce00687c47be8dd203fede0460d4ff5f5bb741da301d30366ed8d041fce65298e8091bcd59423e86819d62e3e8f4989652f21e8c1b50eb541c65c7788c605c
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/kuvert/metadata.xml b/net-mail/kuvert/metadata.xml
index 493a4bf9e88a..1b2becffa26c 100644
--- a/net-mail/kuvert/metadata.xml
+++ b/net-mail/kuvert/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index dd54c88633eb..9052a6f28499 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -6,4 +6,4 @@ EBUILD lbdb-0.41.ebuild 1362 BLAKE2B 87f3eaca4b680eb27ff7f24287317973a9aa93f95eb
 EBUILD lbdb-0.42.1.ebuild 1384 BLAKE2B 172aca3cad92694d81e8da8161a8d440ab84e0cc78fcb86d02e04344a6126c135d6a6a5be6331a596dfc7cb0ce21a5d8e172c3e10196d9d68f0c50c0b363ebf1 SHA512 106b457b72342cbc7ff825b4013dcac2ed61ad2e1da9e772aa2054d1c9cfb2d61acbcea3302b710dee1ca6e5aef0da4b8c04362bacae0e9ebddb5b668a42e644
 EBUILD lbdb-0.42.ebuild 1365 BLAKE2B a16f65e809aadd9fc7783296805b178d79d3b7e37f314a448f3dd6d83052fcdc50d2eb0b75b5a70d0a1777cbfeccb3fc998cc21a7c631c0154c6a5c6c3e694bb SHA512 1c278aa8206024695441843caf7c8f71d8b920981c3643a7da9c92a1c34693724b7e56a5cb5575f49c9403960512e4eac7b3ab3a47f853ebd6557b1900198930
 EBUILD lbdb-0.47.ebuild 1460 BLAKE2B 97d7aa58fdf3f8890b4469d434e995767f3d1ddb7ce96af59a3b1a50e70366c06f3df08f82034fabf6791b6802e610e4687aebbc69b4183ce92e181456a7d857 SHA512 c2f9ddef4676ed5dc67cf25888a671ee7577fc65d7dd5aaa0d5263eedc960937732a11a444d6f29bf8618673a70867676974a84d7d3976f8480fee949fd63c8b
-MISC metadata.xml 534 BLAKE2B 09d25b635a791093567859616f8d9b23d1e31cb4945c70d9c4cba2fa35cd79e98b321849cbfc04dec183ea453599ca920067e99dc1cab349c147f9963579a565 SHA512 55e44252701d82b0c25cd23c09ad988957820662fef87c9d09ff481369e8295f5b1d4942b272052165052063ed4f28fb95370006cc7380a74d486cc5bdc3dd53
+MISC metadata.xml 452 BLAKE2B fb14006c0ff46ee5b6e9c72682db885497f93a3b48e6852c87128a2b17b91a0459ccdb2d5fe94cf2e26459c9176251f79ac18ec31d3f03cf060c0ea2f8294c5f SHA512 38c22e435ea247d967a8d04092be6f0195436db16fc03d7fd7aa3cd0fe0f3dbfbda3ffe6a58cb7e8a5d1dfb18fb0a048b7d525300bd265a7d0522dc91d991a79
diff --git a/net-mail/lbdb/metadata.xml b/net-mail/lbdb/metadata.xml
index 184220dccd58..19d2a8da2d99 100644
--- a/net-mail/lbdb/metadata.xml
+++ b/net-mail/lbdb/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="abook">Enables <pkg>app-misc/abook</pkg> support</flag>
     <flag name="bbdb">Include support for app-emacs/bbdb</flag>
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 98acd563619c..14a6131925c9 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -7,4 +7,4 @@ EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a30
 EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
 EBUILD mailbase-1.4.ebuild 1482 BLAKE2B eb1a131d41e204bc07a0d6a339bbed18c0abd27054a31f259d7ccecc9d129ba3f2c49984b51939ab8e0ee70c7d21e7bbd5e8e249f5361ad467b53ec2fd177723 SHA512 9463c5dd2bdc408972c4e3fd4a926f97a7e36672d2f6fcca5e361dd922968bea1517bc191bf0dc968fcda51cfcb3951ef1def837a88fc38bc680ae2b1746f0a9
 EBUILD mailbase-1.5.ebuild 1482 BLAKE2B 4862a2824fb0c7f56ca4a0c7c443c0dfeb46824bd82fe144233efa397173d8620ba53d8ee9ba97d92bd7d368b694fec8645cd37d5216b6f707286595a35229d2 SHA512 001c7732c000d60fa3c336a1b57dc973c650814b6dba511d520d1977d67e9dc1f938d6d7c186109c8dd2f0dbe39bb541ab4a41ddc1e435e85ec88ef883ce1a46
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 247 BLAKE2B 167e8eb377614081cdfda6ab24f1a1bcbcac4b7db4a34c79d682d3c47bc6de17c14fa679aa3a1d82a61988ef0fc044b99061635e1a50de646b9ddfe88444ebe8 SHA512 6dd50c3fa3c6a61cc3590827074f4dd0586cb36ef78dfaf161c09a613b198af88aa874b96f7958aa59761b0689ea903fac1bfca9d05023c648cf8dabc0596f4d
diff --git a/net-mail/mailbase/metadata.xml b/net-mail/mailbase/metadata.xml
index 9a6d80e5da48..e6f3bf582ab7 100644
--- a/net-mail/mailbase/metadata.xml
+++ b/net-mail/mailbase/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+  <maintainer type="person">
+    <email>eras@gentoo.org</email>
+    <name>Eray Aslan</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-mail/maildirtree/Manifest b/net-mail/maildirtree/Manifest
index 44f3f25a9100..210522416ec3 100644
--- a/net-mail/maildirtree/Manifest
+++ b/net-mail/maildirtree/Manifest
@@ -1,4 +1,4 @@
 AUX maildirtree-0.6-ldflags.patch 554 BLAKE2B 7024bd5632de675fc2de91a9c53b709ae3f77395f35ee844b335a74750ee89ff169cba846084a850c487cf660d009cfe36c6012d1b70f4a7e3d626e9882c4b53 SHA512 7969cdf5887e5030c516ee07de057b33a974df912b457833618925a0c00bffe393de2df80fb67858710690d0ddbc877fe59a2a323b61008a5005b189304e3acc
 DIST maildirtree-0.6.tar.gz 52569 BLAKE2B d2505fe66378ca43c83df7bdef6b8afeb38671cb87ba3797c3ac96cdb6ad0d9b6b59e4fd69fba51e402d3c3318383ef3ad516c51c5c585142ea1ba5c0e5270f1 SHA512 13a897b416308b4da7f6e4cb0a93e201fd873b8c490d77ca4186a373fe101837a2b7ba70706775c2ccd717f4b513ba24efe56a94f3c1075f6c0db5729cec9f2f
 EBUILD maildirtree-0.6-r1.ebuild 527 BLAKE2B 8f540719da35337858c3fe951f8be473d8d016ebeb052ef364a0b24ea2f3426b426bc92b6f750ec97798e6229336f7987579f8a94089d51abcbf31aced3a1280 SHA512 ef1d8d4647f689ea831234411d3af6c06c05b1975cdc1fd5289bd18017c9694ff3b456a70ed7d37b819222d7ad1d0425c9ff7b3242d6ed227e1e8ac9026a08ac
-MISC metadata.xml 350 BLAKE2B 2fb7ee6cbb48cbc68351d8e4cba9f4b253ff52c0a2bc3a482472090059ce7c4da9693e1652c58a0ec04cd34dc07a300f0e628a074abaa536710c0341a1413b04 SHA512 bf86bf8f640c50c2fddb6cb7d73059387a4c12f208e41e1efe8e3a4703179ea77bf3f16eb43246696a22647ec1a59e80b7b82ad0138bc35e39cb7b8f7e311588
+MISC metadata.xml 273 BLAKE2B c6f6adb4442cc20e9f3d34fe2541e57bd6d78a96bb1b060bc4237326b45bd30530078b7cadfe8baf02ddd11ba7c38828a5ee600bd3b532451f23545c7e1f01ac SHA512 062655344558b9693c6c856b8be5cc98b0dbe57cb829171f6607225dbf3ff36ed8ecad6fb3fabce5a18fe83a124f99a451668efcb5287802e8fec5b717accff3
diff --git a/net-mail/maildirtree/metadata.xml b/net-mail/maildirtree/metadata.xml
index b25c47355837..0289f9756d4a 100644
--- a/net-mail/maildirtree/metadata.xml
+++ b/net-mail/maildirtree/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A utility that prints trees of Courier-style Maildirs.
 	</longdescription>
diff --git a/net-mail/mailfront/Manifest b/net-mail/mailfront/Manifest
index 98ca2867a6ef..d2cd1fa5df1b 100644
--- a/net-mail/mailfront/Manifest
+++ b/net-mail/mailfront/Manifest
@@ -4,4 +4,4 @@ DIST mailfront-0.98.tar.gz 77981 BLAKE2B 1729dc60954fa3337bd7be841050886d091fce4
 DIST mailfront-1.16.tar.gz 108212 BLAKE2B 3b3bd3481b572eb48701a2df71a455838430f615332d7de2d4b3c6beea2a0d3b677cf6907bf975c31e7b2fb6cd60aab5ca45a566c515d2b645553a90391d773a SHA512 7f718e9c3b0f0cb4c5fcae967858f2d3597081c9e8e11c5c5e86f147c3e49e338d20acecccfb83d2db4b7e7a5b33f4cc21b0a0c2f71bb6ab8c71c76189281b2b
 EBUILD mailfront-0.98.ebuild 1560 BLAKE2B 7a15058f0d5326131948ad66043ac20b88980362fdc5622c5c83b7a5c1f8a4adc234be22972fe7395381a9f9c9c5bbcc0b9768f1608aa32fdec1b56b5ecb47d7 SHA512 07e5f6affc87c031af9a1b1cd8de49d366baa8ff4fc93db75ae00ffb6b27b69c5e85483efa5c575ee6ea18399e878c11da4975fcf3802d92bbfee6d4c6ed3256
 EBUILD mailfront-1.16.ebuild 1721 BLAKE2B 748ed1ea88a1db8ac72945f88b3bcbfafbdcb7d723495453bddd60f335679df4dd8aaa4f87b15b07ca93f79900cb87c49bd96faf19bce3885c7ca1d8471ac5b9 SHA512 a2b45ef2e4bdbd042af29745c0f8aa44d18d968e023678a8f31afb8bf96f3352c341370be474e6b1bb565374b578e2b82a187d30724d30980f2c4de985fa6cfb
-MISC metadata.xml 564 BLAKE2B c0b74f117dcbd1697fc64d36b6d9df70a01fa755f710b44eddcd9c4b8db7d0ddb6a3f5e727db81f09d41cb59fa2fac5aa17b7cc54af76c65df1383b20c14a185 SHA512 5815bd67c538d4105eb0c38089caabc01ed5b02f79f9382253b92a0720c6ff5aeae8dac311db316c91c8558b14b0febb14c8fa4b97347f1e235d987acf2e862c
+MISC metadata.xml 490 BLAKE2B 1867f6af282bcda6b21c4378e5d3bc117995521daafd19b465d5f34e7291f9db4647c163d658439ddf8268e038866ec87d97bbc6609bd6b277d808b58832fe8b SHA512 efbf524e791763c4aa07477146607524a7f57a8d5a51b98b06aea469cbd6f45a11a8ad2f562459a049a78cc7a6c14c4e3607aa25dec354880b52835ec6a4fc93
diff --git a/net-mail/mailfront/metadata.xml b/net-mail/mailfront/metadata.xml
index 712ab8e234be..29507c232b81 100644
--- a/net-mail/mailfront/metadata.xml
+++ b/net-mail/mailfront/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="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 This is mailfront, a package containing customizeable network front-ends
 for mail servers.  It contains complete SMTP, QMQP, QMTP, and POP3
diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest
index 2868ad22ffa3..f67433a33dbf 100644
--- a/net-mail/mailgraph/Manifest
+++ b/net-mail/mailgraph/Manifest
@@ -3,4 +3,4 @@ AUX mailgraph.initd-new 984 BLAKE2B ea3a6eac4eb9694dc48f33365eb846cfbd3f9f75eeda
 AUX mailgraph.logrotate-new 773 BLAKE2B 392128208bb8209e93d8802f133cb7b8f3ac0a6ae4453469da1cb3152820910de6b1a4b465166da3c2976faaf06c603cdf453ec9c53aba037bfa5eef4169b46a SHA512 a8fde20eb24964a0ab7efbe5e6ce0adc02e0d91daee519f4dd70049ac2f92fb53f63322128ae8716b64fb1aa28b7a2c55a8c647028ac73aff1687ad312d20baa
 DIST mailgraph-1.14.tar.gz 22014 BLAKE2B a4d72a557bc7718576d85aed930a0037cb7d83edcba62397d6e9a51ec7967c6ffdf6d310e6bf9b881839313ed4cf1969e40eae1a923bbae45ac71b9593f1805f SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193
 EBUILD mailgraph-1.14-r2.ebuild 3724 BLAKE2B 58e85eb39a3a2e96b1ed53b4099c81e75524f0ae1992e5b1c04bde5aef5bb86e45a94cec41a41c488b4721147249ea950eb12d78faf5a91461d5f87d36e7ad0e SHA512 77484eaf2c63041bc780c18dd0120eaea06035c74526caba3b553f56fdb61189be6d13bfb5b3cc13ee059740f6bb9ae0cfef44f8de9cd80e7145abf9f4e6cedd
-MISC metadata.xml 250 BLAKE2B 47e4263bf8209ef978ab2559609029ad4952a71dc1ebb4a449c8f767fc20706eee5b68b1ee72dd05fc22176a34296cb11a4987dff3c4c61695da3a143f0d78f4 SHA512 64ce00687c47be8dd203fede0460d4ff5f5bb741da301d30366ed8d041fce65298e8091bcd59423e86819d62e3e8f4989652f21e8c1b50eb541c65c7788c605c
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-mail/mailgraph/metadata.xml b/net-mail/mailgraph/metadata.xml
index 493a4bf9e88a..1b2becffa26c 100644
--- a/net-mail/mailgraph/metadata.xml
+++ b/net-mail/mailgraph/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest
index 73a15720fe77..d8c61288c69e 100644
--- a/net-mail/mailman/Manifest
+++ b/net-mail/mailman/Manifest
@@ -8,6 +8,6 @@ DIST mailman-2.1.26.tgz 9264592 BLAKE2B 04aad3d39724a01df313bebbb3b20bee0e991893
 DIST mailman-2.1.29.tgz 9376258 BLAKE2B 63ae740abed79d2887eef35ddfd8b51f22ee984a0eaacddeb34afb8147c0d239e5eaf93579face987b3c604653fed4c13233de78298914b4eacf5a33f769a997 SHA512 ed25179a4580092629890664c5502908b20e326c2ed06ad4e597fb4e8de84076c369ecd7a272be5ed8a1cb4479413d0e004d87804de763ee850e4d04d9a83376
 DIST mailman-3.1.1.tar.gz 749014 BLAKE2B 00cf756de1a6ce5a05f30b033ad7d1ebc5664bb1c6fadb5d602c4e34e373ee7a0df0801e6b68b0816ee819f77caef33bbc4b8490df1c8f01fd2fb35664fd3757 SHA512 b09962ec99ca1ce1eafd40409a00f976dc47d82adb707313f4516400db6439af8597a1c4e30262fb228c102508ede688912480dbb1dcca9721bb0333693f1d85
 EBUILD mailman-2.1.26.ebuild 5835 BLAKE2B 4e5d1cb9f5f7ea8a1a6e2cf4bdf43844d4db46d1ef3922ed7f6966e5b7447975c305a81be37bdf3310255dc7b0aa7eae7a3118ddd5b1394c2a1adc205c81a97e SHA512 0ed97a6103dabe7475a788d0bd7163e1e16588137f3d4567f953e1657d1ba44610a2dd158202997e37ddea2fc2414c5cf4174943def1daefdcf06bfd5fb4e0da
-EBUILD mailman-2.1.29.ebuild 5838 BLAKE2B 21b2d27467aa222177f20c998671722dd896b9566d49484d79639a8b218ca06f5a3a985d0859d2733a6a0ac4a847b38ca0399ea9355f66af81bfc6ef56d44c8b SHA512 485ab1521918beb7bcf5ffaf84e6c8331f5c50dd372bd3f986a9cddf03e8effc8dfe4aa0f0ecafb7db527a7d65c2c56e8a77aaf59b7583ab6b45e9391421207e
+EBUILD mailman-2.1.29.ebuild 5833 BLAKE2B 5333375de0e639a590baa82cb59f8f48054b3c0035d55900f6f659066098173db92e8cf182a0af7e52c86a56b98f9e3c75bc4831b901efa915c7a5a863b4bf6e SHA512 d270fefc384c455196f848ecd8f74f5d94679f98ca2b3cb8268e259e1c98592acd6ffe3529fd045c2d40cc4f10d64b034403b4fc08c48287a0e6d44f656dfbf8
 EBUILD mailman-3.1.1.ebuild 1188 BLAKE2B 6271605c5bc4701a59ed960c62d472cf1c54ce8b9e7cb69dc186e2c7f1dac33eb974ed71fb3e51cbdbabd7c14088aa18b036463c218e3e0a0ad5cb4190a8396c SHA512 ba9ad78e647b12e3b6eb56d619ddeeddd2143c41f7c0b4e526ee917d23e9a1cc4db0c8d8bf3a28c0ac41fb1838500d0088cb5bb201938541b2ecca2e373e0fc8
-MISC metadata.xml 398 BLAKE2B 47faf896df7388b5df4d4066764385d64413e8a48d57fee0ca63c98b574a2b219bae96d099f3e0f2f18988ae0aaf6e7c400b07c59bb02f4dbb77b740e1b76adc SHA512 e12fcde6e9360aaab80a5cece049ca20ba8deca00c7051987d0903d1dd9992545d62c10186f05dca6fed28682050efe704cc3ffd92bbcb0ceb9ce5ce972cf62f
+MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c
diff --git a/net-mail/mailman/mailman-2.1.29.ebuild b/net-mail/mailman/mailman-2.1.29.ebuild
index daf50c80c719..93a1812879a4 100644
--- a/net-mail/mailman/mailman-2.1.29.ebuild
+++ b/net-mail/mailman/mailman-2.1.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.list.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml
index 39faa5f3af1c..31afb682233d 100644
--- a/net-mail/mailman/metadata.xml
+++ b/net-mail/mailman/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>hanno@gentoo.org</email>
 	</maintainer>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mailman</remote-id>
 	</upstream>
diff --git a/net-mail/mailsync/Manifest b/net-mail/mailsync/Manifest
index 59ad008c2fc1..a38c7e36d344 100644
--- a/net-mail/mailsync/Manifest
+++ b/net-mail/mailsync/Manifest
@@ -1,3 +1,3 @@
 DIST mailsync_5.2.1.orig.tar.gz 139967 BLAKE2B 9790e573c50b3482829f76752069c6895058108b7f635c6d76086bffe8a50522a5e3e5fc3db2337a791556e206cb323d922aeb0ae3e4ed4fbf2bbf3d80933c15 SHA512 9282cbb6a4ed70ac003ceeace933fda92da3fd6f5bf1058016c138cd81f29918c59ceed615a8f05761f3fd1b32c5b04a0087116cbb75ecf56b8d66ab2c47d14b
 EBUILD mailsync-5.2.1.ebuild 456 BLAKE2B 39d9e86246822c9e0742139f12bf32bbd64fb75d90d372c0eaf86e8e1e009f3d11153e9b90f60dc0dcfa3e08ea433661167de46ae9e1c382ec8c5e39d23dcec4 SHA512 0580915aa301fdd03d5280234857c5da49b2b2e9b46fb7b03f5c2114c54ca7409d0a26a643c3815e09c13fc0c64f6081c3ce18c70f0a62d77b877d22e4ea49fb
-MISC metadata.xml 332 BLAKE2B 9d03011b99505dea21232f105ad3120d94d2a362ccdeae1489a2132451d23df5b3138def0236d8408e94d44ea97256464e79150f509a5b3e94e58307651359de SHA512 713e2d4c3fc6cfea7aec72ba4e4b55d5c429bfeed66bfca4fb1c5e3acfabf1e1ca4d731b5792a7e85396fd6e8d72b1f3a0a58abe6412a00f351fb448754da698
+MISC metadata.xml 250 BLAKE2B e54d3c6468265f3c973aa5eeae4b2874dbbeab3ab4cc19a653f83754574d3e63ca297a467e7eba95227da2115cbf885a968b20f90f04e85bae3b862cc848a180 SHA512 f38705b1534ff0688b01691619751e677d83884dea0c3ef7bb30aaec126ef34da08a7454a680d2a0f50265c92c03e98cb4bd10f639a9c6b07972a2ccde21b649
diff --git a/net-mail/mailsync/metadata.xml b/net-mail/mailsync/metadata.xml
index 3f63e9d8b9f8..356ee5f8af86 100644
--- a/net-mail/mailsync/metadata.xml
+++ b/net-mail/mailsync/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">mailsync</remote-id>
   </upstream>
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 893c925ee852..e70ce5cdd424 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -19,4 +19,4 @@ EBUILD mailutils-3.4-r2.ebuild 3535 BLAKE2B 2270b2a23bbe9b55950a23415f5c3983f90e
 EBUILD mailutils-3.4-r3.ebuild 3665 BLAKE2B 1a2a62f7403ad10f534fdfdf9898fb9e24467450fbcad54d0f3c0b7d4a289ed36d400cbf24a11ea92acc2e8f6a8a621dfbb7cebbb55b5d6c246ced31d6af0228 SHA512 1cb84032c3c433bad161c8412f5138719ac8a311f4e904b74a653ce0fbaa7f176f8dfd7cfdc676060a35c7a7808059a8f744949d7b7a1913d1f48d2766db2219
 EBUILD mailutils-3.5.ebuild 3434 BLAKE2B 6d9636f7562041f9c1fdf53e532812035912595f70c98460d3160e0dd808ae88e6727a0808aef674ce09f3bf022f0e50aace4eea6cfce92c38b3de59464a1a71 SHA512 7ff7fd774b22b3fbba05bf98511a98adac854803b86579613dc1d82eb1075c282989d420ba9658408f2b1fc721511fa95d6dfc792470404186e3641d3798e0d8
 EBUILD mailutils-3.6.ebuild 3660 BLAKE2B bda538c07797453de750ed28b1dbcf2bfdd4869378444c6a4c5c74df80d4fbd9e14a7c6cf872eacd5c3a1fa0601442803407290d5853f8c8f279f220be5c562c SHA512 e246a894134e92d7c579d1f00a52608dc79d1420886c7ae3669ccd77eb427f66ec5e7e7107e193916e852c6fcdb65ea1fc20e390522e4f1a6de8a34b3b3a7599
-MISC metadata.xml 598 BLAKE2B fce383bd86c8e43d7b9164abae6127ddc98b606b6a5e4afd17826f6a3fb683f92120d8c7877d250196bab51bfb37ab33454d3cfaeffd0b7a69a001481510f9a4 SHA512 16f2b6b082da7c932457df31809c8ca1caca1f8439037f56b5751c28cf1217658ed60fd4155871d4d5d71e7040c01edbe37198dee27beeae1905da954317c8e7
+MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/metadata.xml b/net-mail/mailutils/metadata.xml
index c54e413ee7d7..f38df515bc65 100644
--- a/net-mail/mailutils/metadata.xml
+++ b/net-mail/mailutils/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-</maintainer>
+  <maintainer type="person">
+    <email>eras@gentoo.org</email>
+    <name>Eray Aslan</name>
+ </maintainer>
 <use>
   <flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
   <flag name="kyotocabinet">Enable Kyoto Cabinet database support</flag>
diff --git a/net-mail/mairix/Manifest b/net-mail/mairix/Manifest
index 67d32f748846..f8247228cf73 100644
--- a/net-mail/mairix/Manifest
+++ b/net-mail/mairix/Manifest
@@ -3,4 +3,4 @@ DIST mairix-0.23.tar.gz 193726 BLAKE2B e1de3f7d8b81a23a87845fe4cc285ee46232a14ee
 DIST mairix-0.24.tar.gz 206903 BLAKE2B b18832dbd5d570d428c454ade693ab0746b6e601d94a9b6d5dd4ca81356cbaecaec5c88623fe5bd612e94112dc4b6f16929fc210ce3c5c8e1e5d2a0c62309d79 SHA512 3e0af50c2c5857c5e1661e1be131c9c184377947b2ed884d1d9faa6d8bd88c17a7b7a29e105e65c990d2ede5d9fff679e57e83c4b8eedf2870493395e3ec8cf3
 EBUILD mairix-0.23.ebuild 1127 BLAKE2B 5849c85e56f2d6fcb7c36db6e6a57a9320df46d469b942a3138c56b307bc0259a4f3d934a0274b250d583fcdde360a602bdfd00416b3c00dda7248637e1c460b SHA512 c5dcaf358b4d6813173545ee12d582b377df0a341d28b820b7b2f708924e0bdd64db2c7c8f5a1e7cd6a88a1ae3a7526d399d00e0ed39d3555cee570658bdb0b7
 EBUILD mairix-0.24.ebuild 940 BLAKE2B 663da72cc3f39b05b88786d42dbf21e6cff8d3bc7dd0c8312acc6e663d68335aef4012d79e7189d4956ea6a6cf88b7a9fa31e34e227183d60b4b39e67a6cf8dc SHA512 04706eb4755fea2b4814396d28d227f2388519887714dc9008b14573650e50fd2be6a6f55bbba56b651a5d0990738edca255e808f56c4e6fdb336b64360ce08f
-MISC metadata.xml 512 BLAKE2B afcbf886af3bd45c9f9a0ff97d1dd38b6b93a240205948e025de1a77b57a8c85e694748720f4cb8a2274d82b878263fd087a8ebd22e96f4e58cd5009233cbfb4 SHA512 0e5324d0a9b4963342d439deb7fe7def81e523a30b1fc6a2cbd6b475529ad1183835fb281b3445ece75e0cc49f753b9e2908316bb804d0d66cde9577d984302c
+MISC metadata.xml 435 BLAKE2B 10c870e9494171a3842301820c03bb8502556d0c2a36e0e5062960db644273eb20edd82b1a9f28df3d06fd1b7205e9403e80275f00652d233f0b6d9a6b381f89 SHA512 8ee659642be4150429b6f925f930b647bef299eb1dfb2fb808eb0e2e06ba693416397f27681d1291d21a215b016a1c1887cdf802f00b7efc8bb0b526a24aaa81
diff --git a/net-mail/mairix/metadata.xml b/net-mail/mairix/metadata.xml
index a6e9c27c6bf1..1c5738b1e1f3 100644
--- a/net-mail/mairix/metadata.xml
+++ b/net-mail/mairix/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gnus">Add support for the marks propagation feature
 			in GNUS (provided by <pkg>app-editors/emacs</pkg>
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index dc7741c9f744..501f5c105179 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -1,4 +1,4 @@
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
 EBUILD mboxgrep-0.7.9-r1.ebuild 565 BLAKE2B bfea9bcbd817323d54fa9a2aed66b8d801680a71f93c0cbc48073b7a3c8448ea13854eecc0b9989191de211e468560d92fd82ea1492fbfc9e3a37d3065eedff5 SHA512 4357b906fc48816a3c4310615b2a76377547ebf61cd2dfe51d2274e1d93c7e013ce14a38e8a16c754be81ba1bdc7deb357637d24dfcae6cea7d21c670e7bd19e
-MISC metadata.xml 322 BLAKE2B fc912b710da527d931de4428c8207bce47c88bde736f6a84791994af790c2487791955d8e08dbc399d60ee2494e986f882047510174fd7bae8c1dbab97849d79 SHA512 98a2d593b4429a08a938fc625b651cfc6a1afa0815c4ee7454c26ab3fd4bd38005455a5fba2b3cc6bf4604a70a39ed8b1e605c9e751dca0a62ebf740aef030da
+MISC metadata.xml 245 BLAKE2B 4b93589a8a73efb60967e4ba0102a586cd02498c0deeeeecc02dca9b11feddfe6842b90d19157d74daf909d124161b73f10f12f46ec4e2989dd2648b6b703c70 SHA512 bcd6489344b1d3d87ddea6a9a7ea086bc2cb3e22c6c3697e408c7df6818cf41abd2f5365dacd91fd4f5e66638b32e4ddd51604ee273ee5adfb7eb4e60f44d867
diff --git a/net-mail/mboxgrep/metadata.xml b/net-mail/mboxgrep/metadata.xml
index 33faa70f5ac8..dff8618ac7eb 100644
--- a/net-mail/mboxgrep/metadata.xml
+++ b/net-mail/mboxgrep/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">mboxgrep</remote-id>
 	</upstream>
diff --git a/net-mail/mess822/Manifest b/net-mail/mess822/Manifest
index c96f93ccb047..dbaee0c54784 100644
--- a/net-mail/mess822/Manifest
+++ b/net-mail/mess822/Manifest
@@ -1,4 +1,4 @@
 AUX mess822-0.58-implicit.patch 1373 BLAKE2B 39fde0a0ab48958774493aebebac5ca82beb74430cbf94e9634f1b0a74963d08f98a6196d10cf2d774241538b395cdc70c710d6dc6885d93a35c4073564eafdc SHA512 ee2819702b4dfc558eeea8e2885ea16c69c3fc9b48a4713d8eead6ba03a870c583406d6ff37269c11cda11f4a0f70caf45a2cf3569acba31d938ac75379a4b8d
 DIST mess822-0.58.tar.gz 64287 BLAKE2B d24c7c6c4d3cfcd21166ba9ac2ec72c0a0dbd05fb8329ac04668d9febe8632f63304342642f8c1a3543d4edd94ee5bcc7a2688ccc6f4afc12bfbd8d38eaccea5 SHA512 5fb30f06dfa08f60dc8760f9c5d692e59397ff848441bc94313a079bac8fb53b779133b48abae9b487dff6fbb277d5210a9690a138366bf4d34f052d661be65e
 EBUILD mess822-0.58-r2.ebuild 1236 BLAKE2B f54190b7049910238117ea52c7e8cca5daf22503584f37ced24920e61f0f4a0c08b6fd5ea366ec345688b85bfcd7119e5e77ad592f4dc24a17441f313ea5d104 SHA512 560ed33b23ac0d78824a4ab9dbe6c5a18856d0f8bb9b18329565c603bea252ec657808060ca6181a09622e97254f6423b04580907166df6a9139abe785a5b802
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mess822/metadata.xml b/net-mail/mess822/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/mess822/metadata.xml
+++ b/net-mail/mess822/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index ed854ac749f1..8884ff423c4a 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -3,4 +3,4 @@ AUX metamail-2.7.53.3-glibc-2.10.patch 718 BLAKE2B 83a95d5e03008f16449676ea6e863
 DIST metamail_2.7-53.diff.gz 322363 BLAKE2B bfb3ee13816a62f03ba5cdc3e54957b03d41662d1d32a908b7a02d92490f4c5eafd8e57d945e18902b873c9bbc4615ce7819bfb4fea3f227e1ca918aaa81fd28 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed
 DIST mm2.7.tar.Z 262881 BLAKE2B da245467b5dd009eb489e136d072205e5bc4a190b2b3a9c558f30c7dc6dfbecff8df1f51359cdc2561f7cd85519a6fd40705f2f640cb6632857507cb6bd551fe SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e
 EBUILD metamail-2.7.53.3-r2.ebuild 1678 BLAKE2B ae957433c723aa32dfd555b57e3c38f60355f4257a605eedca26316145ab3146ac73ae6a3957230e3c85612c36a33653d9416026cde9babc7f1c88f97c64a6f7 SHA512 5eff50ab38578869569f19ea724516c4af208a588fa29f287e928462a8058717a86c3683a6fbb6bc6fc388f141a56a1fc2fb30126743c36a7129294ed33605e8
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/metamail/metadata.xml b/net-mail/metamail/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/metamail/metadata.xml
+++ b/net-mail/metamail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index 06c0efa26a1d..b273828b75c7 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -1,3 +1,3 @@
 DIST MHonArc-2.6.18.tar.bz2 1546854 BLAKE2B dd403ef742ee3cf2ce3d4490a489d88fb4ba8814456d0ecfae347c4dfd5fc5a61593b9def93edcafadae5e32e9afd5853ac0bf584b8f0060962d1b6b3fb1f04f SHA512 816acfd5c68db274848859ea60c8fb47a12daadea5d8dc8acd12018b72c8ff22133ef7e366edb005ef309f7a74f2b4dfdb7ad5fe9256eb850bebaeb165be5511
 EBUILD mhonarc-2.6.18-r2.ebuild 918 BLAKE2B 0922076a4ad11dea1c4be3641871df17781424206fb416fb761a48393b2c172c3508ab4fb02119e4ac066b5aca65d75f4b5f36277ad42bc63b355a6b4c21bd97 SHA512 cbc1343f4ee336847aa0db5084d0b81a9dac92ed54efce5b53da0e8efdb33f7fff473593bf1cc60474bc618d669669916185f0bae82aa53ff5fced349d38e046
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/mhonarc/metadata.xml
+++ b/net-mail/mhonarc/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index b59b5c6741d0..bf2c519ad6af 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -3,4 +3,4 @@ DIST mlmmj-1.2.19.0.tar.bz2 284701 BLAKE2B a145b742a6024447d107b40bdd4072c193306
 DIST mlmmj-1.3.0.tar.bz2 292519 BLAKE2B abaf5c7ad53034d2201a2d3ba6d7f99ca83f47ec83df59e12a90a7118fbbde941d5ed2d14864a4af1568f67e74ea082fbc70fc9e44390673b76377bb3679c817 SHA512 c704d89f8a96c0ffc751a744ffdefb5e4304ab74be89292f06ce0c337b8ff1cc5a91737c8b1bd96fe3e993338986fa42bf360cfefc508e1eac74ab88ffda2494
 EBUILD mlmmj-1.2.19.0-r1.ebuild 991 BLAKE2B eb491ba912a45592cbd24a63c495702ac9f0bdf2ad41db9e7d0cb13b0928b5a5398a3b303f908ff3e17451f2621d17982f30c8be4ea83a30b42fd2798d1c6cc2 SHA512 5f2df9329d2f98ac3d531cdf706283cce3a3637bef5a02867e41b5bf66de7dfa64c649c95a060f4635dd34dbb229a3f6ee431e9e268deea3605030622dd5a0c2
 EBUILD mlmmj-1.3.0.ebuild 994 BLAKE2B a3bf2ac06a899856a33dff5c1bee54b2a98a50f272fb8450c105d136f552b06a582ef81509cd121d0898216431032a4b35ec6f9f4ff964a14b66a8d8e2ad2a04 SHA512 d80921b01c315a14e34b34ab3b0c6de8765527893020ebffc5151fba888c22bc176e5ebe0bcf8911b12b56a63bef45618aeab690df1300d3d0e4fb1fc4014d1b
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mlmmj/metadata.xml b/net-mail/mlmmj/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/mlmmj/metadata.xml
+++ b/net-mail/mlmmj/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mpack/Manifest b/net-mail/mpack/Manifest
index 22aeab862a07..d35c93a8cfea 100644
--- a/net-mail/mpack/Manifest
+++ b/net-mail/mpack/Manifest
@@ -8,4 +8,4 @@ AUX mpack-1.6-paths.patch 2729 BLAKE2B aa0cf351e69b2b041ea14c84c651275cf6e2cc895
 AUX mpack-1.6-usage.patch 721 BLAKE2B 9631aed898a8f95fb3e70f29c82994d0f1abcb935c106074c014a56f59f39df46fe6aea5b9eef0e58bfb25d5c9d4084126b88eb1117d8ca124746058b334bc52 SHA512 e07f72e6a0d037f788829904050bbee9f1c8c722a6b363b8a95ab012dda99b952e36bd7a9772a63d22ff4da34fdd44ead8d42db510e8c340f3410b3cd0d52b1a
 DIST mpack-1.6.tar.gz 179850 BLAKE2B d6b79e8514633fd0bfd1c04b167ba1d1a030cf5407dae30ba2a45e3d30157b66955808aed40a5163737c0242349d05f53c27ada920676cf3d7b81a00e7bd5059 SHA512 9bff0d2753d78288e428a20c8cbb4596bd9862de4da7f42176731ce5fd459b15883d758f9b1ec7d4e1281cc1aeaaa046cec54aeb0997a7ffed74de07edd84714
 EBUILD mpack-1.6-r4.ebuild 845 BLAKE2B 0e9f569170bfd111bc961e4b355ff26a16fbf0e2b854ea20e3f2910b79e5646e9afdfe6209fc258b9f159b59548c91dc6a8fcccd2d4f4cc88b86bf63f3128b60 SHA512 9d5ee1be67c280dd97ef38e8b48686b3a633c4dd740d8a64995708bc4e971dd428ea29034209d00bb47ae91faaa7add14128769021b3bab6b19bc6a0d447590d
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/mpack/metadata.xml b/net-mail/mpack/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/mpack/metadata.xml
+++ b/net-mail/mpack/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index 1738207461e5..bdd428fc426f 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -2,4 +2,4 @@ DIST mpop-1.2.8.tar.xz 272632 BLAKE2B aebea78c44103284929d7819e00377c8d64d0de1c7
 DIST mpop-1.4.1.tar.xz 296968 BLAKE2B 89304b7c63882dd394ff6797d87ceca1aa8af3efa4198fc0adeeba5b5704b57459ee466319f59657d65dfac2a3b8531a4515e51391e7f5030008589e689a0a92 SHA512 66b2ad8fab2d4a8262eb3689b094ac19cc961ef9fd5fd51c2c72b14c9f759194b906d2450b7c6cbeddb78e871198a2be8b336bc1fc7d6990a2b8b9d66068a2e5
 EBUILD mpop-1.2.8.ebuild 1103 BLAKE2B 48d3ddc531310bdda5557bcb979356081c85a9147ddcc6188dd618e1cea9b29ae8b9df84e1b9bbd7f077f185c960b231b060485f5222b4861d4a549c924fbbea SHA512 8b9ac4154d874b5cddf9e5b5efe50b267f5d31b09ef92ca9fd598c0e1aafb517c85e8c8cd00b9db669b4a433ec7f105f772f7ac717b62fa1124dab3edd94daa9
 EBUILD mpop-1.4.1.ebuild 1131 BLAKE2B 925850c2dcb32599974d63e7d3558ce6d3385ea14cd0118cd4e41fcc28eb17e00985ab514fa6cb4fdb1176294ec380712561061410e24ea2a57f56c9bd9acc2f SHA512 4f1eff4f81c5e78062da15cdcb2e4465bdd5f2d77994f0638b36645a992821185ac3ea6e88ef0d4cd19d59eefb154b875658a43de976413b574adfb5607bd1f2
-MISC metadata.xml 417 BLAKE2B 3c7a493ab2f179da566b98df102d3bfc7df20a3eef4694b1ec6ea8dde00197dd526f77af2d42e9c63670eace496992def5d2d29cc929f52f858935941e2ad669 SHA512 a0e8a9f86bf3a53d1ba38cb3da1c12a9df7372876f3cecf089dbef4048149ec7a11fc3f007aa2c50059a0be72c91a4c608e87d206be89c8f996f246e8a828012
+MISC metadata.xml 340 BLAKE2B 479a3a0f1f4e81ab7c7e7af6281465df76abf16643d0eb796af1eae25f845b86b3c934eac65c0cb9f82e50f6aaef144dac00ade3e1989def751d84e4033356a7 SHA512 29efeb748f5779060f64470a85efca0c508f00c6c37a1830f84d3ddb24186395002244df14999a22c63bc95f51b88a751a6eeef7932988afeb33fa27d278da57
diff --git a/net-mail/mpop/metadata.xml b/net-mail/mpop/metadata.xml
index 4cd173c340a2..0f85b7ea2494 100644
--- a/net-mail/mpop/metadata.xml
+++ b/net-mail/mpop/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	</use>
diff --git a/net-mail/mswatch/Manifest b/net-mail/mswatch/Manifest
index d3205ad4b9a4..b974da7f292d 100644
--- a/net-mail/mswatch/Manifest
+++ b/net-mail/mswatch/Manifest
@@ -2,4 +2,4 @@ AUX mswatch-1.2.0-gcc47.patch 565 BLAKE2B 67e42b684d1a134cf6dc02050dfda214d4c187
 AUX mswatch-1.2.0-gcc6.patch 317 BLAKE2B d1d5b9a1d97effc54879f74c6da34d21635ef05bedfcd8eea17c936b9b08a21b64d11b379e6c344fa92ed2703949eea840eee4ff242c8d53cf7dc9aba19db309 SHA512 5f73a6251fbc9308a02343c66a1ccf00917bd6af4469cdd0f1559fab89ebace0e24a6371ba21089b659d212f225091bdf2ff6843b4372fc9f2356add5dd555ec
 DIST mswatch-1.2.0.tar.gz 434986 BLAKE2B aa62ee594740546fce32869f86cda33d81ca8e560d418fce918919fa673431457b8c9ddceee7aecf9f410f98aca009f67e310ae25258d0f130a25d2a6a39c053 SHA512 c6774993909cb066514cb0ceb163bfd5e023d357435c6779d2d049cc9d56a278d5502193af1f4f5d6af264ff041b43b6c0fe2c400f775e8c22ed395a183c75f9
 EBUILD mswatch-1.2.0-r1.ebuild 787 BLAKE2B bc9fa5ec7afcffbfda33465ad74ad98328cd17a874274fb0a196fb118ffed6ba6e58fb8362bd9d0b171a6d3f7488cf229eeedb5eaf744c9c7d29e4aae7fb9bce SHA512 0d24dcd36d4f8ca9b56db7162287c1adf95f7807954b414b0117e3b2038c6b764c0be530892b574972018ad7c3863a2c7d0514cc46e6626f8572e79e66d1eaee
-MISC metadata.xml 321 BLAKE2B 4e575f204a8eaf05b8b14048232b6b5249a38c28f3ec38f9cf211c122b8823e6f65a959824d8a48fc7742a0fa3d6b234634de375f94a114db4c44493ab2870cd SHA512 44d9882a384a0f72548bf129bde41a91419939e38d7f5faf4c4ed9fc79d6e5d96c674e0c7098479efc118d58938d3f2f0168a304604bb87023b78ed89744f631
+MISC metadata.xml 244 BLAKE2B 314db280fdd6fb3a0ca700f569f4771e85587aef5b7800fb9e89680794eeee9e42a61169f5fac7d75d5dae9ab3d0e8cd7786ea3321835cda05deb8341aa644f7 SHA512 39a7436f1722de611975c554c56d0a2f91208bf4a5b92e1e4c3447e194f9c4f9170add7c0809e2d14da5744c060e1a3f4cdcb97badd77c2ceec08d24682adfdd
diff --git a/net-mail/mswatch/metadata.xml b/net-mail/mswatch/metadata.xml
index 42d60d817d52..203ecbe8a59a 100644
--- a/net-mail/mswatch/metadata.xml
+++ b/net-mail/mswatch/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">mswatch</remote-id>
 	</upstream>
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 3332053c72e9..c35b43f08144 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,4 +3,4 @@ DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370
 DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d
 EBUILD mu-0.9.18-r2.ebuild 1967 BLAKE2B 2fc80cbf26459398f0f12824cb310eafe4b0af676dfaf1d680bbff480ff7bcbd363ef6db1b022d87b6fa6333be33c47e47baa2a04db9d00653062724075243d2 SHA512 d2d2aaf0e23a3edb2871353eea2beee972aad3a06d1ad30dedb94d0c283850a2ebbf537dd3245e447968ee202105fa0ff1f8b965964765d3e0312cf9f7f1a824
 EBUILD mu-1.0.ebuild 1970 BLAKE2B 1f0d0ec3b5cc6c79a0a83c4c5d0488e81e92304e15134dd4902aa78f63ca77a120a7d10930261eb061f425bdff3d985d0d9fee63f7952abf10a65768fbdbb39c SHA512 1c9522b996bc308452352ecd6343280e95ddc3ce2684918c18f032537d92f1327f9a1271a1abc30ace3469985c628c0eb1c567e61fd634d87e30fb3f0c1f36a8
-MISC metadata.xml 707 BLAKE2B 88c58887c71748e5106ef213b7ffb5e12d8dace753ed1c16e8edeb04e4d90b78fa4068a641dc27708dce10361fe696a019f981ff78d743412f44564b319dc2cb SHA512 1dc4b5b5a7e23db1882567d1dcd7a34c4c74bc526164998b2d1a062ad7abb67f7f2cc2c21a6817566d56a86f5714700c8e48a8ba40c12046663c6605d035e5d2
+MISC metadata.xml 630 BLAKE2B 0a24656b86c87b2af1d9b00fc8be0fdccaa2fa28d6b1d8a4146b3d4df7a9edfa3934b28f54615115e1369da32b10e52fefc9ede45b5b59e4c5055d43f797427b SHA512 644b98b1c92e4a8b3e51a9d75d815869f84908aa0fd434c6ac24ca327820e6a2eed31013351a89f33aac9a8a0db91636e8912e5b0417556b45d888e3b1b7ac62
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 1a580e11eb89..f5c66685bfc7 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
 		are looking for, assuming that you store your e-mails in Maildirs.  It also includes an emacs based mail client mu4e.
diff --git a/net-mail/nmzmail/Manifest b/net-mail/nmzmail/Manifest
index 1c57cfcaf9b5..6aa3d59ae350 100644
--- a/net-mail/nmzmail/Manifest
+++ b/net-mail/nmzmail/Manifest
@@ -1,3 +1,3 @@
 DIST nmzmail-1.1.tar.gz 94326 BLAKE2B 3a3125c21c67411f1608f7137becdac7b908c2f42e215bbed4897aa5815d8cc3825cbf5109f670caf1a9c8a8b4e82e0463a4acd68473b1664367c9c874398f32 SHA512 c5b689c587fc0d0359c59a02a2a1f519753e7c8a10aecd2c519f0e788b95ed1023a18bf0d2ee39292f36aae71eebf43d2463ceef7857d01358e56c8f0bd70249
 EBUILD nmzmail-1.1.ebuild 429 BLAKE2B a771afa059c7dca398d9b801dff3f20920450fbc0e1d62ec301ccb68850fe3862f6a18b735ca43408bb2e09a659f591746b01d1c739ac73d648d823e1a1a19e3 SHA512 05b0621c84f5f1852043afedaaae3d9f378977b6e05fafd0756cdf5dfaedf73b7c25449d892626b81eec00f9c31dcb71afd7556cfda1c713e719b04fa4442a5f
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/nmzmail/metadata.xml b/net-mail/nmzmail/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/nmzmail/metadata.xml
+++ b/net-mail/nmzmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 601ddb2e61a6..4b9c71558045 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -15,5 +15,5 @@ EBUILD notmuch-0.25.3.ebuild 4849 BLAKE2B f3feb24632beb2d89bcf32d89e4f00d5813e62
 EBUILD notmuch-0.26.1.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
 EBUILD notmuch-0.26.2.ebuild 4843 BLAKE2B 1c44fad5564715905905f067ff901b93ab24acdfc1a15c12a86dd020ddd0c6da8b729b18d40ab390442417604736a69497bc254cbead3606fc1741a7a32dd08d SHA512 700c71470ba40612225b11fef08e69ad4f1056016bfab9714c132c9e4842edeb9e6b53b465ddbb7fb9927d00d68f84f10071b465153e4c6ad8c5f519470c0fe2
 EBUILD notmuch-0.27.ebuild 4950 BLAKE2B b7b849221f3938f311063a3c09906e2294a9e6551669666277aa8eddc1aa3573d5559c94ab068d30f63ddbb7fdc3f0ee1e427c8718e6f4dfa53ea03ef6b64d36 SHA512 01dc2372a92c7c7d7fe1bf08265a81dda1794fab5a7657beab11816b0bed8a27277ea2de1e8123f132fe0afba980e60bb6639c61370e402dfdf3c9eda2d0a337
-EBUILD notmuch-0.28.3.ebuild 4958 BLAKE2B b72ec056bf5ba0cd29168617dedb70c5644b165bbd4223d45bd93470119f160d3da3a98e21ef53bd13b326ea60e5e0f8824dce23e529f3664bbd33d5baccb6cb SHA512 c4972a8e6eb1b2cbb4c932cb14a24324ccb69742c9414f89b8258872b02d5364f21a53554ab4c06745e2e713673553807e9bb21600fa14185f2e0c34b87d29f8
+EBUILD notmuch-0.28.3.ebuild 5038 BLAKE2B b56bdce9701f5eda443f5b94313aab994a2bf17c1b72db8b2950178fa518cf636b4fe46a9f82b0c412a2977645a5d5cdff0b55abb87a220dd28a49143f93ccb8 SHA512 ef727379c336e813e501d0695fc9eafe9b8132ecb30c30cd2fca81c7ae0f7b4d6e9f1eb9990cbb70091d512622049428227e87ac5180b61071118af9b95cb2df
 MISC metadata.xml 1117 BLAKE2B 08710cbb42c20580235f5cfafa39715c33fb50de24cf98a182418db3c52ee1de5a1ee0e0775ae5756fee301c952995a1e7da52b9c13e5bd8c8b2fc0d1d74a5d2 SHA512 c420e475e5d16d35cceb1162c14eae143e5f539e771561d525af4ab0f0853e700b9a3209ee1a7aa9b4269c235737304c435d463cd8b1cf201402152ff0a6a4f3
diff --git a/net-mail/notmuch/notmuch-0.28.3.ebuild b/net-mail/notmuch/notmuch-0.28.3.ebuild
index 445fa176ab44..9a03251ba48a 100644
--- a/net-mail/notmuch/notmuch-0.28.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.28.3.ebuild
@@ -41,19 +41,32 @@ CDEPEND="
 	"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( app-misc/dtach || ( >=app-editors/emacs-23[libxml2]
-		>=app-editors/emacs-vcs-23[libxml2] ) sys-devel/gdb
-		crypt? ( app-crypt/gnupg dev-libs/openssl ) )
+	doc? (
+		app-doc/doxygen
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+	test? (
+		app-misc/dtach
+		|| ( >=app-editors/emacs-23[libxml2] >=app-editors/emacs-vcs-23[libxml2] )
+		sys-devel/gdb
+		crypt? ( app-crypt/gnupg dev-libs/openssl )
+	)
 	valgrind? ( dev-util/valgrind )
 	"
 RDEPEND="${CDEPEND}
 	crypt? ( app-crypt/gnupg )
 	nmbug? ( dev-vcs/git )
-	mutt? ( dev-perl/File-Which dev-perl/Mail-Box dev-perl/MailTools
-		dev-perl/String-ShellQuote dev-perl/Term-ReadLine-Gnu
-		virtual/perl-Digest-SHA virtual/perl-File-Path virtual/perl-Getopt-Long
-		virtual/perl-Pod-Parser )
+	mutt? (
+		dev-perl/File-Which
+		dev-perl/Mail-Box
+		dev-perl/MailTools
+		dev-perl/String-ShellQuote
+		dev-perl/Term-ReadLine-Gnu
+		virtual/perl-Digest-SHA
+		virtual/perl-File-Path
+		virtual/perl-Getopt-Long
+		virtual/perl-Pod-Parser
+	)
 	"
 
 DOCS=( AUTHORS NEWS README )
@@ -169,7 +182,9 @@ src_test() {
 src_install() {
 	default
 
-	doman doc/_build/man/man?/*.?
+	if use doc; then
+		doman doc/_build/man/man?/*.?
+	fi
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
diff --git a/net-mail/offlineimap/Manifest b/net-mail/offlineimap/Manifest
index c6795e5e0685..d875f06dc732 100644
--- a/net-mail/offlineimap/Manifest
+++ b/net-mail/offlineimap/Manifest
@@ -10,4 +10,4 @@ EBUILD offlineimap-6.7.0.3.ebuild 1785 BLAKE2B 43edc0187230509d01c5f7044b166b91f
 EBUILD offlineimap-7.1.5.ebuild 1636 BLAKE2B 045e7fc7932531830b72cedb329948b35145bac6a2c5ac3e777853180c0fa32e335b2577732d3c61d94d11fbeea1d4133a8f912e308889d0dd8c78fe816411ef SHA512 033e5823d7eb6f0aebf8efab0e926f634f4df7299a1faa8c8df11b6b6e72255abb8596197deff53114cc9908d95ea7194d3f3cef2d4b89f9132e4479721b1c22
 EBUILD offlineimap-7.2.1.ebuild 1636 BLAKE2B 5d5280b9461889f799d71f1b756cd5812673b388476c01a857fb2d6e76f1c31c2b688f601f2035d55873d0a243def598191ef0fb0261f5749e8fa45c42903dda SHA512 919380d9ae801b6208403849ae00fbd1ee79996170e2b95eb1a72bbcffbf99832423540a639cfabcd5295eda01608d9b86727d3ec96a507468be6495fb0cff85
 EBUILD offlineimap-7.2.2.ebuild 1633 BLAKE2B 1b20522da321d9292abee87ebb7aa09108ca004e41171f820dbc62730be2cde58d5c08ac4cb4e04bc0d61775563787d283d5d2b51ae73d770e42d1599f64ee5a SHA512 416681831a9bcdba4034f85333fb989b3e588f82481be59b9b6b18920ce98fe7c52a3a700d483f130ce4a5e938a5ad5a534c6fa2c38ff7ae44449ac12fa17678
-MISC metadata.xml 447 BLAKE2B 4bbdba65866601fada2c8123f208ee9f3956478b686a8491a80e092e1705f387b9cef50fdf8ec909e56b225ea5c1c63b74af3436ca95820d5b8d380bea45a01d SHA512 58d5e16ad0ea7a82e114eb99bbb6513229833523a4b3459e567083a6b21a63dbc0ca0c9559a5e4e04c64d66d19e71215154cab275d7114e0f6b57bec8020021b
+MISC metadata.xml 365 BLAKE2B 44c143951196526dbc7e8c23fe3719a33ecf633361b9aa5294dd4e61c1dd0aecca12159a33c3ef7e0706a5c57162f170559c44c554541754cf5049118c8d89c8 SHA512 ec19d9f99d945536a02dfd7d8c113c6a6337e80190ee60ab172ac9c248398f4faad49aabe4f56e5e4d5eb09ea35810a47ad263b8df59f7368e1f8bed6e780c2a
diff --git a/net-mail/offlineimap/metadata.xml b/net-mail/offlineimap/metadata.xml
index b8a2d88e0f12..07cfd8325afd 100644
--- a/net-mail/offlineimap/metadata.xml
+++ b/net-mail/offlineimap/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="sqlite"> Enable runtime support for sqlite mail status backend. </flag>
   </use>
diff --git a/net-mail/peephole/Manifest b/net-mail/peephole/Manifest
index ce23a740db6b..a84db0abf54b 100644
--- a/net-mail/peephole/Manifest
+++ b/net-mail/peephole/Manifest
@@ -1,4 +1,4 @@
 AUX peephole-1.4-gcc4.patch 627 BLAKE2B 7e444ef16bc21c87b260bb61fd685361d3cdb4169a2950c5ee6aa175ceb413c49de0523f4f7cc72aa7506aea7375e8905a1f5eee72ab3e0e8733e471c7fa4d67 SHA512 831724e11a99fb6c3e6ff3ec636bdb54dc6498d934b2f296c70a47fef2f00deb46155ffb271e5253f2694aa580787c7d2d31ee3f0e782abfdd57b186f0dece25
 DIST peephole-1.5.tar.gz 351492 BLAKE2B 713792ec5633c32fa88b39745b5cd3dddc07f6abf0cd8b6a703fbe56a1db3c1a69d9ba3cd2e17530f140e7eab97cc2307f4548d97e26145c3939ed17cd7fc924 SHA512 d60377029f21513cf8bb1c0fc5a3be0bceb57a11275ec089c235a140e069e1bb6837d9b046539c4641d154e0ba93c2803e26887c0f399e401744b1145aec3b3b
 EBUILD peephole-1.5.ebuild 792 BLAKE2B 3d52d0b0458b9d8c406a1aced8e0100e7926f9ed4ffd154b4e7d0bc900dc16a3e398761dc7d3985ac2037654965a557ff841f7a22dad0e78faf5edc2d4e9fba3 SHA512 0aada597e8ebab5327bf8bd45354cc50cb454d268d2e73d982f93f042b63a54f3e337729ec1f72d06838c3810488fe7e1c358f028f7162dc1b091690e09ff4e9
-MISC metadata.xml 322 BLAKE2B 43710c48ac591394060cf17521037d7f1e1ce1b54cbef19b19f69280861db448869402b0f338bb5a541701366a375200083ef1106896ff567257ea520c878d78 SHA512 45d89f2f116e60bafc2090a9bdeb41feff5904b345b059de751cd2eb9331f08de95c6708a4a5c6f009cbfa29b1fd6ee8f7ad4d3ef4f73eafd1f7e4130f3ad100
+MISC metadata.xml 245 BLAKE2B 4e56571bf9d2ccc31fa1f0eb315ef8e616517884868c415e148f0c96f3a886c2f25ba0cc1203e4a831dd51c821b888a2b2bc6bf245948a13587101d9190ce756 SHA512 938867a7de048eb321af44de84a71cac6a98c768748abfe74c3bb23f36216fc218300c471d6ce537a5e349d1333b5df3be3d459beab8cf45c526ed67b0bf7c95
diff --git a/net-mail/peephole/metadata.xml b/net-mail/peephole/metadata.xml
index c2d6a6c4d937..6b81b92ee3f1 100644
--- a/net-mail/peephole/metadata.xml
+++ b/net-mail/peephole/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">peephole</remote-id>
 	</upstream>
diff --git a/net-mail/pflogsumm/Manifest b/net-mail/pflogsumm/Manifest
index 07352c2c2c40..51e84d62b58c 100644
--- a/net-mail/pflogsumm/Manifest
+++ b/net-mail/pflogsumm/Manifest
@@ -1,3 +1,3 @@
 DIST pflogsumm-1.1.5.tar.gz 47130 BLAKE2B ef28092aeee7bdd478c697c58b4e8cc085f47fcd1b59713a3ed1288a646881809177edd5c1711c3dc0e19299dcf2c0d3f7f7eb9623011aa3a1995c8eae4c4f47 SHA512 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
 EBUILD pflogsumm-1.1.5.ebuild 512 BLAKE2B 435a02b0885e4e64cdb6ca93d6e19a682191306d11c8aa148fda39ac56284deaeb3f2572b9b3f62b6999949a0079425f73743328ef8a819ea6ac3f6716a64b51 SHA512 bfc240e6d1e229ac6f4ee86e2b693f246bbecc4dbfc1198431d68a7c8cf608eb6dffa169aabc9eea29c47b7e9af7f4b8d8fa4eded2295eb1e86c08e731f4efcc
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/pflogsumm/metadata.xml b/net-mail/pflogsumm/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/pflogsumm/metadata.xml
+++ b/net-mail/pflogsumm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/pfqueue/Manifest b/net-mail/pfqueue/Manifest
index a2d2ddf4ee06..430c77c917a8 100644
--- a/net-mail/pfqueue/Manifest
+++ b/net-mail/pfqueue/Manifest
@@ -1,4 +1,4 @@
 AUX pfqueue-0.5.6-tinfo.patch 249 BLAKE2B 6228a39564ab9e4ace005b3d5239b2fa54f63c1d5945c302ba11ecdff1d0cb153465125be1ca512cab269e162ff783d61134d4d599df4ea87f9c9803698fe3ee SHA512 ac0f652a16ee74250e92f29280a178bd7794ac7a9f4192b9558482d078cbdc8b4b75d668ac63ff8bd8c0f4bfd191d32e3d9a2af0c3dc420d191c8c79bde4bd2f
 DIST pfqueue-0.5.6.tar.gz 298870 BLAKE2B cee47396f4bad72d8a54716de3fcdc5b41fbef5ddabb88394144d743ba7fba52cc39c5930eec72ece01ceb62a343f0f742ac19eca4ec4e7a11feb8d95f9a3e95 SHA512 1bb622bba6d72ff98ee862d794854debcebabeff24cb6f06cecb06513f453cbb09f0cb8e5fa4c26bfde03aadbc5e803692279427021ccda10749a6c5a326bfb9
 EBUILD pfqueue-0.5.6.ebuild 671 BLAKE2B 89e21406f59dfe64d662ddc52b21c3a5696d9016c8a0f9bc8fef4ecd38078b8f08c3aaa71db1a3f92df15d589dfb1da461f01af10d299602759bf37dfe79a220 SHA512 950e3b2f55cda27ded6348844d70deab78d18719fdf3903b17ff705cc0ce96ec726d8fffe1b3efaddca8d810d71ee0385188905b550bbb63d64deda720f2a90b
-MISC metadata.xml 422 BLAKE2B 892e3cedc21e6027bcc5c8b83e6be2b43886fd1c0caaa0c0c8dc7ffb20b4d4ee810901fe221f70f4e88f41b4a9da44db769169798b73acd1e429e39792601c8e SHA512 78e63cf024fbd99cbabd0722887fb88da5ae659cd1c01f0d0064e67d86abf1881e46f6cc5b9742f11941550eaade785e606ac7c655589d4606b63fc293b6192e
+MISC metadata.xml 345 BLAKE2B db09fd3e556ee07e20ef32efc579a807fe3102e48d838dea84b96acbd9f680369894a305fa31099ee4942ae953ce3d0e43bf599814f680a94bb33ad0c647c274 SHA512 9d35ac5bcaee2e4334ac0c4e2e8e7d4151a5c49931878fdb867e7b3c1bbc95bf4a34d8c993510bfe276cc0cb38c14f35110fa895ccbb5a5b4cae869d8aaeaeb7
diff --git a/net-mail/pfqueue/metadata.xml b/net-mail/pfqueue/metadata.xml
index c00e1a883542..77d20874de65 100644
--- a/net-mail/pfqueue/metadata.xml
+++ b/net-mail/pfqueue/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A ncurses-based tool for handling postfix queues.
 	</longdescription>
diff --git a/net-mail/pop-before-smtp/Manifest b/net-mail/pop-before-smtp/Manifest
index ce59c7a2e01c..386b408bfbb7 100644
--- a/net-mail/pop-before-smtp/Manifest
+++ b/net-mail/pop-before-smtp/Manifest
@@ -1,4 +1,4 @@
 AUX pop-before-smtp.init 613 BLAKE2B 3afc3d71e3c21b8f9d6d9066883f90b0b0f2bd0a9bf3934e77a86370872a33cd38ecf3eb0c424e6d7aa81ceaa6cea15348537f7f74da36d50bd0e237dbfcac16 SHA512 5018ab8d4acf4bd58c635f029c32ee691462836da37b75afd7e26873b0f0e94969a18cdbd77e69aeb7aa32e5ab08b2c3b644939799e3601367ab0380423516ca
 DIST pop-before-smtp-1.42.tar.gz 40612 BLAKE2B 44e43be5abf9f1b98ae553f3f782747e5b26a54d03fcaef33b60d05fc757439c6b7c7e00fa972a76bfe0fa4dc7e86751b7f3edd946c209b1fd00a8502ceb22b2 SHA512 54556509dcd51025519deb1253e0860c23e2862061992781c79606af00d6db493a5b3b1ca505f609f6a157918b19e959568dc138cc926f8886bec54cf9b404ea
 EBUILD pop-before-smtp-1.42.ebuild 1046 BLAKE2B 43243147fe12546a684d236e2fc94095e66094031a7b944097ab3019a8fdb01d24f0198cd462342ffb80b018a453316cfc4f6c7a834bedd828072778a3a23de2 SHA512 7278763ed2538654edcff1451a4c204951bb54f9339e6fbbfb8cf470ab1a13bd7b585dd84b0ae6111dd58346fedb842686c455cf14c6d0bcad0a62d5a88e893f
-MISC metadata.xml 322 BLAKE2B 2794f9c709ac0c2dd0c7545fd72d525d13c2dd77e61d016cd1878bc4f417295252007f051724917608af32928d2f26ff00310183549c09f50cd049b48353e8ed SHA512 7b2b6cd86a1183ee11439fb0e5128c36ca9e5945335f9fd55cefa1e3c05c2d284e5fe8766962fb1cce4fb84a0fa5d536378e4472310a8055d119f977588ffe3b
+MISC metadata.xml 245 BLAKE2B 3d5de245eda58e732472f2263b8c5fc684e0e08a02785faab3a1000330ba68645ba430d94078b6389416f9c68762281cdc13df617f5ad6f0e6a76723d321834c SHA512 c1ef9f4751b9cc88c5a98477014b5ebb726572a0efc21dfd3e03c9c7d7b895adcc10e4f07025d45e92e86122be408de589128248c866fe26bd8b458810aa0d94
diff --git a/net-mail/pop-before-smtp/metadata.xml b/net-mail/pop-before-smtp/metadata.xml
index 97ce2c2591bb..78b45715fff0 100644
--- a/net-mail/pop-before-smtp/metadata.xml
+++ b/net-mail/pop-before-smtp/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">popbsmtp</remote-id>
 	</upstream>
diff --git a/net-mail/pop2imap/Manifest b/net-mail/pop2imap/Manifest
index 65dd67a1b09a..0e5967aaf9fd 100644
--- a/net-mail/pop2imap/Manifest
+++ b/net-mail/pop2imap/Manifest
@@ -2,4 +2,4 @@ DIST pop2imap-1.18.tgz 20059 BLAKE2B 022eacdf48ca65f1f62372cbf3b63ca45906e8433d2
 DIST pop2imap-1.21.tgz 10920 BLAKE2B 6f35fc081aa2b27854aaeec191d9d084fbe063e647fc2042ff8a0670dd4420442e1d2da747b6c5ea05481c25751f8f5f774b0afef4d9007e09a15c879585a7e2 SHA512 8f49ce6ee0dbb71699ec83415f3002f752975eaa39c70ccdc0f2e62ab2791a29d483e1159c2ef035c411fe5e351b9c99845ba2451e95fd3331c3bfb03b8a061e
 EBUILD pop2imap-1.18.ebuild 581 BLAKE2B f1a05dac7c9e0b1cb4e8bd81a4ab5f1ffdef3998712fd4585fba7ff96ea0eb5fbb0aba8931b3baa1fa8bf3d0151368919cb5a4b9af22eb470d3df875fe8f8fed SHA512 bab7703af78173a494d20a3f78e2933b0b461609c52bfbee569fdddaa28e73c47e8a94dc5cf49f4dfaf6e56c023fd7c36da69ccb4464cbd7186f38c90c1bad36
 EBUILD pop2imap-1.21.ebuild 590 BLAKE2B 81092223b6bb4b633bbc7359c42ed0801c52d60c52adf6a585cf654ba48e3b6b9bc70a9e63e65f141bbdffe2c30ce6bbd4d55bd2ecfc06277cac641abe8b108b SHA512 333d243a5b599f805710ba2418a869cc9df1cccea6d7159998b7764a57a7626a994b8470b8279551b8da0c8025f2d5d6f46757f350db0b8ff4ad2f853e571e63
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/pop2imap/metadata.xml b/net-mail/pop2imap/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/pop2imap/metadata.xml
+++ b/net-mail/pop2imap/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest
index f7e25108a5c8..b4ca3a50bb3c 100644
--- a/net-mail/popa3d/Manifest
+++ b/net-mail/popa3d/Manifest
@@ -3,4 +3,4 @@ DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b7
 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a
 DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906
 EBUILD popa3d-1.0.2-r1.ebuild 4985 BLAKE2B fc04eca9148d30f46ca3cb848e28c15d328561a5b0a4589a499dacb06b81bce85bcad3dcfd0c770c8d13dd90f764858328e7ea2a70f4d494564a4f406ef417ca SHA512 b760666182894426255af5f097741e5f65be9c5f84f1713c3f5d6c4510a8f4c45093c8e4fe1f1f457d1db29d9dd28635c7574168fc7e91ff7b40e0319c476d3c
-MISC metadata.xml 316 BLAKE2B 09d029e8c6c866bf1b53e32d7874aee1b033f189591a0205b5b80bea89cba1836954cddc973fa129dddb56ebc1b77a7e3b325ee129d65f32c2b753fae9f59fc1 SHA512 647951f4d61cc7e32f0550016f9d6e1f2ce1e634a0f086cc3355b9826bc11aef05ac4780a69a3c10b62298cdbde1f6a4836659ed19c9ce23d52032279444a7df
+MISC metadata.xml 239 BLAKE2B b8712a639b5f9e4930e561ad2a617e565a1545f1b1b5425e69ba50b1e0175b5fa57b1aa73105a4dd078b5ea6c004dcc4c957f0059a916d06f5c8fe3e58b27c6f SHA512 bd8159d0c8ebc2a64c436fd818bb145da92a22daafd11876898af61a4395781c8442e3ee96d21a970f17b629763a121518c36baf822d67b70383b11f43ef3395
diff --git a/net-mail/popa3d/metadata.xml b/net-mail/popa3d/metadata.xml
index 616ebe507877..9ff037388114 100644
--- a/net-mail/popa3d/metadata.xml
+++ b/net-mail/popa3d/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		security oriented POP3 server.
 	</longdescription>
diff --git a/net-mail/popick/Manifest b/net-mail/popick/Manifest
index 0787172748ab..cf186c486a14 100644
--- a/net-mail/popick/Manifest
+++ b/net-mail/popick/Manifest
@@ -1,3 +1,3 @@
 DIST popick-0.1.tar.gz 4000 BLAKE2B d3a0c1a2af6cce4c70e8c4d9fff45bea3949338e87f32bea58039751fcc7beac6c1f4cf8dd989d375d3916e0be9fa836f53677cf54e0564643518fb0f593f168 SHA512 973c20e2f56f2a49ad1164ddd530344375150362c2e083717cf2034e7851938de9c71300f41164cd2b3687b68db70e66bef268af650556ede5fb74ce7705dcca
 EBUILD popick-0.1.ebuild 800 BLAKE2B 708dd936e0b07ef276a876c9df6da5face798d4b090c7516356bdc15940ba3f8a8c7c86944fef4e6d19a9e633a6df83f79f06439bccf1afb43655866ded9316b SHA512 83a6f12f500768f1ee8ada7bad19674cbd19a551ccc0312030ba131dc7b49c1cdcafa8366a67eabca5112c9f193da36df4e3664824920bf0396d3827237a1455
-MISC metadata.xml 375 BLAKE2B db9d0475fdb06c4f23cea079d70bc527af24c5bc6a665f98570cd85c183e405201965a8882dfcd5cb8056654da6d3452a2925eb1a4e3efc80ebf2e9a5d64b746 SHA512 63cb8a86abca135e7eac31d3e58525e019611d03c470e0a7c12affc93d1ce0090d4d5b8958b7c0884ddf936fd07a790b69c5627abb1f1b656db5a9536e064741
+MISC metadata.xml 298 BLAKE2B ef725f639026697bab4e287e02cb13a5713e33f7397fa93bc56c99e1adc69167a346eb2a6c01ec905bb461f5d820b52dc0a5c1129846687db69a26ed453981d7 SHA512 570f7a45150cf50c9f5a1c55cfa0118bda7ba711d4533715e5feb52b06ecabb447b6391b268789421ece1a04361da180cd23a03648ebe96b3dfb0dd3f107503e
diff --git a/net-mail/popick/metadata.xml b/net-mail/popick/metadata.xml
index fccb0b99db06..49b7128e9f11 100644
--- a/net-mail/popick/metadata.xml
+++ b/net-mail/popick/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
- </maintainer>
+ <!-- maintainer-needed -->
  <longdescription>An interactive, curses-based POP3 mail deleter that allows you to match messages with regexes.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index ce09d8d58416..bbd5220b6462 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,4 +1,4 @@
 AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
 DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
 EBUILD poppassd_ceti-1.8.5-r2.ebuild 910 BLAKE2B f0cf814c91814de5ab0f0e587a5c1f865286642f90a06d58cc57eb95f190dc3b2b8bf629d3be947f5bd78936923ea99586af782990e40dd940f1fa241aecfb01 SHA512 004588261ef4a027c984bb8f776c98e08de981b8b9e243c21fdf14bc53e7410ba26db1c4556000ae7d42053fea1e7a87e85b7856e28ffb005d2a4a589f871652
-MISC metadata.xml 782 BLAKE2B 00eda3e3c64aa944e4675b970f714bbf5763e169b3beab2836532e69601425b0c222e5b88ea259f49f85ba95f884f69a2e597035ee61f6b2ed403b26bd0fe975 SHA512 8ce15614cc7864c9d4a40ad1c83609d403d012f1d4bb9b6f0fcd523b210d943e816d58a3dd6f9e5345fc889118f7d833980b9615cba1d04d54184c2df8d4e2f8
+MISC metadata.xml 700 BLAKE2B fbfae81fc82399b6743b1955eaf992676f2b2ad855fd0cb4db28526a0a0fc548371bd2edc7cf8b4914c3b1d209ec39f4c4cdbf1222f00dafef772ee871f193d0 SHA512 2d790e5243bc98e89a52485b30ec59a5cf67405018a542428d050fcb1d005cc0d25d2942499c07d15f8b80c9b976aaccf05fff00d010c7f8563085350d7820bd
diff --git a/net-mail/poppassd_ceti/metadata.xml b/net-mail/poppassd_ceti/metadata.xml
index 32eb1e27b6df..c0132d24d724 100644
--- a/net-mail/poppassd_ceti/metadata.xml
+++ b/net-mail/poppassd_ceti/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
     Provides a daemon for changing passwords over the network. This feature
     is commonly used for TCP loopback password changing from web scripting
diff --git a/net-mail/qlogtools/Manifest b/net-mail/qlogtools/Manifest
index 7b5d0fc37398..ba6cb9a7f5e8 100644
--- a/net-mail/qlogtools/Manifest
+++ b/net-mail/qlogtools/Manifest
@@ -1,4 +1,4 @@
 AUX qlogtools-3.1-errno.patch 348 BLAKE2B 4a2e1e525a071792f934a7640b0199c7292e08a2c5964f6268c7e5bab945c09d84f09371860311288fb48f7baa24f3d9ad93d57d6e2109a0856e60ef1c0723c3 SHA512 5f9e49aba6e01d5712ceadd8f2a0e3e03bdb2d1cb0c6cc4de7e6b54ef99aff0daa14a93fbeb0557ca9fdb6b75edaf4d0b24ad2b41971fc4f330435ab74ed48f8
 DIST qlogtools-3.1.tar.gz 20868 BLAKE2B bb248aef33e8f8d083956e621437e530c0a7adfe95a8c87503ca7813d756238b54873044777c9d4f362c3c75af24f58c67b8e1fca82724ea8843986fddd4d457 SHA512 aa080114d543d70879b091e3c1d4ddf7a3c1eaf0848c7215fb291e0dac49070833917f66bf02012bcfb1c5df63dadd0ab8c1c1642e5e1c4dd3c34c88bf2751e7
 EBUILD qlogtools-3.1.ebuild 936 BLAKE2B 135ac5fd08b4d0cfe8eba0366541eebd5302b4a4b2da0125d70341c2b00c4b6c43f2bffadb41fd55eea11786efbc9d3b632098a9847a24bf7d7a5e073706c9d8 SHA512 d7ead31344a41e8009b1d710aa6a3f41d6d5dc0f0198227c8874e1e0e543385600228181d024af2833d2eca05d975fec9fad234aed1dff38346c34b48318a9c3
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qlogtools/metadata.xml b/net-mail/qlogtools/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/qlogtools/metadata.xml
+++ b/net-mail/qlogtools/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index fc1bbbd21d63..b80068110b8f 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,5 +1,5 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 EBUILD qmail-autoresponder-0.97-r1.ebuild 1370 BLAKE2B a59d4953ac00090079e466f6539cf948ba9312f801102a020633c14d93ea0ea59bf1642aa529e03ec6563c678a85dbe1839b3e6920f818115a0e7c64deadab70 SHA512 5c21559ea633760e0e400fc58f766446e3d597d12a390439decbf672f1a1145f56e3fa781832b002e96c8f44a6abd12b27615b2ca83a6927206514d6b3a122df
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1408 BLAKE2B fa6726942c874c8e07bb14eaa70c33a4406fabf987718a05680c91fd814b24fa68b704bd77806c96889d61fee94c52bcaf67fc9a3c19366e5053dc246a64a94d SHA512 ce9bc6b50812124da8b81924dd527b533b407fff6b64b91629132c4295557c5b8a54053fb12f699bc359998479bae985f7ffc77815ab78fb3f9c1149b65a60f0
-MISC metadata.xml 489 BLAKE2B 749ac463ff82741ea3bfa354b3c3ed29a6495c276d08f22706b5d614b4e298a2c7670b1b3b2f84a92fda2837756c1da32b7e0177e96832142d324d78a59ab4a2 SHA512 de41d320e5c5efa4aaae8cc862990179bca55069f3ec37a4633af610729d37f39a4bdcfdb6797c940f1920b2475e575fe55e12230a1ad993e65464fc37a5faeb
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 0a635f13cacfe2d6b31b47fe6a65b55c34e750fe11f83d08fda254f260b2a26ddc60b1e217094a064302fc2ba41fe46a49a0fc6709158cf9edb226f71fd8c257 SHA512 e248936a769f31856b2d0defbd74b419eee25d65afc455810d631cdebfd0112b2ffbd558aa0f8c882a4190b6e031dbb30e073e59cf8d0a472e66bdf4518c670f
+MISC metadata.xml 415 BLAKE2B ce1cf3c127835055f2555ab5488f2fb9bf9858711fb6e5be022ee924c53876f3baa97c9a71c3f5993ca71ffd9a6caa5c0a5a804a0aa326eaf3293363dfc657c4 SHA512 d0735db9241b2f5c46d4a2f8e1e2d0b2afe8baa94ec633e474a83a61f894146e1727799f9e59d6efb986c207c4cb6893a130424497db132b89ea2ea1a2ebfeef
diff --git a/net-mail/qmail-autoresponder/metadata.xml b/net-mail/qmail-autoresponder/metadata.xml
index 6b25c3daa7b3..3edb45ea8543 100644
--- a/net-mail/qmail-autoresponder/metadata.xml
+++ b/net-mail/qmail-autoresponder/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="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 This is a simple program to automatically respond to emails.
 
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index 6f70922eedd7..a870147e0830 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106
diff --git a/net-mail/qmail-lint/Manifest b/net-mail/qmail-lint/Manifest
index e42e105b1816..14b249225b1b 100644
--- a/net-mail/qmail-lint/Manifest
+++ b/net-mail/qmail-lint/Manifest
@@ -1,3 +1,3 @@
 DIST qmail-lint-0.55 13531 BLAKE2B 53257224dbf87d6537d9e0377d1bbb3f268db464c1291ed159fed82aec69b3f167b6f680ba914367bfe04c6e3763f680848b3523edb87a5c2ccec9e36bc05133 SHA512 d9f81df52f5587c1f4083789ec55795c1b9cfd896583f4bd910ec7fc542daa9da0a6cbe368d261071224981c5e731aa26560ef645a2c9ce64ae8563e9b6b28ec
 EBUILD qmail-lint-0.55.ebuild 563 BLAKE2B b51a3b3d685d0c2d4ae106391dee078c8ec3901a089f5b485e26d68e2933cd5000d85b45a6954e371e91797f7b742a48a160f9035a0def2ec19c9e1b372c5b57 SHA512 066cfa714148a3150a8b8c56544995253235314dba430e78cc9acc5c603404f674ce9f48f4842a48f66bd671ac85b7b838c7366fe8a23d99597f774af42cf7a3
-MISC metadata.xml 500 BLAKE2B a58f02a56f38f4348e59daaee459c09231b539f5b33e874b7d0be054751533d0fa0233d7a8c6ec74257db7646ed3fea54915afad0d10bd7c1d75b9da5227e627 SHA512 0e264db647123519f4d637fe0f1aa62dd3d05d75cecdfb9c038465d5603220179576e20b5213369a39fe0c376be3217902c9bd65e2c024ed084113547366741c
+MISC metadata.xml 397 BLAKE2B 3f8244d0b47b10f0bcb588fb3f7d0636f40c95dbd95ca2361fdfbdf10b368467ac14a2fabff33795a03e334abefc15fcd182f7b793f290fea3933e8f5a4af48f SHA512 c2b97a33cf013b2353821b86a5e533ee1b6e0e2b2bf3494d4b7ef7a7301c0151985d53f17b342697744534f034929a479d8f1bc63a4ed14d999ce8b17f08abc7
diff --git a/net-mail/qmail-lint/metadata.xml b/net-mail/qmail-lint/metadata.xml
index 3cf755b64590..b57523ef337c 100644
--- a/net-mail/qmail-lint/metadata.xml
+++ b/net-mail/qmail-lint/metadata.xml
@@ -5,10 +5,6 @@
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
 </maintainer>
-<maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-</maintainer>
 <longdescription>qmail-lint checks your qmail configuration for common
     problems. Prints warning or error messages to stdout.  </longdescription>
 </pkgmetadata>
diff --git a/net-mail/qmail-notify/Manifest b/net-mail/qmail-notify/Manifest
index 5456b8dbf1c8..1f82015d90bf 100644
--- a/net-mail/qmail-notify/Manifest
+++ b/net-mail/qmail-notify/Manifest
@@ -1,4 +1,4 @@
 AUX qmail-notify.cron 80 BLAKE2B a580741c9dbba0a2bc00cf55ab83d432df569bc961ac0d463bd5c5f0008ee7eccc386817750041343c9a2da5b428ad15b059234595feaf31ba199d8e143cc199 SHA512 6242a426a601b9461ca1a79b14d2f850b963604de8291779001a2e18aeead5b7315664808968640de62b5615688a246451ba67f6bf05cc002d694d0c73836c23
 DIST qmail-notify-0.93.tar.gz 37923 BLAKE2B 17cc1c436d47d759593d564e23ccfb4ee1920eed8ba2038a3e68add3a0b64f717569ef9fed25b361e6038581a6a6d269f1cfb869acf593d2fa70159db61bc492 SHA512 b39ba70360fff69c40fa9421e94f6bba8b8f65aa85fa8e86580628de25f3d9cff26484909a71e50fd8ae8cd5198c194a43d00c2776132bfedac9c546a2628e4f
 EBUILD qmail-notify-0.93-r1.ebuild 856 BLAKE2B 2570f5d0b47adfd60ced21ea085cde39878b49c17bb40032ba0fae65a0a011914e56edf8e6fc15421d83f9b2677d5a8253a0d1274f2c771a103b72cfe74b34b4 SHA512 873cd6c6cd65c2cedeba00f1e2490fd99aada00601776217080f9107dbe258044e10dddca00954a7f1cadd81b1524ce23c6fbe3e84bb0024027355625332d100
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/qmail-notify/metadata.xml b/net-mail/qmail-notify/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/qmail-notify/metadata.xml
+++ b/net-mail/qmail-notify/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/qmail-qfilter/Manifest b/net-mail/qmail-qfilter/Manifest
index 6822518aba56..62b3ea5ab21f 100644
--- a/net-mail/qmail-qfilter/Manifest
+++ b/net-mail/qmail-qfilter/Manifest
@@ -1,4 +1,4 @@
 DIST qmail-qfilter-2.1.tar.gz 22242 BLAKE2B 386c4a708260c8c93020507ad56766d2ee99af7908203d0cfbd1fefda52b54bccd6a1fdb52bb9e45697c34c554735010a301751f29da2c355285547ed7088177 SHA512 a515969b60aaa08a06513a9d88f3bfb36fa9d1333ea87613facb1d65055d44e69c4cad2298870607c012dffdec4d03c36dc87b24b3b3c0602ba1d7df6cb1ff2c
 EBUILD qmail-qfilter-2.1-r1.ebuild 1023 BLAKE2B 28af3d0bfbc897155fde75c4d0b5f8318a9a2e229c74b36e4ee91a1a538cda382f4f2ea6a904748f952d91057f9450e373198120412276930190055a727b8d8d SHA512 5a4b4b0708adea80a32b8e8f067e69b6ee1b035dc5c7e524ff55f0d8f60f62590896c2b9c1e0ca92d9cf73ab118d1e28a5bffbc8cb030e5c4691ec7f207ea755
 EBUILD qmail-qfilter-2.1.ebuild 1010 BLAKE2B 9fab81508b63dfc1f84c64c0e264bd935f739e2d23242fe212d31fbb1011c84d836ea075ad1c8611e3e2fafa54c1069f1d0d17f8ecf1403a579dadede25b6373 SHA512 4bb6ce90f81aef4301f2e77a4925c6331c4c4d1709afc9a7dc98ea6c6210b8494ff57fc2131c0c7bc49d8db80dbf379664f01ccb28d456e2e1ce9bd8a5e56808
-MISC metadata.xml 476 BLAKE2B c55422be5e3e908ccd61529f1236eb9231608544df1a873f0aad26203b3bc515fc031246d84aefcc3cee9ab53a19ff2a582f8d895f051bb13c5193d0ee2df9fc SHA512 0fe8371c47d4b41d63ea9fd64513bcae698faebc7be6c28615fa77ccab52522a8ed6a91de289edd464faa4bc6059d22d1e4caff809b446e0bd15eb2d49264faf
+MISC metadata.xml 402 BLAKE2B 8422917f3ad81b60432af4fad26c6bccdf1e61858610fd2897eed63288babc6bb388f74fbdfaf6601531203db1e4120f924c0fcfded43bda53591410b232bdea SHA512 23a841d2eae185085b8e4e5b600782f96f5037fe5ff493202de976c7986cf30ca1f6fd03101c2ebced51a0c85214c563b18abcde6db5b6be26879f4950388a25
diff --git a/net-mail/qmail-qfilter/metadata.xml b/net-mail/qmail-qfilter/metadata.xml
index a3a426be3f9f..4752767f2e52 100644
--- a/net-mail/qmail-qfilter/metadata.xml
+++ b/net-mail/qmail-qfilter/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="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 This program allows the body and/or envelope of a message to be filtered
 through a series of filters before being passed to the real qmail-queue
diff --git a/net-mail/qmail-qsanity/Manifest b/net-mail/qmail-qsanity/Manifest
index 0500d378be3b..919cd8ef8ea3 100644
--- a/net-mail/qmail-qsanity/Manifest
+++ b/net-mail/qmail-qsanity/Manifest
@@ -1,3 +1,3 @@
 DIST qmail-qsanity-0.52 3888 BLAKE2B 41ef561890d16bc3ef828a05bb0273bd7a6183dc2d72c3b88ece1ed218a8dc3962791d4d7d8c2c16d97a5f01820ccba93ce0e999fc01a8d3434c9f33c42f3825 SHA512 fa0b9f9efc3138ab700d03fab4214b1f1e07eb03a812f0c74435c545ddb64d0a2e9b47bb3c063c16259c6f2e23ed2157d6316d6cabc820ad7f00dbf22ae4c0bb
 EBUILD qmail-qsanity-0.52.ebuild 565 BLAKE2B e906a450997caf8f8d9b1b94738c572cc652f27517f2fb3dee9ad215c8e301aa1d86bf4fcadeaf60eeb79ca909b5f9eaed5e3c04fc5dba63779816659a822d12 SHA512 165e9d054428ab23e5cc7fd4773eafa4e96d289038a256d6e53da6fd9acfcc33d63cb114ccaf7326ffd7fd612396d2dd33d5db6239e53f4a207a1f3cb4798893
-MISC metadata.xml 612 BLAKE2B f3a339a26062790f180ad077ffa01deb3881e096e9ebbeef181eae8d29b02608232c003f11e251af9f607f852666c04fbc9d4cd37029ee9bb82bfb51876fd5a4 SHA512 3167deed5c88ac40be2ec05e24a34c1cf811dab7a6ce051c910b18b97ebee6221af1da386014241fd82e0acaf4efe36a9e987bff5003e3fe159c59314a5cae44
+MISC metadata.xml 509 BLAKE2B 1215bc847899983e679cc5090d8fc61089f30aa361dceb0b8c437ef734e3682277e3e58351e09eea32027f19264a7ae1ea2c976b849e56c875f8365787d05a61 SHA512 37810a279e6a0c895736c07fc6005f4937da4d9af40976aeff1fd51668a067556f67d3afb86caae3a567c152d1d1db9f5b171389e8892785805e581b7cb5b708
diff --git a/net-mail/qmail-qsanity/metadata.xml b/net-mail/qmail-qsanity/metadata.xml
index 48b94aae434c..e611051e05a3 100644
--- a/net-mail/qmail-qsanity/metadata.xml
+++ b/net-mail/qmail-qsanity/metadata.xml
@@ -5,10 +5,6 @@
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
 </maintainer>
-<maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-</maintainer>
 <longdescription>qmail-qsanity checks your queue data structures for internal
     consistency. If it finds any problems, it prints a warning to stderr. Plans
     are to change it to generate shell commands which will correct the
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 24cf550fa6e3..0524615e9c75 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -5,4 +5,4 @@ DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d6
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
 EBUILD qmailadmin-1.2.15-r1.ebuild 2341 BLAKE2B f79f4ab948b150e15b21a9e40b5537cf24dab2069d6616a3be2258e55d830cafe7648c085bc78c8e5ab8fb3b6ad48e5f3aec630d4ce0180e3531d8b26251b23d SHA512 8e00182cac1a77768d6eff31ebde4ce59e3d199f788bb6e59eeed181f63e515625ea12ea7bcaa3d2dc6f3ce0e8ef9405d0e1361f03accdfbea0e7c28e07e9a57
 EBUILD qmailadmin-1.2.16.ebuild 2759 BLAKE2B 73689e59456e0f63e6d1cf1c58159883061f851ce392f19e9a6bf3640b80c3d00789e5e328ec774b08de2b722f7f5e567277d6889787ac5a9ad4dfb248952c68 SHA512 606397c31e347fbec59dc3be0199b4b67e5e7b985f0dc3fbeea0bd86b477464286d12a2ea8accd3e5aa7db69f5a5256112d80d726dff8161aa12b2a1e19cb806
-MISC metadata.xml 494 BLAKE2B 9dc9cea1215b20658f1769a463e0ca17cfa0a34ecebbba5756bd405e212312cde43ec803efe1c4711ba6066f4b539181c97aef1ff7552c6dedaf80b4a29be6e0 SHA512 b2fbb40308df4de4d19781832a17557947033ab4b44f0ce6a6b8048c81d05ae8e67780970914e97e9774b190c57474ca20877c4d4f93c3d6357e7ec6f7535c5b
+MISC metadata.xml 383 BLAKE2B 7d5f44a77875376d051d96c84e1f33146807299931154722ee05202eb93b31fdac420707de49870fe8e7b94075a82bb70d25c1c3a11c947f4e0de41d01a9c432 SHA512 ee861bd6d5cecd32a6f5dbbacc51d13d0105c83bd9b44f63fe9ec21937b17bb6cbcf27ae202e2b31f60e7e0e79c8810f3c6e63752ee2bef6423520395efa00fa
diff --git a/net-mail/qmailadmin/metadata.xml b/net-mail/qmailadmin/metadata.xml
index 8510b6c0671f..3afc126e1d40 100644
--- a/net-mail/qmailadmin/metadata.xml
+++ b/net-mail/qmailadmin/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>robbat2@gentoo.org</email>
   </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
   <use>
     <flag name="maildrop">Filter spam using maildrop</flag>
   </use>
diff --git a/net-mail/qmailanalog/Manifest b/net-mail/qmailanalog/Manifest
index 05cde3c0ae88..ac55c1b799de 100644
--- a/net-mail/qmailanalog/Manifest
+++ b/net-mail/qmailanalog/Manifest
@@ -2,4 +2,4 @@ AUX 0.70-errno.patch 243 BLAKE2B f6fc2134f1e1781c7887c9dcb0f9ecc05d59558187b0013
 AUX tai64nfrac.c 1461 BLAKE2B bf9c933a5916c578dfbf9fa3c9a02de188b40e376f545a9706fecaee14fc4270af90f1d1fa7f6b7035b23fb4cf0abf8cb701f17469c7bd95bd232a81ea1d5d93 SHA512 0febee72c3a0328f651134105e6c9c7db1f2822458fa873694cad9807847a9a1bfb7d91a3f7a7ecbb99564515d001e10f2829f70b9a8e768d26764c0ab408be4
 DIST qmailanalog-0.70.tar.gz 28416 BLAKE2B 771a9d9cad36f770c1b9032808a5252e8cada6ebed311272e5d2cf7a34449ec9e59c9c032a1c165103535a6eeca03331f56d8a484c171308c9fee49f8b4b2f12 SHA512 0a4991a9ac13b64494b15a6ad42df1bee273a7a3c5ead923450d5516d747989e80e3a0f88e29203dce24dc833cc3bb46d5935633f67bed547f27ac22ad866f3d
 EBUILD qmailanalog-0.70-r1.ebuild 1277 BLAKE2B 7681446e474887922686cbc88607a34b27eb7fd370a62913d8ade784c6fd4af2b12f07cb85d3437a87d29403d72216926be7d0bc621f9f0119f01da4eabd1ac1 SHA512 f071a4884d301008ebf04d9ed78593007e3198cee4b7045a962bd5d5646395467f62b23a06ab19aca9dc55557b4be1d2287b21192aae7ec9385180510a46acfe
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qmailanalog/metadata.xml b/net-mail/qmailanalog/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/qmailanalog/metadata.xml
+++ b/net-mail/qmailanalog/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index f5075c6b5689..4838eda7ed5b 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,3 +1,3 @@
 DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
 EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
-MISC metadata.xml 762 BLAKE2B f3d23ddb50669bab668e1e5279eec4ee45cb7bc44688aa41ba101c3c90ef128473f0bf396815fc16962f8b44336630cd908fb352a617d15370ed84a5170c59b0 SHA512 88d0d2a8527bf75f55da559f64ccf40e4dc08b64c6bda3a9354b6e0e59a53b8fcb5fd85b6012e30419bb9b03a672ab4b83a1aec93583dc77e64a3c0d1ffa08e4
+MISC metadata.xml 651 BLAKE2B 9ccf8ab79b762d85da5c18ef6797e024ca9b9d83a4a83a8b2938073e59fa0bf47ec785415eac661c043e0b52de656e6d53107f445789d3d6b029120401180c3b SHA512 0beb930e70f222cbfd47d27c407fb51c1043f84cc5937c3082e55fe512208e3d2ae774255d41e2e43284e574fec994c84cfdafe46c017730a400d0247a50fafb
diff --git a/net-mail/qmhandle/metadata.xml b/net-mail/qmhandle/metadata.xml
index f6a4d5c79669..f9e8bc396a16 100644
--- a/net-mail/qmhandle/metadata.xml
+++ b/net-mail/qmhandle/metadata.xml
@@ -5,10 +5,6 @@
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
-  <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
   <longdescription>qmHandle is a tool which can be used to manage the qmail
     message queue. It's written in Perl (so fully customizable) and much more
     powerful than qmail-qread and qmail-qstat. Key features are colored output
diff --git a/net-mail/qpopper/Manifest b/net-mail/qpopper/Manifest
index 020c9c4d792d..6450c41b9ea3 100644
--- a/net-mail/qpopper/Manifest
+++ b/net-mail/qpopper/Manifest
@@ -5,4 +5,4 @@ AUX qpopper.init.d 411 BLAKE2B d9a57c16d531ba4964bd7a7693a92381faf86003e8b5c7be5
 AUX qpopper.xinetd 408 BLAKE2B bc3f7cc144d7900abf02371e03535150127c520b46f232f9bbde14f171ac1479e24b102b2064b3ed59725c67fd0ba79783fa21ebf932dcc8d3bc73abbbcc40fb SHA512 291c2ab21356210d415fae4816bfc9f295ebb47a75a4d523f81f0d14dd9380fe0ffceac53fa84f0491c68b7082d543f4c6f4e486ca818efc1fbc254ad5926458
 DIST qpopper4.1.0.tar.gz 1239530 BLAKE2B a82d0ae8cbb5e606b8e0f7f4902b6920e14f404fa78860d4a7e92e0ab9ac354d518aab39f4a32c9b095c9396995e186bde2315d17d9496a7c0231cb1452e1439 SHA512 01e3ac13fa446bded84628a29a23849f623d5e5f85fdb77126cc4c2e20785c658fbc3d8a356eafd9f0ed2e879c6b4f6a754b6b685ea51b784c2cd0458c389c8b
 EBUILD qpopper-4.1.0.ebuild 3079 BLAKE2B c435f2ede982c35443dba987bc301ab238eb38e6f109f640d47b17b6b24fcb331c5d9f6572ddc5f5afa4f190e9c923dadd376714b5c7dadc47e2c10b9de03891 SHA512 35963d36adda72f9af0904ebc8165cf2315203b25a3fb25ff590484e6f9f71cfc6d58610abc47b1aa4f442d99b1338ae361171bf18e00c97c3bc38b091547fa6
-MISC metadata.xml 426 BLAKE2B c5e108cbb085560610fa2307640ccd5932c7c64ba646f5b91e8834ee6a8c8cf0f7efcf1a5c7cc644b9331f50bbfe5a12713fa172bf1493f5c549f9a90e4da6c6 SHA512 642c25f7641cf411968c79646dcd3b17adbcf40beaeef617d102026c4c400c9a5f37cfad7524294ea6df07c8c4f118609217830aad796f1f18ff7eae11caa793
+MISC metadata.xml 344 BLAKE2B cb11b476c69d55cfe560994f31dfe8d68af9257e97ceb51ebacf4032bba64f3747b23b9fa7336bff2eeac22d608de02c9f018e7e781b5f028b8fab5dc2545e52 SHA512 0cbc3b5de7f221da5b12f61f196993db99a75e55d0e19ca27ea02e9cfa07262ba1a599236833f53b0cad74e266738cc3996b8225fcadf5e5422c6e4f07a8f190
diff --git a/net-mail/qpopper/metadata.xml b/net-mail/qpopper/metadata.xml
index c2e9f4709a9c..caf9646ff227 100644
--- a/net-mail/qpopper/metadata.xml
+++ b/net-mail/qpopper/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="apop">Enables the pop.auth file in /etc/pop.auth</flag>
     <flag name="mailbox">Enables mail spool file is in home directory ~/Mailbox</flag>
diff --git a/net-mail/qprint/Manifest b/net-mail/qprint/Manifest
index 0edc8182b759..e1135f625dab 100644
--- a/net-mail/qprint/Manifest
+++ b/net-mail/qprint/Manifest
@@ -1,3 +1,3 @@
 DIST qprint-1.1.tar.gz 358575 BLAKE2B 6c2a756b3e245584ed4ff81a072a63f29ee14cca5a61f7d376b8794a91c69e604fb33bbde310e870cc712d7fbeb2758eb5e649a7b153bf29807cbd891e3f4c1a SHA512 4748f52cc8cabf72a2685fba93ee9957a9a36658a8b0c9fc1994e1779aad59a94b942ed3dd2501c6a35636e7c75e24d512a5de5f95b0ba66ae40acee8bbe1cca
 EBUILD qprint-1.1.ebuild 513 BLAKE2B 2941c85ad80b81b12c7f308495842268f84e35c0aee4ad7694576683953b764297f1ffba349541740d86fa11cbcbcb1119bc5f9bee868262d3e346b2d4d0ceca SHA512 985ba623870ffce67b0b521ec9b18be5fd33dd85e797545a3683831e1046c6b151189535cf0c9a40f9ccafb6f95b51083e0dd5636385731c0e12cde4d1a8fcac
-MISC metadata.xml 405 BLAKE2B 1aaeedae887860dce185acbb17030457dfdb18e7220f8f4f9bf88194643e31ad5c8e710b74f69cbf7db8ec23e88f0c9c254da5eb226c515d87999934809abd2e SHA512 65f4d4963f91de85a1f5869ceb92f2c09ad2b644d37fe19f21af61ab9484d9ecee6a84f7206859ee970e315b7fffac9328ec4bac84ce16e8a83311cb9900070a
+MISC metadata.xml 331 BLAKE2B 697260c308d9dff8697138f4fe14d1bbecee1c15b84f6f67705abc33a7e45d7ea9888853267b7ab5d049e2d2825ac97357dcbdf98ca089d8597053a15068cb5e SHA512 3ea002ab743be23bacd2153c652c8fdb86d75c11c4b79aba100eeb4de8fe5bf2fbea33a52f03651420064a8db6ae7dc2d8f251b9722a080de5c4ed97a2304166
diff --git a/net-mail/qprint/metadata.xml b/net-mail/qprint/metadata.xml
index 991a7243a462..f6c6bf01881a 100644
--- a/net-mail/qprint/metadata.xml
+++ b/net-mail/qprint/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>qprint is a command-line filter for decoding or encoding a block of text in MIME Quoted-Printable format, as defined in RFC 1521.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index 8330b1ede0d1..f9e057909d7e 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -2,4 +2,4 @@ AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e469
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
 EBUILD qtools-0.56.ebuild 1152 BLAKE2B 715cd8c69088fa24f6422702b1f4ec5469c421aa69145cc3ae1361a043956d99e9ebef9b7b7498c3e592c7bdb786d00ec01aedb61076104ed65f52e35aa4d639 SHA512 93675737debc6a1a2d97578f759d5c79a72bc10c1ada2a1e8fcf89c0fbb4406e0928c225bee75d95427424fa9b89ece8ea24b10e23c79addcb8f5f6a1e22b506
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/qtools/metadata.xml b/net-mail/qtools/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/qtools/metadata.xml
+++ b/net-mail/qtools/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/queue-fix/Manifest b/net-mail/queue-fix/Manifest
index c784153ddb98..31063fe67f76 100644
--- a/net-mail/queue-fix/Manifest
+++ b/net-mail/queue-fix/Manifest
@@ -1,4 +1,4 @@
 DIST queue-fix-1.4.tar.gz 18486 BLAKE2B 3999632fb77955782f5bd5da4ee231d68faead75daef293b7cec9da086cb2a69bd8901efba5a3726c9f6047f6ae33060674f110dc479736ba7be8fe8c4253745 SHA512 b7e0ac070a409eff156b3803cc1bb78d1c800ae685d107b872bf5b022a8645d1ca55a5c3380f6bc82e99927df8dbf586b74af587e882938b9a7678b506c600e0
 DIST queue-fix-todo.patch 3056 BLAKE2B 92dae274431dac974e632bec94a1d0b84b652db197d4c80739a3f8da92e9f7f526b59659242456d99060859a35739e4ecfbd4e16d81892acea892de57218eb57 SHA512 78d79f1eaa8492fd9a14dc4a4d2adfaa8c0429a4faec32305f83ea1f16769b8d337fe732adc8cc0c33b909a19617862c9df999f2e938a6b845e15bc49ab5bfbe
 EBUILD queue-fix-1.4-r2.ebuild 957 BLAKE2B 4e5febe066c4ae05aa127e84f49444a85145ac4c76be450f7af8fe656a92be869b34e515183eb61817795fdb7763ada55da8d28da2ea9f101cd1d4f38467afc3 SHA512 a375db211da9618a3eb4d16a5adce1ccd471c278c4bdb9fa9f9dcc68976ba007b0999a94e5f0e5dcfb133afb0b03f8a653d7532e51fae9250ecae74858ae7356
-MISC metadata.xml 626 BLAKE2B 07f476678083f0a6dd14973532e26190c2872f615ed26a047bf4c8e9ed5aa7f8b42c6a4fecd20ec52650ba6b85f261208f33fd9e8f75de226377eda39fdaded0 SHA512 584fc2d21dcd43d37b059bcc1e49995c73ca9668b43caf7517cb6c295b91f608744bf14153f0158201b18cf550f5bf023b87c33980dc6874c2741f6e5a3c6524
+MISC metadata.xml 523 BLAKE2B e5f67ee8e1333e03d8d205a54afa7cefcdf11f7c4f20cac94d68789fb4d1c90a73d2bdbdccb105cbb8b3737b091a6e4a96570ff0e089983375cd13d7e53b99cd SHA512 52c248a6450ebf03064f844d77465303e851444f2eccd2fab0867dc7d97bf003611c97f8a69634366644e2dbcdb2d8bd1396474ce7a5772e4cb3d8de35590685
diff --git a/net-mail/queue-fix/metadata.xml b/net-mail/queue-fix/metadata.xml
index 5cfa391df10f..7442230ff386 100644
--- a/net-mail/queue-fix/metadata.xml
+++ b/net-mail/queue-fix/metadata.xml
@@ -5,10 +5,6 @@
   <email>robbat2@gentoo.org</email>
   <name>Robin H. Johnson</name>
 </maintainer>
-<maintainer type="project">
-  <email>net-mail@gentoo.org</email>
-  <name>Net-Mail</name>
-</maintainer>
 <longdescription>It repairs or generates a qmail queue structure. You can use
     this to help move your queue location, or if you regenerate the file system
     and the inode numbering changes. It will also fix permissions and
diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest
index b59cc3e8a0f0..2e0567d92a6d 100644
--- a/net-mail/queue-repair/Manifest
+++ b/net-mail/queue-repair/Manifest
@@ -1,3 +1,3 @@
 DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
 EBUILD queue-repair-0.9.0-r1.ebuild 726 BLAKE2B a3a9d2ca88e602154cd5035707c854ee24556e4cf3f5a71b17aeab50d88861b2df8df132dc7a3dc74c9bbaa88190ecd85c87e2328842da27ffadc0981d675099 SHA512 2b993f5d3f94b632654c24594fc174e5354c06b5a1122dbc606944c1e5c991b006ecaa0ff35dcbc1d84c9dd49b25c3b15e08643b5b9888298da817addb36f3ed
-MISC metadata.xml 543 BLAKE2B a2923d984da9728c183f5672e4199d2b0b9ae8c8a90553e6029a631184812a4167ea092f53613eb9266e31b895be8172f201f9347a9a0dcca72ff42bf17f6e62 SHA512 ce15418980c9dd62654e82f4b3ae07e55da17d3efee6bcac1bfa5dbe9a76b25736f51cf38a347783aa33b2ec82e41075de8e98d0ef0720919a0d36180396118e
+MISC metadata.xml 466 BLAKE2B 521a85c974ed87b309ccbcd648599ffa3b20602a61654b164dd2b6b0f5cca7ac97716f211c9cef797604e842d6178c4c8345b2287dff3bac7a4c07072521b1ef SHA512 aa06f7e98e2c8e84edafa0a3662a7aa937389ede576f9fde6ae4ff5994faed83aee61b6f58d4a5b2db0d126a7a7f4b23fc7b4124eb4a5368511ebfa17856b17b
diff --git a/net-mail/queue-repair/metadata.xml b/net-mail/queue-repair/metadata.xml
index ab089d76ca87..148b1e2765b0 100644
--- a/net-mail/queue-repair/metadata.xml
+++ b/net-mail/queue-repair/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A toolkit for dealing with the qmail queue directory structure; it can create a
 		new queue, move and properly rename a queue, dynamically change the conf-split
diff --git a/net-mail/randomsig/Manifest b/net-mail/randomsig/Manifest
index 605fbce17376..5efe555df4b7 100644
--- a/net-mail/randomsig/Manifest
+++ b/net-mail/randomsig/Manifest
@@ -1,3 +1,3 @@
 DIST randomsig-v1.10.0.tar.gz 24910 BLAKE2B 13bfbf39cea7c7d348f5a91dd5700a2e91a93e574e6f1c12afd86d72c7868fd1a89123f52c897d9fff0b765e968980bee69927435a1b24f7f15e81b5f6a025ab SHA512 eb47bd017dee819e7b7151a47f5aca03e688e3aa9a4b9bf4882a4df51c6fcc1880e382b02d68d0c1d3a773b1179d5abb0782ec4d6a7649be226151e9e2579408
 EBUILD randomsig-1.10.0.ebuild 799 BLAKE2B 634102733738a72666c35978a998c3326ec9d8ba00ccf9340be1b00e674fdd0d67a6d48bf93662e9f18abf2118976c52249c601604a1b84111a67120943ce5eb SHA512 b6088411df0d655d4fcacf9c9d9b4657b95e1146856b2815b78718cff8d0b7abf0779475e3092fbf8a8794ea4399fe56ee2a92b1e2434884177fb9036e0d0fed
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/randomsig/metadata.xml b/net-mail/randomsig/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/randomsig/metadata.xml
+++ b/net-mail/randomsig/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/relay-ctrl/Manifest b/net-mail/relay-ctrl/Manifest
index e262defc948d..c38081f9942e 100644
--- a/net-mail/relay-ctrl/Manifest
+++ b/net-mail/relay-ctrl/Manifest
@@ -1,4 +1,4 @@
 AUX authenticated.c-relayfixup.diff 702 BLAKE2B c597a6dbf6fc7161caa769aafc3938bcc5ca14ac6ef3da176b04dbf62bb7832059816e603f9600394cbd7225d1c5d9ec30829f41a4b00da3d0e9d2ac6805c60e SHA512 2515f2b5a43e5bae900ef0f419d7f9fb95953e39ebaee524efd8952e0764d82507483b08279866426cd84c6c8524a57cd51b8cf439a6dfbfca3da3e5d3fb0089
 DIST relay-ctrl-3.1.1.tar.gz 35046 BLAKE2B 91e4ce0f1f6ce5933f64e0d60407004d409474180f42bf40632bdb3bce1f3f974abdb597d34ab7ee4113e041323bd55965ce57f271fe79cfb8c56972fe8612b4 SHA512 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
 EBUILD relay-ctrl-3.1.1-r2.ebuild 2045 BLAKE2B f74e8c277f235e1f9f9cab0aa164b4a44516d85287f073717915b5d2442feb202a18056ee3336e97a50470c2b02ffc1038bbd85052e86d7a26ac12effae973cc SHA512 53cf00e0c9b101c2b0032932f7caf82c26631a2220e1242a0ab3fa2d11ed66026e94d6990d9c65caae78f2ab89dfacb894b4923933641d979adc3e65cc95f71a
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/relay-ctrl/metadata.xml b/net-mail/relay-ctrl/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/relay-ctrl/metadata.xml
+++ b/net-mail/relay-ctrl/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index 4d57eaa6294c..9f8366b7ac86 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -2,4 +2,4 @@ AUX ripmime-1.4.0.9-buffer-overflow.patch 595 BLAKE2B 48d9b98e62ae27ad929d7b3d0a
 AUX ripmime-1.4.0.9-makefile.patch 2162 BLAKE2B 9167e9103d28f0dc8f182c61d5fadd1dfa23ad6375cf57bed2971cbef5165c8a480776572995a045f40ca997c6548f41d62e1b2ba7989eddad09869f7351dbdd SHA512 3b4935a57aebc581f907610852b465f64ebaef11317823c45b0cd5501ac1b19fb7c86565850565d88cb77ca68cf764e597f7c80080e1d8887983e03430e081e0
 DIST ripmime-1.4.0.10.tar.gz 172155 BLAKE2B 83e7500a8cc48d29d31515487968dfd7a2b1768b12f296e11ac5e55420dc765498859608328618dcd0295f3a9901a06a189ad8ae24c6a6c20e604d48a3dd29ea SHA512 1c2d2180d60a56c70046e95a29925e39d3f76da98cc2fa153b6fc3a8eb0fc5ec5f45524e9f5ae8706a955366a752d25a0a2f560f1d75de3f2733ec31befb83d3
 EBUILD ripmime-1.4.0.10.ebuild 1077 BLAKE2B 1a9bdf8bd8647457a2bf514cafe9fbef88dc1c3abe09b77b466633d9cb348d58d3b38b7e3de2db2d65cb2ee418ffd449add07b029ccad91abd14065341921b5d SHA512 12b3923d72cd64fcf6b34fcc917196172eca4a111ae6d8578177670f19dc62eb60a94708f1c8109150c7a3d12680902f57d02ce7d205c45a4046dd3f7d6058eb
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/ripmime/metadata.xml b/net-mail/ripmime/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/ripmime/metadata.xml
+++ b/net-mail/ripmime/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/ripole/Manifest b/net-mail/ripole/Manifest
index ebbe19abcdbe..84602c4be294 100644
--- a/net-mail/ripole/Manifest
+++ b/net-mail/ripole/Manifest
@@ -3,4 +3,4 @@ DIST ripole-0.2.1.tar.gz 31031 BLAKE2B 21ca669aca3a27f68bd6090d68dfa1e1fcaa98d67
 DIST ripole-0.2.2.tar.gz 30629 BLAKE2B 63ff7c0d086861d8aa9c1fea7e69086874b90e3181898e36338cb3913e90c6ed7e6f222ff985d92386535a222e44e8a324658f0b4bd51de508f92a82f37f5eb1 SHA512 de3a4fe511e11d4ed8b5589aaf102c60c59c8a3cbbd1d988955b89d597ac7a5992f63a7ac36d8aad3916fa9f6311c5a0260136d534973fdf1b4a5fa5296b6b92
 EBUILD ripole-0.2.1.ebuild 584 BLAKE2B d4bd3636da6288f19089a6688f861a07b2069b3efcb043eb8d83bc9018e2aca09e700f60e2149cc6e33a13866e17e2b1ab8595a4bd42a0f3630a9003eef8056a SHA512 0fb1dd175d4314298735963c7c6d405df09a0003883bd4cbce3e9a0b9b50f342da6fb708d4eb4d05121ab75dd803ef9182409c33afefa4e78232fbb8755cbf02
 EBUILD ripole-0.2.2.ebuild 592 BLAKE2B 192db81496d03db1dc141b7180517edf4f039c839e239f3de274e5f5c615d6af142c601dc58206102eb56c7c60f5faec2f6bc569300a54bb7defc077109f3549 SHA512 de3169ace39c1389ee17c31d554dd5a3ad607c7e2e5bb7177181245047af31f43a5c1cea7136887a5f3681516e88d49c1762d68d96558d4a6fe780e7c0432c3b
-MISC metadata.xml 402 BLAKE2B d96b0165ae60bf8d709043657a4ca2322aa76f3862d11bc428ea729f21ffc0bc6214dfdaeafd0f536aad66f00c59d2cf0aa21711aad219096a7a41e831d60386 SHA512 42dc67ccd291ab06e2f62a6fc455b87d05b23bb209a744db1b8a765607cd32e54711e93f4b0fcc1adefba5c7a3bec5bc705eca085d937b805f9927816e62643c
+MISC metadata.xml 325 BLAKE2B edce91179b4c014b34923d673bd254b4e46e04362e7873b61660e69143cfaab7f5894ebf10858dc2028d3b8d866ead42411f90db2b11b5e4f6906a1cc806189a SHA512 fddd77a4694de0ec2c881c393854557ec48e5f6603c795f93467f700750386563c297302fbfaba72d4980b68fa1c5c0f000c292b9e59ac0463dcb079bbd3c035
diff --git a/net-mail/ripole/metadata.xml b/net-mail/ripole/metadata.xml
index 948b16d3c9ce..5296eb09cd83 100644
--- a/net-mail/ripole/metadata.xml
+++ b/net-mail/ripole/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		ripOLE is a small program/library designed to pull out attachments from
 		OLE2 data files (ie, MS Office documents).
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 3b2f3165a99c..d4b4dab715b2 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -4,4 +4,4 @@ DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d55
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
 EBUILD rss2email-2.71-r1.ebuild 1621 BLAKE2B 90f214d11231318e13fe6acffce72837a36c6a39b378e0eb60fc0cc0ab6626b5e589c35975a11f1ef596adca540995c22e3235f227a93568d0005af2e1d363c8 SHA512 c758468374d63600c7800453186f1ce42279090cd3e39c9dff35f6fdb26a7720758ea0610bfbf99d95d38b9bd204a36217a6a91805eb662f7fd62b1f7baada53
 EBUILD rss2email-3.10_pre20171001.ebuild 777 BLAKE2B 1d8ffd67fbdec8355f9a17fba45849f5298f8171b7ee9463cac6618374143ce9d02b913a1ac769fea9abae477df4f6717e986f4528117ab657b6fd45f68d9068 SHA512 3cb013bf016650b8a3c146f4c43ef48b67b5b1c59554dde54e72f82419e791d7ef35c247d8c5e8b58ad2b5c09711a5c4540c7c2eaf00949ef1bce2fd50981492
-MISC metadata.xml 540 BLAKE2B 32e0d7708d623f2845f5fea8d95daa69c70c374d087bd20b7837fc04a305c90119f8c9731ec2fcc98154f4d76e8882677f252b4ee83d33cc5446df94ebb7a964 SHA512 4291fe42e4663a06a6481e2b5eae59f932372eb6e0c4154fb2fd46a9b871bbdf1d3140e70a66e386669a4ab313c0e10e5066a02cfab22be31168d0719080b75a
+MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/metadata.xml b/net-mail/rss2email/metadata.xml
index 0d7e712cbeef..41e50cc50ae9 100644
--- a/net-mail/rss2email/metadata.xml
+++ b/net-mail/rss2email/metadata.xml
@@ -5,10 +5,6 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<longdescription>
 		rss2email is a simple Python script that lets you subscribe to a
 		list of XML newsfeeds (RSS or Atom) and get new items sent to
diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest
index 2a33e3033761..94078645348b 100644
--- a/net-mail/safecat/Manifest
+++ b/net-mail/safecat/Manifest
@@ -3,4 +3,4 @@ AUX safecat-1.13-head-tail-POSIX.patch 1183 BLAKE2B 846a9f99b40417524d62adf0b0fd
 AUX safecat-1.13-makefile.patch 562 BLAKE2B b80bc02df3244a922d831d10417c2e973778ac737d4a52ecfbdfebcfd51c1571c2dc8229bfd4e35faa7c23d2f58c2f788200977a8c2b5fe93f67de79325846fa SHA512 d48a33ce9e68ce8a27d77968040a146b975986b85e3ef534bde6a015b8179fc563f341be1ab7e74afe3e260ad267c99e18aab027d2f63125f76c071e15867050
 DIST safecat-1.13.tar.gz 33953 BLAKE2B d8b4132b530f975fb5629bc591e3b332cd6c8c29684a8848e76b7a660a6ea683adc8b89b92fbe37cf5c1236bca597d9ec6e44bfb5b35076a98d6590f355a40ae SHA512 e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210
 EBUILD safecat-1.13.ebuild 1099 BLAKE2B a942608e3ec6a8e0d033cbb594cd0f00d77d021a1af449dfc8a32c4221fe83f2df4b883eeb98d9ac61dd97e229504a38fa8fe9fcf237e20fd4a64c1c0f850829 SHA512 5e8b96db8c2aa068c7406bbf47357086944ac4c57365902663e97afc84f3176f8bb17e2cde11181acbba03ad564c3806195cf4775908de5446d14b96baad67c4
-MISC metadata.xml 387 BLAKE2B 0af99a493dabee53421e57fcac3f85353689fffe56d05ab5b0cce7a6e7773e2399ffcaace695770ae36f9d24a2ea02cc620e2ffe320586f04249397e75740132 SHA512 be8f5c847c3229d17400cad4230398bc68046166e080ad1998c9c659a6dfb68a4ddb6d39d059c38ec0c11702c8c786b8c49a7a42147fe51bd53fbdfc52624c25
+MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/net-mail/safecat/metadata.xml b/net-mail/safecat/metadata.xml
index 8f7804014a0e..a4e0d354f696 100644
--- a/net-mail/safecat/metadata.xml
+++ b/net-mail/safecat/metadata.xml
@@ -5,8 +5,4 @@
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
-<maintainer type="project">
-        <email>net-mail@gentoo.org</email>
-        <name>Net-Mail</name>
-    </maintainer>
 </pkgmetadata>
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 614c245ee472..1fa18a876379 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -2,4 +2,4 @@ AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a442816
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
 EBUILD serialmail-0.75-r4.ebuild 1269 BLAKE2B 726faec03d0e857f51a3fb3662c7929b9ac526d4cefaee3e280b5379fd3d5ac34af6ee08a648cd004559473c208f13103625b95c9a6867b5c984366967aa57b1 SHA512 ba52172765ae312b8f7aa27eebf9463b23179a8c4ce8822a2ecf6fc3d63f12ee40cce071dfd91cc56bddadb0e2e68c80723f34e51ecbd0fb65e9f0b7b3d69b99
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/serialmail/metadata.xml b/net-mail/serialmail/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/serialmail/metadata.xml
+++ b/net-mail/serialmail/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/signify/Manifest b/net-mail/signify/Manifest
index d620ad66ede7..ab974827dbf6 100644
--- a/net-mail/signify/Manifest
+++ b/net-mail/signify/Manifest
@@ -1,3 +1,3 @@
 DIST signify_1.14-1.tar.gz 13853 BLAKE2B 3bdf1cebfe4f4e88c5db94d2faad42c99f47a2bbc71374b65f5c576f25a26ed999e58cc0e1f8f084adab8e4ccc4bb6ea4cfe79c0c4b9b990d8abdc681f4118c0 SHA512 4b94c6bae6d36b60610318625eca7856f63a578ed22cc1690ea5ffa1d823471c73729f3f404d5d944f3262004ca6a9dd8ece1ae2cfa1dc3fed0152614792f7e2
 EBUILD signify-1.14.ebuild 698 BLAKE2B c092431907d851ebcac8a5907decf0bff83c9daba97e3caebf94815b66c1e1261a38578c919081cc63396f41b9c575274ddb587a521ed0b1e61de8bbd3b30c91 SHA512 d7490296a08e6c3d221e08d2dbf6f4e569b49e9f6b6851a0142879b3959a0621eab482c282066ba5030b9254cfa2542219dd848a140741bdba8e0f7334465a53
-MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-mail/signify/metadata.xml b/net-mail/signify/metadata.xml
index 9a6d80e5da48..6f49eba8f496 100644
--- a/net-mail/signify/metadata.xml
+++ b/net-mail/signify/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index 6da60db6436e..b5e16be6d4c1 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,4 +2,4 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1878 BLAKE2B 6667a9f32632e87e047d87b3ea4f1836908bcfc3f4ddcc7ecc77e9fc176be3644a69a33e10ed1963bd011f254464bb3dc9b0e44e12840266ab79733ab0ff54f0 SHA512 5bd29abde5b8b80c5a1ed688baf9cc3abe9b9516228401e9395f56f8e5af4aa725774128f1571a8e501d305a8c7258122a9bcace716d8f7704f89bf3bb2b34ec
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
 EBUILD smtptools-0.2.3.ebuild 652 BLAKE2B b163e50564b882e842f47498ccec844e78372732e61a2a378c71c38d45c8e44c3f1c134fa3c6e66f37b98a10cd25902f7a9f0c253eedb92c6d7e5db5dcda15d3 SHA512 5a26ba5791236746f798ee48ebc11265cefa6a68a627b15b4e1a953d4ef28d2f237f2c78254e616290888ad607793c0f8719375877176e44c7d5021ac7e4dd6f
-MISC metadata.xml 244 BLAKE2B 4c636cb2e4dd31b286d765d3c8724c3fc61051ff0653d1deae09a77fb1849928920749778c98dda893f27765d2ff0f94ce11582315cd95569e1b39092908df67 SHA512 0e856f808459b6d83c6eaeee418d87d85385968a39e6c1871a0eb76c04b533bbba16996a6f18613b7c550da90c76843bd01237be9b9f290394048e904535653c
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-mail/smtptools/metadata.xml b/net-mail/smtptools/metadata.xml
index 1c3bc7b3fcef..7a38bb900964 100644
--- a/net-mail/smtptools/metadata.xml
+++ b/net-mail/smtptools/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-mail/spamcup/Manifest b/net-mail/spamcup/Manifest
index 07c7180577e2..f7c4c6bbd8e8 100644
--- a/net-mail/spamcup/Manifest
+++ b/net-mail/spamcup/Manifest
@@ -1,3 +1,3 @@
 DIST spamcup-1.09.tar.gz 6801 BLAKE2B c19c1904d6c2f8f0c7b66ba6fd28a9591ecf95470dcfedbeb7e96376498c66e994ad44fdb407b076243d1efa5ee4c50cdf821f8888f269d6c9ed8d8da4d12f51 SHA512 a43a194b7f90fd4ca9a444cba0d42b7a87284842fa2bba6bbd5e2bc2bf8e5aed17de5ba6fbfd7c439fcd40fd0f9233d989ba7abf4d907d857f9c72f2c3bb0504
 EBUILD spamcup-1.09.ebuild 611 BLAKE2B 1eb2a73698e33f5ddf30894f4d92567fdee5f02021df52ccd907a3b7e18404d4ff562832c88d7f5f569bf7d160b9c32a31206cd467d107076e1adf7ecdf85900 SHA512 6792473a6daa49cf5fe248ae5383f78677c19c544e95fbc648865572f355bf85b415c0b8a696d65364ca1d0ffe59907b485f1169b27611dbeff149fb0edebe50
-MISC metadata.xml 321 BLAKE2B 18376f41d644de68af978b85a4649a97a1fd7ea4ed5b9d3f492da609e024ea50b3aa0a63880196c6c931f4a1e3ebfc7232afbbe4a712a49f101342a2a5a66755 SHA512 82f1683bc6b0f509b1ba46c5c57a07dde0ce0d64a1e657861bd1849599cb2a538ba123bc6b61c8ba6d1f425921944d30c0f0a3f31506d59d80a1cecc2d431662
+MISC metadata.xml 244 BLAKE2B 72d38f9d89ced95e1eb4246a5a24e654cba4c2e6408d890c0920542816a3b9363cc30903b50e187d1bfd742bb35100e681fdb1c6e8133d4cc2d3594d9bf9721a SHA512 7642c4bc265938695d1007e2a83fe3f3b01930c05354e4607e0011f7d5abd4d0a68b866153877a5407ff28be7381f278a4ebd5aded924919199af70091d591bb
diff --git a/net-mail/spamcup/metadata.xml b/net-mail/spamcup/metadata.xml
index 2316dd73d07e..ae3e25185e2b 100644
--- a/net-mail/spamcup/metadata.xml
+++ b/net-mail/spamcup/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">spamcup</remote-id>
 	</upstream>
diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest
index cd6de4fb1baf..8e11e4166627 100644
--- a/net-mail/swaks/Manifest
+++ b/net-mail/swaks/Manifest
@@ -1,4 +1,4 @@
 AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53
 DIST swaks-20130209.0.tar.gz 102227 BLAKE2B 4726da81869e137458f1a3776c51ae33215999bef56b1835cf8558166bd756a8186900b83c0bf32a81d1ab1cf23ec379061f4db78ae5efa51de7a6c1a69d0092 SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118
 EBUILD swaks-20130209.0-r1.ebuild 1010 BLAKE2B 6a5ec222698c1e10d71798b33b7340a62d130dad67e02442ce4e3365b7727f69767f07dca19360a11477b97b1db57c8fc857e552d9fc9700e1b1038de85722c9 SHA512 9ef336029b8e2d2e7f3f10726e2f96d7dfca90b4fa6896e9dfb0e8de59d3c0397c9bc680802d32a33693ad378c1850d5b39254223d30fd0e4c4f1f102ee82002
-MISC metadata.xml 406 BLAKE2B a70caa02c58fd3bbcfde4c0d797cbcd0b65f919fc169f8b36edf2eff48d2fd84b7606729b257bcf3905ad774e205687033fd4655e6218f3f6ed3c427eaa90765 SHA512 1ad98c07755689c2b8696404d73525593ca72deaa0245cd3297763a3b2c81e196fb85568f0de881fe759b4e1ae9d80715f744c85d4c4dea305238711f9b9d17c
+MISC metadata.xml 332 BLAKE2B b960f18e2b0a3a2af9ad3d3658677a1ed89791a26b08be6c745c45e7c0464ade277706d13f3ab764b1b5e733288ef64f3c495286a6e2b4603f0887aa366181c1 SHA512 ae2b76541ea3053071a4cb76f4e423174333cd0666e8606818c2ca7d7f3ab8263bc4b42c781af64fede626f8e665fed7b7ca23c651ddf75c9f5c1a8839becf94
diff --git a/net-mail/swaks/metadata.xml b/net-mail/swaks/metadata.xml
index 8fa91475b838..24e041dfd196 100644
--- a/net-mail/swaks/metadata.xml
+++ b/net-mail/swaks/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>net-mail@gentoo.org</email>
-	<name>Net-Mail</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>"Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" - a full-featured Perl script for testing SMTP servers.</longdescription>
 </pkgmetadata>
diff --git a/net-mail/t-prot/Manifest b/net-mail/t-prot/Manifest
index ff01eb188c8a..e3a22f4f7763 100644
--- a/net-mail/t-prot/Manifest
+++ b/net-mail/t-prot/Manifest
@@ -1,3 +1,3 @@
 DIST t-prot-3.4.tar.gz 46066 BLAKE2B 8f29e0c59ac1529f797cc9970aef40fe09e1b3041e7e1b5405b68623058dec500f1f7a4d51b994e5a764ab92586e053698cd98fe3eec5ef7ceb50f8d05617486 SHA512 6c86c10e5b381b93cbaa9382f8bd2c94eeb9c8ecec092d83cfbda5f0eea5933fb85397b364ea58e08ef93e6a06198447f167f0850959ddf16b8a18d3fe8953f0
 EBUILD t-prot-3.4.ebuild 614 BLAKE2B b8b9cf00802e5feae19979a162b781b3df431ae823701d06a6100772992cf786608fc69f56d39b749cc84b53cb08105475ba32fc20879f6f6fec9f46f7a5ced8 SHA512 961c2997eb39c2b971da08f1ac5b80b49a2b20a827d7cc5845021606a8087fff9550affb238a19a20a1135784c73c897d52877d5e76a5a2d0121f54d9ec64037
-MISC metadata.xml 919 BLAKE2B 511c88dd1959ebce8b0531f52cc0dc0dc16cfc7bf77bae792fbdcf0a2ed39b277f620f3d996037b15d6bed50f7d9e6faae6b30e0b986bf3ab0e045afe3668028 SHA512 e159bed8ee54f18f220ddfb0323986056a4534b82800470655d22dc0709be00aa029f553dae09d6f0965f0e96b4ab3ad10fddef90eebb1b8fb86c3a8a5312ea6
+MISC metadata.xml 814 BLAKE2B 80728aebe90f9f27629af84b57d440941f3d2e4684f95317cdc44e6f9c8e5d4814e7572a635e18a95af85f16e53df113a0e98d4dc4ed7bc35ab91d6479cfade8 SHA512 669e31f386cce6fbf01132748bca9e9c8f34ef1ad6b65c905f02347419f2f3d3310bbc7632f81b648426dde38edeeeddfece0eea82f69cdc3348feb1376964c9
diff --git a/net-mail/t-prot/metadata.xml b/net-mail/t-prot/metadata.xml
index 360d7833c5e4..b759a0743950 100644
--- a/net-mail/t-prot/metadata.xml
+++ b/net-mail/t-prot/metadata.xml
@@ -5,10 +5,6 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
 	<longdescription>
 		This program is a filter which shall improve the readability for messages
 		(emails and usenet postings) by *hiding* some annoying parts, e.g. mailing
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index 07156c9e3d2d..90b0a9d2ea5f 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -1,3 +1,3 @@
 DIST tnef-1.4.15.tar.gz 4650572 BLAKE2B 3feb389af7128dc197e919c002039ac7747aa49ca0a69bde2f5f35940c1d1a340a1c2557ac14f1109a0487dc45d7151271b18cdcac2ce8daf38c302608c26c83 SHA512 51a8c3abd99065fda59ab4129b1a6ca4d58919bfe1b8b10951787ddb007fac69a82d93b7d2a7f1799a9b04f531960f3e1bb7424bcb7cd831b1eb3fcdfad0e720
 EBUILD tnef-1.4.15.ebuild 453 BLAKE2B 6d2a35f40637d70d92a4c6877a417cb9fa4889e5727c31d5fdff3ed4cf7e1d9697b52e9050c7fb297e7375536d4606c691d46e515627a65a12f764df27db7b5d SHA512 0ae6ba62420ff40a0af212df880f082bc8e6f3a62ca5685a18966395b775da62de13262eef559b709b75e9516ff25366c5e3f3e7be05e0752e53617433cfb8b3
-MISC metadata.xml 318 BLAKE2B a1ad80898c99b4ecfc7993c2a897616555ac1f74e7ec5e06b0b7c6e023105271240eef10a6d3de05fa2188adf7f70e1b5961c971232cf1bdf86d9f3c23dec53d SHA512 e485756ad4674420d72bceb57b6e5145a7e46f2c7e4d2f5e60191af658dd7e2b1cd58af2a9980f5d1b8bb68b0fc22488349de6e3979f7ffb68cffcbb6a85111c
+MISC metadata.xml 241 BLAKE2B a08ca3c0f002883ed451aef0127bba0aab4ba07e13953b4a99a45856ba34168bf69751618abdb4d4fe309a00cd67f70aadc7a42edc8afccc18e2090a956257a2 SHA512 b1ba4fcaf6cb9388c331edd4b8f17f6d7145135c6b3480f78898c004f5f148c93f6b3c80b8bdf19523414c25435640a7ef27cff3c9da586ecdb6430d8a93b14e
diff --git a/net-mail/tnef/metadata.xml b/net-mail/tnef/metadata.xml
index 91112302a793..26c0b280a2a9 100644
--- a/net-mail/tnef/metadata.xml
+++ b/net-mail/tnef/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">tnef</remote-id>
 	</upstream>
diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 46427dec89d2..203212341529 100644
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -3,4 +3,4 @@ AUX tpop3d-1.5.4.init 607 BLAKE2B 8cc947bb35566f09236a5a6c06f6b1b8938d51f9dfe0ef
 DIST tpop3d-1.5.5.tar.gz 285027 BLAKE2B e8cc76040757a5c8931ee34b27a57c52889f3533b71a53c7a2fe589823129ce5972f2ddfa9ecdb46d7a04ac77e8d735c02b07cf7e8192135e4ebea6c392b38ab SHA512 918a057c62d7518613daa6335d8fd5a2553d278dc4d6adbcf5ba3caa3ba561587f1d9e18f564690383e91f3ee2e5120af919d2799b69e93bfe3a3b8ea4f5d7e6
 EBUILD tpop3d-1.5.5-r1.ebuild 2903 BLAKE2B 921bc1abc4ed97475adcb9f43d67d3d30385ac43ce4455dd7b43136b31429a407f21b512227b9544d22306ed05cac111da8865b23cfef1823641cc621da34206 SHA512 837a4b6fd6ed03ffe90c8ae46cc3efb0141280a59b9994c924b5512ad8713f07a432c2edada8988de68ee6a6ba92b2b0ea269991308148b92f56332d601810fd
 EBUILD tpop3d-1.5.5.ebuild 2855 BLAKE2B c7ba82c800af6620e89bae702a021ffc72074d8204164c88cda613ffbcbb0af3ce87ae29939f23ed7f54ed298006fe0acf04957a222e48d58912d0409de90bad SHA512 7ec27021a5b5a06e4a6e3186652a085226b63c896ee58afd85c6dd4fa9b733ffe349ae786a33b28f9856320516504967f79cfe714b1b02355f6d014dd23d328a
-MISC metadata.xml 642 BLAKE2B 05d9be7ac8c3b22acf6f83e9f06529882962236b8f94314d128da7719a100b65d56a75e9e4ca8e33cac9e07e778d7dd687b5d9828cce417f40e65c382fe8c7d7 SHA512 97c31d1453ef08a10e3b6d1b575a1cbeee6fd6ad910226cce4147a913835dec3929a0b91faa11af8babcfdbc0f2c2da1ed923ed33bea9ee60acfab26071b7a97
+MISC metadata.xml 560 BLAKE2B f0fabe58e865bfe72fc237eca7cba05badd40682b5a03e420a00c96460106743c10d700082522f379828be1000fd1302863ad7f975ace5786c8f312fb5c6053c SHA512 892cc588c2be8dce623ed1844a7680339ce36fdee74e16b99436925b2defec116b164926f3a000db186ca25a079f90352d73795561a6c361e0c65c8c22c92eaf
diff --git a/net-mail/tpop3d/metadata.xml b/net-mail/tpop3d/metadata.xml
index f435a118d9cb..75eac52ecfc7 100644
--- a/net-mail/tpop3d/metadata.xml
+++ b/net-mail/tpop3d/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="authexternal">Enable authentication by an external program</flag>
     <flag name="flatfile">Enable authentication against /etc/passwd-style flat files</flag>
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index 23a85d3a37c0..cb3689e25857 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -5,4 +5,4 @@ AUX up-imapproxy-1.2.7-ldflags.patch 521 BLAKE2B 817e7f7cfe1d1ea08b6224e70fdbef4
 AUX up-imapproxy-1.2.7-tinfo.patch 555 BLAKE2B cddeb2467a0f7a038414026ad2f1cdd81444f9fbca4bc190d77b7ed674f22a0cb6a573dda010d26c0415035ce4603845f9abe695573967994d740655e873620c SHA512 e4cd2a72337481d4060a091a4540f70997e79863ceb999b9ee64c03042b020718939caabed20706ecb4b876a0cce078559468946c5e29a7afbc185dca70f983a
 DIST squirrelmail-imap_proxy-1.2.7.tar.bz2 111651 BLAKE2B 5d09f12617905eec60ae2fca42895f7bb7111db052a8c6d16f73ef6d6e1fbdc9efc33ff61b0f447f450e02bc862a6f10d6d1878bafc004081e4dde16cb2977fa SHA512 4b341fe5ea13241983c780ad2487ad5bd97136652b095f54ccf8f61d0f0818236d0d6e1005d46811cf3bd15896160fb172a40ae805ccc3ce7d6fc984099d2b2e
 EBUILD up-imapproxy-1.2.7.ebuild 1452 BLAKE2B 9f8b07bb54a7cabdbe2913394f0045b44876b64189e3099c69f85df584e79b9713e70996eba0f3e13fb4999291069825498a522099e32d868a349d10dadd11bf SHA512 617b7473ca0ba6bac5be4d719d022612c5435eacbe203c84205596fd4b09a78e4e7538580f4afab6e186441add8e6b9c78bfb804d4b9be6db54287dea81fa97d
-MISC metadata.xml 336 BLAKE2B 8dc95e6220719033d435317e046ad8b1d64f37ced4e8d041539cfc62efe84f07db011fbbca011dd26849bcc47bf0ee33fb37b87faf7d064dd2a22bab712365d1 SHA512 2ffa6f2d766aeee72cb51c1892d01d9ebd185ca3b7a6b8572b4792a83eebbbfb74fc89a207ca8e2e76fa1362efd690dfad32851c34f9c6b631971883c6c03bf7
+MISC metadata.xml 254 BLAKE2B f48e6c4e3b0eb13b72c3dc59fd212a08064ae47972010b53b5b784d8166b167a7794bae4eb3bfc78bb29bbba5fe38c3914fc7ebd93aa6eda8d2e2477fe6ea381 SHA512 802a663a720e850a7d8e03c857bd926a2f1799b8d9950901ca6b17104b29ff106ab6c74aeeb9a3b3ebb0d0d08c18cc5a245f83d93860c3519fc240f6dc929879
diff --git a/net-mail/up-imapproxy/metadata.xml b/net-mail/up-imapproxy/metadata.xml
index 25a4937fb525..a02624b0c88b 100644
--- a/net-mail/up-imapproxy/metadata.xml
+++ b/net-mail/up-imapproxy/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">squirrelmail</remote-id>
   </upstream>
diff --git a/net-mail/uw-imap/Manifest b/net-mail/uw-imap/Manifest
index bb5f80f0a858..78f9b2ae8c99 100644
--- a/net-mail/uw-imap/Manifest
+++ b/net-mail/uw-imap/Manifest
@@ -8,4 +8,4 @@ AUX uw-ipop3s.xinetd 357 BLAKE2B 78c781c560fb3f244b9c9d96dd58a5df2c10f05ffd22470
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 EBUILD uw-imap-2007f-r1.ebuild 4673 BLAKE2B e496d63c51f88d7f80a43df4e98fe3cab27b35e2786273c90ec699bbef5ee5bee63bb669c42b53372c592343812f9df1788bde0be652d7d4e5afb11bcc3d52c2 SHA512 1b94e2f04e3a9cb0f1c3b83f85abe7adedc65c542d86faca265acb2f0d5845a41809430b4ba313735ba05a20e08737a22cc81f3e97abcab6584d658fce9487b0
 EBUILD uw-imap-2007f.ebuild 4409 BLAKE2B ef3ac9764c0036547a7a839cbdb1b8a64b198ef8da3eb2cc844250125ce58e97db189ec7920ef6b2abcdff28034533b7e4fdbc928fa3051fc1aa03010bc3c2a2 SHA512 ad783b8a36af0a40358e45b974233011878dbd69421e5cb4faf2b6014706f4866aca0f36fab10248a054d35c6eadf687840eeb0091f7710146df78989964acb2
-MISC metadata.xml 352 BLAKE2B 974073c519d9cf6956092445baf695d8ad86681b2fa359ee5e9671be96cd74a6f94d9d0bd6ee83122381a64a3b352b69b81a86ee31f6feb8aad460679d3d6413 SHA512 ba06f1bcbf2445ea006525dd5bbd6dc9d7fb62dbc12dc90ca9ba5c9cecce3cdc9d4dfe31ba5e7a11128de4ba82e97b1b37b7f3240db1cd932c6165bc28f22324
+MISC metadata.xml 270 BLAKE2B c017e0ce22899ab0019f4648c1e13d31e53014e0dd0258822ab4d243d64c79c7f5e250f2bd48fe81282785d065fd6f125ab07325f72c672cbd908e7c9c14d83a SHA512 0be9a2bde30dac6feb4cc1340577c017bdd74b91b38a280a645fdffa1bc0603e5377ccf2b0ceebcd6edb56450bc8d3cfa040f10a2268566b3a6f1d76cc4a2d5f
diff --git a/net-mail/uw-imap/metadata.xml b/net-mail/uw-imap/metadata.xml
index 7b9eb3253953..8bfae6399cb2 100644
--- a/net-mail/uw-imap/metadata.xml
+++ b/net-mail/uw-imap/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="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="clearpasswd">Enables cleartext logins outside of SSL sessions</flag>
   </use>
diff --git a/net-mail/uw-mailutils/Manifest b/net-mail/uw-mailutils/Manifest
index 78e4342881e5..b357d49f5881 100644
--- a/net-mail/uw-mailutils/Manifest
+++ b/net-mail/uw-mailutils/Manifest
@@ -2,4 +2,4 @@ AUX uw-mailutils-2004g.patch 1210 BLAKE2B 26b0c30fa9aaf35aed40ba84c9f4cc4bba757f
 AUX uw-mailutils-ssl.patch 391 BLAKE2B f2555a5d65f2e447477909a3cc1d9456080900cc3ef8fca19730565e791e46ff22da6ac295fe2a4bd5e0d02a48d79d3c3275ea0df88c79e13b134b578162ff9a SHA512 4fcc9930209f728b901565cda00c2a4446a024bcf1abfe5928399f62bf5540f56ed449b6ff401db09eb53b61e4c6bfd4a97da2a67a2942ff8a4394530eadcffa
 DIST imap-2007f.tar.Z 2793529 BLAKE2B f5b597551ef56d284180cd49cf6b7d01a63ee60bcb513a354bd7ec63428184b854e3ea666a9f3ce1f5b27699cf81d2f1d0e66e5cfc7fee93d723bb146d113ec7 SHA512 2c728deaf66d23158c61ae55ff94f05d2a1cf0168002760321ca30c6ee1c58c0a4c7bc14ece0097ea662df6c7c49be3b91c8e5e943724c9e2736800fa9298dae
 EBUILD uw-mailutils-2007f.ebuild 1214 BLAKE2B 0a22765e242b781401783690c8a334c2ef9c2d4eccea2cdbc2b90ef79ced2a906a6702b007b31ab60e17f582702a3010fccc37ee9799cfe5b743dd1f28e68168 SHA512 248f92bbefba0912f1cf18fa4697e2f84981f11ed5a27859d5898e019f7d3f40cea0ef7125bf320140019117c0a1afe3ac11c52a85282866c3c493c969e30ecf
-MISC metadata.xml 354 BLAKE2B 41dc3c3482db345150e200b4a365487125aa45bc0145aa602abf6de7ec7189172600c410dd6ed93d55f8947aab56d5d9d9b2880f7576b8e5d67b8e7968ee9df8 SHA512 f07c546c9558055933bb275a504a7a38f15343ca89cdad8aded334445022ea7775b7c4ec6b7cee59faf2cd2d86e2b9f35c5dc07ce00eb8481e54c24231708977
+MISC metadata.xml 277 BLAKE2B fa21bdeb42314f279aa459d59c02e6368ba90965035566f48e65283b393022dc21cc455c3bcf8aed410e8c980e374528dbaa9633faa51dbaf65d928ff7e3dfd9 SHA512 da7b71b73731acf8415dbc4e08ee8d3dbeff9058a179057f74932f1fb732c0c513febb617e66be1af0a723838a1589b11f64238e885433e7f6fb26e4dcb78af3
diff --git a/net-mail/uw-mailutils/metadata.xml b/net-mail/uw-mailutils/metadata.xml
index ec8a6451efdb..38a99ababf02 100644
--- a/net-mail/uw-mailutils/metadata.xml
+++ b/net-mail/uw-mailutils/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Mail utilities common to University of Washington software packages.
 	</longdescription>
diff --git a/net-mail/vchkuser/Manifest b/net-mail/vchkuser/Manifest
index 1f80059acc8a..08500ab0b80d 100644
--- a/net-mail/vchkuser/Manifest
+++ b/net-mail/vchkuser/Manifest
@@ -1,3 +1,3 @@
 DIST vchkuser-0.4.tar.gz 5890 BLAKE2B 2b48f085fdc6acd86cce3c1e12ad2e445ef1059e6f1446719cbfb3649cfe67df36255cc220ef063fbd699d7f26bb1cefde20a0759cc45e0e92ea93c6711f1015 SHA512 3c33a1c26abeaf45ca90ac1f1c9cf7b1ae6eba3f6e5a8d0d8d0d12dce98fbada4209cd916af7af69d7682c174d88741b1140e5c758a08e0d196e73f2b6145699
 EBUILD vchkuser-0.4.ebuild 914 BLAKE2B f68298426cd955378da25604aa5062a2b1e34ca2d27d985de904d3d0a6af3e77ed7531535c3e1c71317cdad6e990762f5654d34e37c4e131bcfcf1da8cc5e2ca SHA512 828d951ae6a76d0af85a4d8fc626f2cc500aee7a78142d0aa2e3affe42919427be9db599153075e82d89fc6b1a7132d89634a3adcbf06c9813d6614670817a4a
-MISC metadata.xml 400 BLAKE2B 11ada1e3a19ac1ae8a4d1197b084bf96ca987c5574f5b9dda02bba82de21c657f2480e34058d062faaafb2c0746594d498122d6d3afeca6b749514209a9e6230 SHA512 15d3f36f238f73da85b7befce7f36e7ffc03a8207f1a828d9c7b371d4497ad004378cf2508db95317c19a94bf027a753021fcd53c5f36e88072f0efc4db87da4
+MISC metadata.xml 323 BLAKE2B 0147c79382994634fde3cc6fdc43872a95cb5bfecd3290720dd604f48453a1e842edead7ad408b08b59f4393f902c997bbd3db259d34b13ac9ad3a5be9cb4f09 SHA512 9e86c9f10fa850b949b9ca13118399625310655314b607015cf7441c59432b6bbe9f6b3282d090d55de08ec07415b1c5f79b58c40d99f92173d4e59a02920f29
diff --git a/net-mail/vchkuser/metadata.xml b/net-mail/vchkuser/metadata.xml
index 252c0de963a7..4a135a628147 100644
--- a/net-mail/vchkuser/metadata.xml
+++ b/net-mail/vchkuser/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="debug">Enables debug messages to syslog</flag>
 	</use>
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index a5c1fe5bcada..fe76205f227e 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -8,4 +8,4 @@ DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87
 EBUILD vpopmail-5.4.33-r1.ebuild 8059 BLAKE2B f8933d6e46ae839bc4280f21013145c0d2d59dad9121028e0e7f2d331c2fa26eeb236f8491554e52ca7f7d8b82cef2a233c775dea853a29a51f508dd373cccba SHA512 4b922cfade81bb7fbc0d5123346d657873dc49dade23882a75faff2a4b81e220d16b661175f06524320ab78297f8066770a7a9201e235dc34ec021d174fe1408
 EBUILD vpopmail-5.4.33-r3.ebuild 9026 BLAKE2B 1abd3e4d464d12002f64b73a5b7339a202b2ebc4cfaa6df101054deed4fcec1308f20c9225c592dc77ba117fed5672d5dba125e699d59f038b41de6b0f33ab36 SHA512 63ad190248e31c47a1e872a3fc4b108ff6ff3c1c2124360e314c4b153ddf5aed1f46f1bc1d3a61077502b8ba9d2adbfd02d3371ff6f811b2b384e675a6378604
 EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6
-MISC metadata.xml 680 BLAKE2B 66efc812c404922158bcef2b9f264e6e90c7c4af1231b7b558d7c8ac8d3d6e21b78f83d350f77278a3e79f66ef865c22f3666a469551e105c59d079ab652ad07 SHA512 66869b1dd1465c1914461874ca44988a1cf3cc34ca53cdaf2fc2851d6580d756ac1446cedc7168f50bcdfc82821f7ebb109276deabdc099325d0848a97a63ffd
+MISC metadata.xml 603 BLAKE2B 65783ada89c16e0186dc1af9532d0dff0366beb62bcc935895cbeb174d8c7ebb3b4203fc2f2287390d764f9e26b53aac10b78cfbbd38f0d757613638e2d07efc SHA512 fbb42f6bb68c08a378846f9007cdbffe52b0f2fd042bcbe083ea307a2419b2036a0bb085573294d83a464a4aeea97012a966b3135d282912fae71fcc47c4a325
diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index ee267c81e3d9..75187aec0efc 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="clearpasswd">Enables cleartext password storage in the
 			vpasswd files</flag>
diff --git a/net-mail/yosucker/Manifest b/net-mail/yosucker/Manifest
index ea475f131b5e..ab1a70f3618f 100644
--- a/net-mail/yosucker/Manifest
+++ b/net-mail/yosucker/Manifest
@@ -2,4 +2,4 @@ DIST YoSucker-pr73.tar.gz 43581 BLAKE2B 1ec4793100401eebc3d18e133ed679af8cb338be
 DIST YoSucker-pr77.tar.gz 44703 BLAKE2B dbe3bd5002ce9e75b249dda30cfe00f684b9a321f223576eec36c7fd154910ee46ea6656aa55633c0a2f7fe6edbac576035dc89bf04e22f8e43943e634995742 SHA512 ac69ef919d602681b1812727ac1de2f2a6f158b1204bae803ce936d5db0ae16816ac778146ffd9fc886a31c1736779bfbc7c9c548e94722fd07f8e8b63139265
 EBUILD yosucker-73.ebuild 981 BLAKE2B 21e279518724474f76ee7e500fe3ff40d69667014b66a8b00dce40de18cb9c1bb1f1ffe1fbefd31a0d6ef45e7f74e9adcd27b86b567be035e5587f05db9fa33a SHA512 738236f1c3d50e49d2a0c3c0c71efd5e9093076ae9689fec4fc621a83ccfdd016f117989369249a0c5444d430fbf7a9870bdb740dfb6e34c6e0574dd3dd62ca3
 EBUILD yosucker-77.ebuild 946 BLAKE2B 7a013def50a2dbff7fd079d486b6efb283e669de4515aaeac9d1eb466cd9cf4904f003fa6489eebe6c8eb1bb7d500640832a8735808ad6ffce6314e03d11479e SHA512 7dfd8a2b0b9c5d67bec58b7a28a9c4e617347e8dccb54e533c2632425b7fcc1621be21fe201d194f34337dde2ec28561017090635d02b490c7d3aab46d685142
-MISC metadata.xml 534 BLAKE2B 659ae7df4cc3e38aeb17308ab872cb6026fef422f90180e69893d67dea99d279a06bd5d7c35320d8f8570f1e3279876b7eeb29c89173d9ae199e1ec47df6eb59 SHA512 791f0ee81dac6a7e0279c20c48f74f71daa917e0a59b723e3312adedb802a2308dd111eb7c20f9074a0e4fe99c9107599c327239a9c8661dcf7eb4380c0156e7
+MISC metadata.xml 457 BLAKE2B 5cccedd7c71a0cca01a9cf04ea802e344e515d6b3a82545dcf651ba04948435e44259dea4ecd638b9c94977880561993addb6f3401b378eb83091aac94971b7d SHA512 fd940bb934a9a9876e086511981a8b535795457ddf90d2254af9731550eec1eee8a842c137e05bac34cee94275b1fc92d808f782ece157d1f4d61c7716146517
diff --git a/net-mail/yosucker/metadata.xml b/net-mail/yosucker/metadata.xml
index 136bd575459d..be4835642693 100644
--- a/net-mail/yosucker/metadata.xml
+++ b/net-mail/yosucker/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="project">
-		<email>net-mail@gentoo.org</email>
-		<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		YoSucker allows you to download Yahoo mail to a local file or pipe it to procmail. It suppourts multiple accounts, encrypted passwords, transaction safe writes, and more.
 	</longdescription>