Updating remote-id in metadata.xml

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xE9402A79B03529A2!
author: Justin Lecher <jlec@gentoo.org> 2015-06-15 13:19:26 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-15 13:19:26 +0000
commit: 3fa0e054d3822588288f4b13a81f0171052fe04d (patch)
tree: b4189995def2496b34cef03975ff25708d430608 /mail-filter
parent: Updating remote-id in metadata.xml (diff)
download: historical-3fa0e054d3822588288f4b13a81f0171052fe04d.tar.gz
historical-3fa0e054d3822588288f4b13a81f0171052fe04d.tar.bz2
historical-3fa0e054d3822588288f4b13a81f0171052fe04d.zip
60 files changed, 753 insertions, 448 deletions
diff --git a/mail-filter/amavisd-milter/Manifest b/mail-filter/amavisd-milter/Manifest
index 46008f672d3b..ff17f5714457 100644
--- a/mail-filter/amavisd-milter/Manifest
+++ b/mail-filter/amavisd-milter/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX amavisd-milter-1.6.0-policybank.patch 937 SHA256 86e11cbfc8b26ad91f7f405837ccdb5f6fed9eece1a18c7c50e5111750ee51a8 SHA512 a329e9b4e0c7b7de4b2b09ec8cf9f9157f7602761843278239530831673bd70e4a15cc5b3ec91700808de6a6a29baa00ea2f96d6c40736da27c7cb4fc059af4d WHIRLPOOL d0ce2336983289f97b844c60b975775907249bd6cb2e2d4f67d6894e47a49a322e4e868d6e4b852131c76fb16e3aa15074a91c44d819419e8a57ac324f7a9e03
 AUX amavisd-milter.confd 357 SHA256 fa8208d3bd15141808fc4612011a1f58850758a6191dbb81fad52e30312d9746 SHA512 354c7e1a0224bd0f8bd40e35dca99fc5c489f9b7ecc2292d992e5594ac969800ab19e99a784957bcc76e3b06788b0623fc5019d8965f002a67c3e01681c541de WHIRLPOOL 71ade6f23330e84ee23b0ba325f024880dc51ed3fa958e844464af79201fe6b8740a373355dca123ad98b7d9a7e29031eb20f1aa3cb79b2f2e08b0eff3a80ed9
@@ -11,11 +11,23 @@ EBUILD amavisd-milter-1.5.0.ebuild 757 SHA256 b0eca7a71f178ef913cfa618de9dbfaf02
 EBUILD amavisd-milter-1.6.0-r1.ebuild 860 SHA256 37488409bc2194471e3f9961f0ade11299a04e6ecdd23ce10013e210035cb7bf SHA512 e977aa5acc95fda303905415522ae1bf38b1cf66a79c89d21d70cd4830e0039097d39a9e8f8439c69a54712a2d47a1cacc369d0c231f1bcfcb9090588553309f WHIRLPOOL 70f9db56cea879aba07fc29fb9eac614f13aa5dba2902de45c539977fe180193cca43ce0786e97cfe50ecfb7d43d5f0bb7105e950e078ba2b524dbdcabf33fcb
 EBUILD amavisd-milter-1.6.0.ebuild 810 SHA256 ca2da5029c6d9167417d3599d0fb0c68384730630122ea97a68a4dcf32492ff4 SHA512 a36d520bbfed0c71befc2a36d38458d738eb241ba15ba36b8e3187dbee166b78f5ac840d6b33041a613eabb6cd3fb102bbc1e8a6fc86216df8f107d8b3dbbd01 WHIRLPOOL 935cd523fdad7103846318b73d4cba75214c86380f81c63910e3bfbe5973d8e7a849e3f9e3fd2ba32a7943a0562331b48012d1aab960557ea3b2ea0e24145dc0
 MISC ChangeLog 1711 SHA256 df0d19a9dbe16d9986585cc885dcbdf02a4701f594ae93e20022330a0c38ea0e SHA512 33ee06b468cd5baf75b9173f407381915bb05ca69cb36da5ccd9dde99ca3896dd69986fc0e6be0e9667f2024436a68d7af7593301f9ae71ef043587eb256a414 WHIRLPOOL 2c7d5233fee73081815b50d74b02e3106952896d6648018699528814baeb1239f5ca02cade209c2443d24c2a7f4467a591d9583f8f3e9b61a872fe8321d8f918
-MISC metadata.xml 208 SHA256 fc3144c7664167b56b0babaed686a8f63744ecabdd9490486e035040f9676e58 SHA512 bbb32b94e05fe820f49b9fc9886803c4c7cafdb32e0f93e7ce5b02d9737d8c7f68ef6b862e912af8a5c61b31a7d48ea43c69a807accc83dfce147f32569af058 WHIRLPOOL 2b606e04de80a5123b09be8cc6ebd1e2639ce4c9debdd0e79db1f8f380ebbad61edd1edc1eb97ffa8f23c900745eb1efcb708120aee17db0f5b6643ba2d6e215
+MISC metadata.xml 294 SHA256 4c1bfff7c678e82a3f1b95461b1dc53589b905e85c6c8599618da98ccbb25463 SHA512 e6c85d00a8eea209a83e458ac1cf42e84106675f3c21d635b816edfe93d92974c473380a49253a426be32adba615e0899aa4f3ef6abf661ca2537e578135e3c5 WHIRLPOOL d093b2a9e8aee2da31575239ce432b75a878725d81c061a5d4b0c924dddb39f196541f11f0bf9d53525904d6fbd725789893f5dfdbf9ccea7db69786f0456034
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iD8DBQFUuPEnKWxsyjWmQTQRCH/dAJ9ezRFTQ0F7AO7FhRUorE5N40y8BQCgkrhV
-8wgC6odXjOpSc2I9JZABM9U=
-=vji0
+iQJ8BAEBCgBmBQJVfs/HXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiONkP/0F8LGqM9fW4pefX2MsA5QTd
+IqB9KNbaSS/VzpaZbtGOQl+8scdw1E0hMh417aeRiJZCDsKExkmjI8FvQx5ZnM03
+M5Q25QZUOWZjLtjjVvvucgsJbWxQgrv2pF7CmbyITMfkCOb3MKctMvk38KSNpnao
+fo0S3xUl4QhUwT0UtUC7DCYUJIgSCvkF34bWdcdae2tvWXjhhyYli5AscNS/6Ttz
+3Y0qpCWzkWYMjg4Uwi28hIr6ornES+VTNUnPXrBLX953+t5g/wHUia6npeS/DmaZ
+feahfZuN69MUGu+20JuvZ9gYHlvqPsAiU7FgeGalY9YW4gsRz2RDYUVxGT82neYu
+oKkiKlfx8Iipm944TIAtjHpDOaNH7Km5KBZC66pdZ1Efsfj7UccUPFwdKz6v/oDe
++iGYzfxQsMzdchouOTn7lFQYQwEm1BVaUfW6GC9z0Bwm7htDnBLRh6CQJvM4O1yD
+MfvGlf0Br+1GVmmZhuOHj5dopdk42YWcGTfu90xDD8NIbLPW5/MoCdrhqCyXJUA2
+KiNnc99cj8HasIogCfjpfHjWKDviYjJvrJDnYzKEBx8goYMQOzE1tsaD2Y66hKMV
+CyPJZ3V/bKFAP+Q3ng5El1nJhgK1ADOGmQt3nuNvyhYt30Wg1o8J1dtp/hCo2Fuk
+mwYdStfzC0ZIXYkR8jPy
+=KSWW
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-milter/metadata.xml b/mail-filter/amavisd-milter/metadata.xml
index 3b7e86e0ab03..00715a1e10f3 100644
--- a/mail-filter/amavisd-milter/metadata.xml
+++ b/mail-filter/amavisd-milter/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription lang="en">
+	<herd>net-mail</herd>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">amavisd-milter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/ask/Manifest b/mail-filter/ask/Manifest
index 25d7ad5ab3c8..97abf688dcd0 100644
--- a/mail-filter/ask/Manifest
+++ b/mail-filter/ask/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST ask-2.4.1.tar.gz 102631 RMD160 7b93565b0837274927c4f7a08d6f0976230745b3 SHA1 c639dd2dadc47e3ba1daec145c99f078de281a58 SHA256 1b5aedca6ff52cb6067f07ca6f8766e86ab4dd2b19585a3e4221c01cc50f147d
-DIST ask-2.5.3.tar.gz 106339 RMD160 7576c4a30fb57b72bbc56f4bc23958513df1897e SHA1 462834c245a64acb9b885e108c89e1baf5832ba5 SHA256 f5f90d9006f655673104d45f803a6e7e1f9baba708a51510cf16e5e753183f15
-EBUILD ask-2.4.1.ebuild 1517 RMD160 f5b326eb2acb3efbfbe29102cc8e5237054f842b SHA1 1115fb8ecea1d771d1b65dc538fb681a37ba20c0 SHA256 e20b769f8801a86dbe7d8a82df8601b1cbdef9b5d7e9aff1f0dfbb95b3aaedbf
-EBUILD ask-2.5.3.ebuild 1112 RMD160 d10678257bf28d688055aa371f61805f467a6e2a SHA1 d0005b5bc1d0f344d171fc999b1442f8dd0ba435 SHA256 482820499b0bdaa219983a78d92f5ebef4770ada3a033e3cdf1508c1a6655584
-MISC ChangeLog 1158 RMD160 699db74da55be1ba32c571c48cd39a40fdb2f376 SHA1 dd5f8298b34ae81813732835609861ffcdbce3be SHA256 15e3728bb3e2bf7f38d3a6590e67d9f8dd0aa3c39ac824ae3b128469220c5191
-MISC metadata.xml 255 RMD160 cc3efc5ae35c0cb56bfd2a3d100c4e43698a82a1 SHA1 f8bdf2d803c4f7f9d17810699ac356a16d5c1d93 SHA256 4ee01654c3da9f0ada8de5da4498f054eb79406380e0df3bc660166ef1d16bfa
+DIST ask-2.4.1.tar.gz 102631 SHA256 1b5aedca6ff52cb6067f07ca6f8766e86ab4dd2b19585a3e4221c01cc50f147d
+DIST ask-2.5.3.tar.gz 106339 SHA256 f5f90d9006f655673104d45f803a6e7e1f9baba708a51510cf16e5e753183f15
+EBUILD ask-2.4.1.ebuild 1517 SHA256 e20b769f8801a86dbe7d8a82df8601b1cbdef9b5d7e9aff1f0dfbb95b3aaedbf SHA512 cee71dcbfd0a77406efe157a53802a81bab4c919076706cceea33e9f1c40f9816a058765a723edbae119c79d0ea60c93e0e3ab8e2248f4d8a5405221f88650d4 WHIRLPOOL b56cb605977a13637a3b1f22d08900229afc82e622f1db9407f672fdc12d0c8ac73a4b2de280fb629ddbabab439034e7b6b06e7593beda758c0548d49f981785
+EBUILD ask-2.5.3.ebuild 1112 SHA256 482820499b0bdaa219983a78d92f5ebef4770ada3a033e3cdf1508c1a6655584 SHA512 27a55187d8074f197b7e690e904cf92a918c7419898297e0c80806745a577e3da183f36326807cbbe46ce87617a8bf96976783156143f4657eb2f6b17c76d2dd WHIRLPOOL ef33cd77e2fdb93759ea7491b46216899f3873bae0c8a8245cfb45c45f5528ec40151944f470bc22ed7a94a78acb4aa3cf7635281e684243fba43029ebc3c754
+MISC ChangeLog 1158 SHA256 15e3728bb3e2bf7f38d3a6590e67d9f8dd0aa3c39ac824ae3b128469220c5191 SHA512 2c2dfc089dce9f56d917d83f24a17b017f36e048683f1bbb2928905f9d9ba07361ee0e42120d6eaf2e463fc8cd15ade466aafd3413c75070d85225371c1b079f WHIRLPOOL 77b34ca33fe85d337c027c132a0e92af97d180fada605044388cb2cf65e1e5c2daf88ac18156bbbe0978faa2f145ae4ffa4d4fe249fad0cf1170d8f9457c76d6
+MISC metadata.xml 334 SHA256 1f987da78b8e7580216a7a5acf47b215899a4373f4d7886b11fafdaf70c756ed SHA512 9f315c281d9e417f9f8bf2fcd0083771e55c4ccf5d461f4eb98ebbda5c9d9426cff95777fd4395301c33ef4ffe2fcec4033411a012e20c5f5c6cc6c71752abb6 WHIRLPOOL 8c843c2f6831443e3e835833c63ebe97bdf32d90aad91cd8151167bb4245ebb1d9509b825c0f4bc271cc33a82a6367cb7b688198b1fe2be37a2dd30f2a12cfe6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJOyPYgAAoJEHfx8XVYajsfp6oQAJg13vR0ibghEnZ+k7PEoYBH
-d3yv0DE25NoK5A/icy68Q8ciBP3c9LJBtdc7KVrOb1X44A4k0a906+vddvLGniUI
-dCdCUlD2ZBh9WTc9nF+ClzgBtcbsgsddJ3dvglHi3RP279WbPxJFD5xhiG3nblVF
-BAM48YyMpxP6YxwrhBuUGbJ93KII1jHZDI5DxvAohOMCfV8Dv6LWEWWxKbIF9YWB
-l+0AE0vMQ+xNVxhq2JSzOTHwKsBPEPtyT93WwBsu++GQxbEZHz3F1NANp8qqgWQx
-W0+Bas5iU2JM8TIovbt4bsERowVS24eaGo1w2N8HElCkm54iTmWM8352cp3chwKk
-eq44hWoRipVwmYX28AR1MzV5/rq0a4W+3jtg82HvPqJlvwpsxFeGRhO7fVwuh0K4
-/OveTW43F6kqNs37Hm+xKP07HX/9eAvy7DBtkLeHmuIQQ0rS1ZtCRouyQdGUEJzP
-CXcMAlTZ3VF2cUpYcsMay5q6dmT9dWM1s5OnUV7V7AWoRVz5cJHLAxScnuc/EHQ7
-37/sT9vIyqkQNiYf8Wyhn79G/RnwN/ZpLNr7JV7ZfyEkcnsFMZR5iGsdzsNNbU1D
-/0L0rzGC7r7Pb4Fsmu4FuABZtbYUmbIKQ65da2Q6SbO09itpFAfdIZdEq139nNxH
-qmULcAfxHBZVp8YuGJ2y
-=1xsT
+iQJ8BAEBCgBmBQJVfs/QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9GgQALe1kSaBh+pHGRx9AYc0RgQN
+X50MAJBqjH79GozYhitiGiZPpoK29URLF8BNPB1BYBh6kYALRM+ig8MJewJm9MoM
+ukUHt9wPaGz93U02jwbScksTlhfzfyPmUpIBcKKlVJtJMW+nd3gHmbXbBrDt9k/D
+KaY/kgfKohm9b7thvK62aT2mLpTN0WWsalP3CpyPwH24xexJxgulne3Mw058er0l
+EzGv/o1h7pF0PbLspE0P8SYEyoMs9+xxFRtUaWmfr16kIyvunGX2o/k9cjM4SXRO
+1zX6tsGvGhHaQabyQaXuiz3xtePg9128CDpDxZnzXe5GKJAGXKkKcpvsMNGzBIQC
+3pi1EuioulGaJnISBmfuzxbnzun+jvC44v+8AlTSeAE+DTkLBQSU1mYcBQZUdSqT
+rxBvbIvm8PI6nE7oQ1oPfCc+mnsewNwHbmw+y8vu51Jh61znU4N68RsUlFu/frrB
+rA+ilkoNKYRzOgGO98+dPiFwmOimlHka06nf/k4/NmMerUGwn+/8EApUVFBujQU/
+FA6XF7cKeWXG0GdZp93V6MGoAQdqVQMbM+Uf41lq0r/Xx0m4mIHYf/iVpAnK5AL9
+JKQ+s4NDuZtmtB4qrrOLhpp8sy24wotkZx2SxjZLQLzZrVfHJs1W31Jfh1oxyVul
+AMJl/mfcoqSVsa+CtkFe
+=YjbT
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/ask/metadata.xml b/mail-filter/ask/metadata.xml
index e29b89073344..6e7a699e30a7 100644
--- a/mail-filter/ask/metadata.xml
+++ b/mail-filter/ask/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='procmail'>Adds support for
+	<herd>net-mail</herd>
+	<use>
+		<flag name="procmail">Adds support for
 		<pkg>mail-filter/procmail</pkg></flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">a-s-k</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 4836b6c0efa8..a50e268a2828 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX assp-1.2.6.patch 17111 SHA256 4e1bc581b0ed16a8e3261f036eb049699d5de018e0f35ddc6def6a8261d9e29b SHA512 f5b18d955fba98ce73c21178a49b71aa5a5e9ba05e8a2f6cc2d43ec9f0c7c6f14aad9dd83021dea122fd047bfb22a02867ccc96984e7bf27efe037e17e78acb3 WHIRLPOOL b0210029360f19cac57038b57612589e6e0f30dec599eddd6c2a89d1eea920221b1b684a3049c25b6a13a7569545edc96c35606dfd33571ab52e21af61a1e9db
 AUX asspd.init 665 SHA256 4749cf530f34d3e3c0c510cd613be547742b3d280991555b236f40eceb24c0e3 SHA512 af70c00fba902d988c1826251fdd548f52e1421a51978278bb7eeca76dd97f71c1d41d54d5ebb1d5dfa669e74a94d1efbce06f2e85664c5679decc49ccdc43aa WHIRLPOOL 5df09cd4997f4894824292605be6274b2df8def113ad59e9007ed35f160aa66dbed197d808559fd605387fd2b9c14e3011b4aea02db52fe1ddaedeeb5743ac6d
@@ -15,11 +15,23 @@ EBUILD assp-1.9.4.8.ebuild 5961 SHA256 d248070ad462f5b6a26ef10539c8ae2ec571f6a79
 EBUILD assp-1.9.4.9.ebuild 5961 SHA256 71f8ede3d257e9ab006ef29d84d96a287c8da99bd9e3a17deb049b8f222f96e1 SHA512 76f683736c2495359cd5c45356ff8ea8e9a46f887cddaf24c17284f8330d39214b04bbb64528176eb56f3a097e5bfa9433e07f912d282f060fbb04284be97772 WHIRLPOOL 4703d36441b730c6ec9af7c30b015b61c749bba11f68abf607edc87105913e9dbf565d637668b39e26e1962233f9e2f0c64a2f9e89c8a8909fe6a83c2c0ca1c4
 EBUILD assp-1.9.8.13030.ebuild 5976 SHA256 198ed8910dafa76c644bad9f1d8cca838c49b99811d29e873e797c4b6cce7391 SHA512 edd4c90b5f0f778b0dc535bf1341ad703641ed40868f63b81c8d720f20ee0856fb7205cde9b8912c2afc6981431cd5eb2689f260c26762d6e4694c25b5310a97 WHIRLPOOL fac6eaf783aa3060d2c375a026754371749f9d4f53bec46e0e95b873a34511b57333b7210d8e684e28b4367121b760af3e7728bc5715c5d6976ba66a1a79921d
 MISC ChangeLog 10295 SHA256 ee3df0d005e7afb0235e4bbc341df49a06ccb14ca1991a042b60027c539f3ac4 SHA512 63de39f429a21ec9b4acbadbf62fd3fd2bae5c3ca6ee6c524c3a4c394c06608558411e2ba1deda3f5c75ef5c12aecd1c266d641ec119479a1fd810ec2cfe14fc WHIRLPOOL d37887bba9d2a142e4dec7f932a8fb1f1332fcc996c3dead5001b0ff589e261bd0530426b10e08dd5e19d01d65e96e1661b749a8cb8776ff764f930df25a5d33
-MISC metadata.xml 952 SHA256 47420d03c557612984522bc0c831d8a7ceacdeb1fbe78aa835daae8da681324c SHA512 1e577714f95a0fea0a5a2e212e8089339572170a1a9085aefebfb94eabc2899639931cb24befcc8c9cf2d89c6822fdc3ca0016153c7b1cec23e35228829a98f1 WHIRLPOOL f5884508d5615c36cbbbefe035be3d4187e6bfc213d5f3d2ee1c4f89c58344ec3bd94bb63997c1bde246387ea12a552e07b7710d8a9a46366708fc035d88c434
+MISC metadata.xml 998 SHA256 a2778f29205781674c0db0252a76d6681eea77fbbbde32c2639b080c611cf73f SHA512 ad9d88f6ef737e26d3ae33f970e38aa774df8de5a4b945128fdff1bc66ffa8aaf0541a4d8ddec695a1fb2de339ea7757d24679edbe48b295db532d26e7dba9bd WHIRLPOOL 487f64ed0689c81d60c18e0c9e473e85656d819123f7546a4227a0340468d9e21c0979240acec0fa19c31b1c515a00523b436888ffe2f53706a236f86d8dca1b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4PEACgkQcaHudmEf86qK4wCcCvQ/YQCogAchi0iNRgT12d/k
-MDgAn29cmIPAgxOC+8OpiV1r9+ox1Rt9
-=Qzky
+iQJ7BAEBCgBmBQJVfs/YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiv+EP+MefRsDRzeYqqENhuqgHA6Hl
+RJZAyQpu27SgJLt0zRWnYzM9jt3TnpMHc90fPxI2X9rZz2iGy3JWfNrrWtzZ9L8V
+UOiTEhp6EodjPspRkjsJq+rNNG9/ZW7eVTZMxrUeuNQvutotq8Z7lOb+8FINRRhe
+P8fipWqQ9nzLPGV8L2S9PzAf8tEsFvppzRs5WrgXmQ+OL62sv8SfefJuEft6lBfM
+10lCDWhuQXFrubdqzAu8yxlen7MxscyKs9JqYoQWvk7Ov7LxpMnaXlMWJa0d34vG
+HmZVaN3xgmlCMVaJZliV5c7M1HOeO4jHXNmApR98qUiRliPVWw9CkMASvpcgHWW8
+8Zi1lxfUYwNe7ta713+qSMttRjH4dWxIJ0/4LIqk0HWFe6MsEeQW6up8hr3sheTK
+OT77qj8ilqU4m7/FMTvQbjT8kBSvTv6/GyH5dQr4gubZ03OmOGqNoL7ZbrvIoK9V
+JqpQfyokRpB5TcmoTkKwJuVdYyyPyip+UbQgJWdlZbGv1kJlDs9hs/E3Hh5BWdwm
+u7yzDpCSH04i2lrIoARhMWczrZeKVZPft+wc7GOvV6rHENuWVZMOTaViVzVgpMKN
++edTeywxyXG0Ch72Sq/x5VA8khOi6fIKiNEMoP2Fk7w4LadPW6hivv88wi9S+vsF
+QwrmaiiuKmIqgh9Zywc=
+=atgR
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/assp/metadata.xml b/mail-filter/assp/metadata.xml
index b77acd29eff8..7d7dfbb78f47 100644
--- a/mail-filter/assp/metadata.xml
+++ b/mail-filter/assp/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-                <email>patrick@gentoo.org</email>
-                <name>Patrick Lauer</name>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
 	</maintainer>
 	<longdescription>
 	The Anti-Spam SMTP Proxy (ASSP) Server project is an open source
@@ -16,7 +16,10 @@
 	initial setup phase.
 	</longdescription>
 	<use>
-		<flag name='spf'>Adds support for Sender Policy Framework</flag>
-		<flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
+		<flag name="spf">Adds support for Sender Policy Framework</flag>
+		<flag name="srs">Adds support for Sender Rewriting Scheme</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">assp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/bmf/Manifest b/mail-filter/bmf/Manifest
index ba9f1db46cab..243c62d66d01 100644
--- a/mail-filter/bmf/Manifest
+++ b/mail-filter/bmf/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX bmf-0.9.4_QA.patch 534 SHA256 43d498deaa38868775aef5b05a8d5760a4603998a3a366dbe5ee67bb03d09196 SHA512 553607088051618cc88d0ccd7e74e644cfc6cc5a7e53f7e622ed1f2259cc49610c27c65613981f13ceb6173093e62c7e20326f4c2fb718bb6f3b2b2de011c2e9 WHIRLPOOL b7a203e25386f65410f785a22f0d2c6df506535b170dcca2242c02d63b622f86bb8152146323143a64759efcdf88100831cbc0d7a5300bc5a379784ee9e39d14
 DIST bmf-0.9.4.tar.gz 36740 SHA256 7eed21802f95df2321ac4c958f99e14d2809852a5708700b633e1abb032c9ce1
 EBUILD bmf-0.9.4-r2.ebuild 1297 SHA256 981f1bc6d4bb058d9142fd0ac0967fae17007636f91e46a48230dc3f06ccfe70 SHA512 e2b4d396478ede6cd92c72c4a22b7be5171b495cbc0ff97ebad5d9b2a1435a0cbb7b1edd2e8c41dcf496201eee81189997323dbafbd8a6fca6f7e41b127f0519 WHIRLPOOL 1dad7e97810df92724495465adde780a914e892782208e0c53fa3d5bb4e585df4b7e05311bfb52db9046c2284e4d3fa370c7b40aa4e6cc1b374e4628a722a122
 MISC ChangeLog 2396 SHA256 432871d263f21263ddbcd5b92a3dc307c455bd9da5d1bbb1dc143ea830e81d03 SHA512 ad905447a45e26ed13361c08aea44873875cc79bd57a4fd02a83e7433a632db783e3e00354fabd38c7d44e5fc1f47ef1949175da05ab938a4fd1951bd07cd971 WHIRLPOOL 2d5e171650fc9908a2735a02b1ba779310ccf29c6041fb5d14e31920246ea52ec4bfee59bc74cfad1d2494ae5a8a020e8311f01e56ece18e5a5065a8e6d0de81
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 235 SHA256 8fb285c597d45af017bc3148c8ff9eac27cbb59a2e75e4249045c6b046d1c4dc SHA512 a3d3a6afd63244520145144d8e475591ded191965a1e47cab3ba276f1f201e3e5ace96e281d1c7514bcc84902510f620579389f927c5eeced2f2f957df9e4279 WHIRLPOOL 4519c1a4310ad4f15028d3d9b14056d3db357d8625675406c2f4336b6a6cb47ee53ba4ccbe72fb4116282a53889eaa7c1d6733f7b13da0ddf7873c9bf05a0535
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlHao9kACgkQG9wOWsQutdaA7AQAt8MT+1ipKmrZWQ8sc/gZqmMe
-nH5IlLOuoKGaysannMUnvF6hiqkQP/8FktXzJn7M0I31DSYZl17onKusJBzkD00v
-MC0loYsj/1GZBlgVM/mnKygmAATNoO48Gaofm9BFvsvh4m9G9oF5q6pYOrbpQ40q
-lkdJC/zkFpHvcMCdzXY=
-=Dlbw
+iQJ8BAEBCgBmBQJVfs/hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHNMQAKVDOKHUMGTEApBQVlVDN9Ac
+eyjXSfW8v3B/XUrLv0a4IIAL9SZqUA+V3xQv5XcQmeNJAqW3yJ8MGdQtkuORsAAZ
+Rq0EA7eKmF1y143WJGyzZjTSRbUjCjnp30td1XlDavdsultPKP0SG3qUN9qOd7Lm
+xohTAZ6JdpLsVj8RezeyvRNAtzSd2MefHMFqyezWC8aWyOemBbwWErj0BDRv/feu
+9lpf9KCiYb0u7NIbEOJPeTlg1v+i4JSTPuKbTRblWOybxIOL1aUe6zYKvHqGIhH0
+H8SUrX0pkys5mTEoa9MjsVpYnpawrzznGYE2o+RrlSJV+2hi0ugyBuCq7JG37wKv
+2Fh1uESMSWrpxTmunP7kmIK4/Wkogb+BcJzwUIRtzJnRgzHv0zFe2P7n05xoPAcU
+hDEC7GSoUhB+PLBIayJIQDIPBUgb99Qv4ivuEo3idYo5YM0CTGGNfBtyNLX2wcpk
+gTw6CP7NspEG/s2/xRK7St8yOdGrFXelDQJXwzBuWnTAD1GnERk6D2WPEI2n14Uv
+w5zneiqFfmwmNQ5Gu3rDZkOzeLggFv3XpfSdfkW7gngpXv8VOEEslwW8qv2H+T7g
+aaZ6yD3Rqz1MNc5dxfX9fE5lfzsJ7D3x5j0TnCsKT/69Ulc3b/f3FZ+PY97hxdnQ
+dMlmkNTA48wGjZlY7044
+=qjmD
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/bmf/metadata.xml b/mail-filter/bmf/metadata.xml
index 51f94e3fbe0e..85b79b68dd90 100644
--- a/mail-filter/bmf/metadata.xml
+++ b/mail-filter/bmf/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">bmf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 23068c17dbfe..9215e983e1c8 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX bogofilter-1.2.2-gcc34.patch 1393 SHA256 a8dd6640782dc2c564c4b402cfbac2fd6d016db03adab67b8507d914cd110dc8 SHA512 7179efbc1a8a4ba79a6710d6324c955dfa255e46fb5d9ac3377b11843f8eb545bf6e9ce5b547a62198d7be4fd989b9a5ea96487d34491df7d42f33a818f02b84 WHIRLPOOL beeeb55b64a22b60fca8cf51c77ca1ff42631c086b50f3e03db5b83a04cdca5e55363c75e4d4ac2459dc4a5e0bd121cebfe29d4e52cfa51777b4162dc1ce5367
 AUX bogofilter-1.2.4-test-env.patch 392 SHA256 e24638d2187074f48cfc19e1146b5f5b37167fa3c6576e2f8920295414fbfe0c SHA512 c9f08a1af44d3281aff119a821423adbb9533cd49d87986a13d817db8d9446bc48a195b964527940aa0e41f5106bd4d7b2a9684c6c725bafed95adb8d3e87e96 WHIRLPOOL f378cf1d420a12962e015c7a9fb2db64ecf91f49ac27622c893a8004402b2b88360660542ff5e967196692836085f6d46d38d0e246d4d087d59518aef746ace5
 DIST bogofilter-1.2.4.tar.bz2 887848 SHA256 e10287a58d135feaea26880ce7d4b9fa2841fb114a2154bf7da8da98aab0a6b4 SHA512 e8c0b6bcc14f12fbbb2752e697a6d9065e17abfca3f70045ce9fe668d01c1cfad4adaa35c81546ecdd3639b0c28f3f4776bb5ed4699f21e9e2a5b19ca33479db WHIRLPOOL a35a2ce87333d07fe64972d173a4ae6a3105e31577b5915fdd376f41a14fb226e94a173d393c14aac7ca147726aa4267b1c6060ce7df5deea11ca82c3d350a13
 EBUILD bogofilter-1.2.4-r1.ebuild 3854 SHA256 d7f9da546bdca01c39ab95cd78def05c2b334f2737449b8d143ab38923ba3c4b SHA512 44f43b9fe2a0306368a65022ba1e412de6e7e69e3dad5722a48232f1d6601e7e956a657e57c1cf09d2dfae30ef76b0621c91d8eda2e96782be7b7c0cba91f790 WHIRLPOOL fa5305e538d8266885bf17c6548de35df75decd43c110cdbe68b3774ad632b6428768ddb98cb15f4e6ef130214f6ad01f6d70271b5b8c5e5e34d9ca5dc004c1d
 MISC ChangeLog 28328 SHA256 1c697e36f0f1965b3246f4d99dcf5a97269bb3e9f0da55db53a03b57749dc560 SHA512 d71ab40a72723d33a40cc0096e6592e98fd9ca7b9bc8b6e00ff54b890f7f0f85a2fefab22835eac81542eb0d48334b32f04af5d045ed644dcb7e2d8589e8de33 WHIRLPOOL 8ea14c28dae8900f4288cbfcfa6ddd17b0c9d0063bdef0a3f383c6bcd5b121810770eccf5bb2bc63141ee765b7175d4bc043947d558bf71351ca823ac6121f0d
-MISC metadata.xml 587 SHA256 196e9e473061810109261585fff92f8a3af60f619196d2f7b769a2c29fc7b2df SHA512 99f1e2e2d859cf1808c0ac408919c44345dd40471eeb89e2c0d6ce82ebf06be9ac9d3c082dcb834d9b1d95478ce45e56d3c0b9860674a36054a9a3cc75b85f9a WHIRLPOOL d8bd7feb2973721cc47c33d24476882e41d51a176fb8cde8fea82b0de64928eef0f78ae17714ec31089499dbb81c5e5aa94e0cad44858838aa2615c60d080d8a
+MISC metadata.xml 667 SHA256 a29f2f4eef7fdad85ae1d1b402af8b2712d15521ec70ab03d1dda6d652f78860 SHA512 6fd2c2c34a3e1bbf9499498c510b3ab14173e788e7f5826d9721ceca16ca46d7e09f28e129e1244517477cef8dab94de9145bdf05bfeb2fe89444aceb787e76f WHIRLPOOL c9203443bdbdb3e0df407cf6ddd9bf8eb99b25633af66bfbe50280bb1659e5805ccbcfb5c81d3b1ec1804fd956469e146bf63280ab1553f88a74b450fbcabba0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVYF4PAAoJEGVpnaTzz9K9rusP/RCFqCH7wNqonx6L/o/MmwTL
-XaqgisJ62NtDVS6DdBuCB6JgbnP+rnrE0J78GPtx2rJisBdGlz4M/T71VS00OVWh
-aSsVw26HMlElc6KP3G6aiTUZ1KpR6zqfSz8IfbQeSu5qRbCEbcoEPb3PS7xxFCwQ
-f6Z0qRjASQQkmbykj+nKRkqB8zWbrdMSQN3Rx+38pgOlMgcNBkaaO9Udl2dHf0FQ
-LDggykGDYNv7gdTmUYARNy+cUZGJUEttijY+QIvR9lPv/FERWaTnghRJLuOvU6f1
-1gKDmq+201rO2UKNwkQdVrKInnay+2X28caHpSP47ot9Hb/xbHrIwpY0zG0rwNlT
-Z9Z4R2mdCgmwWUGH39bh6RoqkL9uA86rN/arwtDZisDURw/qcPYudFqCxJAgooS/
-2L/lskrh7dXZcTlniXI7MRzdKPUtrawulSSoF/q9YTfbl3JINfNfUimSk5Q5JhY1
-zkOpz8pnnZJXUxUjBGsBdSdLa6xyzab/3jn6mxZPk/RouYuL8fHhKiX6ZUqqcZC5
-MbHaWmykO/E54C6OcF8hZ9U/GQWIXDcJ0E76nr/OhnYmQ9OuUYKsPaftPSjsZ9pU
-H/T80CwDXFXWGzU3P9FBm1PrB5QeIxRBslt5dtWcQvUelwWIzi6MMSab8pdEVBkH
-jUAEthVx2Om15liAO4jj
-=kIZR
+iQJ8BAEBCgBmBQJVfs/vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioVUP/iiTzp1Fhibux8RnJqxr7jqk
+pZ/tI4142U4CKdz9NF2GkdkNk7INfB4wKgJagXm0CVvMcHKs35WN0mz3XvDNQgJC
+e76EGTXTIYysbEZ+SCcpSisF3L1TKo5NA9tcA+RCNtvKpn1excJWIwjRQBujCedh
+3+1TgUkk2uSXkkFI/9TXPu/N9P3omrTCOmIAgzdxnDUqPrw1yavYi60ojDSg7khK
+dCGaEsM5FJVSR/UB7G1jvezlgrFCpXuCRbmOmpKfQdtDu8LuACwZ8ZJcW1vnyPao
+oMlZ0B24fJwQhqYzDMA6IBlMJN5znfMq4v9eVh3Nhq4oiIRz1ua/sPDgvqNOnsyj
+tkYjQcIc+V2bNPMZNcMoyfrOVLVyPxcW2vJfxT7zAE9LwF+s2ldUZfKjyQBwwT7S
+eWnVliJKdf2k6u3gXBh5gPekqPgsoK8MoqnFBav8n2NteIH8SZRTTYe5LM/1+hi9
+kWEiBA3TpKASdU7fkr+KtmXaSvHL7OJ/mztlOVqNv5yGiyn1lv/7TVfDPlJ9pUmI
+WOtD7YgepjXTb+ldU89zds/64/srepRkuXJ0vNd4IPDPRZR+VWyZ9+EuJnpH97X7
+pSrzfwN6A8wPdXYY7vtDR6CDLieh/3NGoO4JTC1NfF7xZx1CNYBQofEuRezrUhw5
+uGptZaSIjrlP83LZp5tb
+=c3S/
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/bogofilter/metadata.xml b/mail-filter/bogofilter/metadata.xml
index 85f46167b885..5204b3d1809c 100644
--- a/mail-filter/bogofilter/metadata.xml
+++ b/mail-filter/bogofilter/metadata.xml
@@ -13,4 +13,7 @@
 	<use>
 		<flag name="tokyocabinet">Enable Tokyo Cabinet database support</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">bogofilter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/dkimproxy/Manifest b/mail-filter/dkimproxy/Manifest
index a3ece1d45d53..b82a6e73a898 100644
--- a/mail-filter/dkimproxy/Manifest
+++ b/mail-filter/dkimproxy/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX dkimproxy.in.initd 674 SHA256 613a9815ceab97529f9008654c4295febac844e480d90f527c7b5c3d84f80aa7 SHA512 faef9a681adbab63c84f4f0039c95df245754cc5673550efd5113cb2d80261c0580e238aa8e067e241e87c34fd49c98ea2e91786618117877698ce636e00aa13 WHIRLPOOL d2329981e96230f106719a901049148fc31c7587a342c6452b7f5129dfc4d1f2b4a9a18c72c24e7b27f6908933e277dfdd020a5937ec8c4b31742966f0f19824
 AUX dkimproxy.out.initd 683 SHA256 dfd17d79c6655d476f9eac1d402b2f5f049062e89f71723e75d75d82e7864ca7 SHA512 2c8fff1da4f7a2f6594ca7bdad647477a8a53193eb7edf8f2b5cbf03aeb58c29b1f1d7085efc885cdae9d8619b6ab3179217d3871d0545b39b6f3cc34d087ebc WHIRLPOOL 2df22691af0bbf9eef75bfa521ebb97afd119544c59d891c9e7588da5e1c275c35a145a63d6425fe432baf624103ac3927e5f99884ec39cd5096326c9036a23b
 DIST dkimproxy-1.4.1.tar.gz 109040 SHA256 e5345a1d3cefd32d1fb0face9fa73490118132767253b0ce643463f1e86185bd SHA512 ad5ac961ea25cdd7ccc763521d1fa5e143ef93056ca4bdace1d0d8f564ab85cb128b4c97ace310bcbf9e4d49430dd5baf1e9f836f5a44a4b3f1e7498ebc352b6 WHIRLPOOL 4121f198b4c8406c310ecede8bfb7fec7c0368c637a66c5484f66b873de03dabd34a6a415a01cb285ae131699da37a8cce36168c8a73d7fc32086e73c0690af1
 EBUILD dkimproxy-1.4.1.ebuild 718 SHA256 b74340704b297c02babec81cc0aefb6c01c1da9485758cb4daf3108c3fcf10b4 SHA512 5712f621c26d322023679b33d41b19d73df09812c36fd5fd2336e5950590440e97d92b6aafc924eb9a21e952626494285f0aeae2984528606aad380e665e9bbb WHIRLPOOL e5f4bc14bd7bc95e8dbc3c604d10ca3be0fed6e04527c818fd6692c1af23826c2856c7ba386d145fbf1bfcfad757e132d97d8ccce842e99f880893c51b0c7089
 MISC ChangeLog 869 SHA256 d45070fe0cd90e2b3bb6d5468bbe500ef4bf17439af8c87ee614cb00de4f895a SHA512 f810ea4a7e5329c6a28e86eafef3590751bcd3a213c7b248acb06f0338983874a6dda8dd18c6f5f309a174eec17937818fd74dbbc05d991fb679e5db4863bcca WHIRLPOOL 16883fdc03d25b909f13588ba5f7e47ab07d64371801c64daea52670fa57c61aad2a65467a014031af947f5b003d12f0afeee7f4b6ea5fbdce93bf069219ecf3
-MISC metadata.xml 236 SHA256 dc03b7658e6c3bab57a47337eb53cb7beee88d3f53d6500a483f7d77dbff0945 SHA512 8251f0097025bb08b35b72566c1db528074fd80c7d121afdd6d4e91d035b622bf7edb496d205dc383d06f9174f38d4d48c79a1155791467c3e056d0aa59fd1c9 WHIRLPOOL b9bca030f6fdfbd2b7634c0f0cbb20efdd0dfcbdddeb5ca1af1dfdb063ef56f13ff7d8059b31dc0c61a37f25b0a005143432cb5ee18583efbbc238e0ff5d70ad
+MISC metadata.xml 315 SHA256 953bbc99d263ddc4fd2dcaf1032576f76d334ff373820e14723491fafb60d4fa SHA512 880f90e03ad92e3877e09eed60dffddcf047b998736d13e78348cc0135285492d71a286b56e73432846e90a2ddd4245aa8e5b779f4499c3a324dbf171a00ec8a WHIRLPOOL d30c16021e93f9737c85f2cb386cb84a774e93073f4d4f0673f51bac76e0d1a6dfe0823ff922163bbd9a53313a210e5116d9d8fd5ce3403af01a7d29859c59d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4RYACgkQcaHudmEf86oDEgCghfbHWErOAR5X0PDjFgxF4vR0
-sI8An3jWl41TqSjnWtY11T8j6GPEb+1N
-=KoRf
+iQJ8BAEBCgBmBQJVfs/2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCUAQAL6PHEzFUTjdCTgehrN9+T3+
+H7rEA+IPAu4rYLsiYAe4ccn3/ZLpxBFinzRAHvCvw1UCm8fahyuDuv+igME6Dr5h
+GoxH8EWU9wJRK5TVgJnxJudGBazubozOhB5Uac2sZ+AZ4fHTuvqvKJkjY9oqoPPh
+SYUaL5BySrX/EYg4gdtn+92l+5LVJrVNaEf8+vLz6QODTB0WGyaRxpPitVTef8g2
+WrwSYC0dCLoHZhadY5rgd58K6wVHPx79rdScDeghJru5KswyZf5kIUqUfYvuUqv2
+GS4r8ZGqOgZfYuT+zLH3rDTalnJ8BOR60c/BFF7CS22n27FBczTceySBsCLRrrGp
+bV1lPm5efbGcTKH+S99w03Cbd4WlkSVs7DCGXE2f7qOo2BdsnGL8QAbUVkFXcALj
++xb5R6sTfPOxiEiynHT7O3xwAidN3/bU1KoXSaDhtJDpGWeWS8Ql3EU2Ee3B86Ay
+H99MkEFYgLWJwiCCz/CGkTTagIdKWVRFgFULkzNknEVIgwbgsJ+2mSltKIP+E7Sj
+BUlO4W+bkkddIbpyjZMKNlAtfLqAJmX6KYdRXgpYraqptjLMsjc4W3yyh8Iwv2K+
+Ng/55yVHleHR8n2FLXiNw0rN5xZ5QfyxcX88LT2c+2AMmdbTrIbnPg4WcBtyhDAf
+Ky0R40R2bQJr8NPKEMWu
+=tEdM
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dkimproxy/metadata.xml b/mail-filter/dkimproxy/metadata.xml
index 160670d046a4..95d1a131392b 100644
--- a/mail-filter/dkimproxy/metadata.xml
+++ b/mail-filter/dkimproxy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dkimproxy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/dovecot_deleted_to_trash/Manifest b/mail-filter/dovecot_deleted_to_trash/Manifest
index c9d3e0e8c54e..50b55ed5663b 100644
--- a/mail-filter/dovecot_deleted_to_trash/Manifest
+++ b/mail-filter/dovecot_deleted_to_trash/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 29-delete-to-trash.conf 289 SHA256 31e7d493e6b437b3b1847ec08b009208cd0707aa5bf0ed242c4baa4fffff2850 SHA512 3b1c7156128bddc99ec96576e9b97d0159fbb2034fd755bd9a60c1c2524d1727ce8a17a4967039f7c4bb267eb5bfbf65ceef4b3d4dcf3fef0a34178740ac9119 WHIRLPOOL 2e95b88a30d740a0f479d7bc9e43dc691d75527f1f1db2b7504e2f06bcbc2e1d3e4b9e459ace65205af5568add4c9bcc50b3127fe6768ac3e7de767f34739f70
 DIST dovecot_deleted_to_trash-0.6.tar.gz 4805 SHA256 68d128092a42ad1a0aecaf273a59aee22c9b23e9697203fd7e629ab327d638cb SHA512 41da1b622f30ee137ac8c06a687466a36c21035fd54b83393543c944b4e7cb4f3576556f220734d934033e6804d371eb5a1ec4f1d2491f3bf808782a59e2cb12 WHIRLPOOL 1c9e6e516b9f2c350a087aaf525c6e7f2d879fe240797a6f38b088a5c0bd4d8232592900a250b0e64486870a92d52c6badfabc2da5628d789923951108037b58
 EBUILD dovecot_deleted_to_trash-0.6.ebuild 978 SHA256 78f49c28eae94f27c0b6a38eae06dafb0de90b8428ce40972e337e0ad276403b SHA512 86f54e872e23a9caa4f33e50a6066a9f0cb02f3b2734d58e36d80b790b6f0a66229990710c3d2194e27310578cb17672c9ac5caf7e8eec3edb944f8db1fa85e6 WHIRLPOOL 0aa180554bfd225bfbbed5fc1ce9c5c4ef1cb8a2f40db01ca3287c17b036bbe51a34b4b66cd4e15aa31803b52da83229d389e7c469d41e461f3ac1ea86a5a8d5
 MISC ChangeLog 2483 SHA256 c3d9db75aacc7ca5756b737dfe224ba931718da163ccd9f653fcee2a67d82274 SHA512 64157d33c4bfd98485c918408b0326d08e831ee3b61e3fb74302253dc2569ba9b310cf8c1dd8fc4a808a39eca34d18cd5adf82f40a1e8123ff46a93592fc1381 WHIRLPOOL badb2027915e879fd33f42c95eac7c5d6b1078852632aeaa37cd172ba632d6415c8e45654b14d55e823adbddaefa0ada80d969aa8afc123f4eee7f3998e1bb6e
-MISC metadata.xml 369 SHA256 fbf0c047dd8f31baf2319b73779aa528e5c22283e2eb6f1b68a826e42b7eedc7 SHA512 1588487b3894d396348e5754ae1d9f93a0a7b2e72b87f59c4ce6ec6ae2564b6c7cd7fb40c098009989143412cdd3affbb6a7e07ea10f7955357d1c8b2fb41377 WHIRLPOOL c686ffb6a35eeee66c8316d686b1066fef117b216b264c96a84d21eb8d79718456babc43db707af119c84bf3f99946d64572c32cf5a05ee82b65315448255bd0
+MISC metadata.xml 478 SHA256 50f4b6eda97a88e9f271c72b950fc3b82175df363d4dfed5b8358bf8490b87d0 SHA512 23c623535710c3b6e4df296e42411138ab8b25d37b2e9953d58c7168ed821f1fe1763fa9454d65aeac1586e23208b6c2e384a805de0287154e977d1ec70d2eda WHIRLPOOL 6516b3f2f63e5e658a7c6a82c30b2b1b8146d1e7ec16cae9c9fa9380f9a4cc807a89465b94412e75e3fcfa238bd0128a800c6124f78ea159ae5a4846b5385b05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTkCuHAAoJECo/aRed9267ZPMH/0m2MokFSuUoyQryKDh1gV+M
-DssmuaSPFgKxEOrOSgFEtei5DBftQb8FVhpI6ZxM9XYjj4goLT87RfRkHrJxQujC
-+2c9nYeUOnxxkLMlLDCUKDgQNxqxqCqkjbAE8RkVwoR2Kuk4Giv3N3CSfnusJRpY
-+em6obDUx9xdXaumhkJdzi7TJRFn4I/BkUiKVSd41U7rO1rzyFTtygJPJ4+xMlLk
-/YnFVqcP/H/qyembHfV4w6go6xvOUR7scJAtcmlYGs269nEu9oxiZK9Zh1GRz4ti
-mNz9z2BsHm1mC0wPons6hrfsiF7Yd6oAvzO2cNQBPqlUqohbktQOVnCZj9xdnRs=
-=Ws/Y
+iQJ8BAEBCgBmBQJVfs/9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAYoP/0N3UkC0bkwWLOKRHauRbD7x
+a8iGN+i7UOfXbtPhC/wrLVUwPU0bZV0EeqSsjHjDv7nBtk5wVbOcLPOSzXO1K5B6
+HyKzkjHbcVsb2g6cbLMDQjO5veQ9XqccVqjjvpwx4YjUUgFhK/jVw3Pk3GPur0KX
+Dfijm72tfejrjkRDlgjHvtaKlhMPDSXw2aSUeHc5z2d/HIb0CSQcsjpb6RXtOE2L
+LFudmnuCDROUZ3aeWl34JI0wb+93GoVmnh9S1dGAwYJI17MQ2Oso5cu33Dd0ZYFF
+Y68R4dxfJ5ilfKH0WQelA9xkyh6OnPgVHHM5N83dQoU9rxiog+01wsOUxCCPLhTA
+MmvlO6E0W4Yabms434biMs/Rj+VxECVkBjRQGtCSnsERAIpVf5mDnHFltZwKDiGN
+RjWVOhzMyEl7w0eNtNajI9JsawtKF/2uw1wK3Tip0EG9s+rMZBZ+xmjuWaMgJN92
+HyQMUelm5jEpwZe1gmcWbocXsHmGif572LGlci3hUMBP2eI/7LTl69g0BPj8ECVD
+XcutRoDZlXvFO5KGbBpVp8nupfMmtV8rfYQ4QtQklP5O5tWA19T5FQMdlKM43qZu
++X5HWLvjFKoI3cEhg9e3Gpb+CsRQe9DJDzTgsy+32vilwxTMOINo/izblpxVoCKj
+qxxQXD/Y44/F95fceHng
+=z3A0
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dovecot_deleted_to_trash/metadata.xml b/mail-filter/dovecot_deleted_to_trash/metadata.xml
index 60c7f53239ef..357afc8de0a5 100644
--- a/mail-filter/dovecot_deleted_to_trash/metadata.xml
+++ b/mail-filter/dovecot_deleted_to_trash/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
-</maintainer>
-<maintainer>
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>andreis.vinogradovs@gmail.com</email>
+		<name>Andreis Vinogradovs</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lexbrugman/dovecot_deleted_to_trash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index a866e261fb58..375115d6f943 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -8,23 +8,23 @@ AUX dspam.logrotate 180 SHA256 17285ab0e624ec52124e8f661649ac9549c00e91a2f8d0d6d
 DIST dspam-3.10.2.tar.gz 1035054 SHA256 ae76569604021f35b741fb95198a1e611a8c64c3838661973a6cf360bba593a9 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856 WHIRLPOOL 7195f295e786d0b327670ebcb292dc5d9fe98d94e48a5b4e3dd231aae88d55c19dfcf2c04df65bb969fdd8f1210ec125d6aa84d602623cb20964a170f95b880e
 EBUILD dspam-3.10.2-r1.ebuild 6090 SHA256 eb7398d05eed376886d55be1399b12b69db3e51cd83f8d6fa2b980917fd72202 SHA512 f21eaef0a3d005e2d25eacc69f8b61e6e27b0ff452f0ee238e449e8f0008fd23ec1b9aa60660b49b0909d9c5606465088ba4e3831ed64c07124424e201e3d3ad WHIRLPOOL 1fb3ee8a9a8b84cbe4d214db98c2ce219b43f9eefa17500334784d0a5c9816ff197f5defcd1878abc51e9c8626b867529bb58c79a7f448443969eff89e0b8897
 MISC ChangeLog 26596 SHA256 48cc718f5ac5da356442a56534f447ac1ed22b97b2f23343a4a4e7323f16ed96 SHA512 42941871eb6507082f0217fe9f74292252865e5eb2065c58f3813ffa81da1527baa962ec82dcbf809c59528801b5c853fe28396a6541b65a6d7a09b36f9537e9 WHIRLPOOL d9e94ca6990d0237d47c0d2defd1070e04e95c2f0fdf34a8390071546011dad1e38ac40601ee2b7793cb6b3c9f4d599d66893cd975d902e22487da975c74a5d0
-MISC metadata.xml 988 SHA256 f4e606cfc13e00ee42e46fdc32059610d9927605bc4e55c10c02fcb71fa65916 SHA512 6f61b430938b38a7146c94d8a582d527634da55f4d2aec61518fcb259b7e1c83780d38e4c93409dc7b4582f998c2dae428f3796950b37c4ce98fd3c42a5875df WHIRLPOOL afe38ca6ddc7a69bcd2f57cf9e8b162f3b6eaf332ef920dd4528feed7372acfbec8926c8e2e4766669c82c842e2af84098197716825bfbd774107fd21c511e55
+MISC metadata.xml 1075 SHA256 c09c3af5f0c477d4b3ad4a84b1f875dc5d22c8f4763f70e55014404ce71ad434 SHA512 0f29cbf3c99cb6944d13dbee653f5e5cb63f4482c977542a787c4a2fbf63938258877c52900b733065342521a41bb06e57686252a7a4565f52ca2e4e155b01c4 WHIRLPOOL 802674d1123daa5addd7837662e25d2ec5fcdbe7f9ab4dca238ab1b14afe1028d3220435da20352f934c5db3be027401960ec184e14b61909d95d22354a3c265
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDZ6MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirgq8QAINQSNJr7sz5yaMKoMBC037R
-7pKRcnNIxz8USVWW4DImlXvj6GNnD583IB38/jiakTLEYVFv1NQW+E9B468VIsCj
-y+sAYCXvWePFLFl8s/PSPkeacND5Uc5LcOrgDYwG7d5oaYvXMPeBjl1OBRlbxED+
-Xw2aleJoOfFAMk/iyaoowD+PQhOiP8FPVBzjdPkpOri81M4QNrV9DpkEDTvE5Y9x
-MXX8V3ZOihmw0JIKfrMUmOe1+heJwaREYPTzHWu/iLUFAjg0cxz10X+w9jSg4Iw8
-0cWXoVdKJz65m51F38JI7DmCOSzM7O1V+tSf4khBH23i0tyPC2xX5gpECVVXmscT
-4A5aDwD+WMtyJVF+TrFzhM/PCtg9jaGjY3Zc0n58m7yEiNlOP/g8AaAdjjl/RGYS
-/bYy8aCeZ0iDkz//z89I9HNXWSVtmfsorZk0mbPyzQOYzmvRiUelW4MkDgoiH3++
-ryvNRUZNYXQxa/gax6w2ArAryd45fmYAPCUiMEBPrtnSa4MxLAmSMEbGq1CAK+Zw
-/N0od0I+1QC58JdpbrZQHhsBOqX0+pdGiG4XrEaHweC5qpi9mgsBs9CZHBetMkUn
-fvFkrulfBKDkAhJOI2zvZ6IZoiKW3Z1iX393KotYzs9sDltqvrID9wZ/OjnzqvlQ
-1ZdjmAEiXOkllXvIwDe5
-=OXOu
+iQJ8BAEBCgBmBQJVftAHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDHUP/27xDLOHWeRmGF/tUMK48k3N
+ej8KixKE38KnAUyzuYzRYs+O5qohr4jc7QPLp+S3k5xI0Y/fJFptosX2XE0kd16T
+ugD55HDBRElsgFG0P6I8Dwfr9HxN2KDsu3tRLhOo4A39+MpUyiQ3uXJyxZtrPRCl
+YEu15wdQfNvBs6R8uHHOu+LSHgKNvPAnD8YM13O6WHP8gQQ/pVgGryZB/mRxIyx4
+lkfmGCoBTs2gcAftpPzUQJe67GjhiL43cygzZ0YY1IINA8eRxszlgyKIa6xa0xnM
+8K2T8Jqncnu4TVwbwsIS14j/Hb0hWc7WQoKwC4LvKzzNE/SNYXVFLwDxF9H2iRaB
+JwXwkzcoBhRUF5Eutnit7gA7AzHXyYNqSOilt2cmAz75A7J1gUlEal7pWwb+MADr
+7ADIGJENGvxqkAq4WwqA083jlTfEs0bsF9VbeBHme+UjSqQXAEv8bkSWEUOy9VmY
+m82G55sNSpXJChPF8gcNDDnhOtCakAr+/rWtKEmZ7Gs5lSfQ48cgCXoy4uqpqjqv
+EwXv1M0zRyhenwIZIJ4NiZCPRkoe0ndCYbykCXdu8GAIAdMsxThcihG0gwDYD+Vn
+f53MMUD0bPMxMb3JCXECvlRBVa1rb47x6Nm+RxVeuWkE9RJU78088JGWOoN6W+UL
+H8W8z+nJqxJ5ZHUueS24
+=Mhly
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/dspam/metadata.xml b/mail-filter/dspam/metadata.xml
index 9fa40a3d90a5..a8b33acb2055 100644
--- a/mail-filter/dspam/metadata.xml
+++ b/mail-filter/dspam/metadata.xml
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>A statistical-algorithmic hybrid anti-spam filter</longdescription>
-<use>
-	<flag name='daemon'>
+	<herd>net-mail</herd>
+	<longdescription>A statistical-algorithmic hybrid anti-spam filter</longdescription>
+	<use>
+		<flag name="daemon">
 		Enable support for DSPAM to run in --daemon mode
 	</flag>
-	<flag name='debug'>
+		<flag name="debug">
 		Enable debugging support (don't enable this unless something needs testing!)
 	</flag>
-	<flag name='user-homedirs'>
+		<flag name="user-homedirs">
 		Build with user homedir support
 	</flag>
-	<flag name='virtual-users'>
+		<flag name="virtual-users">
 		Build with virtual-users support
 	</flag>
-	<flag name='small-scale'>
+		<flag name="small-scale">
 		Build for small scale setups - puts data to $HOME/data/user
 	</flag>
-	<flag name='domain-scale'>
+		<flag name="domain-scale">
 		Build for domain scale setups - puts data to $HOME/data/domain.com/user
 	</flag>
-	<flag name='large-scale'>
+		<flag name="large-scale">
 		Build for large scale setups - puts data to $HOME/data/u/s/user
 	</flag>
-	<flag name='hash'>
+		<flag name="hash">
 		Enable support for the file-orientated hash driver
 	</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dspam</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index e805f5eb024d..7483d76edaf8 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST imapfilter-2.5.4.tar.gz 52585 SHA256 e5a9ee0e57e16d02ff2cbb37b67202a514121d2eb7fc63863174644ca8248769 SHA512 33d8cc822a4ccd02ede6df7f30b5d2893088b352b9d1900df6597fd6443ae51ceb9ff22cd0100f9ec9e28dc84ac294bb717e0a85c4670677dfb09b5e5da76915 WHIRLPOOL 773e73fdae4b7b8f70f22d968f97d383eab444dcd8f39d417b2893408b94fc46be39fc4808e82d38c5e244ac21258a9faedeb0b564f07c9056e3c9f471146703
 DIST imapfilter-2.5.6.tar.gz 53579 SHA256 064d4da9b3b6458e3f9e061174ae4da07e57bdca6b7e1a9d6863cc6959eb2431 SHA512 98bca5cea00cdbbd0bcb3b98c381ae75ec43a3b6651a171cce47df38948d6d7f043f5bd6f42c8f9e30297db17f5d542bb0174dfbd46fc83d25cb5ea6e60d962c WHIRLPOOL 2c636d11f9533c7f8f46e64dc6626447760a49b3b7596deb6ebeb43d5caef5a948d1760d5d0ef8a5c40811cbf7da5f34aaa24c0975228022c8335cbb8bdfe1a3
@@ -8,15 +8,23 @@ EBUILD imapfilter-2.5.4.ebuild 911 SHA256 7b0d7564e54ccbe9fb637e2b3e333c350b780b
 EBUILD imapfilter-2.5.6.ebuild 911 SHA256 fad87989356de88f4cd8ceda2275f0719430b082080acb641e4b3957d090a2a8 SHA512 7820058e70f34aeb29bbaa1e321224f3675148f541c70295f39c23e48c9f87c606e1805095609e74aedb60d051a47965afb896b0a23c360b48b809d0e4e43173 WHIRLPOOL e161f1ce2a2446df235de03b7e6cd14a8118ae6730896cf253781e6256530f076608118b12f37c49a183f2feaf52c09bdc06cbe66e877b023c3b075a3523630a
 EBUILD imapfilter-2.5.7.ebuild 920 SHA256 d300c3171539f92ce9886315612e6b9c1074ad2ca90162d2182267c1ca4d7e3e SHA512 0f733a6a73081a01bc62ecf9b96cc84803e54139fca4e51b57fafab11d0a05739b1a626499d072b6f17d9be866557ccf71db2849446632716721fed03cc252bc WHIRLPOOL 281c8afc27a840b6edfcc1212200595570a1ec869cd0ec3539cfe130e3d05e5318bca131da543a61882fd83ace5d474dd4840adbb293a093a3e5d5c883c168be
 MISC ChangeLog 9250 SHA256 886a0f25388a20f8a7fd735278346d90b9e33b9f8879f8f930ae248cfe51a284 SHA512 5369998ea48c00ae3af0636df916e3a9fac8fdd5c04064396a1a95c649b8f9a4613e4a4ec05767c32be96bf73fc80dc75f37947fa3a0d275f51967f8dc2343ea WHIRLPOOL 5e9a1e0bdd6d0371b989b1c61b43147d715fa9c5d0b9d07d2bed005163d00816b8ec57193761c65ba79cbe2b3a6d033b6ce0f3eadfbc4b10f0945fdbc8b711bd
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 244 SHA256 7ad97fea294dc460af14b441a39908e5d0dcc5de8111e1133ceb514c787e07f6 SHA512 b52f40bc23ffda3a089732f3782ed9de7bb7bd5d3296cc0695535aaa139021523bdc3b81cd1ef5b87564c8d7ade3fa1256cc61affaf06aef3f30c59f778c030d WHIRLPOOL 41e2bfb9d85e0ac70b2f77b2f9ec8992c4b32dc78558876ee0f26b714331f08509a463b553fb1605796f5206e7963bfc5fde70839ecc4b3c3f16e29b569bd2f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUk50xAAoJEEqz6FtPBkyjHL4H/2jTag3ec0C79elPl8POEctn
-aiLSoR65eXiHgU2i4QwbjBRpmWucib/huzaLwJeoAV0O3eQAPlN5AQZEthFnqi2o
-fFYf6Dt11nDwwuiSihI8xUm/a/tgTHXev0s5SdQP/cnICzeUvJUZKLSEmrL0xyTj
-tNEy8Uc5hvXOMcOaZmv+MYgCb0TLSCZsCnq4vaAHeBzgYfSKnMXD46rvfss3+2QN
-Njlj2v2EaEWPJQO7B4eZrraXZ+anfvxLHviEd0Tua0/X6haoGxyyBnP9IKaEUzuf
-IgICMF03W+3JWnuxMUSELqksP4QfhUhq5bOKJTN/kn8wcbigmzUYg8yChPkVNX8=
-=UNOL
+iQJ8BAEBCgBmBQJVftARXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicLYQALvhO02zr48B1WCPY+6TAbOs
+YcP4plV3+CkiLvjUhnwB4tqB0ok8lWPavjbGqSc0WU7Pbf8EZNK2M5omWGCLwX0u
+v+33MdpyFHgopt0OtZvIYMBWBSvTI9sFG7eJ7R1RcWYKyFl4IxIIvaTHZT+OKoRg
+AjFRwSsVcsiPmiF/cY3W4UnUviEyFyk0zlCfJ8mBgYtJSWbSXtkA4jzzH9heziYF
+L7Zpfx7genuO57uWJokFtGeTTaD+Vf1MIDt2UO+zSQ8+DjWT3sAw+bDwcDNvSr6J
+4M39CaSPff8L/yDoREH4iNvR9W7ARYKSCRAWSlQ5ILgg04lJRfuT4eY6CMF/w4HR
+W6RZ/kQBE/gt+2cazFEgmaAZsEkkB3T2Nw9eEgmrwlJ1sfs5QodYv6t91zlXGnXU
+pP026MYnL4jC3VURJA7wh7uy1X2lNL9xvfviO4o2BjExzYbFq8SrC2GdYYaTmT+n
+QDYSJ2GMnuIAowoz+d3a0oztbuUoYGrCwGj9O7lSbIFlWw4AUOUsXMCRTGJWVp1w
+g9nU+bDUttAfnzo/w2H7px/eY4aAVHETk7ciNuIAst8DeiZFINqMvrFrtUz+quiX
+/8BDf1pMKKxaBt/xGgPAxmJi6ppRTjcfvjiP89gxTwKZ140GNzkTuVCpAYkqzjZv
+TkTb0LWO0f7CLaumUiNX
+=YeTi
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/imapfilter/metadata.xml b/mail-filter/imapfilter/metadata.xml
index 51f94e3fbe0e..389142a3fceb 100644
--- a/mail-filter/imapfilter/metadata.xml
+++ b/mail-filter/imapfilter/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="github">lefcha/imapfilter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/isbg/Manifest b/mail-filter/isbg/Manifest
index fa062619bc61..bb9b4bf8969e 100644
--- a/mail-filter/isbg/Manifest
+++ b/mail-filter/isbg/Manifest
@@ -4,21 +4,23 @@ Hash: SHA512
 DIST isbg_0.99_20100303.tgz 7562 SHA256 cf47d36645e588132acb51459b767c9c31ea6d4322de341364034b4e669dcc42 SHA512 cea6bf34c07e34e3a640f680561f0a6aeb5dca7b82c745749f71adcdc4b117226b5a6b7b5f0208d51d4426477f13d93d984c6a4bdfd55baa9a80c8c82e31a15b WHIRLPOOL caee5a61260914495ca7730a9c7ff4fbe16e86389e89b14c76958a74a9adee4bcc45d55889ced2f59fbf619a204cdade6775f3f08ca0d1fa0f7af7224b7a3acd
 EBUILD isbg-0.99-r1.ebuild 1005 SHA256 7692847ca0a823dbed16e9d53df06d867513c66f98bae140c9d12bc3e6f80370 SHA512 d27a225ab16c9a750e17167a5e19a3456040b026b78428dd6e7229beb859383d216ff87d636d4b6a529ab3befd06f56267abd9e5dc2ba8a89ed42f65896ad326 WHIRLPOOL a307c3e6ae2eecf03652ed23216db2f635b5673d2e7fd1d9ac0b5e5ba08e961ead43e39033b084f82cf36bfd3d5f277605dfdf784d3f332061248e7cdde391dc
 MISC ChangeLog 680 SHA256 6d3eb72aa9ef157b55f2542c38a0e60d747511a2b7e579b54fcaebf47a23c8cb SHA512 1490d8db3f35a41464b40a59bf1cebc95bab4e0dae566ca7a2a66f3b96a04a52d49e7bedf2c6e0d275a8321e111fe0651d7fe1f2fc0f8d9eb4937fc07ce3b80d WHIRLPOOL 70eda7fb3e6119b2a093600d94ea92b03d70ece77361470c3666ff23a1439ccc78e0c59e5ff4806d4e93fcadaec1586936b381fa1fbd21810539c9790700c967
-MISC metadata.xml 232 SHA256 f59a9f25283f4c8163747c326349b600e83094f77fffbf99c266a8f82252d6be SHA512 9eae53c343fbc6308b6557ea6b5d98ba29bc93b27d6650a89f82905cdd9d6b0b2ae419a71c3b21c7afa04101e3df742ae0128cd925aeeed74559e08d72aeb53a WHIRLPOOL ca941591b5a7ab808f603a0438cdcd1cf3b4b52e2dd76277110f34f55d6acdbbc1d627867aeabd150e9febf62bbf67c05cec40a37e8400e44ae556f5fc32829f
+MISC metadata.xml 310 SHA256 79a2706ff82173fe0f48c154d952f522cbe77186103047d497e1b3a4452e16e5 SHA512 451b366c224e4fda7df860feb84df2bbe393133b337d29bb58ad68a2382038d84d568d9d0c5b138bc348d966f61234b2d9d79a126db49be6fc412aed5af43ab1 WHIRLPOOL c7ca8f59c011cca078675098da10312b42f517e460d6059144b5dd495d1a4031736fa2713f7834bdb1917122aa85ef3af0a4ddcbcfa52a515a81a0174ddb3924
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJR4QZiAAoJELp701BxlEWfkhYP/R81Tl16RIxlGwQn4RQyH0/E
-M/jmLugrd5aHgRNFsOnpfQhTovaQd1ud1GclwyFA/CNK1AWMwaz0RuPAjsiZ/4fv
-qEU/xUiRRscj5lnAFHyGr7j2c5XJP/oBkcZvJm0sIX0CXt0ORHUhqmit3UqWXPMq
-UV+w5kczrLPInDwAKbcoaMBM/MgnaDPIGTPNtiAzn5LIpd8nFuUNuvAsofc5Ujoc
-GtrjGVfUaCfW1GtB39QH308QE3sqJ7+NIWdPMhDPESIRcZLYIlGHLZFQdrNc/Prq
-6qWm4ISDyD0dW1V3GCpcGmmuqV+9VXKFAGBSO0vb7FTbWdKmh299DSwUMWua2Kea
-J3SeHFeXTcBcIQ2qJX2pQYCUjaN6pmrWMXMRmGp9hrSRzPAcQ2aoPnEN71oz4kxd
-YmT5SptRDHVNTJkCSh8GL76AeS9FFqKVYOvcboqBjjHIqnDNKloPCtf75k1Zvkid
-P9JdYy6JZVjGIz5iWRy+5MiKvmCXx8QiUC5JjBJ2Cl6lWLXDENBVWwGrcBdFYEln
-y00vzf1jdvChTcDO5qvZP9s/F/0RoxMARLpxh1ma1OG1vLXV7sqVnueCl12JUtbj
-vl2lJow5XNp6rLTpHkQeZvo4pFvOheEa7Buh/6BpkFnLKieloDA1foWIoFx+xH/B
-ojW/juQmeH/+KiUv00rR
-=wqqA
+iQJ8BAEBCgBmBQJVftAYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBOkQAJv60E8ep/RPb+nkV1EMh1Ep
+3uSfGlTeIg+fgRke7e6NYIXaKs6+hb/cnjRmiKWlm3WdsCcZCEYskA4v0Y15/CeH
+nmReyIDiHZCaxehj0hd4mov1TeRjquJWy4SeR9YsCY0oGETy1WRw+NAzyuuM1V58
+v9HdVBr2DeOolk3i+/ZRwBaf9LHLBIIU6CaNLrL7Q+CKbYYBQ4T2ZH5WG0bGeWx6
+So/fI2HEXcl/bukBGT3G8HazVD7N70J8I1odwd8y711/G6zT3hvBPb4F1W6mnOPr
+MMDL6FW3KGU7zRR40HITQiEoyBfPOv3Jn0cLI0FobYaAid/mc4Qlr9kmNB9/cMnZ
+Wqwo/ATGBdodrO6ErdfJbt5sEHo2GjANeBy5mriP1gMTqWYF+y2ZI/+clI54AldT
+6NOGNeDXeV7iJNpb0UD+QoTQA8N2PssmYmy+hkPtC7wMMxTzIrtgKNRdJM4wJopq
+EF9aiNV0rnPY+oQj2J9v8VCWRB33shMjT+rb/ByjT4tgMVlKH/3PL3FyRQgftsH2
+VjGGblzwyFspqJx5P8cHyfUWWo7ZeTJqEHIDi5GGbhQXoN1ApAWy15aIhfbWQIQy
+N1QlM4cY/9DTrngqo2xjsCIqHFLLvjiyjaoT0PLyy7nDAt6JWwCloVajgvTi41oh
+bxQ27/VIxcyJTKiDLgnF
+=/elN
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/isbg/metadata.xml b/mail-filter/isbg/metadata.xml
index a15d7230bf71..00aaecbcf35c 100644
--- a/mail-filter/isbg/metadata.xml
+++ b/mail-filter/isbg/metadata.xml
@@ -5,4 +5,7 @@
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">downloads/ook</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest
index 7ba736c41fa3..f43e6c9a404e 100644
--- a/mail-filter/libdkim/Manifest
+++ b/mail-filter/libdkim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX debianize/Makefile.in 2428 SHA256 01452e3aaa461d5d3dfc908c9b7068f312406a662db2c6e1a8a50b41b39f6c47 SHA512 05db88fa13c37e3523c7ec9fd4687d57b250d789318afe886d9b5d37813d12ec1cccbff9d519faee213061e25a41dcb0cd2cf0490755d1712e5bc58a023e69c7 WHIRLPOOL 827b83dd031875e2c4a1d4786db47664469491a00707c2abdf7699b982d09ad5126299f582e6427c9a6bcdb349560df9f3ee1a9fa86881ba286957517ed31bbd
 AUX debianize/aclocal.m4 5813 SHA256 e27480508f65f624233c17e47e0086abf15f08d8c7e08370080dde5fa71a33b2 SHA512 f0e4b4d56768c1c05f0e814c36597f7011274914cad28938a8b174e89dbe4263374849ad88a246b64789f312740fc660853d086f54397fa5ccd3be95dfa9b99d WHIRLPOOL 52e17322dc2d37aae9f6eab8b37c0f5ca7d13d95425db3a85396e076b7edb6b0573df5f0eacddfa18e826a906cb06e78b6f7fb6ca46929e87382d07951578cfe
@@ -14,11 +14,23 @@ DIST libdkim-1.0.21.zip 55049 SHA256 dc685c8c47384c5d0379a1bcc0c96c8b7877a01e0c3
 EBUILD libdkim-1.0.21-r1.ebuild 933 SHA256 e0c61a1a244b1cb19b1e31bb9ada6336b95704052bfc22fd90fb15b7429a2434 SHA512 a38a979f942daf83f9191e56d2db98999458bf3132eaa24d4c9434e4cc1709bbeea168dd5fb91dd426b1fe29aa8a81b03a11b33aae4984dbe02133a6810f08c0 WHIRLPOOL 7497e8c29793cb74932789ee09ad519ade4645bcc89dfe8ee83e0fdf66d4f72fb9e7fca421d01bde3813d16dfcf9059718c3dacada3af4d086b9735effe55c67
 EBUILD libdkim-1.0.21-r2.ebuild 1170 SHA256 1d7de552e735ebe89c645b80ab74b05818b17ca33477a58ef8c36cc8a68b6728 SHA512 2c7cc918aee71f14d80b07782c930465cdee0690ce608e58d8ed3954a09e475429c46a52659f3915e344e82f1ca561daf47c1c409ac4a8566799e372c2a0985d WHIRLPOOL c9a9f98a71ed1dd3cdd14c0d2166be27393a81d6447de4936cbb6e189e5b609fc76cdb764171a161591d22c243fdef5f32ee094f1c38b04c3a5a8dcaea08d031
 MISC ChangeLog 1830 SHA256 1b338ea31636afba570acfe2623a9cd67b440e2c972d1a560a06880ae3726ffc SHA512 5b3e33e7aa563fd650d34b1e583985e99982f7bb669a708e853f4cf16ffdc6fd5c0c35ac0712927408c6e406e422d5068528c679d76a8fbeb8d7bb50dcb1221f WHIRLPOOL 8ec2ad81115e248c0d7b5213dfa3fe128a921ee061f0c0f40b5aed682badc82a8f4ede5caec259f3aa2eceb1a98c7011b5ba7aab4a34e0f3609c562c29db3a32
-MISC metadata.xml 483 SHA256 ebcd9c9a1ec8f735aac6ef6bfa5474328b497b582694e7febcba42c5b7930188 SHA512 e7c1b8cdad59dfcbb5a7390c3a673ef4ffe3183fcc7de023501e53e27eff0ff60a871fce07089ff5d7a37d6c1d3586b9b9cde8eb88d23b50437b1cf805130f38 WHIRLPOOL c30ea2ae391568034a41607227a20473619eb0c3376df43ec6257dfebcf520598e1d92dfbc18bda3802a5ab3e9d1842c326d288635ab31b92857ff12869acc31
+MISC metadata.xml 578 SHA256 77a419b96d4daa423b0cfefcabc22c7916eeaf75c21dd4e461b296f05b906d27 SHA512 449c1fd59f609ad13c50ab60bba210377c2dfe6528bcd7b295a4f565700ccab671f65c7dd2b20c8dc9597097d48376e13adb0bbb23869f8689655c5c5b6b56f2 WHIRLPOOL d5a365bc74a1d188d8986a3b19edfae0b8a6b1d7dee8b7668b7eda2d165881e86f4c39b52633625e9ea9de13558a9bb41bde9e9054e9010de051f9d43c18540b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4R0ACgkQcaHudmEf86qYNgCfbeE9zKvWK0AAwjYyrNUEfQvA
-j4gAnjfvgsyrbzeahTnTrFJVxMAV11zV
-=b1mu
+iQJ8BAEBCgBmBQJVftAgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwugP/RJf1DLt4hKrx8XeU0PX6V5t
+aj/jfvx0JfEtSxCNf+So//iThXhGVKiDUZ13UVP3vgmRoJNHAknTKL03DCwrufj6
+pKTp/TLrwR8leQQ0wm9gJ/HHhiLNa7cJvKENhCcdCrq17RWRxAl55Y95JYDiYLgz
+KhcWCsjYc+cb7CbJMPSTieSdFJoQ6mm48Mo5puimAL1XpwKGmpUvYBUWWXm2PMBk
+/hrX+739CIEh5OnSN7+oEWJneJ7LciLiIDQ0Cj17njTLA+8Fmj3AHC5kOb0kfWCZ
+BzKMnJn/BQPZAzkbV5Uc8svI2fqSg4e1HyHttUSR+1tu2/+9qmPS/5fs/WVZXn0Z
+8ERGxRZqdZbi4SGQu4rLi6ZbAUR0g/D7QSwWQU8xsCGfwRX8JQQwsafvNH+MmF6R
+Gy6BJjhG4qvE1GGmsyvRiSg/dZhFn4XcB0WmWo9bjlbk+Wo5jvKHW7CttEPx6RoE
++Hc2zNtVfnRHB4OHntWAoeP61gqLmVxMEI6Z5XHsGUIlJkejkOc8cWkRLphAnI+f
+x+060L1EqtoYVsY25oyd8KSbl4FGojJS7GYQhtSBSwKgTN5qZXtGNT4zDKQqXUpy
+ahih68uQ7siedZ8MS4qXVyLUDjzBfA5xwUqppWtOq2XBYTKI5ei62JX5widnc7yF
+iCmz08ryc2Oqc3MxITtv
+=1MYx
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/libdkim/metadata.xml b/mail-filter/libdkim/metadata.xml
index 9841a6ae8b8a..514b6de10ce8 100644
--- a/mail-filter/libdkim/metadata.xml
+++ b/mail-filter/libdkim/metadata.xml
@@ -3,14 +3,17 @@
 <pkgmetadata>
   <herd>proxy-maintainers</herd>
   <maintainer>
-	<email>andreis.vinogradovs@gmail.com</email>
-	<name>Andreis Vinogradovs</name>
+    <email>andreis.vinogradovs@gmail.com</email>
+    <name>Andreis Vinogradovs</name>
   </maintainer>
   <maintainer>
-	<email>qnikst@gentoo.org</email>
-	<name>Alexander Vershilov</name>
+    <email>qnikst@gentoo.org</email>
+    <name>Alexander Vershilov</name>
   </maintainer>
   <longdescription>DomainKeys Identified Mail library from Alt-N Inc.</longdescription>
-<use>
+  <use>
 </use>
+  <upstream>
+    <remote-id type="sourceforge">libdkim</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-filter/libsieve/Manifest b/mail-filter/libsieve/Manifest
index ed96bc360036..92c3e1ff37a7 100644
--- a/mail-filter/libsieve/Manifest
+++ b/mail-filter/libsieve/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libsieve-2.2.7.tar.gz 569646 SHA256 41645ad28d25388925f352858ea23a17ff2a25897b98c72e864d8cde899a6723
 EBUILD libsieve-2.2.7.ebuild 699 SHA256 3f416cfdf35d715863d90bd395d11448ba5b6d684a1bed5c271ac4a6e9331537 SHA512 3987a764b3d748bc00210263bef5c20f23ce9e30129aaf6d089df4cb9e8ed8ff71edcf78191685801e2a4782b8c7614cdd1096021eb0744d1431c06a52e16dda WHIRLPOOL 106f043c84103dda7339f42ec5208c6bde845343797202d086e6e8595907858e0a94599d1699289d55be85af2bcb4359c1daa4efa130721632997111f4356c33
 MISC ChangeLog 2824 SHA256 f0c407dc61c339901a9f380cd8e179f40ac138715600caa8e580de7fdb8f011b SHA512 a6ce669e78f8cea96247ac0fafd6e1ebe7297e0b0a87d54ae32d53b5151ab5479967d680b7d708b93445701ae54360d4f85dbba446636225ca91deddd3ff467e WHIRLPOOL d1da47d22fd2246e6602498bb58f992d6f614838ee5d5772de6a391eb21c2676d7083fcdb68a006a35dbf3fa7b3abdbd19cc43129f12a7a9a9d5bcff0ee2587d
-MISC metadata.xml 507 SHA256 91e48b7e9309c3322447462c12643365c639852ffb594643b4d7eabc84c6bc48 SHA512 d3fa6f5f45b2493535a3fa70c8fa8b82845c3e400d175ad2997487469a5d8db78888e129c5ec499b4fc0eeec4a1ef7c7b14c9d3f94591954b7f35c7bb8b8e5ed WHIRLPOOL 613a022faf5b8e1adf464d366736f67825e3f3a479cb298655ce46c6cf9574b0ee1eacdcab2ee9712fbb5225e8960c06a07a489898eb2de51d39dcc25a9fdded
+MISC metadata.xml 597 SHA256 bbbc77d085410f57fb104c30435cf7c9276f48ca1c6ebbcb73cddc068726c06e SHA512 447ce60a1736a46c78b5ef5232bb04ae53c1df19b24586eed0c148bc2063fccb00a440eb7cf56d439a6ce96968f09c91c28e1d7f36a34dc1d8c5e5ce11627c5c WHIRLPOOL 364975c2647ac5733aafb839a957fc2394845b1302ed958d878be7ab807f9152dfbf4336f123e3860d23455fce53e8d5ccbce71bd8d27018252b6dd67c700a29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4ScACgkQcaHudmEf86pPwwCfXYLDQ9n7J9kVDB5BnX0ivLqq
-F1EAn1dcuz/M3sCabwMdb7bo+W+NGCdJ
-=7QYd
+iQJ8BAEBCgBmBQJVftArXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmisYEQAL5KqC+W8gy9QDADeSWz+l1f
+/nKTVrr1kqnSjto2wgZMTwVPeFKrYFLMFjwrqwaHV2NZwvy60ytt75gkf7YqHyxc
+BYVcZhcqqnZJpnBmp+rVegpfTqFc/sEePcy8ViQeWsrX14YMG5hjqeio3S2TshD+
+VQfH4VPWtVYBIYmXKSvdGJkb0xJaylB54iN+PoxCl9dhO3PtooluDJdnUT8XRir5
+Q0O6VFZx+ua4+hjFfCSSZccaf8dq73c0JBpNExg1t5sDtqd2bYWHqU2LntjSzUFA
+ysZfVsAoDslS7qS59H3VvuD+lua3plFBzE7+JCVFdJ81w6K7eGQzMm1BAzQKRc3+
+NGRRDAVQVgg6G7EB5ltwazcoHWg6SzMzBzRZrGjV1CXvaXtApM7Tj2lDdHLLSnz6
+vuMW0MJOfxxnMpriWkpjF4s05upBhpzM1RRQXZtyVEY6yxCjVe8A9BTZ8VGu8ga1
+BUwkuRozxrtKoatiHK/zUzsrUItF/Sugmb+ucF6mYsEdDd0jo+OK96ZFr3awJRtH
+QGftkOgQLiY/P09okDYF8Kd7/3GSAn7mTBYgHi49TeVYKS4efvzAiYgeQh0A1aR/
+k0wLoA3HjrkU+LDl6XtfX5FH9l1FW1I1xR70fq95g/bRUfWmv5b0RRdrXITHRWZY
+NggniH7G3tWJo/3CVfnj
+=2ZvC
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/libsieve/metadata.xml b/mail-filter/libsieve/metadata.xml
index b990b5f194df..5b379a1483c6 100644
--- a/mail-filter/libsieve/metadata.xml
+++ b/mail-filter/libsieve/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
 libSieve provides a library to interpret Sieve scripts, and to execute those
 scripts over a given set of messages. The return codes from the libSieve
 functions let your program know how to handle the message, and then it's up to
 you to make it so.
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">libsieve</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 73faf6e6a4f1..950a36af96d2 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX maildrop-1.8.1-disable-fam.patch 2511 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3 SHA512 88337c94f928e5bdc5d41cd02a48bb8e9475a34348b0bc75c0af36ca369d4432b4eb15190814b14f4b83b3f4104f476198a9333982fe326aaaa98bd5a3f1f18f WHIRLPOOL 6610849b7e51f9b58a985bf7964f3e9a5b065c99a1ebf7e40c54b2c6d855fdaf8f8729938de8441d77cbf7029c6cab364c81396b2a7bdff703e047134f9a14a8
 AUX maildrop-2.5.1-db.patch 2512 SHA256 194985d2da02add048129eddc7ff9a928944a849b5f303eabfdfb2b0a8beceb8 SHA512 b8cfc9f5040193848a6d892142180b2cbef63d3bfd1f89fc71978751e47a81c45eb0ffc896bd2f9328e366fe106926455bab71eb1b606eb5514d5e8973127089 WHIRLPOOL f6babc571f7abf3bec136120afa022b66daa68baefd6b26fc799471aafbd080208f2c47fc9282f99caa18752634b18457bbbf74b9abf19ce5ca8941de7dbf945
@@ -8,21 +8,23 @@ AUX maildroprc 58 SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b
 DIST maildrop-2.6.0.tar.bz2 2174922 SHA256 afc115119b2d3197c565002e158c2cb69d525288bf72c71919c3c74096b824a9 SHA512 210841add8aff389589802f15ea74776815ecfd0dd9d5fb4f244d101e3d3f5dbb833a38f1d539b869c49685cfe34b0e6e014a5888c2537c9d89c68d754248db4 WHIRLPOOL c6d8f2be69a02fa757ac4dd653c22c79c8da6c2c1c112d48e0d4c491238d20e4c093d01f728ea337b1ba12bc75d88c5a252ff036114fe2339666776f2be44e80
 EBUILD maildrop-2.6.0.ebuild 3884 SHA256 e14acf57a0075f330038963cc4a5bcf44227df6ee4497c9b9e5ec65806e1ff95 SHA512 34c00609cfcec70f528dc316ca0fbeba8bfc26d1dbf287d37dcd8590988241c949d574357c20053741768b18fcff4d0b01c8fb33e9e88e2f07e307e0dab68108 WHIRLPOOL 06bf202d97639b3b5aa9b54f0b4fae4e270c441f0964e40039e7942efa92ee5477ed3b759d3e081a82f640f332e51473d5ab8c01f158bbeb11752b945b0db73c
 MISC ChangeLog 25382 SHA256 19fe465dc90d47bdbd5b62be3ee8234ef8539c98a84a37aea68e9433fdd86ba4 SHA512 4920f148a15f6366f0729a74ddd94e7d545605e5a3db3ff0304466eac5bacd71875968f074b71d93c028ab5efd16babd28c105dd748686d06d02698431b472d0 WHIRLPOOL ce84418c7ab7ed244fe4891abab5204ab2405c0bc71ac649bd250f1c7a1a231436aa18f843e06c7e90dc07689ec3ebf6e88638396cf418405f8f427ce728c988
-MISC metadata.xml 400 SHA256 9cdaee423aee027a354f501415ace396a57ab19ec2633562ede17db5d52eeecd SHA512 526b73b58d567afffc201c4feb418efaf2239d224098e9000593bc7aa503b0e27eace65f79ede704a45a37f2b8de136e62e43103520fcbc9a51270285815e0df WHIRLPOOL 17adbc041a6f428982a04a60d5f61c11e4d4173bad326ae71d95f4b58c68877b781d58c4904efc6fd76d5f23e77e91c22a3d35a0dab6e08bc0df852cf3ca7943
+MISC metadata.xml 481 SHA256 5b9f6528b058a112d8b2350a47029a9dc56dd5ea496a6bcedb305a1937a04836 SHA512 ec440c26727e8aa9d068d81a74bac02f0adcf545808f1d332b6935fa5b08828c450a2f0782e3fcf123b40f69182675f0e62f3065e50dc96d788edeac8d8878c6 WHIRLPOOL 7f770b4b8b4b7b3847804db120438c41bc1e4faaf7a8f5b079eac3a302739ad3bc6e5e79eb15a579a73cfe19841090dd51f890e660bcb63b0b97c75e55d11881
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJQvegOAAoJEHfx8XVYajsf4OAP/iScgAVxoEIdvwAe90x6Y4Pq
-SVrkibYBcP6fIOnLvk6kYFEDxBCzAaB5GBq5gFfEX2ehNo9Uv1eOp77p1kjYyLbz
-L5ETPNQjRcmb0PeUt8FOWdgUbNIdzWRm3qw9q5a54VWbAQcxZE/cpluoUPb1Xco/
-pkfAXP6LV5a85xZPeJOd06g7H8tw9HDa8YvtMlEOziP07oi9oJp+rPjwck90LOXn
-4X1m+lbTigWbqGxbEAHvIrKxLDDQr7fZc4jHv1a15hw5xUeF7bTSWwqh+c71STYU
-nnu1ScrexZvv/AltY9HXS+th/rz1bkGHf4AbSv+t32lFKNqAX32Zsqb/AQCHS5t3
-U09ZfhIoOBgns7bzo/Ch0TISbkaEkTBMOQ07z7ZLeKlKcqPMie7kXtUPu5IXtJi/
-WQgQIBjKHLvqtEaZxyUIX5NNc1YpMopV//CfGow6AUreto5VRlEkCKzzy/RagEZT
-D333+WqXPcMxqTajTE7BQtH2UOV0Jf8sIaFzR9M4RTwWJUmOgu6P2HQu2lma5yF4
-ZZLv8Y/9CzQdu5UnXCtEHSqCIT8ayfCuIBkAP4Gb4VgAtKCBxeCnkrHuHaH0Xpdb
-EPC1Dfyf4+pqShG7VTK3wJnbUeerIsXaD0ora3N1umU8IdUeZjYP/fogOgT6kQL6
-DPAvdHprg8Dayp5pEBWo
-=21Lw
+iQJ8BAEBCgBmBQJVftA5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNC0P/AwBLwMmg6v6tNsDe1obb/XU
+QDsTNcH8069cenOpPAEacjzCa0Pz+6K2rhSg0X8ykknVyIFZIi/YD9dHg71FkrPW
+2h9OYHw2melVH2oz/p1SotVpVeISza52f8viJPShHLoROzFATeCoTW3nwKZIl8B3
++XIzSfpgrw/VGOH6qhBSXcSJOiwFNXBMw8x6gkvBd8Pbn0I7IgQztFQxOEHYyJ6w
+6/jGSUouaFUHZAOqFca7nXsr0fJmVY6tnhNGfs2Wxxl6GAVp2Z2ACJGUcTcDvkpg
+GcUujUmBLVVxNjqkf0XQ5yyh5uf4lfc8Gr4+/etQjs1uWPZvWdUQIW6uxNes8jPO
+Spj1Uv4vgSbNi0FJ/gYkcIUf8kuYzBKRLkxX8I3bYcR6ZFrdIqtUM4M4z1LDPptm
+zqCFv/z3NcETuacmi0nhsZa+dR6GzDUVTT1AHYD+6YAfVI+uBCthBjLvupn8gRMY
+rQVV9mbEfSNEE+tfJy76AW0fL1haRoLgfDJLtBiB8V90jgpkh5wehmCK50w0SGar
+xSn9rYYodIv5sGVEQ+Wc9KVpE5+NdwHCvlw6DjtFXku3WUza3QU8jspuY01nzVbx
+DeXPi7eKJmEh8MjXAgTHTjnc89BIm8C9O17M2zjeT2bno4M59xUrrWCtLxwCdoys
+JLw9NukJLEv/iq1APx+Z
+=BzZD
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml
index b58ea1b9a1b4..75e94b28412c 100644
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -7,4 +7,7 @@
     <flag name="tools">Install maildirmake and deliverquota tools</flag>
     <flag name="trashquota">Count deleted messages as part of the maildir quota</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">courier</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 50e920055eda..ca579904e5ac 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.8.2-gcc44.patch 709 SHA256 621b454da740a71b6d01bb49cfa9580b0f397852810fa8176e10dd0874a58ce2 SHA512 fa205c8aed42a41adaf7f034f3ebb99e0e0fe10a6b1135cff8c8f8fcf678ababbf5fb7b65ee8f2865404d9b717420f1f23b13c2794f038813d91b3ef7b6c1da9 WHIRLPOOL b8edf6472964f9225f5b4e5f7413d30e34f0bbb2225f5c6540da2d02dff668b0918e21fc8e79c67bd908d1c53c194c640b06fedbd99947add6486718c49fbe48
 AUX 0.8.2-gcc46.patch 530 SHA256 0ff765a71d4e41f1ece3121c88ec70dc316d68ccd72b5cc3159d2d2741824b63 SHA512 f468f02aa73b6e7262dfbdf52aeb4fb9f14af8198d73b116a9d44d173373e3fc54aa567f0d8c9c38e3a13991a2e0e1fda286e853424cea2388c983773b5671cc WHIRLPOOL 80ac490e3068eb49a3e52f4f65894a5b42fe567304cf33676f753174fe3b924fc233e07172f3af67d3217fbc40ba5e662ecaf77478edf3957e04a537d2c3d9ff
@@ -9,21 +9,23 @@ AUX rcfile.example2 4554 SHA256 5179d51a310897cb1b39ac12e906afc38b09a622263b8efc
 DIST mailfilter-0.8.2.tar.gz 382966 SHA256 4822fdfc4c7db543539a96429086b4d01ac22629396896ee7e52e6edce43fdec SHA512 fc988fe8e36204e4041ce10d6a87f06c8fd48c311aee0d838c2eec08c0d26c13c082fb44a63e7d9c0610d8be52dbf69e340247241f3c76a209319391969ec387 WHIRLPOOL 678c3bd237fa79840f1296ec70b79110bed4fe843ab0894d2e55abdb910302c3096924e897cebaa49b6284ea3df1e9f6c70ef0ad2443a371873581d29648084f
 EBUILD mailfilter-0.8.2.ebuild 875 SHA256 88d1debaeef629eb5b4ea285383de2425d59676f79a53aab9de649af3f4b1ad1 SHA512 84a12c2ddcdaa7ad8512773d6fe0e1f516c11234b34dc526d871a05a752e3498bf547854113fb8e331dbc058a3a7d4eab9e2ed5d2436920e688905a87c115cd3 WHIRLPOOL 6c0fd2260f66a9cfcee18999a0be9722d701c0b6e682f74d902433a220ced7b877ae29aa6dff2fa6edf433d78a1956951869b3f79bcc1e1ddf88566443ea7f86
 MISC ChangeLog 4950 SHA256 fd46911e90aed38dd0a1d5ebe33fbff0abeaed1ce1eebcc132a5e8b856a70c31 SHA512 932a831d552e34dbc3cd20a8397a2f274d39b4ea50e579dab6c1bda4aad26fa30f980b1b26c0014bb5331e806d0b9c614568700e7ef3a4d78374c0ce944d1f73 WHIRLPOOL c4eac02ec7816d4818e2cefa4b87f7319b07d8cce1519fa21c4ecc473a690809eef6f86a014e000494f81c39de3f17a6ebbcf04507e8350812f838962d23b21a
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 242 SHA256 8765b58a4faf8c1fbe165799857fcdde225eed1ab9fa9eb42006093b20b39055 SHA512 9921e685cb840e7bbc1785c784411c38bc55ee41a63a900382f5060c57923ced3e4bc5b81e646a1f4c993b98b3eb8802d67aef9a69a111458f23ceafe2d8dfba WHIRLPOOL 2832be9b79dc3390ab4bf6855398efd5984d7c0444fe6b06385f64a0c0c95d2c1948f996fb872a2fc1951e5642911d53a2b9d3d67765945d33cf3cfdc0ca0acb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJSxquTAAoJEDYO1FT4VRUUdOsP/0LpXp0Rw8WhlTztdOxbdbFV
-bOiOe+cuxqIDE0+giSsdYli4mIiViAgXsDiL44I7eSbUnS+Z1o0Id1RyL5Tv36qj
-7M9I+mCRg+nmH4Fk+Fyg/mcnegzR0HAENdKtEQPip8ZB/qyiyDsJs3J8sRf3jEat
-xCnEO/qdYymf2QMLh0V9MCvFYnadn7Zq4KPi9tetiMs9ANN7AeYCIwF1ehiZ/M9x
-bQx6spqoosafhcTpxmrXX2q+6u/cxSqLBUI1oQckrUVJAhw5d28YU3k/i1Rmz9GV
-ucoFcCRjZnkBib6WvfSAhKWZlyQyxHn1yxvbo9CZNYO4SVaj6Pu+oY6MaRkiIxL2
-rE2mH/H6LJbtqQNr27IR3Tp7uXRSpqO0vyZ6oqUZ3IPND1OMeYeOdooRBHoMLQJ1
-J4jqzV7QTyzru3j7v0udniFGsKam+SDNmFs79AcaN/EFIwQNYz9/0zio1nszVF9T
-Ipv8wj47WRuk1rPypAqkCTaYtgTUjY2ZEZe5jBFTLftN7kFnSMWFg7JvrYhuAp8W
-gSaOZy/HeiQfe/LqJ+isgxr8JKQxjDDjaw1sIX0tktMKftojww4B4P2khddaXIt4
-BclMbgWTujZrBvkuRhCEoB3hj6C1T8XvrNbOzcZzy6Q2eSQh44TSOOhTKv3zEku1
-mdtZTVEKkMLo7YhYyiQR
-=lpvB
+iQJ8BAEBCgBmBQJVftBDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLSgP/3cnjP07NNXyWr1PnmWlQ0+q
+7MW++YQ9zT3MtEwvio1jelK/3G0yQMb0Teg2ylcpHST0z6e89BH1JaiOG/7pcyo9
+8k1s3qG1n78mjkQ6JQ0tL0+R8peJIkSf2bnU1g9gz4Xzj0o1aPq8VE44ODZEn9nY
+9bo/TiSdh46JVanTRkdx9EYcCTQBqc3I0IN/Lf9sVDp+Rk5snOVcTzamL0BHxMnp
+LtGKKDkFKgBN6rlwl29jKmEEfBtTDZ66bTs5OpUakIgmRtkv9xlpHXufAr5A/LwU
+cerz41+8lGA7PZ38oxNmgG/A8BULGgFTJ6OA9vqDxq4+IFoL5mllJ9xTI4DDd0KV
+aDXBoHgju6QxlKBftMXuV75imw73aSM40us7QbRXgXDRCcrd6ODrrlhSJut4Fk5O
+3kOtLDPKW6/BfOj40fXHWyf4qdMH+1KYLZvhmL5CzeMv/jYEm1RwYMJ7h1aQhp3V
+bv5zmaSDXbntWgc/Qt8izBZVfXgKxhVACS2bpwD4yObODJtPBiauouffx6qLT3Rj
+wa9TzXxmxuJP7Q/vbwHeJpIQPNvbRkARIecGYscenvxrjreZp3GezIM0rPWeIMae
+qifeP2OXa1JOvczGOCPTLK5Bw2CTqhhd8X837eITMiXK+0/JTXTOhq4BAD0pc8KX
+91rvjfL/DyU0LwAm7RJT
+=rzzA
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/mailfilter/metadata.xml b/mail-filter/mailfilter/metadata.xml
index 51f94e3fbe0e..35ed8f5cefd6 100644
--- a/mail-filter/mailfilter/metadata.xml
+++ b/mail-filter/mailfilter/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">mailfilter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 6fe88d872cb1..79e23f63de4c 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -4,21 +4,23 @@ Hash: SHA512
 DIST mapson-3.3.tar.gz 421820 SHA256 91e5cb1f39f58c71c182ccbd4fb9b0c2cf323030961ab7283276b14b5cf63850 SHA512 208d3b21d59689465a5c46619a53b3342c3ca96575d681b9ad01b1b6ffa05f05f56ab6e7ae38a8b2161e3f8d42b90b559baf8ff9db4ab4c83238d7adcb645fd0 WHIRLPOOL 66a7cb58f31105fcbb8cfaa63c1ad6ade9f3199f49b7f52e09ef1ac638b0b01c188c5251c14d9268faff6938093e4f0c2815f0c09fe87b0c422f3cb3bbf37286
 EBUILD mapson-3.3.ebuild 954 SHA256 97edc8cf04fa0acc092b4b2b9bedb2550d3ce0f4e6315db91a4505a9586cca57 SHA512 5c2c4e846186a26a85922afbac9f1c46bf71362104e9777e1c23d65a375a9bdb345220aab8254daad256035c01d6aa7ae49d633338c78d772aa3453df8341101 WHIRLPOOL f3c0a2a424dfca546fd6ac852861aa5d4744cbac852a1aaf3c299e7e390bcf2a95166858dae9fce76ef0d0d2e74385244546d2198c364fd24c8c15a98057954c
 MISC ChangeLog 1710 SHA256 e7619638e88bda706021c55785f1540dea40630e95778dfe9713b305c5e9cb52 SHA512 e2fef493a5b21003df373740de0f4caa4898fc82697f7c7a07e05c3ef5aee66c17fc1890158dc2763bcd8dfae079a5fcc7616be32b1256d887b80a9210246855 WHIRLPOOL 08c3cf7048fb7f9a4abd577251d450db9c2fed48af5c9191a8e94befc5f4919e691238dfa9f35224ae01b961f6cf5bc934399ac909a47d49356ddc4b044491e6
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 238 SHA256 c79e7d56df491132dcd7932c21962b7cf4399ebdbea03f2e9954a2ea47fafb53 SHA512 8290c02d55a96af654356249a892b8a7f33e916491ffb8059c787ad1adaa17a0dc2a0029270108e4616e63a6edcd3269e1af98f965996e1f801b3df2f9374940 WHIRLPOOL e80f100643bdc5f016b93604a4b0e5c481b1c6b591a9d8d9858735463185d06035f93d2dac70f833e260754c6f0344e149b46bcf1e1b074aa2d2564a4c20bf0e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJR34xLAAoJELp701BxlEWfpjQQALLOEJVXck9+G8kmSt4ru+ey
-/YGT2Wlw7oGrCrKo1rlZ2kHoSkBIUXZqjlqLwyTBVZp3dmjvht8GD7IXKj1m2fA8
-16vYLYLyIOcOSd7EeiIaN1h1/gC84G5yxe0rdRS8Z9EXoI8NvE3R0No0QCWmgSdt
-fLPo2lFWJRSTjVVC2aFAgM8QyK8COWARW0uKWoIrfCNwt8CP47aSINxlxIQI/lHK
-CRKvyuDIqhq67+34qJ5OXveGaq7dzdAcBJxxMe/yri/PHbUr2+Q58gg1uSI6sfuC
-DkvsGuBfbtHBPyXbWhCc/IbhdJfdFE1QodlVDZ1JUL5Tha/I5a41HWUwsgszKVo9
-P9GXnJ0bGd0syUy3jxb2VbkymUA0OxZORZuLzirKRsoeFuEGU2i3pJAjLwF5UKJn
-I1OgYeVdZQSaBkvdtpLH9FebLMsIekjklnDZOhjYnCLtFXmEanJHVJOaDFZF6g3y
-VSR1K6JRRGeiCMmtejInsDTkT3h4LMTsEX1Vh7GTPPjJeluubw3WVgH5VzoKzbIz
-D85LLHTdfXA5j0JpLVi/cz4Yc7ou2+aRRMsRQUTa7JNFc0y0WRUZ78Sbeb5omLUX
-pVAcL3ThZQugjVC828skYbNaSRs3yoSZlFIAxsBmTwwjZLPAmdTtK7l3KX6RDJ4M
-IXH7h/HdtVPEVF84ODty
-=B5io
+iQJ8BAEBCgBmBQJVftBMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUqoP/iNEKGwLmtRbV6iOvB/YKonA
+UgH9gYfas7Phlk3JSTQH67DMzqGpvqHbbVBeu/uetxfLvwmnSaUnwlT6wqEDpNi+
+UQrrTDrguElCuvCixYpRzbWc8bC1v7tIWCDGwrY+zjTy361EWIHRyj/pyorv3n/A
+KjNfxPJpgWy1fkyP/wEP4pT7+GfbdgCeJdSZoOOK52Kak20caX0E8d6m83WX9PsU
+pdbTYzUXO82wUFXSvg+9UA/I3cRYK0bCXhMJCfgSR+I8sLZrydh8LoZhznOJp8mF
+qFxT21j8O3JewHX05KslwAaImKRwsGWgHMrCO8T9t/JJtT8N9I1T0HRAZgCBhb5I
+8R8CKZQH44CIm3NAJ9VC8kHVpk5KL8sBY6omqRKtX4JWkTJZn3UjRZ2tnhWYuAtG
+uq0mxT+8tEolKUKW9Jz+nMrKBdNk1RPni/wb216+nfDL20DVKG2qpHZSJqPU+kkw
+4EcRM7tbaL2HHQbVHVYQVuOeff5rCBaGGCpNpK6jityhy+EDEv9YrW/m3NdOQbYI
+JRW+V0Fn+/aOM+5AFvmvKlzHS230Y0CLCCA8k6ZggOIoOj37nonkEWVqsNBaKFEW
+0sjm/Bh1ypdaYXXjQRNCw9tKicGXgDZPdnh11btH9zYeV52tMhZosqHYd6WnBU+6
+n/t2Z2tHFLF/icBzGI0x
+=XEqw
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/mapson/metadata.xml b/mail-filter/mapson/metadata.xml
index 51f94e3fbe0e..d4dc3ffd0a5b 100644
--- a/mail-filter/mapson/metadata.xml
+++ b/mail-filter/mapson/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">mapson</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 07ca5dbd44b0..e311395539c4 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX opendkim.init.r3 1545 SHA256 63f316ef776ad1a9fe87cff7748fac4574c2355b6205e3ef21285ddb84c8cb33 SHA512 c28b93f230b65ba483302dbb0f6cba0d8b2cf29cce0309521e67f6aa0e4c041b0dd69eaca8152d6b0b1b02dbe1ff9634fef0840856c8e192f17a1c24ffac7166 WHIRLPOOL f42cb79de47d2fdac26ef4a45132e996640da824aadaf0c3e66182160e941322ff78a37c18a32ca50efb0bb4fbf11b622a1ce5931146c47a06156c256d568b81
 AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76
@@ -14,23 +14,23 @@ EBUILD opendkim-2.10.3.ebuild 6211 SHA256 c4394ad0eaef52cf58d0416de0ab932ed1fb54
 EBUILD opendkim-2.9.2-r1.ebuild 6237 SHA256 e6ea67d53781c8b4f35cfd983fb779395420097bf558a4dabbcaf21db540b55d SHA512 38465631a7e619973209b6aec1afffc0dbbd07eb8218a5ba811b1596da64a92d96c3cd43bfb6fcd89f3b8d29d39f387f7124788e91ad0162b218380cb3002a20 WHIRLPOOL 0088c2c4bd969b202cc809fb42c1880be37e1236fbdcb0d588a2ee100dc75d7866df754cefaa5874ddf8d851b48db88dbf2cba6623d428db07d026ce4cc5825f
 EBUILD opendkim-2.9.3.ebuild 6231 SHA256 24fd9d2d6d2543644ff9da5a86e0ec875d6a92125f76649a56ee6fba377d3391 SHA512 bc47ddd421a69953757b10bd7e965b6194465be2bcca401e9942fca45d645b0f47749751313433c8292e8385b475c7f67cda0e819bf1ce61c3220dfdb1709a25 WHIRLPOOL 3f22a2ea86bf3543d802cc7e2c26393d58ab8797814247ce3b26ee1093802a3fdd6b48d8e1c3c98094428aa1d59c9a9a30c8f1dd3b6c779f4111dc05715c4f2b
 MISC ChangeLog 14887 SHA256 c3eaa03db3025033777fd3568b7c8004596144605607136f3098e7fb60b53503 SHA512 5499168a44f7a262eedbe6926378ca86a8cb6128faa5a7f2c7c6b8ffd1a1e6fc26c48c9324391f6a3296a9b9ad8f24be598a17916d0273217fcf5c2838c7abf3 WHIRLPOOL 8ccbac366bb408f2ea82500ea34d4ba25717e6287878491f9efa69e852f58a389f46ca4a46920db3cd9b3eb49201c29df9002a086d7866e8269e5aa8880c19f2
-MISC metadata.xml 1403 SHA256 85ffb9c9df1fd60d7f22db45e8d4b1edb2b882dd0fb2004a646651e4f7e675a8 SHA512 b7529c54897e04109deeeb30414ab175de5989baeeb398042995fa193ec0302bbc74a43037550c4a2dc60e490443eeaa4bcb038229b1ea179f70e32e27bdf37a WHIRLPOOL 862f684ef7c3d6f40d5b95eca699e003f0085c62cef406c54a307d4be3d8a847582c2bc3c68eb0208e072b506162a27bde6115fcfad548b1865bee7f033ae371
+MISC metadata.xml 1494 SHA256 754868c3fad3021aa2d999dbe42e99bf2ffe2c0ee8921ddb5ca81f568725b49e SHA512 7cf0e04d1ac7cf40ff02134471150cbe1aad82667fa2fe825fbc7a2a878605bc62bb0971651d73ccf488b4fb438cd92cd372ea1bdb6a2b5967739c99d318d0e8 WHIRLPOOL 48021ca82a449eddcf0057a6f4fc363a9c3b0ea1d811a817705db9b9d0b73f682ee49635820fa3c8ec19638961d339e7c6d167aac9d9cbed953a95ec0457fc18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVU2meXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBQjk1NkM0NUMxNzFCRTY4Rjk4NENDMDk3
-N0YxRjE3NTU4NkEzQjFGAAoJEHfx8XVYajsfrkUP/0FCNwVtUZ5aFHAslVuNID+A
-nauKduiBTyWfJicciKQN4R304pyeF5vR7XyTOeAPOvcpSONP9Fko7y23dJYB956J
-cJzl6bnDHVctnR3uHLkVZzOGABzKQLa7anwlMpa7JfVqIcvPgc09miyBETX7Rgk7
-PBOVV20zWZieD2gVIJIziX62tlrAT8zr6IF3NNKPChz5jFMzD8hyua+fFPTNbD2E
-aXrPMy39PGO7bL3XifQqyZK7WGEvq6QcB65WyvXOi2n4kPCNoa2EyKkDTHwX+cAL
-nuduYGJrjiVFG0j063di3kWe48VHODGT2w9lwYUML47tbyNl9qV4bghJhq4cw2ZN
-53LhHfxbePBaIq6jxknbbfOzPOV/UEMslvQUmbgXzWhE90awJDtNKBKL8k9IRoHt
-bgD8jnFfYfueJwpm9QtnseYOP+2MQU9gvQvc9Mju9Vq+uP2uZcNM5vU4yVIrYNMH
-ttV1oOwnuKjv4kucbpShm9NlcwUH1lk4QP+x3lX1SgCvZAhWiw7sUXSCv/OsFeKz
-jraqNnEcGVduLy/ckD8uiNWzin8Oqk2fQ05Qnu9Gg24Ba+besGI5A4A/cTjopr8+
-z2c44EiSgtd+AS4Dw/v85WvPL+r41vhDdffNkdZLVi+NMVRgvl9MXV9nbkXEuxIs
-bJxwinqDZ3I+X7OWPewZ
-=aLNp
+iQJ8BAEBCgBmBQJVftBVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiAIQAJ53NYIh9ljYBEMZKqJ5IAvz
+0s7Iz7fWmg3m7ignzuuK+9ZwlBdaekHFVULeasf6qBcGotInlZfOzf/4XA2alN66
+qSAZK3D85r5HTERS8MAG/MHbqskZ3s5MTtceWcmoIJXydTMaWUjH1iZVD2mVthj6
+IRDSoj1XSyOGmmOyrMaHBjkaqksvjx8WLh2XVhWAhaO8BakEWNRvsuAVVDYNWMaK
+4YXyUQ1MCvJF3PSQ1iB6+i4jua7sViK2a4g5h47fgkPjxErDMQOUOo3BeNo3i60e
+4wx23PaZooVnM0mChAH05jGrS84Zsv0f0wLq1x4L+KbdSD2ZH2xSs20xIai3yTJV
++ebDjM84Nqoh5ZEzoR3+sExm8B49Jdrgb4hkkvYD2/qu+eBZhfTxJjI+8BqVgHFJ
+QX9S9lgoeg3pKSyn8kts3oDHtos9FOjr/UQgQ2D1qE1Cjv4bF0CIi42ApgF5gBzF
+4ZAy89Mu0RWkXWz8QIC+O5Ik/pkGKjt8bZfVl/YghFWWUgCmgVLuBZbwJONCTstN
+ebSmZNQJyrQezg2A4YKBnEriyFAORJ4ip2QhEF3HONYJMPN5jMi6T+VCMK8fKirR
+KFRW2W3KEqCmbk4ps2tEF55kkCgTCHePd4N25u1ah3O6/9XMMcSoT3LcZBnAzOwE
+PozxsR48LPrffshog6wT
+=4Dcz
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/metadata.xml b/mail-filter/opendkim/metadata.xml
index 91e15424ba7b..2eaf789b438a 100644
--- a/mail-filter/opendkim/metadata.xml
+++ b/mail-filter/opendkim/metadata.xml
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>A program implementing the Milter API that signs and verifies
+	<herd>net-mail</herd>
+	<longdescription>A program implementing the Milter API that signs and verifies
 using the DKIM standard. This is a fork of Sendmail's DKIM-milter</longdescription>
-<use>
-	<!--flag name='diffheaders'>On verification failure, compare the
+	<use>
+		<!--flag name='diffheaders'>On verification failure, compare the
 	original and the received headers to look for possible munging</flag-->
-	<flag name='unbound'>Use the unbound dnssec library to perform DKIM DNS
+		<flag name="unbound">Use the unbound dnssec library to perform DKIM DNS
 	queries.</flag>
-	<flag name='opendbx'>Use opendbx backend to facilitate dataset driven
+		<flag name="opendbx">Use opendbx backend to facilitate dataset driven
 	OpenDKIM configuration options like stats, bodylengthdb, etc. against a wide
 	variety of database types</flag>
-	<flag name='sasl'>Used to authenticate to a LDAP server in various ways if
+		<flag name="sasl">Used to authenticate to a LDAP server in various ways if
 	required.</flag>
-	<flag name='ldap'>Enable openldap as a dataset facilitator or keys,
+		<flag name="ldap">Enable openldap as a dataset facilitator or keys,
 	determining domains to sign for, and any other dataset that opendkim
 	supports.</flag>
-	<flag name='lua'>Enables control over signature verification, filtering and
+		<flag name="lua">Enables control over signature verification, filtering and
 	policy to be controlled by user defined lua scripts.</flag>
-	<flag name='poll'>Use poll() instead of select() for the provided
+		<flag name="poll">Use poll() instead of select() for the provided
 	asynchronous resolver library.</flag>
-	<flag name='memcached'>Add support for using <pkg>dev-libs/libmemcached</pkg>
+		<flag name="memcached">Add support for using <pkg>dev-libs/libmemcached</pkg>
 	</flag>
-	<flag name='lmdb'>Add support for using <pkg>dev-db/lmdb</pkg></flag>
-</use>
+		<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">opendkim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest
index fe4c68bab984..b745143e6224 100644
--- a/mail-filter/opendmarc/Manifest
+++ b/mail-filter/opendmarc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX opendmarc.confd 85 SHA256 706e2af2230581b833eed4119a01e3e8eda51ded9db4e57ddb85d589b5e8cbd6 SHA512 7e5faeebbccaaafe42e6edda3a812b9954f19d71b4593cb2ab895dfeb26a8073e4aaeb2f5c626b1c35877d08ea00077b0507fe833e2838b10d83d5e0acfe966c WHIRLPOOL c027b848771d9dda25a2c064c453a9081e462b62dfbfb35f25f0f201ebfff5fe69d5661563ebe530a57e7b9e985e36af2de039b50bd3709c6b06310e15b1e431
 AUX opendmarc.initd 1480 SHA256 baaed9d36dd702b8606f8212f623f7be4e80ac0fb929e831f6c8e57fd0e01beb SHA512 fbde4b9ba7e3aae9e9c623943855a46f62e3c5e1299df16de17ae2a62ef9a1c1984a0a2ba67481ba603b6df7f5b3b331cb5208c9ab33aa54121317ed96f7142b WHIRLPOOL e8c001f25c16c55aeb2a92ff9ac38286c6fa0b1146304a6ce91f47ea5d9dde46ba3dd3bbecd029d981571eb4d8a4aceb4db4aae340772de1beaa13925929f9f2
@@ -10,21 +10,23 @@ EBUILD opendmarc-1.1.3.ebuild 714 SHA256 de9ef7543dac2f425e87377c3fdac29ce453159
 EBUILD opendmarc-1.2.0.ebuild 1288 SHA256 a11f21bb2f4161df5d511f0d7b139244f8d2bc719463fc897e333ffa8aac629f SHA512 585d064c6eab656d90d837e41c5d139520ef876aff21a03ce0a3f55c77bd98cdd8939c38e0188e9bad09f1ea3c0dfc077d2fb977cdf1646a16dfae2469f0040b WHIRLPOOL f19f2aa361e44b833ea5acf1f0401459f26d7da2c656e91db7c2798ddddb1ff8e4f087a3115c04ef50d69240d199b2d702ded3bd7a3b5ec8f76800124bf106c6
 EBUILD opendmarc-1.3.0.ebuild 1286 SHA256 3553fb195069bf99a84bc8524b446fb6e29cc11b247cd31310dc9bb0bde869ff SHA512 b2bedb9d5caba09f61d2d0ebbbcf667d79064063f50832d6a922b041f223c896b8a9087ea75f55c7b257537280aef1fc2fa632afc010642a51eb4ea42612a228 WHIRLPOOL b7f97df4727c7499e858d78afaa26bc80d699d11af0338c0b092f02948c432d83b028fd8c16d3c7ecd9be26883cefdd73d1f08952d451e52900d453a888d90c1
 MISC ChangeLog 2749 SHA256 9951d05151e4c3275d234576a75a71322b41dfae780e9ed3d886af686943b2fa SHA512 bfd78d995e4b66c0b167f377ec8f2b7ba62a3214536c19016f7f587310ae9aef2deb76c6992feeda09412dfd567cbe233f33a952af564810d3aa71aa6e3a053b WHIRLPOOL 61712de33054f7d15b72b8acbb3da89ca7a2f9fa8718d2518b709b02719cb2b2b1ba6a77f5d92cf9b8da94c21df7023ef08305ac9b1cd312ae6ba3bde44bec57
-MISC metadata.xml 227 SHA256 1c5377e37b9c43ed35a6528e7240e31408fa418ee710e571afe23e37a132e09c SHA512 ffa395b50c2b15726a8b2059081d0c4127cf24c108efa2557d409798c2ff0294bf1bbf3229c043a43062ac9e8580b78bd798f34d0a1138778070682ae008e574 WHIRLPOOL ba7a033d1718f78a0b1038650317f0a1c49f23edf0fbc47a3a34494340874949582c2fae88ae7c7e55221018a1bd468674dd9b8985f62b83ac2378f616d8d488
+MISC metadata.xml 306 SHA256 2998e11065a1af577d6fc5ff654ebc681f1da1ae521c01c3bbad2320acebb51c SHA512 60fdc8f57ea51dd65f6bc66dc436aed61cbd6193bde880b9ffa65ba383110a1960e7ddafb53e140c1d122f6b323a52b4f36e588db2ec534fba62eac81ac6e998 WHIRLPOOL d24b6d2f7f5d473cf9aa22c7116197ae57e75b23f5ea4ac8bd3f2beb79ca00689a1c0c535a9e27a4aab945cf32a4bc28fb5433367a0d7ac3e8f700a51786aa9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUQnSkAAoJELp701BxlEWf+6sP/2gIyxrujHJnYY1Y0df5g1ej
-kdAxIl8CGLHIZ8kN5Z5K4w9kLoPZ4UiNCC4ioZTpzup3UteweQ5pVigN9Mmhn0YE
-kkfxyhVDj8FP0sgVYIATxKRTuAN20TA0/VnvqWQZp7M5yf0pga0+yqxnj/mGJLh6
-8MpQXyHIztOMHiCNXubHeXaolSS5O/PoCgvObyF+2OZb0tChlKE1DdD4MEEo7ooQ
-nDuPCuqVOuwleCyCOPw22pm8uxUxnG5hpbHSKbd4oH5gFhL9p5JRVqzXnKwKSQz4
-Zi+H8etQ39ZjtgK7GdrgpSEZmqtLG5+QspA0Do7p0XzDT7O1GJFd6j6dQq5pkqNs
-IwS7NCkJ7GGvrTjKgQRWEPtD9F/jkpjADvNiNMHifKuriQjhnkqs4X04dEsdozc1
-/c5ad3XD6jXjvR0lFIWodl1eU9NIeCBNOj03h4JlGEU4DFTolX2TU1RogiWLm2dK
-QExON8/L6E3uEe0sDFzHkTXLxFvc6ukPYVaXxjo3tZWpU2lJFlSn4eSMd9nscP8H
-mdV/lSoF9OAHPn+WJj81RGy2ynwwtBv1QkIcgK3ootngN3NN3gsY15dUPBMTOxOK
-6GBBDp/b7jLx10k6vtzlZMv1mtK7dTdJuexAlHlW+UjLlceuaEh7MCfbO5XHSDEA
-bFqsLH5BMf4Anwe5YLUi
-=krtr
+iQJ8BAEBCgBmBQJVftBjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihAIP/RqC4h9tLIkoYwoHzRFFOJ2C
+fKAbYI4I1GajubwJ6hJvAU3wCWlMDOCVNcbIcJrSUHC4LspU8hOz+uX15KALwj+J
+889A9gp1Zkbg0pHVbzdYK3GEXXRwwHpfk8kHrM9DRMAgUOQVpjlN4zmFDEybQ25d
+eCC0S7afRxzkB699iuUh3lO6Q6JavS4VRIReaumDGcbjvEIgMV2+SSXhoyfjjhwN
+MI/OTDku63Y9wpTUUhVV9B7kGwf1cwt3cvpgOCTxIEGXV+M/KqvReoeIB94W0atc
+0Ngvi4k8SUwpdR6kIeTh9L0lQitKXXkejDX3jhU+2ZG+TtC04ZCZYGRQZYgQZnqp
+olt3Gx7mH71f8evGaZJuQOHfhuwrf53PyXUeMrcdNJOyKIQXrbzAyI/DWKZ+a6tw
+wapNDQ9AWPHuJ0ZQ7blCsAPPhzM1J9TgKzIXy+REfwrQSXYlIsajiEp8UhA/8Enq
+csHSEcnmy1hP/esa9n0Sr2H9bV2zlhu+dDpCup9OD+WwtWFVeID2TXdvhcckMcVH
+ZGzZwsjTK2/xmbHRgoCzzxmouO2g54lm/5dXy13cS5Iyldm4CE/Y+5W0jov0HP2y
+Hwji9rpKCCqPT3pxASkpyteweni3J8Z8vu+cMUiHxY7duAsLfMRgBD+CU05MX9U9
+TJJBT0VMAyOSV3hiNMU5
+=wrKQ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opendmarc/metadata.xml b/mail-filter/opendmarc/metadata.xml
index 9d7440ee720e..7f6848f49a8d 100644
--- a/mail-filter/opendmarc/metadata.xml
+++ b/mail-filter/opendmarc/metadata.xml
@@ -5,4 +5,7 @@
 	<maintainer>
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">opendmarc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/opensmtpd-extras/Manifest b/mail-filter/opensmtpd-extras/Manifest
index 1c957687bf11..06b3259d3d90 100644
--- a/mail-filter/opensmtpd-extras/Manifest
+++ b/mail-filter/opensmtpd-extras/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST opensmtpd-extras-201506020835.tar.gz 159567 SHA256 47dfc47dd6ad56b15707dcfb592ebe04e39f107a44076e0ab969b6d940eec84e SHA512 b4eef315a7c44166ec36c821a0113cf0f448125fce4773b9d748b34507cde71b131195b81237e6efe5a209817d770a76050b5538c21349900ee2d13cfa1b5f5f WHIRLPOOL 2b35b4a8c2855bd9110ee639f5d6e269f4fd393483f58bce09ab65c188677ca81abba3cd55a65a16cefd0a15a15bcf59f5c53f5ff11f9773a542d18b0858d6cf
 EBUILD opensmtpd-extras-5.4.5.201506020835.ebuild 2299 SHA256 ecba0035b8e2957c5f569408ff7bb9784592b6c91dd3d8d1046f0b58a989a95d SHA512 e4f6bef7ec06153e3b8fb6bc46952fdb74fe2267c632506d9b799d9324d6a898262a64d80580196a5b8aa864bae4d34d8e8ec63eaabe5bfd79b92d663c850d98 WHIRLPOOL ca12902daa6145b576176eebc306e080c60778d2406f12a6126bf0fd8e6ff63af2f3a1929838fb11a5876731cd20ae0df74c9de835098796f77459a56b39059d
 MISC ChangeLog 978 SHA256 79f71398dada3c453214532c6834d70ccd1d3dd1256fe516297243f1d0d90fb3 SHA512 5a94a95066e6da57cc0ab7c357d344fd1c5d1d8a0e3b6b32a601a8617decc007b1e04e13b8cab3778582258543401b3c17fe8a935468dae1a04c888c8f679f14 WHIRLPOOL 0cb6ebc5fdd76980a1267673be7234e4996a25119bcce98c0fd944d0099c20706ef8b6751aada16af97296902b901bc54fa229df7d80c8b0bac3f75dddc627f7
-MISC metadata.xml 2365 SHA256 d533766f3e9a1fd3bdc94b36c83d547b62002ff16a156f7941690ea777b0f80b SHA512 ef6e392263c2207c7f206d4148ca83f46afc45394798c6f2a19b0fb14efd6ec6f6a92a7e7776ab66421ceb54e249fa5fbe0975f794abaaab3b42761f7ca4e558 WHIRLPOOL 92c01c7588ccb36e0fbd8b74dde58ee4d3c137905546b8cf30961823a01755e0318f331a91315f4c7af4066f42b7bec7736abfe6e2b43cdf3a34316f41b884f6
+MISC metadata.xml 2524 SHA256 5e1b1263c87bd540719ad6a6aafe64ce662464b77e5201fdf4561a9a74c9132b SHA512 12430420c3af360812e054411be4ac06fc1f5157185dd3f845bf40495c404d3bb62bf38bdf97e4c37944cdd23ae4364111141a99978af396cc2002ebee100c91 WHIRLPOOL a719c4fa9f020007a4d1852f9aeb0c81aa2724e945cd9932e4e745a33a517810034f20448e6885aa0270e221a987b7fd71ed31e9fb442c2e65099b75aaca1fe4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVbZraAAoJEA9GG/3yO0PNGCQP/jMpEWkobSpyVeU9Kd0/rfLE
-NxR6+EV/YHs/M1zc+yqBJvWBHSz1X19EfFGjiXDiPdbb/CbiRzetGVyYGQnEBQmn
-H6hh8r4HqxCIX/oe7DHdXBQzN0VPSH0v5TfcWXaLLVVR00KK3fgFXBTnE9VxV7Ek
-iFj1dSsaKPd14RNbIhOaXATJlGs1cytadsK4QniSG8kc26p9CjxDgO/dJZVdTUmo
-GXOxU5Ihs0TABrxE8nsn26K1uCUnMzFT6CIG95qEeehwSxjh2/b06vigxW5JEGwk
-2K6h60F2N6BXu6asRMp56GuuXhZbYK5fA5sDj19/iPjCEdUDiW0iwHPNN1QGvr5J
-oEQ0nnyv2cj9ByCfR4nJAJpK2eKZGH5grpW0kflBA3vCKTNtPQdZs9LiS/VZ0GmP
-fMCuNMmJ+ArGPPbVsXLQW4TOy0wiMojCf0PHMK21XR1DUEGm/j7Nu/82tkXioE4d
-YcCl8Nxm3IsiBj+E9ZSJDwICdwSQkNEUP1ThRClJdR55Ew3IE8Jtt9yWsbwDCRU5
-OYU9V0TKS6ogIihK+924B2zuEqNmr8xSsdM96SakbGGa0B2gy82zHcMoHwkWEgYi
-9r8dx+qai3wZMj/i/Le9zP0T4N4jYi2rrBU9WHmd5Yh2lcWrlXsanRq25EW3IbMd
-qWEHUwLQ3YdrlJIy0hWS
-=EKW5
+iQJ8BAEBCgBmBQJVftBrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQ+cP/jyj21XQ0Zz7pMtxJ55BHojF
+VY++YjRiISoVkT0LlQhd+1/BxQWkBICiMlrZkyOuqCK+PTXxQPEBS06Q0I3pJtQq
+510xhjhLCzPQRFVhb+ZfOJsokuXFC8nM3AncYy4M6osP/Aka1BIO9+ADzqX4my4O
+PYb0f7gtfFpC/aVyMp3cZD+83BH5qbBOfd/yAjylxkR88zXrpLRX3VOEeWE1PGJ0
+/OG+HGNvIkgPrll3+0p8WEHmRn+sH4/gNsGegLA2k9PBdbyE6hfFcKIRjJZoqJ2O
+/l7HWJj6tshD1W3IER+Rf2RP1KzYvk5Hvwnwew5k/TGfaVv8qpjsUh3Amuplwsh4
+YPp6j4TMuY30CsT6ZVV95ZkhQQIxI6RK6jwhStWfQVeDLpUy5HOCwZYAxB/WL/oJ
+O08ZhyIgTXMz1HH2XLx9uv6kzIGesMS02coxdWWPbEbaX9y9ahvmiPVINcUAu0W2
+yMZnrptDoIjbFQonlvBU7n2GzaLqQmVAXfKARm+r9Gis2+V5QfdqPF0q7nUxoW7D
+iEGI208c3vSYAhLs4chAqrQ6sSvqJn2N3J7JoGgRqNwS8HYFwri8l9eMPdU8WQYY
+ZBz6BFKsfLOvYE0xlmvHEd/tYI8yNQFNVtX82un7/Z5x5uwEUK/nLJ0lphumBCjh
+59lORDDMArZtrRxQ3gMQ
+=zyiK
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/opensmtpd-extras/metadata.xml b/mail-filter/opensmtpd-extras/metadata.xml
index d329432a28b9..cf2a746f5d10 100644
--- a/mail-filter/opensmtpd-extras/metadata.xml
+++ b/mail-filter/opensmtpd-extras/metadata.xml
@@ -1,44 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription lang="en">
+	<longdescription lang="en">
 Extras filters, tables, and other extensions for mail-mta/opensmtpd.
 </longdescription>
-<maintainer>
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
-<use>
-<flag name='filter-clamav'>filter for scanning with app-antivirus/clamav</flag>
-<flag name='filter-dkim-signer'>filter for adding DKIM signatures to outgoing messages</flag>
-<flag name='filter-dnsbl'>filter for checking hosts against the DNS black lists</flag>
-<flag name='filter-lua'>filter for interfacing with dev-lang/lua</flag>
-<flag name='filter-monkey'>filter for arbitrarily rejecting random emails</flag>
-<flag name='filter-pause'>filter to pause on new connections</flag>
-<flag name='filter-perl'>filter for interfacing with dev-lang/perl</flag>
-<flag name='filter-python'>filter for interfacing with dev-lang/python</flag>
-<flag name='filter-regex'>filter for regular expression matching</flag>
-<flag name='filter-spamassassin'>filter for scanning with mail-filter/spamassassin</flag>
-<flag name='filter-stub'>stub filter</flag>
-<flag name='filter-trace'>trace filter</flag>
-<flag name='filter-void'>void filter</flag>
-<flag name='queue-null'>null queue</flag>
-<flag name='queue-python'>queue for interfacing with dev-lang/python</flag>
-<flag name='queue-ram'>ram queue</flag>
-<flag name='queue-stub'>stub queue</flag>
-<flag name='table-ldap'>table for lookups with net-nds/openldap</flag>
-<flag name='table-mysql'>table for lookups with virtual/mysql</flag>
-<flag name='table-postgres'>table for lookups with dev-db/postgresql</flag>
-<flag name='table-redis'>table for lookups with dev-db/redis</flag>
-<flag name='table-socketmap'>table for lookups using a socket map</flag>
-<flag name='table-passwd'>table for lookups using /etc/passwd</flag>
-<flag name='table-python'>table for interfacing with dev-lang/python</flag>
-<flag name='table-sqlite'>table for lookups with dev-db/sqlite3</flag>
-<flag name='table-stub'>stub table</flag>
-<flag name='scheduler-ram'>ram scheduler</flag>
-<flag name='scheduler-stub'>stub scheduler</flag>
-<flag name='scheduler-python'>schedulre for interfacing with python</flag>
-<flag name='luajit'>Use JIT for Lua via dev-lang/luajit instead of dev-lang/lua</flag>
-</use>
+	<maintainer>
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<use>
+		<flag name="filter-clamav">filter for scanning with app-antivirus/clamav</flag>
+		<flag name="filter-dkim-signer">filter for adding DKIM signatures to outgoing messages</flag>
+		<flag name="filter-dnsbl">filter for checking hosts against the DNS black lists</flag>
+		<flag name="filter-lua">filter for interfacing with dev-lang/lua</flag>
+		<flag name="filter-monkey">filter for arbitrarily rejecting random emails</flag>
+		<flag name="filter-pause">filter to pause on new connections</flag>
+		<flag name="filter-perl">filter for interfacing with dev-lang/perl</flag>
+		<flag name="filter-python">filter for interfacing with dev-lang/python</flag>
+		<flag name="filter-regex">filter for regular expression matching</flag>
+		<flag name="filter-spamassassin">filter for scanning with mail-filter/spamassassin</flag>
+		<flag name="filter-stub">stub filter</flag>
+		<flag name="filter-trace">trace filter</flag>
+		<flag name="filter-void">void filter</flag>
+		<flag name="queue-null">null queue</flag>
+		<flag name="queue-python">queue for interfacing with dev-lang/python</flag>
+		<flag name="queue-ram">ram queue</flag>
+		<flag name="queue-stub">stub queue</flag>
+		<flag name="table-ldap">table for lookups with net-nds/openldap</flag>
+		<flag name="table-mysql">table for lookups with virtual/mysql</flag>
+		<flag name="table-postgres">table for lookups with dev-db/postgresql</flag>
+		<flag name="table-redis">table for lookups with dev-db/redis</flag>
+		<flag name="table-socketmap">table for lookups using a socket map</flag>
+		<flag name="table-passwd">table for lookups using /etc/passwd</flag>
+		<flag name="table-python">table for interfacing with dev-lang/python</flag>
+		<flag name="table-sqlite">table for lookups with dev-db/sqlite3</flag>
+		<flag name="table-stub">stub table</flag>
+		<flag name="scheduler-ram">ram scheduler</flag>
+		<flag name="scheduler-stub">stub scheduler</flag>
+		<flag name="scheduler-python">schedulre for interfacing with python</flag>
+		<flag name="luajit">Use JIT for Lua via dev-lang/luajit instead of dev-lang/lua</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">OpenSMTPD/OpenSMTPD-extras</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/mail-filter/p3scan/Manifest b/mail-filter/p3scan/Manifest
index 3dbfafed6bbe..820d549630d3 100644
--- a/mail-filter/p3scan/Manifest
+++ b/mail-filter/p3scan/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX p3scan-ocreat.patch 433 SHA256 06f2d8bea897990df6d6b09a5fcb564f4a1e4eae37027a9a11a5cd62145d6670 SHA512 b5b63058da540a8ea7f56191ead2c2b537f1b5dd4486aba35285a26cef8e0c9759063fcc523c5664890fab3e0c866dcf8e5f38d83288f6f5689e5b294131d139 WHIRLPOOL de4b935c27c4b4caba372e1a0ed334bb03f99b8d702065169027ef033ab741ae2ef4304eb23462bd039f4d3942b816844fe268ef4ad1e05b858813d7f0d74b83
 AUX p3scan.init 612 SHA256 8cd2a9029c045184667a098e136092505bf04b3223817b8013094a0440e43415 SHA512 049eceb6742b8151526ff45cc899a019b090e01ce1d3b9b53530e715a209f491fb3cc197265d43d774896aebbdc2a439189125790a719910ea6abda36410af2c WHIRLPOOL b4dea7d066d86ca559e2369e3352b07f0ec29a0f07fafd4acf7eda9bdba787b078c963d24dc502a0fa1ca14eac71699eac2ee6defa185705f2be78c75318cac1
@@ -10,11 +10,23 @@ EBUILD p3scan-2.3.1.ebuild 2033 SHA256 b86d96e15fcca851cc79fbbcf96b6a52a51f56c8b
 EBUILD p3scan-2.3.2-r1.ebuild 2650 SHA256 86f277c25cf56fba2281136c7a95eb2af40080dfb113d12219bc89ffe32c94be SHA512 5e9373b6f00aa8d63abf02943deffa328ca71a97ec6ff26717c90fe8bac4130ac7cd7f6e4ba17a607e7713de3630ae516408aef36406538fe93ca3f64a164806 WHIRLPOOL 99911525151322988196ef243a2dc6abd4ebde6e8e0d2fea5add0acacf1e74defa1ddcbdd2c78b26bbf778258fb920677b3f81f0c2e6f4e7fe907f8ad378242f
 EBUILD p3scan-2.3.2-r2.ebuild 2584 SHA256 00a2be6c1b530aa34712f2c87b24100699a4f77e6404f89683f1895bf92bec9c SHA512 72a83272febccec470f118987560f9564575b98862e68a938a1ee64619df7e750022d7bad31a5a3605bcb37569f0d288f320045d73cbb9e0cb918018fd1f9f14 WHIRLPOOL 7c47758ae5c3d8ebc821ee27261b86012463df5882db2e9d144bfd8a620de52f7773598f30b52b2fac5cc9596ea832c01fed492a73bde33703b7b34b4fe83536
 MISC ChangeLog 3211 SHA256 27726d5973f9cd041db1ae066dc550907dedb0620bdd5bd30ca6324bf4d18eac SHA512 3a9323ab5be3e8769579c50a4e362d794cf0257ae88dd4097a00d70b661b48abc063f8166087eff408cfc2475f71b4a7f4eb61288f0c884e657e05978282d394 WHIRLPOOL 5e922bee985621cc600e81dfe0478ea48c11854d5efd6b1b15ec0ce8b42a1eadadb1b099d86165617862a4cf7dc24242374a69aea493075a7ef77042c2eb0cd4
-MISC metadata.xml 409 SHA256 8b53ab62bbcc46fedd73c744afccb5cfd4d99571d30e65d3021115ba8a0ed16b SHA512 51345f6ab4ca3411cd1c3a2f4d6e94dab08702c0d8cf8e5099a41fb79dd8138641649026806f5081a055a8d5a1d5da9e77c2b1dca77cfa30a65208bca2db50d1 WHIRLPOOL 65d8806295ce5b60e45c002aa7b603a5c75677e7f46a30c8ee3ff82a48a2ad9a7b269fb726498c3cf252244cdb68ee811c92a73f918bf77f919b5588c7f63081
+MISC metadata.xml 487 SHA256 640522718bbf2eba1a919485d83f01aca26e7a0aeab629badb529422c1087690 SHA512 3b274993afd3e40ad05d081de9f79f980c99f284798392daa60206f063a13a483f3e480c18569e8fa2e35b65cbd719cac690e26f1c8a22f9c08a63399e50a672 WHIRLPOOL 1153a2135925a42376ab20877e9c5f74b5a59b6c918d0c4b6aadf276a09e5e7759a7130d72a19bc5aa3ceba01f6d2b2fd36bf72da48f8b74e985a84bb0e58c50
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4T8ACgkQcaHudmEf86psGQCfXTBzkEAY+qVW5t6O2qtHKzFj
-Hg0An00m80RwdItO+UAjYFTxGc6Gc9Pl
-=vQwg
+iQJ8BAEBCgBmBQJVftB1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKMYP/iv5nejl+0c2CTpefzbrv5sI
+nyLqyxcLgSse8oo8sX2njd+00YRD2LrgXI7YRtFfMH8JOSieaEYt5YGsDyTVeLIn
+ppOO0ghgPfwNHWo8KI9ynPWRwSs6b2SmSPVf6FNgRVmmh65vTKAKOGNqEorNBHiN
+yHufw4G2HXfF8z73Vu7Gl87i/FBIOVGdr+SaUkMAvBopcUNrngQmhhr8o+Xy0zZo
+n1zuKWzftx2ZMB+5hvRNuvhK/TCt4g6LOUPc5D93jIvmkUIP5+tVzj1BZZlPgEUS
+iQ79Ofx8I6QB7cFaQX1LkASk6HXHUezoaOQ58wMet7QF0+ueu08d3kodvxhN8sIb
+DUE1INOqyOCy2ltW7a1Y2VWMDn+Vgm8zNR30qscsdxoNrHDzhvZmdBlW9R+jBOEb
+noOOLE121pXK+/5mo67xZaqBvo3QZ/Wiy3Dxq/JklVWR8DouJ3lJ8aQFXdmQuvYB
+sEXJMWBh9C8PW01qH53EHBSdoWaMluKA82pTIupwjbEAx2DWbKPPl8QguQTHu2bU
+oLFYsaRxEZvVev67Hyy1l/ZQQYWGXG4lX9B5YexPUcZv2xfkJt2yDjm3Zye89bK7
+p8+9dW5yxa8m9a8Bw4/AI2ImBiCSXdVvAygwCkVqj6EQsjyR+5sZLCTmcKs+jQ1D
+HaTLs7PL/1zhN/ndfihO
+=TULy
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/p3scan/metadata.xml b/mail-filter/p3scan/metadata.xml
index 673316e53881..4ace1cd8cdeb 100644
--- a/mail-filter/p3scan/metadata.xml
+++ b/mail-filter/p3scan/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>P3Scan is a fully transparent scanning proxy-server for POP3-Clients. It provides scanning of incoming email messages for Virus''s, Worms, Trojans, Spam, and harmfull attachments. It can also parse HTML messages.</longdescription>
+	<herd>net-mail</herd>
+	<longdescription>P3Scan is a fully transparent scanning proxy-server for POP3-Clients. It provides scanning of incoming email messages for Virus''s, Worms, Trojans, Spam, and harmfull attachments. It can also parse HTML messages.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">p3scan</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/procmail-lib/Manifest b/mail-filter/procmail-lib/Manifest
index 94baf33c230d..f02f4c09acd8 100644
--- a/mail-filter/procmail-lib/Manifest
+++ b/mail-filter/procmail-lib/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST procmail-lib-2008.1108.tar.gz 763653 SHA256 11604d007fc95ba084b824a0c8a15aa55281670a14fb4e4a05033c10f1536a65 SHA512 54a9ffa7bd5e5554c0d48efa59c22ed4aaa635d3b87a3b8cdc2b660ab8a4acdd1dfa39d7d816ed3ebc379ddc7e8e58e54e0f0fb8c8f6eb51661201f03bc0332b WHIRLPOOL b6661ab8e97966fc6075409501ff83c10093c13989ebb745c1db071029a9dd83ad7ef2cc5df19ffd315552dbb3cb72c7ce5dce2336e82b253bbf51b7781119dc
 DIST procmail-lib-2009.1202.tar.gz 765078 SHA256 f08fc745b66d0743974dfe8194b5016766d68fa8bea0af7da35c9adb60e46b27 SHA512 374681de60f7ba55f6581b248684841482eca01b04bf81b67fca8fc62caf1e7acc5e7562db16f6aa11fa072bee032e54e925081483e3987f820c9863d19e4a97 WHIRLPOOL 52c11be6e01497b009f5175eac9718a4aacb8a9fdb141af9dd45c39792430191e578395ab2c1bbd452cae4920c18ed3a3383b2580d01fa6e24de776cc314a501
 EBUILD procmail-lib-20081108.ebuild 740 SHA256 5fdf7d6c57cf47677dcdcba1f9e0ad5365c3f05cc049b8e9fabcb712b2dcd6fb SHA512 a12ec8599baef8e8515b64590b2781b57398950193396e3f34d83b428cc247a5b6253d52ddafd4202b08fd33f2a4b99a785c12bb3902c43c22711d6fca31d347 WHIRLPOOL 68a3429037685bb0652133c0df62a7cfb3b58cb86346b79ff5c4eb28029fd47757d2a5d80139edfa9eb7ea32352ac8b20c1c1a97b5cbe2f10d1280b4fdea6262
 EBUILD procmail-lib-20091202.ebuild 744 SHA256 ef78a1dfd91e03c761591a45818d0f89461103c2f8940ee88866e705ca8ae353 SHA512 53653f595e6a2a15752c9be5ce5ff713d341f1b1328679fa3a7a1583ce3c1fc81fa1a1f17005ed6509043f5c0db1cc8ecb091e5093f3939e5dad76248a470786 WHIRLPOOL 41684f1a6ff31cec72a16ce707f88ecec5bb1a5686972be38b53dacadbafb9a6e3742200f7a19589233f268f4175c7efbb33b211c9e61909c25050225254e9d9
 MISC ChangeLog 1236 SHA256 ac1f122c7871ecf9587da8b6efc920467939d23d95d1b30b63dc6fd04dc89b46 SHA512 15f7f6dedd5e2bd91dc3303cfcb43c1ffcb3758de9172016c6868073e71d7498d6aac1a0d013ad2963b24fd826fef4c77f0866e877de326103eca7854ee4a6e7 WHIRLPOOL ced196a53c3ba818c446b427a8e90b8d6f6921ae397eb444087d004b5feac5b7fd058a1dc723ec947d06219626e60e6a8b06773154f0af11495bf658c6d7e734
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 242 SHA256 fec1c2671543c7694591d7cd7a9031e7b22a1690ddee3b52b7bfe73d55bd61c3 SHA512 ed4345268be978055ff4d8da7f6911074b486456378086fa1d14620c151e6cbc494a10ba7aec519713543f56e4c478f63eb914e4ffec63662ed1f39bdb10eb01 WHIRLPOOL d3477459e3a07492f0d0279702a1f668566129d4bbbe9d7aeac96ad7a8feb38d7a5e23d62a0f7ff1704272c8a9422ac7e4779469239a94ca7b95fe613efc3fdd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVftB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZZUQAJUXstx3MBH2aiDkLGgnlpjU
+IwExQZAWjhBJFnnZ8eTXW5pCo1QD/buqG88JXYoIRGoxyyOampRuYyeHOHyZgPwi
+3VuzlaAL+9ZTH4d1laF2xWn6Zv2oE6Q6WG66WEhw2kKc9TvxduynfKGlQr0dnmfW
+0PoKpVydw1zoclh3NJpap2m+WjyI0jS1PEGt69wNuPxLqOMzIShHig1XB1OyKJUZ
+yfNONRU6PgICWivfNqhApRHCLa2L1/Weg3YAbKuIu7rAMtcFwnjFnoVuclilR53E
+trytccr4N82ezSQQyf7AmHmXoIeJUBl2KIR9ifG4g8/xqsIbS1b5QIUATnpOCqOu
+t5QyNEXvF4kc3kHU1MUROQ8aG4IMqrNAOFeUZHVJNFyuhV8I2p2rkXheJUNYI2DA
+Ntnr1h+Mrw8mNZNAtDCse1RP23B78WtJ0qzP5+lxXorhxBm4BpHm48FjDV9X5yRq
+EWU8UPQwexRR/w7m1ILV8c7nfX+EZKGwxVnH0YbXLFchb6LAlTC7JZzBZPoRUFe/
+ZdkysTzkVY/Pao/fbiJUkbgZEDjaaIcdDib0hpxQoOeM/4TG6gpSMb5Q5CwGWtTc
+KRw6zePyg8xUwdTeZtQY2VFzE/kFKYoCo+ipRj6eJvA/wD2c2faSI7Wfe/YBiL+O
+7so2sEaCUzvB6w81RRr6
+=Ibib
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/procmail-lib/metadata.xml b/mail-filter/procmail-lib/metadata.xml
index 51f94e3fbe0e..875462bb5ba5 100644
--- a/mail-filter/procmail-lib/metadata.xml
+++ b/mail-filter/procmail-lib/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="freshmeat">procmail-lib</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest
index 4cacb9803e85..14a6bf1b6347 100644
--- a/mail-filter/pypolicyd-spf/Manifest
+++ b/mail-filter/pypolicyd-spf/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pypolicyd-spf-1.1.2.tar.gz 30813 SHA256 f8999a9febc5ccb4a66f9961e4ec2d8f81b407bdc3ac1c84563cd5085429cdea SHA512 17321c6df59620a1fd49a67564d3ecf2156027bbeee9b0f532a3d5f7bfadb060ffc61556b2126d98ea285f80cb552239636e2f461af6256c4568fb8696fec951 WHIRLPOOL a7a02de368037ba9a15520cbdfcf2e2e42c9b9016e3f7d6d83c93eaa6584af147b84acfa3f5a659238dc49057052c8189c20e19ba760b07677fc25cef7fc9ff2
 DIST pypolicyd-spf-1.1.tar.gz 469687 SHA256 93ca747e1e62d05a3e3fa54b9415f6c6da7fa40644e32507d0bb56980e31cc56 SHA512 7968425ae5b966571b0787769eff484f4d779f02c8460f515b98549117fdf270de70861f61b8c3e7d9da2092e91c191055cd9a312303c50a2b4707e9dd92840e WHIRLPOOL cd47648c122a13e99c08dac9cfee5cbe12b5b4301dc389397ca824ef19ed976beeee02e7f17fb0faf8abe29184be3aeb73c7ab327a0e6b19d7f84434f20b3635
@@ -10,23 +10,23 @@ EBUILD pypolicyd-spf-1.1.ebuild 754 SHA256 b48347ed874e91f56b4fb8cc776c5f3103321
 EBUILD pypolicyd-spf-1.2-r1.ebuild 1856 SHA256 31b259a14acca46da448e776a5b7cd25c3396ccbc568ffe388108804f2258e16 SHA512 5746986fca44f18e661a4b42bc6f7c4215df00c2d8e443736d209dce458552326d5f174512f978b2e7a9c9885f3ad513b638e54f5fbf1b3c16d77d3b408dd1cb WHIRLPOOL a5100ddb5386451543b457454e209752087b21b4dd3b910af3554080139247f1e60c406ed623a287fa9fb94f9959bb29cd04df9b713ae9b058846be42f5c473b
 EBUILD pypolicyd-spf-1.3.1.ebuild 1991 SHA256 f0ca91c0010598bdf46e79e6008396f49910b5e5dac38ce35ae0cada9108457a SHA512 bcdf66de38909457aedbdad585bfa84bd143a5688a7d9fe7d0c21c163067d27a5be70790c62c007cf1e3c1dfd1cb1d64d4d588c399621848eb7df2a7586ca6d4 WHIRLPOOL e4380cabfbac07c11f494ca66f0279bae83c4390fe5c2db6c704062ddc6896510b0d6e16aade530c2c0605102a4af88aafd29b2eff626bc012f3ec32d046a4c9
 MISC ChangeLog 6187 SHA256 cca794e67a40d63f3a3ec6d7493fccd1be6137b99b93abebc5cbd3b16f3de5b9 SHA512 37141dac90a3bf38597f6d17ae755868792703e468930d9c65afae4797f530aff359f2829308ac041204e538e5a5a1518c181205b12fd9a64816aa117cf5012e WHIRLPOOL 4bdffe707086d84a427163c6527a4d3ca66226be3d4c9b16bfb31da614bbf39fbf1d0354cf0dee496c5a96609e2c3eb84d16fa700d6d9eaf3ed297d8f6578538
-MISC metadata.xml 198 SHA256 179c6f13a84c31ea7305a54d0be4bb4056895a6372049a8a0a51aeeaa01c35d8 SHA512 2057381d2aea02f2c9fb8479b2881b00968950c99ab78b5516c574f05cae99d75a9219e28f208473a89332a6fe05a63a84bd93baf9e6a811e7dc5c5f73f38b7f WHIRLPOOL 0b13d7bc793e33311bd81958b6eb15934f432ff463d9a1a1928ab6a7b3c554aadaa05590126367ef378e98110e42bfbbe28261d9cbc296d82af8dd57a987adb6
+MISC metadata.xml 289 SHA256 562d5e12b57ec33981da34e1466f5c186de98f01a14574568169a0d95cef5e76 SHA512 be1c960cf2b6e65376296b7af586070a6a84018f6c3af3e7ac304f860b3c0e3d144802cf70a1287ef5687d246b1d7216bb9053ce6e1522041b27d5612bbf2a01 WHIRLPOOL d46226b73baa1abe81a29a42a20aca770ea7dc766d01eb64c272cb508836918a7c1014327019bcc22e825f92ff1f897a3657f1474c0dc325488ffaf673070cec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJW+iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGAAP/3zy+VDpSRLLFwfHGcLTkwub
-jqSgkzo+8g8oE+eE6IX339DlFc08cFC5fkbx7F+92TZMlctK5BKyhksbtxQZHZ/Q
-orufro8xqi4qx9jVoMweaiUR1RwL3ICvs1oPaiwC+Obg3cIkIsnst1+hW+J0hMii
-1wrqUALVFS6zqYWSZHfwSIaJAc93c7/R6F5OsIdtBIMjiwdI9JT8CJFIBH/YJf9g
-dP4u8uYPv9Zt5GP2r471Dkt1/O1gBqYEekXe8+bR/gjzLiAaJNuUSG+AKhqTi40m
-BL88lJXZeuWW4bChAifJhV/Z8nux6O3BbJFhun9uV53qaiAARNn5sI/sbeB0PvkW
-rsNKFKUIPo5wT85EMTeofLAeMet7Cw4Zi1r9FQt3GH1VMUQYXRQ5QnJgVr90qZpD
-oXH7ejxL5NYAjJiDOqwVbIKYgwHBvINlnVmEJKO96i39oy0B8pnqR0DLTdFBS45c
-uJq0ULzf6Sx2T2+tbEYhBcu1LI/Ycagf794vh7iVfsSWhrULmowq9dwdJTjG1oVe
-GGmO6LYhi7JxAAITKKZEgJGDGz3f3tXQrNkDWNQa92x2IRDwaJzKEixyhDvezYAy
-atl9+AXifu/uRjKF9SqB0IhFBdopWchszto0MoI3jMR63F1Ohu6tjs1LI9riEmXF
-//KBRA3k5O9Ud4TeARfn
-=Az7h
+iQJ8BAEBCgBmBQJVftCHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/VMP/1HYAjqIWqJOy4hVPKJ/UDgm
+OPVOxaCvIZAK2rXp9/gEtXscW6OTQdkAo8Ro0QWoCko4fEemKW+MeMsZFyA0GMcN
+HOaDUr8dXZ2mkNsZOV5P89kg55HbzziOQpI5vPYngWuyKcg5v4oEjFdIz7BsR4DY
+l8pROIyZiNlllqywGgzv+cxbaMu3Vd1CRZ2pV9uqUMSntspCOIzbpw/U+mdmdwal
+VHu2m7O6Qj3ang75cOeNdj3dYueLus0wW+r4G0DxuXl7ryd2x0mKQWVzd/XRe+FV
+0EqxY5qaNxyiy1DtN07F0kqmc69xz7coQnrPHKcVkbYivyUh+8bn9DGqWyyJXnBJ
+tCMeEIy0WPEx8qY4mvmwaVESCc6ZWeGOtCgWHWxr3Ge03vJt0FDO8YBR/3Zc+R6S
+uBFHUG1PPuE4myYNz+80inj+0HZkg9aEar+nfJqcaLuQlwCKzWqKKL58X9yKDMuG
+KB9JtsZa1bOBfkJRBdVay5vkR5tLA1wergHleKr9TRg3pZb/u6icFcXdhWKikTBL
+02ZoQijODV7JjKtzCJNsIrud4O1NPGSjvivuGGKhSSJXBZ3Wk4wzr0Cw0CXENg36
+POIz05Us6jH6kdV52ukSh3ldf3Hg+NtG0e0pZSxeHauGDY7fn07T0jNRemrnRly9
+SRZKnKW/FW1v970eex2h
+=52vf
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/pypolicyd-spf/metadata.xml b/mail-filter/pypolicyd-spf/metadata.xml
index a14643c6d3ee..a09f4df7bb3b 100644
--- a/mail-filter/pypolicyd-spf/metadata.xml
+++ b/mail-filter/pypolicyd-spf/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>mjo@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="launchpad">pypolicyd-spf</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index 54cbb3657440..df2cfbade5e1 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qmail-scanner-2.05.logrotate 135 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5 SHA512 de9382e71982183469be3c134711416e6889a38ff805db5438de6a5ffd2f40217b0b1e64d7d49138abe58f1b44a5e10a6a0d962a660438bd09e4b53465295c21 WHIRLPOOL 4a1e649f9f0fbfcb64ed65cc4a3b874dfb3a381ab25fde844ded5f6c4c58b27495634f3344a47c4e570534b8c19d6a88ff461d157462101358f68cf621ccc169
 AUX qmail-scanner-2.06.logrotate 135 SHA256 d61514a06570b55089915c134beefe5222eaa1199cba7afbe91681b7d67248f5 SHA512 de9382e71982183469be3c134711416e6889a38ff805db5438de6a5ffd2f40217b0b1e64d7d49138abe58f1b44a5e10a6a0d962a660438bd09e4b53465295c21 WHIRLPOOL 4a1e649f9f0fbfcb64ed65cc4a3b874dfb3a381ab25fde844ded5f6c4c58b27495634f3344a47c4e570534b8c19d6a88ff461d157462101358f68cf621ccc169
@@ -21,11 +21,23 @@ EBUILD qmail-scanner-2.05.ebuild 5642 SHA256 720919f51cf291a73143bde7bb06a67d131
 EBUILD qmail-scanner-2.06.ebuild 5665 SHA256 5b7876857f54c162e323a691b844d90b4148f662ea0382b721894142b758397d SHA512 e75243d326b75def73f88391b714880eed0423bf3f1f3ed192e811798a51551d3ec91f2dba3628ad9ae2e24e6feb91da9b1e23ef68e8fcee4fab4b19abad364f WHIRLPOOL 06045bfc18297c979e9413098674a38e2b40433eda28c5a96b09feedacc086a3ca5281c299761a7c6f37305e2695ad1929d5350b0436d4b1de6f0aed604ec737
 EBUILD qmail-scanner-2.08.ebuild 5708 SHA256 41f4da3a0265a2cfdba64ee129e09e16ca07c7e039dbdcd5127af7a88c16296c SHA512 9376574990b9fc685fb2d73fcf9c500cb2e0df627b578bb4aeede9255725177395918392e471de55e2a54317b063399977688c742cb2ff8d227e22ed168bc7ff WHIRLPOOL 3ee8af4efe5c25f99d1b5a53f5ec27f4f9dc2ffa877751f203b266c71398cb949541125bb08ccafaea919fc87ff26d86c5c0cdd340d7b70fe74f3f84d1b62834
 MISC ChangeLog 13195 SHA256 016b7cfe94639532cd2f24e50fa03df3fe31153590e7e62b1478c99fe14d7e49 SHA512 2b662987d168bf06e5f96233e1073e42ca01a4407c926c6d9a94354bf3bea45d7cb27e219954d1d7f4cddd4f9d8a7bc4d9fb959f0d99727bafa903835581bac3 WHIRLPOOL dc1590887f99206e72e10aad00eb18d4668a4bb548a073ed668fcaf79108476c5f8586a43a3d83690232a070ddaa540840f0a07f266373a0560781df1dc5f147
-MISC metadata.xml 282 SHA256 48e16cc43d5cf9869e871f9779e3188fbb3321a16a119c19e5f8d7cdf08649bd SHA512 623e6652f100d63444abbc937dbcf1546bd2d71485c05799d918f66489c766310f276a603e1b52714858fd71c8b1b2a2ef99f42c1112d616ce2f1e918832680c WHIRLPOOL 417e4b4e9bbc5f65296809d1218fe3c8e85102223efb9e0433c5b5fb9ec7c30cb31ef2efb392de90631cb5fc3bcc6887034499c4529d31723cb3678f72c03374
+MISC metadata.xml 369 SHA256 27213b49bc38ea09e7ab3e8c88fcb3f48f360fc74d4220bacfe9a7bc5a3efdbb SHA512 913b4a76075f5e337e5ef9cffed3440e178a04437ff555e5bc15ab293279201ee0fbc5f7f98766f1a54630d3f15566c303bc71f646962b5b190fae7dd707510b WHIRLPOOL f8ed86e60dd91ff1e41a3be00fc919a9298f6dad4e4de3c48adbd6fea3e08ad3650234ccaf0c92b6d3346c3ab56cba022ba23c909d222e5736bb568831bfbec3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4UkACgkQcaHudmEf86rO5wCgg9D0mReF1otNGLvxbLur4g4q
-ouMAnRRk5OQHPrxmbqDUi9ZRWTj/OXOA
-=7Lnt
+iQJ8BAEBCgBmBQJVftCRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOfAP/ApqbB/yLNf9qwB7ZE6sMvTm
+0owESFGEh6046BDQqbKiDPdwlAAH72oBcXqiahT3qSu5QfW8V6VhAN+NCNmtNpzs
+LjmRbaygiYCtBBNjUL+62uy5JS+mbs72qoWsplnMdf3Uus9jrGrCaC/6my5Uq3aF
+RgimwEIb4Z7pmq8b2+/Ljf0i5ytdwn2L8cRT3bcXtpCHE9S8gFM8umoLx5XWJruh
+/2E5MmuXbWz1bjGOVCm+jG0/IfAa4tk2nko9G+4AAN70SHhqahudSV9IxELm2jkd
+KXz/QScCQ4ZXMf0RvMCqWeGVYAEyHEQD9WpfGGSM8ohMrEpwlpG8f9jzrF5NeQF5
+Pdc7w0oWlugCWgEb2wkkWhlwBcDew1Wjn96AsrTxnsD+NWGTb3iSDKaFXFkwqYbz
+gWKSTancj4YORRAJ9YaYfzFzG0oMbcKoLNafnE2ng/fdGShYg0ybLmTWj3Jy7zdZ
+qqFMpGFKR9iRwXQUr6pa2OgwEltJlc5bUERKV8+g0Px5Zcvypp5ECIew9ySVwxc6
+isBHZm/blerRfK3g8dHhQzEG7RAG+sqQyPYksLJmTqLtbR5F7RKJ7ZJQDh02R5Fh
+PdNSYH9A9cz874HDBjoWrHz8l+3Bfz0rtGh2TY1/K+aLg/XrAyxtRcaHCj+WTCTX
+FFKTmkxDv7uk+mK8mGn3
+=qhsg
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/qmail-scanner/metadata.xml b/mail-filter/qmail-scanner/metadata.xml
index 00f49fc0bde1..6e2faa5d7457 100644
--- a/mail-filter/qmail-scanner/metadata.xml
+++ b/mail-filter/qmail-scanner/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>qmail</herd>
-<use>
-	<flag name='spamassassin'>Build faster <pkg>mail-filter/spamassassin</pkg>
+	<herd>qmail</herd>
+	<use>
+		<flag name="spamassassin">Build faster <pkg>mail-filter/spamassassin</pkg>
 		checks into qmail-scanner</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qmail-scanner</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index a5008af564e9..97017ffe7376 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX no-install-razor-agents.patch 292 SHA256 0a333ef827ffb4b6da05c17bf0cfc36a33447466be90d3ec65533f396bbb2a5b SHA512 58dc7e851a5740754b8d7b195cc9cf73fde8de43ce833ab831baa933c37e142b2baa121201523caf63b9a53d8e95e7799104fd643fb8c4b5f6e8798f4e30d67f WHIRLPOOL 4de9022359c3a92229feff7ae7d1b304f7eb815e72cf174cbff66670a89d733974ca7144761e8fa3af2d09124f68801de7308ea790edd33ea23070c3b1248d57
 AUX razor-2.85-cosmetic-pv-fix.patch 616 SHA256 9b9e40a6ce0220bb2228dd7807a14ecd7febe5290ace74744eea90ab9ab13aa5 SHA512 c7e7985e779185d704d88ff4c39d106df46ba20daee92c4a4410e8a1af7d4c31bdca0646018fb5d1f7d58e106036c8442a0fa2635b39a5e1df2a259f79eced91 WHIRLPOOL 2b24691be6b3d3a1141f5fbcfe19298925b393c2870153ec08fa5fa91fb9385c948a777671616486ef4db1f7f61176343a1326c16ae4df8674a4b01c78f23447
@@ -7,23 +7,23 @@ AUX razor-2.85-use-sha-not-sha1.patch 3971 SHA256 a8d5e844747c69a9ed6e5aaa8e76dc
 DIST razor-agents-2.85.tar.bz2 81691 SHA256 7fe0afe73e5b3979444dd86e2ad25ea99bc05b23d5648d357544f78f0b6eb6d7 SHA512 31dded1969dde963389a5939514c29638ad07f45dbb2f4c633cf20ebc4abab94e65e9a6d8885233cdde686ef365aab11fa5eba2ca38d79c5b8fab689143ff5db WHIRLPOOL 6c8f98e8f1090204fb9e4f53f5f53fe810034829f781226bb156e23d2297d1a420e616be1b8ef8adfcecda358ef4d74e3d620d71f28d92490ca6c706bac53a43
 EBUILD razor-2.85-r2.ebuild 2828 SHA256 5656a62813cc047df556d6990cf7ace0aba62d80da687b57feeb637f032e0dd8 SHA512 918489dc102130d93f5a65a6e5707b04c3e0414ee026f9f9da6da3e9d3c60ffa5108748a49f26307b5521073c61db121ef2e76e73e6710dfeed9bdf138e6491a WHIRLPOOL a908aa9368ac801529e086451e80408bee6beede39dee38bb79883abc1fc2b2aad2792dc16a1ef688d7fbb6430d91d24b7768733036bd0b8f10fb97149266241
 MISC ChangeLog 14897 SHA256 7bfcf736319ab99e073309e7d736cb4b975f55f4ccc9d3bef488389dcc4df538 SHA512 34704c1e96565acc4f2f065c1963d3a0975c48617c403291240bd41e9cf8c62b10f71407a54816499376eeca6872ee735f86a2c8d72bf9554cc7715303db71ec WHIRLPOOL 4abb682dfc1586b75608b558d44d94d4a725faa0eacada1af0becaafac7eb4db08cb922a898c25e51fb7ef7f4d0feb7887f11712b6be8d2586799e81d9f5f40a
-MISC metadata.xml 449 SHA256 78c881ce4273ca2f2bbeaaee357f8ccb2ae120a8f304a10df7dcd591de2c290a SHA512 ab25e0310cb694b0419032d3544995c84b5763e9c3ff929dd79a1427839547ac5e8d52ec739438642f93c42620a835a3070d04bd05ee643a0b9f380201aec3c7 WHIRLPOOL ed8c7a13f1451375f144a91f1d33ca0a3503ee43f06925836e0275ee0d1ccdb494ecaba6f0c82ed0e2b53c1860334aec2067146e65756911be4d230ba54c59b2
+MISC metadata.xml 524 SHA256 1f675ca3f248b806967e6da0a661927147b009d25b16bc0e5df8a26c0f54cbbc SHA512 9f1414598ef50382e642e8a46c7e4de17195dcb140fcf2ed2b9c03fbe06368b0b5877aa260246a886119907445b537fe3aa7e6ef42eeb2d542e94ee552dd789d WHIRLPOOL a450f06c6d6cf71b65623c3be2b77d6089e3edfbbfe490b839fdec026b1378960a9ea8195fe9bd5a68e84a313ba9122915abe245e51a7e08cc56fe3a84898e17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTzwEaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc7WQP/i2lhzyqW8icmKBOBXNGl8jo
-Gny7WQAfbe4EEt6zJWijz6TXJuizSMuvqDNVRzxCSq1iaLYQ5SSLkTbzUO5dbD5E
-ysHiqZ7WtS3F0XhtZRTSKzGNR9B8IItp1xJ5W4ZIPrXobRO1MAKxoUjVhIOUK/po
-F0OCFujNemmQ0h80jcVWDkQbU4L0dkZmZT7ggKAT3Sy1KDhsFmuQZyFPVGS+YkjT
-V6AoULxqGyppOvInxg/b/m+GzARBlc4CIt4zy0HJm8z+xNSXRkkw5zN1MteuauyJ
-Eze6gwZHcfRWON0Y0qQytn5toV1sAW7D7Mun4ZeDVZpplay/WsgUkA4r9cX1xuG8
-ouxg7MO+peBLGD1SLqo0GYBZvE+py26bbTJv17buGrB9baPSL2Nogk+qoMHQ+jES
-QHjDkRTL+Qv4m3EOKj+jI8f0Bi6i5pzp0Svrh9UN0bHcYAyeS2K/czUgus5HYMac
-7mybYn9UKboU45OmBONEJqKtlvB92r2S58UfWPlqBM0v2nMTp3F/CBYIril/w2S7
-5ExJYX4XtmugrwrE5SMYKHAPLEgWGj3S+nOyYF38Qpc7L1pZWrhgYT3XPBdHc/7U
-0PJOfSBqRYY9J5xZzROGUPW/NbAnCnbpbcHN70Wg1Gc3I3STXvuV+M6F5mhvf0St
-EfZRq/akn6z7J8nU0p3U
-=uB0m
+iQJ8BAEBCgBmBQJVftCdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmis1cQAKpMDqWmr7d4TEGloLmpxMgq
+5Ulmkg2I8Wu4EYZhvPQAOaVdldFSCD1USXqUlzSJoSyBuWqJt7ouBd7psroUR4/N
+yz8duactXk7lP3y+WVswxq0j0NDRwdQyAUZ8Me5vjVG8oUNbxlAY0YSr7cWG4D9h
+YNWQFfdondj1vVamMyNWqc76ccwJ6IkVxTViIsiiS+oNpg8Kfh+5b5MTaqbIbmtj
+081xGdVWOcTR8iTNeHmSOACPTbL5Tlel/U+SRzF8B7ggYllWYDpssCYRQIPfDk2B
+LON7bTl+IOPZ1s0kmk6nHTzOv7wmnW1PgncuEVqrYlKw4Fu2QcIirx7ZhBVR/mA3
+8QoX6nGshdm3Y2Ktwu7ezX3D7t9TFUKnkK8ThjCjbkdRs5A/I4jVa82uc1vmWNu2
+Fyx7G9HyoSMh63BML6ZpXeqrikHyLJN9dxTkjxDcqFgE5wlE6VUfPexMYB7pybDH
+iYYomZUx1JCxlMBvp9HAk6RZGUy8cF34stAHD8VrTmI5fSnqcW5Gbyx2IzljVUBW
+xkK4nBZ1SdNRiCg91MKRSDOlL+OrvHH+Z3LyxtCEjcrkU8CDZ1huRUcT8bkzo9Vz
+NhmklHg9l58L+o2cJYggpVUxb7uJIT3VMLO776fg8Mz64lDCszzvFKRns1Bi9E8g
+t0EvDCvPLnnisK3PvM6c
+=7AvF
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index 2b022b9b0be7..a9c5caae301c 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -11,4 +11,7 @@
 			upstream care.
 		</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">razor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index 95a5d007186e..cb2289b4aa3b 100644
--- a/mail-filter/rblcheck/Manifest
+++ b/mail-filter/rblcheck/Manifest
@@ -6,23 +6,23 @@ DIST rblcheck-1.5.tar.gz 150395 SHA256 c0f28cb0ec215ce2244e2a2008dac76bb6426adf0
 EBUILD rblcheck-1.5-r1.ebuild 691 SHA256 1d5272e9d2477d3b69ab73eef19b45feca10eca99867773d6324be15b82095be SHA512 dd0812f49dfdcbfc5a75151bd1ef66319270ad83077c42dfd11d2c67ec25bfed042b3376426b729936569048a1368bc4345593e8c2c1deaa756133c7a1a374eb WHIRLPOOL bdef12eba2f9c470b8f8915acd69d893cc9975b691d1953dfd79076d9d1357a941a19faf1fdd113ab8f5fb80271bf32e46c51246aee54c2dce4c799e83c9548d
 EBUILD rblcheck-1.5-r2.ebuild 696 SHA256 e00fd80ab6666edced829e4d46505f1dff4012650b9c8df040899144bcf5d4ac SHA512 b1b5b446a46dd7066865dae432ea6780a4bb15f2b7f1cc9b5fab60fc565c463f4bfad772c061ffe63c88913b730894bf0c743fd627981bcec56f605513db7336 WHIRLPOOL d729c9c8fc7f74c60172798c92e4af36709b8eddfe23a6247d8da873f44d77b6f8bfc2a92bddca94a59b8284a65c163157496d9b6d6c9c2a48bea5878f84f54f
 MISC ChangeLog 2288 SHA256 cfded483782fb95dd49d57ae4ee4cb36d35ed0ca1c81970fc29946e3a33ad724 SHA512 0d06ae1c85596d2b3ded7b933064da3ba0eca782e56dbeca5cd71d1a7c7467eb609f51328cfad1edd40c00423bab44de6b20f8f87813a35ffb950f7e96802da9 WHIRLPOOL 8aa0e42d2f5eb51302c70e96adfca1544572bf97cd92cfc78fb887ca584ec1177f3cf73a1d2574ccaaabe5bc9e8db83685a85988ff2152ba958e0b572020f0af
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 240 SHA256 fa305b0c9969550ecbbbafc10a9ddc3f80d22c08d0707d54d35d027015fad4a1 SHA512 887bb7cdc45d8d96448d64dfa3628016bc126f007a7dc60d81b34d118745315382aa430fead25d062163e434b0f5196fa571eb3d3dfecad4295958e2753fd72b WHIRLPOOL 5bb908a3de76bfedcae07e47f353eea78d96f710ae6f021c199ee88f6cf9b73ae8850a9f211659241f02fa80e71437815525bdafb462a84a780b9ed92e276953
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVDaClXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN9cP/jC6/0CUbbL6K6X2jwpx4ISy
-+g/8vOaYSnYLQ0g12+c8zBVO7upd1lJdTViMBI/G2XpmrUzTZU2vSjzHeGqTeZGs
-mORO9WBpth5M8A+LDyW7yaxvK7RaQ70LWOosJHOi4Id+FH6LaNvDj+e/yVK2iU8/
-qbHSPc/VPn8of89LgmG9rze7zBHvCOg0cf+35O/Uq5D1rr2sLXDCUUYsQ7wTB+p8
-UYm9SBJ6VqG0i5HRfY+K17cykHe11vFF+RrZQsdYAQShMdUiav0aU3jNZ9FNhUJk
-H7SW3lNA8fJfaz+YgFUp/ZSh6pz6raARsfH5Jub86QjqitExQzCDmvjzaJyiw3tF
-sbfYCQMBg5imWWnVBzQfvhmA3QplSaBnH+AHrptpuOZo849UjZOkRCEggWHiMM8k
-e6nDUtquyWVp448a5Rw41ljDHjKLTeVR9VyzVgEk+fwUPEyzLmPQcug1SYdcnpGn
-/rJNEBi5eJxtn6p/gk81D5mR5yg7N0CPGRBD0/wdEzmvdGhtUHkznZfSHYhshxWe
-mymwXiKGGpswptaw+fJFtFNbxKaPtSrNfPNCvaNhvwunqf6T08GiGY0Ru8ew25rS
-HdvgHk4+nWOvVWIUeSodh5IXZQD/mqsYpNJ0j2tvomjVTJPqPB6E3kxe4aZOFwbA
-26h0wbaZLy+pJCFLdOT4
-=x9p6
+iQJ8BAEBCgBmBQJVftCpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2rkP/2+toJMKTKmBBEhGUYh1xrLq
+tpOO+u/WyvlGT5PSKdcSxzCmAHHwyeUuFgrTEdFZ0UXpsk1zywizS8zk0hWJsfRx
+nEYGTcSYCKENNIzd3uQ1EBk7mV3yGURLteOd4CHcb9h5iPzxyYxZu9ze10CnsDps
+8wG17mhJTPddFQlAAfRBriVMG9d/G2eLwc/uEmlWs62/tQr7Trpz9vjHUCZiYW2C
+z+/m/s4+Sxdbkg5sroNGUu1LHtNmHZj9QAG+U8c+SFMj/gSnElhbVSnvZ4JNWhv3
+7s5qDIb+h4jzll203H39PAgflVHGncQKKE0KuNoG+xIIy1p1lJ+W5eIhiWgdFddU
+vvbLq7RMenllvGzGY16pCSivWr2s64IzePtHfP0t6Qqgm4l2w+TY5fDqtM9As0d2
+t5tlzxddqVyKuBQMHRn28h4V4WTznzRliS0mfKdW44JFSYrescPWiy02/2rKPa8+
+Q0dZwFGrnm6bNN4K4SK9klreU2/ZEtRMRDya8RVqdginJhd/qDJL+krvLhkE/Q6D
+I1QStERS222o3koQcK8eciVmbpY3P2iYX35Eeg9XfHn2EtJ4fH3RxQSWSpemabDM
+7K51jho8SbmjnjQnobqzDAPkKqXW/aHo8nENarX1JSyainihXZSM37wNUTXdKjZm
+9AUQG7rRRBwxWJN1Lenr
+=qoNK
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/rblcheck/metadata.xml b/mail-filter/rblcheck/metadata.xml
index 51f94e3fbe0e..d2a53afd5dd9 100644
--- a/mail-filter/rblcheck/metadata.xml
+++ b/mail-filter/rblcheck/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">rblcheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest
index fc5088a50072..252052fb3f77 100644
--- a/mail-filter/sid-milter/Manifest
+++ b/mail-filter/sid-milter/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gentoo-config.m4 197 SHA256 e704faeab661553c2bb886f9486693681f07d3581d8d8b8eb287faf621c23738 SHA512 67c1e602c17246bfc2bb60f63a6c5045bc1cbcc10fb9fcb67085aa4d8a8bea948cb0fb35a761a3e52668b8350d799a266c8ec78ee37b28e20d7b0102256f80fe WHIRLPOOL d518be8d58882dc65fb3fbf913f2ce970bead17cff25e0a4e390a99243784d1a7515b9186a7af4657454a0c255f0452d44c35cf42241d87f653735644feffd3b
 AUX sid-filter.conf 226 SHA256 9c887c16afecfce014ab64a4747fd6c643f7b570f5d506740401d61872ae5249 SHA512 3a8c54e7ff0cf724a3a24f5e2c12abe404e4c1e293cc536c24ff81b343706f463c0b4f36780947e998f2e601c64831b76196738c5737c7b1f753f39919959bdf WHIRLPOOL 0014342fe6901cd640b18825d8d8380c2289717b37f4321a272827c0bbddaea2d95d4a87081bd6e251a810468399841da6843f4d37a35cf4d41d4e9123479895
@@ -9,21 +9,23 @@ AUX sid-milter-1.0.0-nopra_on_spf1.patch 1777 SHA256 2a01bb115496583682e1e6f7837
 DIST sid-milter-1.0.0.tar.gz 351161 SHA256 b303bf0c43afd0cb0c814b8c862b8d22563d1203339ac130036873e79f696376 SHA512 599eae36b7708e045e3f120cd6b4215906ea954b5f10be520d917404a02cf0b03d79b8fcf9543080288a9ab8e436b393c8b6340d2b1edced3d4fb827ff4c30dc WHIRLPOOL 603271c53bb7397a3dfa1a7aee87e6d19156b1bb0153fd2dac7b029e45f6d4d7c98723ff255cfeca98d7ded03776090271d811d10b9646430be4db648c1a84bd
 EBUILD sid-milter-1.0.0-r6.ebuild 1863 SHA256 e041968e8d2982212ade82d80155d76d56910a19bd4f0d4efc378026084d2fe1 SHA512 240158dce656fabdd6b4399b4accdc60c5fe86cbb557318f9622b8f12b7c61d50756c63e55f49a8ddddaee14e5c73672833e098f1b8852aef173038ba169a86d WHIRLPOOL 0bf8070c50580dffb13d5df5ea5d56e7d6948b9268a7a14a41d923b17ded28113319371dbaed7bef64d6ad84ff3c82b2d2c0c8977446398c582a7dfd54f5c235
 MISC ChangeLog 3695 SHA256 cfbaeca7bd449c629226490bdc66c64d60b205eb9a6ea826cf0b7bd8898eaf76 SHA512 911fdf10a6f1d9b2434089545bf554fba636dab6b5ee375abe378da4cdcb4b56c0d08259a976d9ac8b36b17f01f022b30d7c5c925d936c6393f3345f45f862c4 WHIRLPOOL 51a38906ec1c07198bdd6f2648e87b7c9243b1f277b4f1d926b715861f86be3ee415be5c34557ddc078a1c92f19c3221bcc5914452b7332dfd6c61a361065218
-MISC metadata.xml 355 SHA256 7c0c8341bcc130b83f1e8a2e9f8144e7a289aead1753410af3beecc68af2d1e6 SHA512 2f4f806630177a623c93575af1522e2853777ede7396e1bbac1aa15b8b3fdde475fc462f5bdae88a3723332f4f6d566e0ad566370b288773fa640b13d6d5cbe0 WHIRLPOOL 2d5b9b85e61abac4b18260f666485554e6635f120357d3003b7ee385891ee3dbe5873e6daeea0dff664f275b21167c1f1baf437d87075a268b2556496ab27822
+MISC metadata.xml 437 SHA256 251869c2e38c498cf1222abaf7e80a7e5aeb47eab3d3c97a6f810a237916f2ed SHA512 0bb6aec52db0912095406879769853142329cfed0da00a7221629f718615da010920a36f182210aea2fd70cedb711dbb68c49d3955531cde3b04569aa99ebf53 WHIRLPOOL 928c6557302e29d760e828a06c44189904ba7310b900b9e820b715a0709123f86cc5e3cc7c282e7fbdbf1ef87d98aa1f428aae0d64660afe2fdccb15902198ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRLIZEAAoJEHfx8XVYajsfO/kP/i4x+tjLnGws95R4VXxGfTon
-8yfeBmbaZzFEkOtzXFtwN+mK4uLbgMb6/sfwk1pfnp5gogQCpvWeERVl+iRcG6J3
-p2wEPsu36blq5OLtdNMezmWcPrmfJKrN2xUl4wdsCGMqxDq/xLZozqu+n8Nzr+J1
-gi2fUqZCR+nAC11auzsIfiQLYC33LkF2VZxcKRD57ZvZcz2QEt5Q2SzuhcX6W9JI
-PUNFK2NIG+pEAYvliQamiU4Q7/+AVWZj5TEtt4U4rtGA9cOOVrd1ifW24AQdTsbr
-cnvgRmKc1H8HqkXAHjq7KSRuORU8rdMYA5HYHjavYdLlsjQASxw4+9XtRsII/8fh
-0R0qSyuODzVQ7zplDiv1jQWBKHy+8bmxj0ZrFPYOc7t5mVb7cW4ZtoFlSX2LTHHI
-tMUqyEkT9KloZjSRpDiFdXdMCjQpMnUAdvH2TKBAuzVQ+jQ6ZTjXNeECFrSMvmuO
-7GZa613GVSnShJaEjuk5jOi/JeqD3DCPIjkc4Dl0asmaNIY7jKGzDFfixIupGvLb
-XfpxSTLDlxZi2KoCrTbpIqSDtnqUhUGwWh7Lm2IZBLEXn/scSEyhaJYZvrUzcGsz
-gYNRd8LCml3STBHTJlYNUnBYrdUSZKoCETI4i4T5FmsekgKuP2p7R9QCayoRoNvm
-3Vy1Elhf2yuAPXSYnJSX
-=WrN/
+iQJ8BAEBCgBmBQJVftCwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiw80P/1oP9D6tU/636Nj5vCSAjJQJ
+RTOcMy9YIO6agNEPF2lq86/xRSGHE8/hd9HeJ82asMIeEQFc+rNA0A1dIu4F2fQh
+pTwo8OQXAfA2Y8wvdNqLC0hGw76BIrfj02SAbsLrJcqD32aeTSM14Z/gjcDBzFHs
+eOOdGeUnf0E63JyqsVRhIwIUsbfVYPYTD9bIyS/aMPt8U2LcizRH/2Cm7FJtLRow
+2HwmXKHjSzFiwhWLLmzbd3rDvyCf4SYNgbaBzmXRIUqfWwWyhLh+lIMyBayCaObj
+4yWQvYUJxUn8uQNDGDh0JEg9zU4tMLNdthwfrb+TSTKFd0AYWbWUi7CuoCZy3E/c
+gmLAnVeBU4dt31yH41cZbyVOx03yUv8x63wJrz5Rf54xoag+L6MWnKdLlaa8GUGu
+adih98H4CIsCtjfANYO1SbNSlQCbc/tEISJIt3Jz2rTRXaED+9B0jfBPLj7qDJZl
++JPGNTAUtHeaj2BqO0/y570MJUsX8S6+QM5T0sSNjZECkT5YGrxbwDxsIb+Og8C5
+oyywUpU74ME12zn1LTy2t1dmJIXuv4lam/8HsE7BvAqXqpGnsQScP1MaZ1JcB2Zf
+Ak/udD/rV7+CRrUAk2VavsY1UwnEyut+d/hvE/BaEimHWJqM0ydWro+OBQsXU9XF
+J7u15poumSmRsruHGnML
+=FFU1
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/sid-milter/metadata.xml b/mail-filter/sid-milter/metadata.xml
index fb64c9046bd8..775cc002f35c 100644
--- a/mail-filter/sid-milter/metadata.xml
+++ b/mail-filter/sid-milter/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>A milter-based application that implements and enforces
+	<herd>net-mail</herd>
+	<longdescription>A milter-based application that implements and enforces
 the merged Caller-ID/SPF specification from the IETF MARID working group,
 currently dubbed "Sender-ID"</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sid-milter</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index 6c23f93ceb1a..e4930b3c9efe 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -10,23 +10,23 @@ EBUILD spambayes-1.1_alpha6-r2.ebuild 953 SHA256 41e156e48ff9cc252948fcb02993dea
 EBUILD spambayes-1.1_beta1.ebuild 948 SHA256 305d62c855e7a5cfbbbab63f22ef68f99503ccea0ec54065807581d55079b600 SHA512 85de9f5089118ce263f7e08e203bcc3177edae9836376a4f92b0f74160dcc9a1a113d9feb07800504c032f8828ee6b0da88b2a5791cdc9d42669ec10d807a910 WHIRLPOOL a66c35fe07497af490dbb03eb1c8f98aab74223521868feb9f24120b051a1d14a17da5d5ca87b3c63747b49eb209676b44859d11d04d0b89e24f1a574b65b588
 EBUILD spambayes-1.1_beta2.ebuild 993 SHA256 d07b40832ea3669cb510676df4aef8e04ba67134a0364a13adab2937690cb17f SHA512 9ab9a6fb662a64e9f09d3d8752824505368e07af97cbc9464547dfdaa7cc482590199c695c71e8eef0b1ca6801a4c1ef4d35ef9e16eb527bae4c9fabc95badfe WHIRLPOOL a5310f81a6f5db654c8b8add7812fd105f06935217756a5b79b3498971eb26a4475002967cf8832fd992ffc7dbac2203ed286a3f9bbe151cf782f7d974271210
 MISC ChangeLog 4834 SHA256 0501352f8c5f6571a86bda38e5d51dd1bb4b34062229f8bc6a77231a7c55a7cf SHA512 355e1c35341420e603306cba28a48993e77a5f7e7c5b4b4e3aaab9d4a360a21407275fbc44a67f7fd5b6bcf3db5002bf405ee3eae7dfb0fd6b31cc4a7ff40278 WHIRLPOOL 04aeeeb9fc034300b004fc85aaa8a7e51fdc8bc6e804d421373e404cbdfff08a7a12a748cf191fa21a7d2bd7adc6cd5707ceea0b1408340e9e625ac0ce4733d0
-MISC metadata.xml 306 SHA256 9439a37b452deaf09c804fbfd120caeedb5bf6a364e31b8f09199baa561088e3 SHA512 a3f9d813a78ce8837b2c06727ebbce696a259094a4c04b9e03f8c7865d05fd5db950f08b0ab4125949a464eb4390d8f2c3771e085d2cb73fa1952a1ba3166f47 WHIRLPOOL c489c531cee4e21a80bb74edc6761a7478ad2973975f9d83165dfb4ad09cc6124e964d183ffcf52a85db8afceb47d5202eb8fde8542ccb8bfb089800de766a42
+MISC metadata.xml 362 SHA256 63380ddb9a8a428a2ad3b9a5662372a6fb661121312114c276b476c3b60db590 SHA512 ed67036fdcb6e9b3855c2604c6430674e72821120776eb6dc39344965c1345667b90f0503d217c417b2a6a7063fd692df92da19ef357d38c269545784ed73353 WHIRLPOOL 55dd490bea6353855e68806ee064e8f2ee7b415562c594e05a3b0d9c66005b9c797e053e700ddd77d7a3f99bcd183c8d59c6aa1f5c6ab4e832b731b64064b75c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVcCfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVftC5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVjUP/A7RJy41srCKgeREO27/RGDI
-ABlepns5LK4Vd3SMFKvUfk64KLdjsOaTerTp5QH0VD45u34D3VqzWQjMUUgKEnlZ
-c8ifdy6mPK99GfK+IO60h+94pLZSqfRl28Sl9z7j3qg+Bid26c0C8HzNsaqoFJaZ
-eOdAEY2uPag9jl7XIY/Zu2pqi7CKWvmPKUW25gYiMyNvxZU/92Myue7F6314rdln
-sCJVUevc/wDvocoNR8JTq67A5C9Dx2M11uWYen9i7axghU9kg100BIp5db4XRjtj
-y+ycGm5/0TDtlh6Uo9uvmLx/RiRZGlDlc/LIvYXVT+10a9khBmyqmdmkBjMB9eBt
-5Kd//oXqUCCZzMH35OXspsQYGtSEW9A6UebtVOZUAU+KuY+uxyyxb/5bv0m8ujYn
-HT8PVJuhdXzKr1bbXEaLe8qIbRZ6F1aHNOmYpV7nq6Gpp3su88rHPM7O3mHKiyuH
-AG58s+pLLnfaGmYhPA+6E7ibVUtdxYIrgM8N0EpeXQY9SQ4dFiZdea9q1Te6gwvx
-XAyYwif7arSxtYDDjZawM+IuUgl2WCJP/eCm9XRW0FiQmmyg1VJVV1Oqbf/ev1U3
-AYgeuByULYqfdrK9tSLQJl3/00k6D56+7EMf6hpCIdWn/5+aSW1jkvPhdZe1AtY0
-mLe84Dq5lHmtrljHjqq4
-=BEOm
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEzUP/1/1ZLG47NYNBiVcoeG6OTwc
+EZdhEdTKJRIUPbMaBTp3akR1a3V4CqGKasq0c+zVYPgyp35aDihxp+J9KWjIvD4p
+PV1sKySrYE0mTEhU1CUPcZYQYwxnfUqODGttjfnLR0PB4U2SoUcjXNDaZ6OVa3UX
+JxWKZf1D0caJnq63lEx2rz8HMGD4+3gtiPva4zr8CUIavdQ9yHrtONAasyyxXLam
+Zk+7mh/OL+SxmPp77IQAnQDq65IUF70LQaVG4eIgAObVS2hCaMyhzLXgBXDHJ4Pn
+caLyh7NCVt6wD6NC6HdvQ3XFt68lRlLP6/dUoxWk3nEhYPt4NNU3gKXJh7DSn55k
+WmmIm8wxntlEtTrSH56wR5wrR9Spr9zeT18BcfHghHxFBgWC2PiY5mnTIkj6SXfE
+AVESxXq1n34S5gj5w22uG4Ftkw7+hE+rgZuMsZTrqbCYp+UK4EAvQ5V2aN/w7AeS
+Na7OuvMATBTRIXyaj7ByzbXSdrRDg6lCi5QY+qswM3FTu8rgF9XqM/kS9QlRVJxV
+3gB/bq5xpwubqD5rw6Iej6tisT4NJrbIxKmPxV2/uIgH5c9UV9FF09ydIvqR/9hM
+cCAaZRD3UscKnDOwC+T0ufUfBFB9nsYaXn3ey8nSyxq4LHC2unIb/TmZi1L5hg5B
+sbzW/KF1EBN2jcuf7PKj
+=SvKA
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spambayes/metadata.xml b/mail-filter/spambayes/metadata.xml
index 89f5501434ef..9db371324c33 100644
--- a/mail-filter/spambayes/metadata.xml
+++ b/mail-filter/spambayes/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">spambayes</remote-id>
+    <remote-id type="sourceforge">spambayes</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index de8a74070774..887bae53d1a1 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX conf 665 SHA256 efce536ae345412cf963e561ffe4682b226f9ddb50be2c0d9541dfddc7734fc9 SHA512 f184a784261923b8e36279c5cca24783812617220d266f5f16f15e83e2e2f3b0f9c1b9a82b9b3ac7d297b28a15af78d858f9f250757171187e6ff2c885a3b741 WHIRLPOOL 75077e5d3f384a8d1275e204d21a4938a4d288fee97c0b65cf079fb385c17b1a2818ec800135ed2daf78803830e95a0bd85f0b2b3eca036c7b8f4567bfd6c666
 AUX init 627 SHA256 f6f6d28273381de60457744557ce439707b225bb47c3053ca20a4f6ce5b5dae6 SHA512 55b3f194565b0f65e019363de4f66ad2db6d65292304290388873b24a95ff7d3adebe1cbaa0909a9bde89c49cb2333ece6f9210ac5d2b3f07c895f185eded1bc WHIRLPOOL 8afc174f510538119420cde22bbc920dc456fca24ba49cc28118d603e5a976751f7f9bb6093b4425494552325c068d33d420446c97aa3b6f6bda36d607d0d24c
@@ -9,11 +9,23 @@ DIST spampd-2.42.tar.gz 202504 SHA256 c6dcef8df0c471b3982e777bcccfe343f1f6f92111
 EBUILD spampd-2.30.ebuild 777 SHA256 ca959e1f7917757821a6b9bda5f0118b37f85e9e1f52c2ad6dca544188f62025 SHA512 0fad5878d3a6d820a48f74d9f907f34a2f707e1897828d5c340e524b64966489c61c1df2f70519a6c6a21ecc2b663e61c3fcff3d8f88439f3392769de2b7ef70 WHIRLPOOL df2cfc4600966aa176b6bd01e44121f25152e53327ec07e6f6eeacb3ab758644d6eeddeb5fcd1f179b166d20e9dd3de6a60ee876b28d07bf5aed940a4a099ac6
 EBUILD spampd-2.42.ebuild 830 SHA256 e149bec724f69d904bbf27dadad9ab033e8bbad8953b4f955579c2b8f23a67e6 SHA512 88255ab5525b7d1f9c2c3348d8bb8732a32609b490a4d0646bd5203008de62fbe498ca45dccb521dee59fe1b5d9dd8ad088a8cae10eb4c713343aa25d4981c95 WHIRLPOOL 4c4dbc92e01ec8953ee310436d23e39a82276888bb82e9de15d241ab87b94dce7aabf6b20dee1801a91fdbab2d83a113aed5ea5cfb42aa6c1e3fa5dcf98b1649
 MISC ChangeLog 2454 SHA256 09f4a041222e99c41b4a3a35a049f4695108f8eb90ece88235b6d9ecbf16bde8 SHA512 b44bac6689418560e31332e5f419110e8918c7920c09a9efd78fb7e413df69f754c7b990f6fccda82a9db777ad1b59ccc2dcf4bc546eec8737169eefa65b599a WHIRLPOOL 4bffe81b34a526cce673bd5cc7f4680144c07ff79142ca46d741f9d00aac85df13cec2f3b29a7b99fee10ee892577187ac647f5e2483acd56d0a06000a9be27a
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 242 SHA256 bf41f61bfdacd092ebe372ae9a9fc9913eef602601af3594b96b69ca3e0d1301 SHA512 faa309eefdf01e6f449a4c6a5be85f659ddc6dd6ac401d53a5ce9f3b139248155d87c38db5d8f68a8de31039d92c9111bc33fda1f8f2a00acde6afc8ae4e89d3 WHIRLPOOL bf47eded0ade236f572bc4a3b790292d822179375197c7b1456bc23c77bf0da25c1d5cbe9a3a3a6cfacf02fdef047f3841377824a1e02eb336109d32555900f1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4VwACgkQcaHudmEf86ppuwCfbSJslRTlXb0XuW98rLUFj3O1
-ZC8AoIaEllku0+/7j8CVDffn03bEXunL
-=8lyS
+iQJ8BAEBCgBmBQJVftDDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIsQP/18bfgIENOhRg3CTApIB47Mn
+RLpcaB5k9+RlRuaticeEWtOfCHk/8dOTNBQGs2+xIL6+pNRELYqdDrQQdTFF4fby
+2SmRxHx9Erjpn4qvE+WMTPzA3mYvTnv2r+Z+9/UKQ3Ci5oxOd2zTZO+VRQwKhJ3H
+tj7Zx6tkjEoJYNxNo6iaAeZ6ZB53fGI6hNNzVMTQk8jwCCnloul29T7BvBCXMmP7
+b7af2R2/D+YKfV8m4JScbprwmQBuTGhOAcpmC33cT26gFZ8Uwah7dOcFiTY1Vr43
+ZGQS9RyNYtrZVbUcSLfD8KNOHkXycMv0FgH/fEWYPXejJc1Df5gUAD0WK5jP9JzY
+PfyMhEVABbSAr20vAb3dfb+HDhP8UldXm/lg0fDkp27rf8reX3u5tMpqMpgdE2m6
+pvtkYjb7y0xEbLHvFspMFzGvB2wRgx3MyQvEifP0CoouYtybGA85wKYVFG7Rzatl
+3bJGKHaj5sEVn84ejzM+6rxdLcUsMPDFR+VZPIJ9wdpLECeWTIqWLIrQsxPgJeWo
+M8zczYMf4gN5f/b3iFYFahMvjCpR5XlesCUdItBfxk9UkX1ii/HrEafDAd6Fmq19
+HpqEg0XWIX73QLRQgiLzK+G97b20aKXGxaHZNnxZx3SFkD2hWWdjfI5QtxIfmjGO
+yDzsgqqSbDS1A/XvedOq
+=lP9R
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spampd/metadata.xml b/mail-filter/spampd/metadata.xml
index 51f94e3fbe0e..6d2e935469e0 100644
--- a/mail-filter/spampd/metadata.xml
+++ b/mail-filter/spampd/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="github">mpaperno/spampd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 68b4536ba943..2d64546dea18 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX spamprobe-1.4b-gcc43.patch 4002 SHA256 61e1ba0b7c0046f77fe7c2e41c802ecb3873bd548ceb52e9ef0f4aa94a6e1993 SHA512 4ae363124ced22ee9c1b6fba934cb320e491230e5b553bbcb13d20b2ff07e5c554be78088017f1e3f88ed0c5189a5055c136d0d5cfdb467cce3318b65ef8f775 WHIRLPOOL 4e5a0e6b98347027cd86ab9f5e6f6d7453ad5da69964f180edca941878d4eb9c298024528994fb2403e4d14fa575f09ac906bfad8a37e1b28841502840a9782b
 AUX spamprobe-1.4d+db-5.0.patch 768 SHA256 787e0a16d712718ba97c9e7f23a62b966bda630c5ba8e8368876a92c959f2ac4 SHA512 da18dd185dfdf31f91b82de0d6d9ac4230db90cebb4decf880b3c931968653afc1879ddf30893ae9d74f3962539d33c8dcdcfec10fe0117e717a29346633706a WHIRLPOOL b4e71e71e6fc0f8be627a6a41e5eafdf0f44dcf4e7b7fa68865437e4b1d1802ad90d727e4771ee8feb2d4e1ad9561a103b9f2f113e32bebd5cac216963bc134f
@@ -8,11 +8,23 @@ AUX spamprobe-1.4d-libpng14.patch 786 SHA256 e999b5a6b55fbea6fd5a266450c2e664c72
 DIST spamprobe-1.4d.tar.gz 262761 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68 SHA512 176097b7e9de04a26a0a6a2c6b331ff375108ef7eb20cdfbda9abeec7ceb24a52c0edc932d8fcd8a5731f06b891469b4ee328562f4e88fbe6c737b719f45a8d8 WHIRLPOOL 854a8a4b711bcd4d8dccc1f7cfc5ee935eeba1af1b46e9c427da57c4f5a9742b1c49ee0bd6f9a471e42ca5ec7385656f118f8373e220ad45c3dd8031e2f5bd03
 EBUILD spamprobe-1.4d.ebuild 1026 SHA256 9dfc0ac9ba80287d3377f082fb58a78025d4180025c343919c9c3975c26a5b8d SHA512 fffa7c01ae2aac250aee93d445f112cbe6334cdd3ea4065f3d298c1e6fd4bb411b1f3adbab79a0cf6ed668c3f86d4837c51861a660798cc8bd3c3f4aed6bb838 WHIRLPOOL 78439bab89a4822e26c3cfe61f351c745fc1863d9aa33ed7842736cbea98f71c12db83248923091deb4f969755e5ea3ad5f8b33921ff98ee4a6ceaf41990650c
 MISC ChangeLog 4398 SHA256 fea856b224ba93c14690c80b7807acb274d4248bce2ca106f378c20ee9f1d7ee SHA512 b00c7c8f8fab205e2ad333e592fb7ff67ebb22b1843a20dff83552086f18927ad7520b29edd0d0ef82250fbe5ded93749f69ce8e92936d8ade12be8a95273943 WHIRLPOOL 4e8a54d1367dba2297df06cc395dacb50a425d00caba6fabbebbdfddb5df94ae151e24c7e3901f5bc3a14992c765e761e8dca731f4c6ba85124014d99731cdd6
-MISC metadata.xml 162 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b SHA512 b706438a0eda682ad16d8e2217bd54d5fa9f8b305efc6e009d0bf523df159162afee0fae9107c5887e12bb64951bbee4c36c8f4744d008ba8fc2db4c01504fa2 WHIRLPOOL d1196dde03902f1b7eee5c0ad8e30243470e014ec8b6d56fe556125f636872345f0dec41e45f39fa14993db3db78a782efdcf26c3d50cdccd88f4f7c8b7dc67a
+MISC metadata.xml 241 SHA256 06cd29c0f18c3da605e1b38b0e64f297e6defa01d19b92cb3e1db630d8a129ed SHA512 eabc4c8cfc28ffc652791f0eaf66144f97e7aeab4fb0db77beb0daa2346e494218a44f4f8c5b4e6a646da44c36cc6afd46137505b30f1325ffb23bd03da33028 WHIRLPOOL 26b4a02e90b925150bee629de27ff8226fec81336fdfc06379479ff700659b954c3af246d4b44c09b4e9c17887d8dcdb3298cfbcf1ad3b026f84e2d5717d872b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4WQACgkQcaHudmEf86r8tQCfWKEObE6FUKJv5O3thYVNQzfr
-jvgAn1dte1kNFijGX1zBpQKO0jhAD0tq
-=hhON
+iQJ8BAEBCgBmBQJVftDMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTcwP/iSuVTkEYHEY3UyQWon2amgo
+c2ILTZtVytcEFDsGbByzdhL9qTe6TFod/fFGO/qye3z2PRV+F+kgV+T8FRiBHWPM
+TdntKfglyr6xQ9p0y7vp/SQyW2WJr2fpY3b51DyEDgqK2KzgHFNQvdmy1vgG3dEB
+FxBR2t31pT+7+zSh/V5/HJ2cer+GXcX7uKSWHsWEIYE3VdkltpvdI1NaXqblr6qr
+To1UmIhqa1kP4zgwa+vH63lXB1BJTlSwMYF8Lv40yT0fFh/Fd5jAbLb1OGQ/HABy
+6ys2osArYB6gtxOKzNO379nicy3pPTb11xKnALl8BWYK+GRikceIKzl3DgfX2X57
+LoP0A0czN7/DGMKyYPsRYVNG7BHHNvEsoF5yEf77HdzUHrbQWzM9HKIRYrGc8iy4
+ub4rkumsOOjD+nnLgMPcm9CG8hxF66siBq6g7fppcllDwzJZFznwfWFMNiYe87TN
+soydnKYlA2FjOCD0HeB8qY9y3vsYvOHMU4Sdko9+uojf+I7KRSb34lnE2wyrFiYB
+5GTErNtrfdovlQyRt0SGDBOiTBACvVNgarj4bSdpaN7vlogXluVG9CMS/JqwHRVw
+6NVAIuLygptaPuaHOHzbjZCR2MeeXH0B44nBTBStkR5kKqTqa2jb2Ua0zTjnYMxD
+8YZu/7NVq1JWKLscDuav
+=8H3M
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/metadata.xml b/mail-filter/spamprobe/metadata.xml
index 940fde8f70ce..bb04a779a54a 100644
--- a/mail-filter/spamprobe/metadata.xml
+++ b/mail-filter/spamprobe/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>
+	<upstream>
+		<remote-id type="sourceforge">spamprobe</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/sqlgrey/Manifest b/mail-filter/sqlgrey/Manifest
index 8c061f7b3d43..9efbe3052f6c 100644
--- a/mail-filter/sqlgrey/Manifest
+++ b/mail-filter/sqlgrey/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX sqlgrey-1.7.6-init.patch 412 SHA256 4b486f895628b128b3d9a853861f009097beb42cd1d3f059bca052bb2f8ceac6 SHA512 5c6e7f7eb4770cf123cdfb73717d9a50ec0e64e6129dd4c92e3abeb688f9d0b1b1958e298786d852f7341be1448c885c916e7c9086aa8fdf84af154301d0d2a9 WHIRLPOOL 622882594deddf48b0cac4580b1a94bed32e6ee3ed1078a337ea870e091f67f78d7b71255cb220a2c9eca8d82d5a2ed63b30ebbe9ea59e4d3aa30f810b0e9e3c
 AUX sqlgrey.service 161 SHA256 8b95b9ca2693164c481c7252e5c5dadbf2dfd9a08a09daa28f9a0bc5487c9222 SHA512 8c7587a4a9348eed1794a8a4982a4f68052a8218803ea36e195fa930729772afa9cd736c19341ab74dba8a90f155dd98993b45b6f08d0f901a2641a4895ee55d WHIRLPOOL 8cd684977e465d55eab95d9c65989c2414619b99317b04d7e2e834b7a01d443ecbebc9126eb32c6dba54b16f10499bba9bac6ec7cfbb87966738c796a9a40a8a
 DIST sqlgrey-1.7.6.tar.bz2 63738 SHA256 48f6c855e18d3ac3d19a0c2ecd250394a355d0116acd631187b880cb813646d1 SHA512 62822d808aa5991a8d29f455be933cf782c9d5232b63bd1f357093a06982474018fb7a02dedf29274d8b7e9f12525063e6af744efceecf420cd01e74f561aa81 WHIRLPOOL 0cecf88739bdab1c9d5cf85e4ea2625627f934fc88b4ab37e1f5f6452238a2383349eb1ed0206a039bbaab5c6e218280c6d6431582fd17219f7aebe77f529335
 EBUILD sqlgrey-1.7.6-r1.ebuild 8628 SHA256 4c2aac06a358b0c222fe07c1e755519c13a701304576955494e0f8708ef2c65a SHA512 a29497314103fd5ae29e838ced0a2c51262ffc830b2241f54b2a9afa93d71d364c8bd87c204aacd7c342d672a2ce33c50ae47c8206665e6953b5d7a73fac43c0 WHIRLPOOL fd456577b1b899bb7bde6c80e906bf0261050017d10808fd7a3c7dd6747590cc61376b83141a1f2409d1cb765e9edbd683921e4cfb15c6e5f57b8c54ef715de2
 MISC ChangeLog 2854 SHA256 1aa1c6207f684072145dcaa1a0f9740c0ed8e8a92085f98fb51ea181ca1d5d14 SHA512 b5ac02bff87f8a75c9668e93d000d6a2823e1bddea2fc5e8f2797ac9b6c24d92399c0bc40760bad4a824995e7b55cdb6f6d8db4034e50d8c4ce8162714907301 WHIRLPOOL b9bac1a0be3f55e318d83ea73c0122acb84d9c7c3fcf776a5c68d3d49078acd2383e269dff182e010e342f1127ce9d27e136570697afbfa09fb71d52787f8a1c
-MISC metadata.xml 268 SHA256 7511d1483b3d7f112c2013cc1c8cc9aa46e38e1bb3ec1070d08407fd48726baf SHA512 6a27d6dadee1e478f17d431f77a4686781308fb10077b8eab4a5cdfca1ede05226e0b9e3748334efe8ae35e052074b0530779c822bbf632f55d0982e7957f16f WHIRLPOOL b510615ea5401906928c0d37433b4217c7effed271e1157138c99d9543dc166a8a68db56669dd8f154d15cf77e5f9668d641f7905355b746a61c516497b3c3b7
+MISC metadata.xml 347 SHA256 d489c522f7ba284e2ee78be40890c763bfe47c1a73d824275901e61e8e03233d SHA512 2442fa8d8ded23aced4e12f68ebfb8b8b40c9a44fd2abbb44a72331f3cc18473dd409b807f8ff731c6d988e684469c25aa0d6a0fe94d2108d0b1b8b4edc8e57a WHIRLPOOL a12017d6da8bd62159f6cb4ca2eae9ec43de723a1df05c56d22f88f63874c7d94634bf7b17534d38b426dd1c536d03b1cfb24e032044f5caf1980f05fca798c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVftDUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIzsQAKVms4X2+N9sAflGUoezN7O9
+cuJlmRxTMvyLRcxiA1UDsZmjfx3lAZXxIJTXMcAqXVcoAPQVeI8T5G3ObIbL5PgS
+2L5r01w6Mabsq/fXlCSeWAHG3uwX0w/C7rvXJrPFDKOcYPtlK5dKoCZe2Rbuieqw
+a3jIUh396GHJm5/SpeDtlZ32Mis/mAjyfg/inyJTKQMl5N8sBo2PmPBOcnMiOX6x
+ufZsTLXc/+uMWRHRWQjaYKrX5EX732xjNX0+MeXULl2k1We0x76FD/to/YqgGZ5I
+t9OOxWRz2M0u88mF8kOP90FH9ONm295Mhq3gaee9OnccGYSULV3Hw0VDub7bTxiK
+h7B1GBKmcKQsrycLRGjAY4mvQITiSgZYsjJUZzFSyXvv9dwwJNfjh7K7ezvkFYQ6
+TBOlW8w2avSZ2RKFxQp11It8pVC+7ImDE/AnuMdsevZaXCvPAvbeHRpc8/TlSS/G
+c1ygF2ap7b31tqxAEEP5e5384XQ8XETcj1Ir3OmLnwTGw05pVpqs6nZ0QLPDkFc2
+MBgQ6A1N62nkkKesXwt74ZDuK0+NIohEwmsofIS+4waherjtq7+B/4ZBqDXBE/zX
+xqV90YDJg6VLK6wr/nyotdI7KDBkS0laVxFxenxHvXI/2Bz5gRfDXKEg865JON7v
+/oZB6LYEwAB4ojwd/l1x
+=gwq2
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/sqlgrey/metadata.xml b/mail-filter/sqlgrey/metadata.xml
index f1478cfaef45..5697feb720d0 100644
--- a/mail-filter/sqlgrey/metadata.xml
+++ b/mail-filter/sqlgrey/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<longdescription>SQLgrey is a postfix policy service implementing a grey-listing
+	<herd>net-mail</herd>
+	<longdescription>SQLgrey is a postfix policy service implementing a grey-listing
 policy.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sqlgrey</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/tmda/Manifest b/mail-filter/tmda/Manifest
index 35b9f86aee8a..2a4a0ccf9deb 100644
--- a/mail-filter/tmda/Manifest
+++ b/mail-filter/tmda/Manifest
@@ -1,5 +1,27 @@
-AUX tmda-1.0-non-interactive-tty.patch 976 RMD160 175d990c2c9b4b54f8b9606ddfdc8f7d561fa31c SHA1 71068f023be73c3408b5ff5768a3096cfa4871e3 SHA256 fb9e7fdfbee30a1a7c27f1d2f832d646172ba6bf89b1c79a98652fcef6f90690
-DIST tmda-1.1.12.tgz 1427638 RMD160 8a674f312fe9612fe204d081e7fd3d38d802cdba SHA1 0b175d01cd03cb4046d41c62ede2268d4eb12b03 SHA256 93c3d7a5baa7af366f82089b2f99c58d3fb4b5c259f78a0c7fe90d4b39c4a6c3
-EBUILD tmda-1.1.12.ebuild 1816 RMD160 67a79c5927b282b45e7573616fe133e4432a706d SHA1 cf0a1c97254354777214b497854ffdb4bd295bb2 SHA256 67acb5c9105a2270f032c86c28f8e49219487cf1f41c4ac13323b664d6f9f70d
-MISC ChangeLog 9462 RMD160 bac54cfb6ca158aa4bdfab8905a7feac79607e12 SHA1 4ca74d7ff867177d1f7f530cb8f63b26c1727f59 SHA256 8bddd76d6d393258cb5c4b00706ff2f90511f0afb6548cb88ea1e9fe5c63e54f
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX tmda-1.0-non-interactive-tty.patch 976 SHA256 fb9e7fdfbee30a1a7c27f1d2f832d646172ba6bf89b1c79a98652fcef6f90690 SHA512 1ef2afaa54a2ad10fdbe6085698312827bc434a0733da27f402ff056d32c8aaa60cd6fa395a78b68553fcc88ea1561187cc8a2a1a83c30a6e3bdc07c419656e8 WHIRLPOOL ceb0504483f5b2853a034309b849f1a446b9f2d1e5be7f99e610fa55356bfab17379adf333c5911ea550f59bf35bf9eef586cb93f022abc5b837744d48d20e08
+DIST tmda-1.1.12.tgz 1427638 SHA256 93c3d7a5baa7af366f82089b2f99c58d3fb4b5c259f78a0c7fe90d4b39c4a6c3
+EBUILD tmda-1.1.12.ebuild 1816 SHA256 67acb5c9105a2270f032c86c28f8e49219487cf1f41c4ac13323b664d6f9f70d SHA512 6f7ca5a39bdbe154d324f20c4f1384fbfa673d22e3760dbaa959ea0db3e97c5a8aa44789232d421f2270859b8743b3e47303e46fe5785dc23acfb855c879032e WHIRLPOOL bac42f1d347374f30a65417c1add44c508288707ab21053c22996dbf5a040f95bcd91389c00ad2047a5cb2603862ed1df82b48b53b2720bb409ace07462a0187
+MISC ChangeLog 9462 SHA256 8bddd76d6d393258cb5c4b00706ff2f90511f0afb6548cb88ea1e9fe5c63e54f SHA512 98eb807627311207fca7020291de13fbef8cbefed2c94978ed8828e5df5c9e762c6f24fcb00624ed252767d3c33c64e55ba37645091f9e0aa420c430c5d49575 WHIRLPOOL 8cfa6541f8202782ebfc85d1ffb0e541c2640c0c80e109ad58147fbd1ebffa6243a870302e71e10c57dd59e82ce188c68f51a6ec986c804bc19dd8e214e624eb
+MISC metadata.xml 236 SHA256 64982c887ee6383e2d836b5dc6bcef6df9b7987d1767783218be007d3401207f SHA512 2112f2254af3a706fd123c076ff1c488d23791bfc48298b381707dd168ef9921944fce0ebcbd2dca7689dfb29b6fb705f310dc1e4d6ce58770f4414261114a5d WHIRLPOOL 8ed5f6a1b4ac0150753c7a9abf4698457a297d31793c6d3b71ae0ca7c2d1a41c18ca75c460b1baba272448e54ce689150a8a6ff70ade1a4ea9d404c78230440e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVftDeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJosP/3+p8I+QklW/Lrm5kLAYPt5q
+2CEEhWtL9DoXAcFXjEaHXDvDGGTH5n0rauJuDpMXF/LI87REohF2Ta7J+SaxoY6D
+zlAbj9A8CJtCa6UWPW8E4IonmMOmadlRAPRv2sYwq/ZCl5YEH0D/sJPwDWtx3rc1
+I6mS17NBFCgDOfkKhJmkvlsGGCSB2K25vNSP/dFmARmpIDl4edadZK+AEL8lxIpV
+LpmhgrYR7umPaHF8X8JVea1DbJjf0FaqjSTlcFSXOMzZ668AqfNYBmvO8QA4bkKk
+AIwkisec1walMQGPAvhc6JrAoyyGrgW27X2l1otyEEXlB0tBncekilBVr81KyYBT
+Ysm6F0g9DZ/c8ZoZRwUSo1cofz2zrEHmG9K3aktvL2/6Ep2RMxnKvA1gSPN3UtLz
+uKuWo5y3qpkd9CaiY0UfaqW+cELTKPXUM1C193bQuUAT9Qm+3STC6sb0teSMBZgv
+VXCj2xVlmPbmkuYnZgNljxP3VlneMye1dJkRLFeXJBAOY8Ld8WW4EA/y6Z4q3LmX
+Jluu08K3CJyLF7ckAqqEBT/Bw+cPn+BvR3v6jmCKL3SpReuwG1z8XlI5Ek9GZt1T
+i0C95N5KJmGP2Oh0X4CaftI8+ffVBdFW2j2Q9/a3u/FOJSO6bcntZxwpCDK/He1x
+uVSl7M4tYy5ZVjo68LyO
+=Z4E3
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/tmda/metadata.xml b/mail-filter/tmda/metadata.xml
index 51f94e3fbe0e..5fd6a74fbfdc 100644
--- a/mail-filter/tmda/metadata.xml
+++ b/mail-filter/tmda/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">tmda</remote-id>
+	</upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-15 13:19:26 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-15 13:19:26 +0000
commit	3fa0e054d3822588288f4b13a81f0171052fe04d (patch)
tree	b4189995def2496b34cef03975ff25708d430608 /mail-filter
parent	Updating remote-id in metadata.xml (diff)
download	historical-3fa0e054d3822588288f4b13a81f0171052fe04d.tar.gz historical-3fa0e054d3822588288f4b13a81f0171052fe04d.tar.bz2 historical-3fa0e054d3822588288f4b13a81f0171052fe04d.zip