Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

10 files changed, 128 insertions, 76 deletions

diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 169c0f3a9a56..6715d8cb82f2 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX apache-sqwebmail.inc 347 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0 WHIRLPOOL e586f1bcf82af87df2285ec142f92056fd25df515b2cdc1027d62a97a26ba8205204c192c0bf0b59fb636ca84f70baadd79ea8a60bf9cb97db34e2b66aaee8f4
 AUX courier-0.74.0-fix-linking.diff 1101 SHA256 638fff8645c0d23e1614cf9657cc314a22a0e3d0ec69baf576124d0f27b7d7ae SHA512 019f59a477732c154681629c70a36380e810000350aca3e6f306faf532c797ac9d1f1f8c58d9d433ef87be58e5fff2a1dced53895686faf6ede55216b4c25a95 WHIRLPOOL 246bf9aa882f210e345f0687c5c587f46625f65a4ee5d33fc2715c8866ff3b17ec663e568f82c76740e52010f24bf9e00d0ec888be5eea2deae77bcfa5cf101d
@@ -16,11 +16,23 @@ EBUILD courier-0.74.0.ebuild 9412 SHA256 370e3105cc3744f4daf681a71a2e4ca4dc3f5b0
 EBUILD courier-0.74.1-r1.ebuild 9558 SHA256 9c156119baafce30a7b4021c9676990465174bc87422649ca75387ce4e9715e4 SHA512 b7250c2a67658d798cb320f9883751a789ab6d92385ea264f619f03412f80fb6b879059ba7fb9eb38be059c8dcbb63c46527688ff9a133c85f8ce839608c5721 WHIRLPOOL 2d05a0c8c9d25d7e21de44fcdfdcfc07ffa6012fb4d2b228e32404dff0f67bfd40a6801f03a2e107ce929defb4e967c0874c495fe78b4dc1b19fe24cc0fcf0c9
 EBUILD courier-0.74.1.ebuild 9358 SHA256 983eb1ce9650d016daf4f82dd1505eb92801c9d4c433c64f78ed2ad880ec3e8b SHA512 4a1f7136996d686459077998a72f8b86c63b0a692f7fcc7df17e1044723e5732d387eb2c08530c2ac0216136645c4de461a188f7e8f286b04da603d71ee725f6 WHIRLPOOL 224d78e46dfdbb6c11edfd7f076dd60a8d814612f3c650e022b6434fb737e6dca890b0dd882b26a8f913a835b961bb3554970f42f8d9611a15f3381b398614f6
 MISC ChangeLog 40706 SHA256 65056fcf58553a46c313109dd7808d3faa3890d61ea3dd55ac1b9e41139393ea SHA512 b83c8fe8e8e3755b03cb7c1add4a829e3a6afe4c25c685c488f99a7df7212b610abfe2fcbaee303421d199af87f810d4c1c6d0fc962e8673d406fe0792914eaf WHIRLPOOL 349b88547f207b816fe5bf5f2e4080f281df7c5945294af0e6ea21919e4ccd9bdbe5d284a4d62b6cb920e865096a035f29c0e4acaa9801063af4ca5d3931dc87
-MISC metadata.xml 688 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557 SHA512 07955a3efaadb572270bcaf9fab65f988d3999834fb95515003e7022707731877efbb7a749622b57b3a768db27db331a5efb3beb0637ac8e6def1d667dcc93ae WHIRLPOOL 07da4b25e2640c2ce0318e5fa2086b3f4f187e821940b7304184a0b4634e0dfe55edc7b359430c76c6617ed512ff68ad33cae150c1e34e0deb9d04484c0408aa
+MISC metadata.xml 764 SHA256 5ecbc0c4da54a1dafc0ab2af31d6a7dbe878f3139491a908bc0980f85bb93755 SHA512 7001c0223740eb3f33902524e77371d5b27ca089058a925882c70c7861cf821ffcb414d3778ec3088d33be78be1ff0eac86ae44ac6550988dee08d7c22d9dbdd WHIRLPOOL a431d8517f3616b376b5d310a2057f3ff1bdd822e674132a7c121e4e84648ece6e7977d41c5a32a0064a2fc672ce7ef1275295915161b583c8db4cd0e5ebee9e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVV3uYACgkQCaWpQKGI+9QTiwCfeYp1ueuQvJyKVgBtGEO02akc
-PA0AmgNci44ubYL5Yy34zry1ypdUp8I4
-=IzH1
+iQJ8BAEBCgBmBQJVftDsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihigP/RMZ/+/RRa26Yx3fX7i5iwKW
+k6wsy6Eol87Cw15Sp39jzjmMRChXlUhbaMzg97Momi+ky8/q2v74y16su+H2KDGQ
+jlvL/Jdc45y9tbz6uENAuz+mAJTrzJpJc3BRzQrsAcrjtXlp/E43SMwoiInPGCtC
+RXGE4l0kGuf0pUkP/wtOgptSZcKRGWaJv6w9hXl1Cymv4j9mrTX8O5kF/AAY/Fml
+EfKuIQM3X3PSmT20jLyNg1Y/V+2OLQUiXulRT5h4E0fSyQSxYjNCSc4w3k0fi7Ag
+3MZ0DxWDqqvC3HfJO5kATYjMYSE2349kEmKeq3qpcwnXqgjXPOFqEg/hOsrpX8qg
+GBZEFx/px2thRSx9M2vqoC5iuCCGw+K77xHKn45AAwrM4dO0DkVYtjVMZuKT7QTr
+6jSKS2uh3tQV0RJidBM7c2LJBSfjaQL019sbhFiJZbeRkA2jUmOfNYBih6cgb1D7
+zS/QsncjHe/WNc34t+jkaciFHJnpTDtxX2+u4sF+WiWzmWz/P8aMdYtYvGFEsy8r
+h9txM+N52gQTJyY7AVKU2LThhy8gJA7HQCishPq64a2BEHj9XcplXXO02/w77Au9
+Cyst9myXzOsxWxAprUl8JLcKt0scfa+giZ7dfUeCgEsHeoNvSI+USGjvL11DSZkK
+dl40jVMlvYKBaCD0a4yc
+=wBpr
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/metadata.xml b/mail-mta/courier/metadata.xml
index 63b67d987eef..319a82ad1dfe 100644
--- a/mail-mta/courier/metadata.xml
+++ b/mail-mta/courier/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<maintainer>
@@ -11,10 +10,13 @@
 		server and secure version of the above also.
 	</longdescription>
 	<use>
-		<flag name='fax'>Enables fax support in the courier mail server</flag>
-		<flag name='norewrite'>Prevents courier mail server from mangling
+		<flag name="fax">Enables fax support in the courier mail server</flag>
+		<flag name="norewrite">Prevents courier mail server from mangling
 			virtual user addresses when sending</flag>
-		<flag name='web'>Enable the web interface</flag>
-		<flag name='webmail'>Enable the webmail interface</flag>
+		<flag name="web">Enable the web interface</flag>
+		<flag name="webmail">Enable the webmail interface</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">courier</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/esmtp/Manifest b/mail-mta/esmtp/Manifest
index 8c7f8d44cf28..bba327de8874 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX mailer.conf 295 SHA256 ccfca2b579165153e1fcfd049b02202e193f3de4fd475a967c2727e939851e37 SHA512 aac10a508be594b2d8851f181c1673e157bca7446794f37054a69acfbc2e1c804b0945280bbb44471e0a33e3f546865219e6ec7655f667918ee0b3c537feb50b WHIRLPOOL 76090e95c7019416afa1d4ac54042d150ce4f262c0950207f4eb23fc9a0a6d19f247b8ccf371d150553670dab4aa37e578d2ca5bd175e36d651aee7995580b40
 DIST esmtp-1.2.tar.bz2 127921 SHA256 a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce
 EBUILD esmtp-1.2.ebuild 1066 SHA256 deef701a5c019745bfdac37aa97e41e2a1857f4a620bc4342db30eefafbc1b80 SHA512 0b9e0666ed55b3b8dd8d462654bc081a9e44d72e303ec5d0e90311c554cf1252edbf5ff0593621a8714be637ef252138558414dabf3e381164f2b86670c1ab43 WHIRLPOOL b1f295929e24359542ac9c9df05426dab42456004637395e088ec8e80d008d499a58061be07a36d491a56a7b301c13b4b02669e943d7c6f1b16c9e9693cae8ab
 MISC ChangeLog 4515 SHA256 2568eeab41799c070ebb362c78dbcf420c2c64737ac449373336ca5d34a77b70 SHA512 253862b2ae93fe9ee8a9f16e69edd480f9f7d736c9feead9a843b039cefb5e77c320e7b50dfbb9c8b9dd65fa2c8f94c9654e7a82273d6dd1450d5e486370ad78 WHIRLPOOL 80bc8850a042f30cca7b750b0babfbde1ed6abea18f669857a872ca86380673eed315aa0cb67a31c3f321d0543f249adcb2934cdd046801c6ac1e5420a490938
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 237 SHA256 fde648da3415099edcd498dac4b63f521956206a1d60e0dcb9496213877b00a1 SHA512 bd2d901c75ca955b6489344b171ee68dc944d99b097e9145a0a5da6ca55285c85aa6f40852d8df5cf286c9660becb97ba3e402c02c751811725bf38e75f7b0e2 WHIRLPOOL 5ef65bad3bfe4b0020ebabebe3bd34260ceba2051887b0ebdfaba84983d7259e3cbd82e4522a476ad4f8a6d0941e182893e343312f714eaeeae5311474b55f10
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRRiD5AAoJEEn8cBKl3gOuTYAQAJd8pDPFGjaajcUbMy1ZBbQt
-EMxW4+uAa1RY57NH6PqJeaflxTTkf4E4wTVkCV9Tev97r9+Fv84OrjirI26kw1Xu
-XNrCUQo6hfj3KELy/+hNrR1KtDEiLLSH5dYwpPPBQdnenH0PEE0yoTfevYIdKSk6
-YpnOMgy8uayHy4QsbvC3Rr0n2UQndpDSfyPTPry6o/cpPcOtfgL8NdvQgMYQ+JUB
-xVABybwTkhVXNBvkSuSMVp8COx5HUtYSgk+w0C+uc0Pz0Da2VJ0AXo1hjC9f7KB7
-M2IlI/SQjzx9j5erP0aEZ8If2DmVpfuA1r1UxN6zoxYNBMZanRgYebvLGDaLCWUb
-qZ/ZJARq6pOUoZbzfQrYQ3yzP9nREfkSCFpgi5LC4cx3yZ6xcaIjWNSGtHNqLtWc
-Ttsq78IumqNtGJ8J+4KwdT57l5T0Rw3iev5E0l6wBYHKnghQBfzrvpBOAH6JzsFS
-qfA2DlTf0kdTHmpS/naZI88NyfUSpcxIErA5AXGTo+HFuSWqX4lGTOMsJqjwyod3
-V4vnLRu/SqyF0II+SVoYJCMxUqR8wBJa3UfyZA2jKCPThmLMOvPVQaDCW/zx8arq
-kg6o4y+YKqz5KQ4eyJe9bEjypD4zFIqnknq93t8/0NLFwVmLDu094xrzrxLyCvtA
-CjDBCkv7QeyTDYxb2Igz
-=MLeL
+iQJ8BAEBCgBmBQJVftD1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXrcQAKnUpiW2MNdjt+4nqK9Odz0B
+8lroyj4q9Eoajvv4P8nFE6PSoausks6Ee970iVT5hgexKKyC7i9v5MFXI4MyJi5Z
+zQUvYOEFIlcSwwXCX26C5jS5cGDvPUVJr4U3GAeA7p5R4/o/tYIfBSvLorXSs1OH
+ik+yS7P0TchesZ2/icJsOFliWduRcatkjNoIB2rT+EbVfhQKt0c7lgLXT4EQSl6u
+u8pl8uq96RfJKcH7ZminvTQThxJZyz7cOe3mjzBpQKvmdWhkRv8m0P+3r5hMV8+B
+SyzCQUMBux3NcTlBVaterrGjWcEkc4us8WJusbsr3eyt8ErPVRjOrZWdOlIxhuOn
+YwfNX5zHmSeHPydvw2m01FYqx0gsxiB/z1UAS5NftKhLMUXqLK6myIrgFu7eupP/
+gBB5FhXbnbseabIZRxhtPYVKY8TVktMXCffjht1acHUM3ScrH1jwjq/1XFqEuUkN
+2j6va/+A+Loa5JuxfSZahqZT0lN4f8eDwPykDlHpqqiYqnhoJ7mP5jN86UGoFJLh
+1kFH1xmqpk21tXob4c/sz3UNwZBRfjpjqnFLEl6cO5gJhiswf1IlKqhzst1b0God
+fFxgPDQjZhi/Rdy29JzSIzIjnLEZU9kH6vsM0EQFxU7sWbQUeSCvjFkdbLSrSlnZ
+kbUBeUjUxBO8o8fnRdC6
+=nnjx
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/esmtp/metadata.xml b/mail-mta/esmtp/metadata.xml
index 51f94e3fbe0e..725ab79598b8 100644
--- a/mail-mta/esmtp/metadata.xml
+++ b/mail-mta/esmtp/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">esmtp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 9d778c0c0329..25f29808c412 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST msmtp-1.4.31.tar.bz2 305770 SHA256 247af9a95fa22f506e85109fc4268a5d91ca03af9b17eebcc1e46b7cd64c225f SHA512 aec12bd9479342d826e7c838116c1771a17dc2b53c220c7fdf4d3fa4cb53eb76041bb64be7417637887e6f0109f65d97155e9c74d60633c280edb0613417a136 WHIRLPOOL a4c1413937786b3cf994b3d2227821e699f00c517915afea04f30064b48fdfb4ff8829c2ad9826f7c5776580c5ebc38e4dacafe53941c3d3615c1226c9619b14
 DIST msmtp-1.4.32.tar.bz2 303652 SHA256 2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88 SHA512 68886e1eec7a63044590cf65ec8f9a2b25c77abe2209f28d6f245141d3188f23f40f9e572165e5a446342c5867cc94cc44337caf4f4d3114227a021686966ff3 WHIRLPOOL 7a8d25f75a4b6b31b2d0d67c8818673279891c1bcd067c7d5c9b3c3541803161c9737f4b89d6ecdc32b11aa2c5c2cc2e1c896aeeb61483f519a76c88259a7dd0
@@ -10,23 +10,23 @@ EBUILD msmtp-1.4.32.ebuild 3407 SHA256 d31ec2f6f62b74316394fda26a5e97fb1a1b0f4ed
 EBUILD msmtp-1.6.0.ebuild 2987 SHA256 a62af6eda0cde546704d78983a0d7ed223ba29a0745dc0374b926cba3af8f0ab SHA512 bf73f98c6e7765387edf273e6bf30172aeb62246950fcae1c8e194f89ea8034045e6c51d7dc508a83c1f294eecea2098490485e4a0a87365dce89bbca3887f15 WHIRLPOOL d1de48222da6c5c981d5f0c3727ab93f4aac1c5c471d946b393f2a31fe59d3237d8e5a7b33a8d63c5de043ca2ba1873c48ac699b4bd8fbc1eccb443264d521c2
 EBUILD msmtp-1.6.1.ebuild 2987 SHA256 cd328b44448f3be01d567817ab3c99dfef6ebd52c1477f640b49456edf99acdf SHA512 32c1e7a44c6c5bd3cd320f2b9861266ffc89a08e7edebff43b19467da89eaf1f7e57485c83982b8de28520c8f08640a421f9e0452847c713d2dd6ef0d4b2b58d WHIRLPOOL 214696441145574f397165a6a708d5126afdaf68a4e31c93112e09e7e2571e8574b71c71b11acb367cd56418daddbe1e7fc408135fb44de3a163947c217a546f
 MISC ChangeLog 22320 SHA256 1a65d93c689d930ae57e4576c3def7552f03cf178d73fc4532bee3fd7e36d03f SHA512 5faa5eb316fd96136f011732bed35ae95209067a7cd653561569913c69a373a838d743ef5e6ea16dace2996109e111fff8f60d4f933979d3dc16733a2e727045 WHIRLPOOL 85720cf6e3a663337de9df707a502b7a07d1c45bc8e6b8adac4a445e3fe3092a0736a82ee52df7dc7c5627d80a9fc0e1a504bdb9580b9c5320cfc2bb8fae6b5d
-MISC metadata.xml 324 SHA256 aa2518be70b46886f60ee4d7c2c9044b4fd11c0e3123e2252b33205edf7487de SHA512 0d0de3701379ac788dc38ef29f3b2176cc7dbc6ef7c134fa6ff1448d8f8b47ef3fe8e7d56dae97ade911cf63eda1a41243a50618307a64f1ba3d46a0c23ce307 WHIRLPOOL d52a743031aa579c60a8887e280e179bb4d8932d5af57b999e091ed39f736a351f2c23d7fc56dc43ca3a5616b7da09b2a8d413464a630684850f6e4613104504
+MISC metadata.xml 404 SHA256 4b76d37cb7643de18f9fc7e6c8d6a272b102a09eda67c62f5d15ed277ca264ed SHA512 b4d5439dbd4d6856c7fa6729fb5541fb6a06f1804fbcde1edf6a248e9d6b4f520f10aaa53b7759232de06775bbe9a992ff52c89a5d72deb6f5a8017294e17838 WHIRLPOOL aec7b14c3a80da6ab444efa110fd992ac7441bb42d081f7a5048a6369207a4f10a350b7050c98b67fb439a2ec85290d17b1f819bb17264c38ea592b6bc14c6f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJW/2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxFAP/2jSQLXU4qgEi4VeImtIiQUS
-pRMSYiBudConAQEljTl7GHwl6+vDRlBAd3oKTq+yTa2QVBrKLdAQPnkgWjO1w6I5
-Yf1TUT8D+7y86LM2CPtt0DZxBbw7aBQlD+50D4QC/HpZVC9DXBfA+BcwTtwkfHRb
-pXF5u9vuumSdO2+joTzUqz7DzMF55Y4vu/k3G2Fx8a9N9NIDmlFwJNnUnGfCFr3N
-K87QNPmRKuZTMqUgtz/Ptpd7/tMVs7tPiPmZeZWrlqd15/t9P5GnxIYNS9TRORhb
-bIms/UyT0+OFiwWb8i6SpkblahV3KpUwYpnM4/gnSEivteAft2Q7rq2mwAqGwaIf
-rAbxjS7oO6sZkaB5V8OeiQmVSLRG/ysr99bsuC7Lp0zbI/LwZ7Z0heNdPfjOQOdV
-cr6bWB9/2/mE4MoRLpQyl7ztENsF1EcWBTCtPBDk7nhuvBnKGlVBrKLqKakZFC6x
-tG048U/pAqh8RAP6wACYCa9GAGuPcP7RbKvLS824zs0rkLTN+afU0dYw9iLZoLtt
-cl9IXnRDNbLSjrJIHqINvXrDB6coymnYUBIaFaQu/2gBEgLmE+HTQO7UFW/VAmqF
-jx1/+bsBPJcJbMdVQGzhI29J3KAvugf5O73mN8TnwUEyqk3COnSGBQ/6kHEKLbLn
-KZd65xE1P1bedDDCZLhA
-=Bl+A
+iQJ8BAEBCgBmBQJVftEEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3dcP/08arYuLWGcqF8q/nSfWWVCM
+SpjWk6MDGTaBkDrOSi4T3OtWLKUdxA7Rz6JgXehMFd0j7ujGDzzt5PmtsUpOa16A
+NnN25SmuYfo50GifSkLeiDgN6mzMow2tRQdhKU0ghzqVOmSy29vertGc8tT2neBb
+EiTT5yDRJUwtLLmnhOtYnL6fbEWtoBRxPfOJFBMGxD9CQZBhMBeXJGlfYPFczCMT
+OQvN4p9W9Fv50qOXTe6ERSneIZ7Aw0Fm6+rHW9WbkRbzERUyQH2XyH4KwBshKbEL
+Dlaw7Pz5AYqVejgbHRZmmnbAUejF2fdWT15CXJmcG7GiUKkb1Nu8rHuf2b8anIqO
+WKKAeiu9Gn6HGHpbKbSiVBt96HHQMBcdHF44vUctxHek0TfPxxT5f5Ral8EeBsJm
+DExZB7eAP9vXXJpZ1JRE8XmB8zN7jC2QBQytAE/oGm/SByChBqPd0UBzIfhVUeXU
+WYBpUqsGFADxzCtykl3jpRBsJNGlJWVop4iAoGO3xsoQEmSo2mzmh7jbbkAjoYZt
+d8TT3I5EEOs/ZDS+DcSd/gGWtATAa9vCvNpCPpzit/hbcrJHkjZCZ7L5ToXuZURA
+tXYOX8pPMw2jEkpYjHTfG1M/nLVfn2nlWmAm/LwcyC3dUwI9C6ufC1Bi7coRQX6e
+VQz2WOUzxLeGUIfMbgQ+
+=fnuV
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 16db75806911..1de9daedd0e8 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<use>
-	<flag name='mta'>Enable this to install as system-wide MTA</flag>
-	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
-</use>
+	<herd>net-mail</herd>
+	<use>
+		<flag name="mta">Enable this to install as system-wide MTA</flag>
+		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">msmtp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 7136091a27f9..3a2d6e675c41 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 1.06-exit.patch 551 SHA256 400ab4719d145e29b08d266b38766b80d894d5473e4c4f3b5e436916a36a4333 SHA512 9623d4c045d1399ca035ad49f82e50a344529edffaf7c0e2f1015fe0958dfaf8814462a70b944403203d84b86852e8a01f6a3c4688228b45443258dc908e9236 WHIRLPOOL 9e7df2a478efe792fb6b392429ce32e2920baeaa4a7082493a7ddb208927d344185ddab245e2b92ec05c5471c08c18d4b75f04f093849c2305d140f8cde13a83
 AUX 1.06-fbsd-utmpx.patch 1903 SHA256 dc21eb0ce3f199e346e50a51324120310a88a2f00f7e2c6d06b1b09e3c06a373 SHA512 b6e8ff4f6f582e0d6d69072547a68a3741345d08041e29285a3bf39c016b2b15231d5b0370123a95b35473d67f1780b69d19b61ddfbddae5f463709575344481 WHIRLPOOL c78df462488090e2656aa7a5a5918fbf8bf594eaced99fb6c51c5ccaffa8fa295563abee3e9ca56e7f9cce45686e3c304f9be27be4c33b446d159994a985ab50
 AUX 1.06-readwrite.patch 237 SHA256 71b60967ca83d9c8ac0ae041298ade87174930472f4eb2628a26e30665aafd35 SHA512 4cfb7991f2b30740d007a655743e77f5271ebefb4ed31ceb44d10ee53168eec713bbe64ff3616c372851c5fe1f04e57601dc83a27f1ce9cccdd0e2fbc942b550 WHIRLPOOL 34768aaa96a56b324755187b8edc64cbd84afa3562bd7f01cf136c4c8fd91999e351221d7bb5379977887c6128efeec581b20b34f7a8e597971c25e5e1cb84d9
@@ -13,4 +16,23 @@ EBUILD netqmail-1.06-r1.ebuild 3790 SHA256 7ef9de2121ed5c9f50089cdf6bba9bd5e097c
 EBUILD netqmail-1.06-r2.ebuild 4050 SHA256 cfdbe46db3b814a158c6d9f32ba049d34c32cfa84bcec75bc42f5a685fc548dd SHA512 a85c6374304f84e2dc88bafa59a1e36b9ba831c3abda4ebfcb34e8ab59b89a4abfca1ab113d2d35d6189ed62ecc898fcc4f0619e103ca2bf9fc851e0d13964ef WHIRLPOOL 740ff5501acdb492a176797bc47a91cf9463c8e5277af01fce1c781efa0b2e7d206e29eb1948421382a9a8afd901dde3133b6889533d275d552ca4a4672c226f
 EBUILD netqmail-1.06.ebuild 3384 SHA256 d1f33e62d838f5cafdf23e03bfbd53545cfb9425dee6a495eaefcbe6ca57b60c SHA512 5bdfa66e704b2049d519f98a90c575b186b179378f2bdb98f950a0b250e5ed6b4797406eef64b199c72245d72338dcd3e74b70c6a1525a25b0678accb31a17ad WHIRLPOOL ae75b3b9306ac1101362bcddcd892f001fb5e16cccbad26679d43b2cb07b6f9359ca1ede79811fb9600ccd1cc46c277cbd336820cb47e603967c733c0f6f6b62
 MISC ChangeLog 11663 SHA256 9abd30bb8b56ccfcbe1a636b6320efc110689af18f2d324c8de36d62770d1d7e SHA512 85f07e8c8e79b4779ab099742fbbb76cb0f7f31a0c7c0ec55a28e6703ae86214a7f9cf950df4830e0d34bf346fc4f38e3964a7ec512b7aabbe080e64cee581a7 WHIRLPOOL 0026b621d7da8e3ea2bde86184a2f8a7f107c5a78d2d481bc80f5467a64c5f2cb27df25c053c501dae0c11331d558dacb6cc4e6a2dee5a963b01ad82dee2fd09
-MISC metadata.xml 391 SHA256 3490aea8db1707e2dc54bf525527f82d66b03a79e88d948ac4c733d9a846c01d SHA512 c4fb450b7eae853fc507654fa81477c79d4419a27b157953a89bf943077dc21a7f16f50a4cb712285105d292c7c6c8193ca352ea71375979bf60a7c2538d34d0 WHIRLPOOL 4b18b6349d451031848e8c85b8595fecfe5e12fd75b12adc2f0bcfee0300ed09dfbd2103be1c34fae66421de6f5e7e61d08199ac4c6a200f45b8c06a70d5f5f3
+MISC metadata.xml 470 SHA256 00d8cf00000eb7b4d66a9fa3d1aba93a2ec3a9c3b3a6d5779b65efb22faf9e1d SHA512 ce626d883fe865bbd138b9eee26bc8bdfcdbb82ab1fe3f54e63eeb92f51c099a5c1e5c5eb09cb20e03b05526ded1941631d831554313f5db3d152d82a0a1b577 WHIRLPOOL 57a66ac7106e53d14a94b78d5021bcc2fe7de4281443d7082387a9c758e4e260c6d8f6900712a0697da9a12fee637df544745ac615b85f1f92e5f3ac5e73126e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVftETXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiT48P/2v23SaO5XprruAxcnyQ/svk
+pb+mzc4xmxoJWfTn4TPlL7u2yPlVFMEMLe2MS4ffOZ9KEgnIllR3FFUOYydnPkoy
+12TKLUMe1LFcQvWuzYm2q3ez4zpbgNoBL/sEIu6qBaoWpMzaOt/7ASyutPNMzg+F
+iSJgUYCjvTyPcdaCkHDGOVjnMBngYJtvpTDOeEOXXAxJo7R4upfN89NoThBge+0H
+bAeFyjne+QFNSRKdhY0BuBwnyMP0cecyw/jMVr6GuO7BAEEQmF9VnoibrhjvBTE2
+KSs2X4CugKbRwSWu31e+FsoM90jT4vrKGcDnEJXJGFVc2ZBy3uk2DfiLIE8J45Jq
++aaFLkPvtJVB1BG6tuHtBsEdKtabn4OHgzTof0c/6TCl7V5A4y+53EtI+fItPVEF
+3sMwbpPcKtqi4p98ISAIa7P2nWlBv8O8cNiPQUNdOsxd31pe2psG887SoqHh5UDd
+Iffih7MQy6pRvCTy/ktD9nzZFDhDap2XaqMj+e3blQtiW5lzklz4X9ul3A85e62R
+wVJzSduM4wGZtRu9QwuOl0KdiUkTbcGbXdYscgqf1ez+/FKMzf8YHivLhxKJ9HNB
+1MjiYwzR5DqlTQig0erO0++zzPzVjBvRaSfDAkMAROfEjHXSnEJ2lyvhJrQdTffA
+hF0rInkStxpp0GqZMHWj
+=0ANr
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 8d2707a4ed82..55bfa8244d3c 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -3,9 +3,12 @@
 <pkgmetadata>
 	<herd>qmail</herd>
 	<use>
-		<flag name='authcram'>Enable AUTHCRAM support</flag>
-		<flag name='gencertdaily'>Generate SSL certificates daily instead of
+		<flag name="authcram">Enable AUTHCRAM support</flag>
+		<flag name="gencertdaily">Generate SSL certificates daily instead of
 			hourly</flag>
-		<flag name='highvolume'>Prepare netqmail for high volume servers</flag>
+		<flag name="highvolume">Prepare netqmail for high volume servers</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">qmail-spp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-mta/qmail-ldap/Manifest b/mail-mta/qmail-ldap/Manifest
index 8b6419f0c002..a79077efe45d 100644
--- a/mail-mta/qmail-ldap/Manifest
+++ b/mail-mta/qmail-ldap/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.03-warnings.patch 2604 SHA256 2b27769cae0a52229787b67ae0f5b7a0fbfbb8377ee43cdaedbef418b27e7444 SHA512 6bf142eb11dd14133786b4c8ff44e70e2e3ef625c7a488e1506030a73c34bb8029ac25be6e2567436aac8b08efaaa174260694875ec22795d8bbb2ca806849ac WHIRLPOOL 73597de4a976eab8ddc3b3ee3e868af816633bda084444e2e2472c18d6ff6b55c34f2567d43d43bd550711168ad45c64ef317efb54fbf3ecabbcff1eb46fbb92
 AUX samples.ldif 821 SHA256 7fc42450cb689ee3e71d12aadef4dd68ec42bd8676040d0f3a22813204482c60 SHA512 2b77a383a1a2fb482f583b8044575ac476a3d0e6ee0a807b05cd42ba25d701e8f1562675518d76df23fbb33b7b7b1c691866ea7d8f918d73cd65c4a4ce52f38c WHIRLPOOL 1a6764a70f13072e965a67ea7fe54e19935f974ca49f5830c12e8f617655168e2478fcceaf6c5b8f84823f751fa993fa716561913ea95cecd64a6cfe6a967ee1
@@ -12,21 +12,23 @@ DIST qmail-ldap-1.03-spp-0.42.patch 13618 SHA256 0f673a5944347d5e46c7beffd5d9fa7
 DIST qmail-spp-0.42.tar.gz 18689 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
 EBUILD qmail-ldap-1.03-r8.ebuild 5799 SHA256 646d4f0b92c481ae0074ee831440cc7f9a7b0b1213c8e3dd18c49fce0c656fc9 SHA512 df983f0508294185395673e91da134617e07f9a39fc5dfce4564861fc7099d13b7de470b5e6ebed421d55f36b05b26d63b2501fafb957dbda9a30423200d8fe2 WHIRLPOOL 18f58e739ead35750e0f2b00959633589d26ff0573f45549db6e4c8d3331bd6d5ffd90599ae570b687a76cc56341850cbc60fc0c08f84289b6153c7867755794
 MISC ChangeLog 11499 SHA256 fbc00aada9042f8b5d6b93282d48fa5fcff5890211f591596a5593dfe5878479 SHA512 40138426e782e5fc19540da2171b9e0de630d07f46f67268fff85a55e21d266143233ee235654db18f95f8537081b07c7ceda13298feebc8f9b59fdfe7199849 WHIRLPOOL 6b977151146f7cea7e2330e72da11f475530782d19f563023909aef8811f86bb17fde609e88621d0bc57977c5816e06d6e9f324233b4bdcc36456d3caea45466
-MISC metadata.xml 595 SHA256 1b35b5b258df994c9232c0e80d44cb2ecdac90054ce52b47640fca48841dec21 SHA512 0817ba0199653b3e813c37d420445314f9ffb20f686d4bc9bbe43f490af2ee759e783f5e41bad4804f24e047b893c8316f9b9d87564260b045c075a840f7bc1c WHIRLPOOL 61394c793140f11f4a5313401a46ba974030f2566199ef4748f83382ace959110d2d03b078e6e79a82bb9b4981f15ea7b440169576bfed452f9bc0b22745602f
+MISC metadata.xml 674 SHA256 6223835a2ed4e76a96964cb8161eabde18f7dcf231a2f89f2b98ff3eb2c72ecc SHA512 3b896301db42ee5f3322eb31a17ee2a762bd546ab00f770c1573921d037406449e4bc5cc42a2257474aad621ad589d2cf81eb2de05cd9a6916b3fd82615816c6 WHIRLPOOL b1215b06b650cac92b4aecbafeaeaed6f6c9a7870b7fe7c92108510039b6907c7ad14544c5c2a2c143528723fc94f06806e0b257880ffca637f910c02b4e0965
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRL5mzAAoJEEn8cBKl3gOuwJ8QAJ1yPdV1XHOkvQgfzZFQD+SA
-ciwtOC8uBA00LWA1pp37toiWWLyoS8eqBvXDKiCvVS7xDoLEVLL991rPXdbmensK
-JwcYCzFCMK5F7HZNSVwcZsm0s6vMY5O+PNhsmdWQ0SglGA/GawN9af/A+4aMMa8M
-E5Cg6aN51tiejMjf4denyjCahehyjpniKdHKAnYvcLu8zzD2zljX9gyPMHTvaxId
-0l0znI3CeI++queol1xdlRb5F7L3GHSRcdCVacbUJRXdhOwyVzV+J0E8lF14aFiG
-dzgy4VK9umQid1aVkRNBed70PCXUb7AieQj2dA8ptCi1IzqQEKgzp3gVaJ2h3GFx
-D/uT8iTWBHnthxwqqURFGnrxYtG0u+3rkpWQkUPaQgkflSegMNNIFS2o9NhjH9HG
-HxuohUFcoSBRoVeKF1u7Xdql5jVMxKYRFp036R2BkptFMsu5uzGG+R0ubIAa5IIk
-gzC1nlfo0Xke2KU7tlTy6tIqe5F/RZtSVCYEmaHAgKB9RFl8FxlQQ0ifrqs9NKFv
-5kRrWqEuHT5IJ859uB362y3VIqUaSRkAlVe1Xs3VhpvpHLonLM38dMnT+RA4Wa2M
-p79XH1a5unNv21pTShbZY8U7cxD7VqH5vudu+SXeDTar/YbhCG4+sqG/zQbXwcMe
-gvKYB/eYxgFdWE/wkhBx
-=KMcr
+iQJ8BAEBCgBmBQJVftEhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi510P/2bz2VFDOwgG9a/zicgpiWBD
+dqgTW6P5sdBM973ahuzKdx0iDhHZ7LfmwBGycPUydxvu6e4Ltn7cz8hndJpP0AA0
+LB6oqPsXlVMRknMLjli5wu1swWCB9hAXUm05cbJTQavHp2zWKJkfck+GtUYSdEl7
+7qGOSERQEnkc3Ur7nVQGV7of/4f237C4yDPC7vB6NabfA6Ys4Tf0c97CMlUB7+Sv
+urolQV/i/DWPzvLq5F/ykEFAsKBa7CU6BqpbFDZlLYuyuAFf8jyHV/2RNfLgE6Gc
+6RG6QPncpYowTfHmpipo+0jjU5FAWySZzNNyd7UFIHHIdLjyR5Lq1r1+tfS+wY6Q
+eRp5peqZbJobxE4yDDb0ycp6LiN6HM77h8Ylyz8AT5x7/Bt8QTdkZPD8HJNSy9p0
+8eJQfbSf7P62i17YX0Px/Fy+BJtuwyDxGU1Sxetl2KJjjKfV9Ns3RRga0OoYPi8o
+joZroftqnonVJbmAsvheZz+OP5ETwzKoQR1wdCTQN1Q4PONYtL2QAm/vUZJ2hF1L
+4qbiSvtkeSNTGT9y1qKG8aGVfO+gn16Gb2zKbir8Z9GExeoHmV78bHrnJu2P4Mv5
+18iJlORaOfsjBnUevOzO5FdvBUkzDCfRX54b2+7odvBEma4IDIGpNotBx19liCl+
+2aK+F6flKRQPhMIuyQL0
+=ecH1
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/qmail-ldap/metadata.xml b/mail-mta/qmail-ldap/metadata.xml
index 746e1367507c..76f44a9e5963 100644
--- a/mail-mta/qmail-ldap/metadata.xml
+++ b/mail-mta/qmail-ldap/metadata.xml
@@ -3,14 +3,17 @@
 <pkgmetadata>
 	<herd>qmail</herd>
 	<use>
-		<flag name='cluster'>Enable this if you want to have cluster support in
+		<flag name="cluster">Enable this if you want to have cluster support in
 			qmail-ldap</flag>
-		<flag name='gencertdaily'>Generate SSL certificates daily instead of
+		<flag name="gencertdaily">Generate SSL certificates daily instead of
 			hourly</flag>
-		<flag name='highvolume'>Prepare qmail for high volume servers</flag>
-		<flag name='rfc2307'>Add support for RFC2307 compliant uid/gid
+		<flag name="highvolume">Prepare qmail for high volume servers</flag>
+		<flag name="rfc2307">Add support for RFC2307 compliant uid/gid
 			attributes</flag>
-		<flag name='rfc822'>Add support for RFC822 compliant mail
+		<flag name="rfc822">Add support for RFC822 compliant mail
 			attributes</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">qmail-spp</remote-id>
+	</upstream>
 </pkgmetadata>