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-16 06:29:59 +0000
committer: Justin Lecher <jlec@gentoo.org> 2015-06-16 06:29:59 +0000
commit: 2b6fe7f5a1293891b288366d6fff488f33eee47c (patch)
tree: e19e596427c05c544e6518c26fd9a685016262f4 /x11-misc
parent: Updating remote-id in metadata.xml (diff)
download: historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.tar.gz
historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.tar.bz2
historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.zip
126 files changed, 1504 insertions, 695 deletions
diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest
index fac931e6e551..9a7b224a21ad 100644
--- a/x11-misc/icewmcp/Manifest
+++ b/x11-misc/icewmcp/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST IceWMControlPanel-3.2.tar.bz2 586044 SHA256 6259d27b5de151049b245cac17606ba77d055766ef1706363dc301085c925af9 SHA512 017b257bb30c49eb0b13a9570df70f6f8ccb55087121440cd1331f8364ddc6c23fae26c98bae1bd831f2a9fc52bef531cab9313f3e2ea209ce26d776ee64c47e WHIRLPOOL f133b4998528c10071c39bab3187705ac7f5c6ee87bd2b73de395a88b0953df217b9e4cc2216ca9bf14ac70b190c30879f04eba2f4a1d342b30e994952a4e17a
 EBUILD icewmcp-3.2-r2.ebuild 2542 SHA256 9e1bb0fdba9810206f118c30b8817c8b84446eafc96d1c9aabf99128f6477b2b SHA512 d065d464c0bbe23fa9d462372373df16de8efc7991de06a54f6921868e8538564fece8e07cdf55d041178f352c7d1f00a2111d708d752337737cd7db3302a804 WHIRLPOOL dfd9ab007a71c28c088e9b478d550f7099c16a69f7e738eebb51205dc9b7166b96646dec7c6b1b49427550a49aec3729240f3ab0212455baccaa64cb198c335c
 EBUILD icewmcp-3.2-r4.ebuild 1539 SHA256 eb406f559a2a34b31bcc6f5ee962cf6f210f3fd2386e1f0a73ed9718bd2ff71b SHA512 f0c4e614b4b118ce79492e164d6539dede752aafbedd2bc103b28d41d6541abc5592f699163a18cb1a16c515ab8d462274173d9628a55182b406d27244ef15d1 WHIRLPOOL ac9e131dcfef17a1455992adfb697ff7e6479cd5127570f82ffe3bf0bde3fb347963129a5a4b50f4c61e445145b31c7d15581c08234a89337fb2257402c727c4
 MISC ChangeLog 2247 SHA256 15d5156ff860200f656c36b8a71a3c83df353d5913a81f4e20af83044ab379cb SHA512 6ed597489551d00f8cbd5b974b6f1c6fd7b27e80dd415e663a9f4c2ca16f08847406c91bf5d257522030d73c60a7eeedeb30f1e280788db31db6881ab9003084 WHIRLPOOL 522682155578cb7cc227b64628d6e40432fb31563d869062b6ba94f186416551549c939ad82fa18afe1809b846e8fb2186ba52d59515a1ede132df7568afe566
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 251 SHA256 624ca700960a35204868b05a3f463ec51481cbbfeee223bdf5642016688a238b SHA512 abcbe9865be32265a3b3764ebddf555ffbc5ad94caf563341e572f0a10a316682de3fe96a73c40b7a12809057566cf208f69ed0934805b7fb9755e9ab3b71fa1 WHIRLPOOL 74b752e9c792d4293a33f759fc9b66d480e4cfc7c6fa12e520f598ec2db4bebe36f402d9bbb22ea21e6a47ea71c36df71ce698654b8bbec339c2d376f239e21e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEUEAREIAAYFAlSGMiIACgkQVWmRsqeSphPeXgCY/ZpSzH9tcwNlrE7FkgaRp5X+
-MgCfUyjPCH8i9ZUZoFq0ZhFJpFTEn0w=
-=jWWF
+iQJ8BAEBCgBmBQJVf8AiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiSqkP/2KAt5pTsODsNdekv2Q2qqrN
+I9pbqz00y//CxUfZv5vEBrnIu8SYVPGPp6vkT1njIbBAAzfsaxBkRZGyUv+viPzC
+bs8cDUjwg+wT0TseDznnlEeFwukX8EOu1uTwZvb7KU3MfPER6n3V0Jqax5oyfjky
+mpYb8tEaVvr7C8O3Cg5z7YVAjO+Vylaxvr4KsbyRkqQhR/+acU1vhOnWBW2Vd9k9
+WnRVpxtWak2pDa5dJtcMDrx9ivaw0eIKwF5UqZKjcp+PL1QxugyVet/WnRwm/ous
+lg9LI11s057yIp6Hmhq/AJlcr/f9Aq8qchs8YwE6M/NGWuhiYbbtSsatnK0pqVNj
+686k7c4qEt8QUEkadpqECrT4IK6lxE56MPKgu0d4rn5EC6PuioVTHpvFJyPryOFC
+DQwzr8AA3wNviQFjLb+yn1PY8ZQPAwv/Ibyyv8qXxtIEuGRfVCe042GGYdkLJ4oZ
+rSvroqVRUBXocOTDHDZA2SIGG3mI8ZCh0fe+ixVFOGgUEDFp3LvZhWcaR0Jkm8Fj
+t085KU75SkH0H/h3lukbSnq7wPqRnqavPMeMRA0bscyeZONqQOaeXO+ABtI84GFH
+dhE6+38zOoe+e2ScIn0NvVRHGcjxWfcWEZhELBY3USkAVHgKun43se30NnYzrIlP
+yDUn8ogEq2skVDYGS53t
+=gbLM
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/icewmcp/metadata.xml b/x11-misc/icewmcp/metadata.xml
index 731225048652..0c74c3eb46a6 100644
--- a/x11-misc/icewmcp/metadata.xml
+++ b/x11-misc/icewmcp/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">icesoundmanager</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index abce430784fa..f49a5b8a0533 100644
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -1,5 +1,27 @@
-AUX idesk-0.7.5-glibc-2.12.patch 544 RMD160 d8095d2151daddfceb06d6aada801c73e10e916c SHA1 a02aade5e67e0095044480d7865cc61a880db0dd SHA256 b9471ba1727f4dacff5d304c29bd81aa97070fa4581770fd4331e168f6711bdb
-DIST idesk-0.7.5.tar.bz2 185858 RMD160 cef8fefc139dd96d6a7cf8c43637d9a504d2df14 SHA1 d00a2183835f06ff29aca61efecd831edf19ba49 SHA256 d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
-EBUILD idesk-0.7.5-r2.ebuild 909 RMD160 9b435cb1bf9df5559dd704e189d591a890f6e5da SHA1 2c7c77d0c56a6e2c41cdf3aa2364594b827d4eb7 SHA256 7dda67d1065db35e248b80806ffee980444e606ba40091a1b55e5074fb076520
-MISC ChangeLog 8100 RMD160 de910a39f6a41897647fc29864fa21d2d35f1b90 SHA1 7aa755bc4b63d930c427e4a6baed2a0ec552b774 SHA256 bd7802ee48ff59d3545c59ef9fdc8715a790ef476504bb3a11cc664fa8f2c63b
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX idesk-0.7.5-glibc-2.12.patch 544 SHA256 b9471ba1727f4dacff5d304c29bd81aa97070fa4581770fd4331e168f6711bdb SHA512 f21f419d7facc62990a35b67e57bec2f9b46c76a6026a267348edfbd0207c14682cf1a3b8ca0ab4d508668a0c4dc9cc8ad06921b3218f077225bafc3f1ae9fc6 WHIRLPOOL 8ab0d364be8a9973b1ec474c532cbf10f6405b7235e5ed833282c3210ae9a87c91f1e23f71f267e6f99ffb9812f642f737d418ec5577fd67218ec124c8c83bdc
+DIST idesk-0.7.5.tar.bz2 185858 SHA256 d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
+EBUILD idesk-0.7.5-r2.ebuild 909 SHA256 7dda67d1065db35e248b80806ffee980444e606ba40091a1b55e5074fb076520 SHA512 a60c2875d38178ddcdcbca4e594dec85daaae22c8ca058b0b5a532e8c30293bf07bc4192de084e440bcb63dce2f45a0589c36e65a4a8eb4c41fe63892172c972 WHIRLPOOL deb73ba9ebba6f3568682170f1a8602bfe87ea932ce668483ba74b21d159a899266a4615f690435341ebaa52b9b832cf21c9f610afa8881e16792a689f656e29
+MISC ChangeLog 8100 SHA256 bd7802ee48ff59d3545c59ef9fdc8715a790ef476504bb3a11cc664fa8f2c63b SHA512 a73a062ce5c21fefe18ce20a2ee78d72879578b3b3735fd45aaae795f909103baa3bd2356348bc6e8de1352f3f41796599988ba25bebd756399b3094eea47e72 WHIRLPOOL 5d578061c76a36d9dc63d707143a406863f2400772fb6fbb1eca4f4f7aaaaf0531172c753408816e36c03ea3918d7f906228c22300335f9a0ea9f5cdf04290c4
+MISC metadata.xml 241 SHA256 4ec1508035efd4bd87c204fea665a8b6f0e8727079dd96acf17f6303605abde6 SHA512 862720cc82acfe998d4b034018ffd8ccf16eab3898b37a2b26f232c49dd2e394922a26c42d6cf9458ecafd828d19a0b091f484a3e711dfe439e8446f8ee14041 WHIRLPOOL 20fa33cfe89cad2d8658c5a9a38da08704c495d82d041226302315c3f597ea9b0965fab149eeaf96929570e97d5344c93490ea682f414d461fb77a716af063dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8AvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi11MQALFPNDfnocM1h6OuuJ5eiDQe
+Qq2b3XS4utQFGbHORK4noOyXBL9nJUJvLhjQpAw16N2ARyEkmF+fCFOZvpdWFOHO
+uZvCn//Tl9ytL5xqN3G3EuiPJLc48eqYpGNECQxUMYWeUpxSuADo/Q1SIgdC7xry
+NY9UsS+d4npxK8Vfy8SBNvmW38jpl+TMq9QCUMrHvbOCP3Y78mzLQ2Yl2l7077cr
+6/hPDPgQV6DWYMyYmuh1BLQtCxSAa0RzAvfQJvjaNYCLKSUimIFUwwn8+/AfiffD
+Xzq/96ebhbL6X8ZfkFzlZBrGm7S2ZjKh+XykQ03dsz8WWoe8NSW0ISrrJI27rdEh
+t04XbJkJvpNdnQ9/dzQserF7U7MoW+pe95aV/rDWydwDWG8VMI8tleNqrjLKp4dH
+ZnyOrJPSbo0wuPx+W3CDCizXz/YWcozsCyarcOgurkye3WGpgPtdMeG7bFhn0wNq
+7baAg4FnSbS+nhPSnawlIQrP8x58pC2BDfizyzmHRnGQFYM7macH22wQ6ssEPiNV
+Qfif0yRJ3NQvQSsoYZqiOAD1qeJzd/f494DFzXRjOU4Ksau5O2mqo1DmDa1532S7
+joWD/ozZtqzZC9qa4uTvd1nOtFM9A9WlyJ0rfyNy95nnSIz3WocHiy1+7Ufj3r6M
+U4Oa/+ujPD4xRqR3dkcR
+=skLf
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index 731225048652..fb0d57fe87f6 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">idesk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
index 45f3f6c1fc4f..6681d162c049 100644
--- a/x11-misc/kaqaz/Manifest
+++ b/x11-misc/kaqaz/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST kaqaz-1.2.0.tar.gz 5824631 SHA256 9e6f34164623e79319a962fed6410b74e0d479571116a4525364edfa8ea4a3e9 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4 WHIRLPOOL 9aa125318b6a94325509f22f08cdec96c114e0bf3de8b37966de91421da70e75d09e10414eb9cddfd3c16ec79674b854ffc4ce3a4c66924ec67cb55f339cfd68
 EBUILD kaqaz-1.2.0.ebuild 887 SHA256 43d1e7b32451d74afcd98bfb11afe3cabba17d5f4e7e9723fc17b26bb0e9dd77 SHA512 f193cdd7d0734f9921a016a9d0f32434623f941e77c66ff8b9b086e86f4912c1ff4d282110df5960a303ebe2ac5c1638ce45c360e42a3c68a55abfac937bdfc2 WHIRLPOOL 3f0a395c8ba0a4fd403cd54d1f4dfdacefea3803dd66d7c3f18185d4816d9190bf45c15ef1e8550347c231e745085a97312a7188f27e442f67032e5dbbc345dd
 MISC ChangeLog 362 SHA256 6821492d5fce2e63d48266ea5753b0bb072769fd56d4ac825237348d5755b085 SHA512 3e3421604f8ac30ff205f492d050e778c15e4214c6145b9343f09903b7162c7dc0c5011214da241a097cac38c68a7c4fb0b95d58da038b1c4b77bc3a49fa430e WHIRLPOOL 02517cb4ad292e514fe67a51c7bb12f90c583442d4ca23dea8344f888fb2971f229fc95d425cf40c0888281c3b7eea7bab602d46e9eb1d0ba37608157f503900
-MISC metadata.xml 255 SHA256 97ea282613570f70216aab25c7b32a5fbfcba27d02d7972ff4f38c0e78829b83 SHA512 fb1267dbd13b99b80947b2a13bd5083709db36e43cba5f61dfbea1614034ba5871f1f52d8fc89652b1213b351f5587829f9e3b5737cd3d5e238a70cb600ef9ae WHIRLPOOL dcebb0a6ad86dd54ed3c9b1d71a223bfe44c41f598ab41c3e43bd56bb800b6e4fba56bfc99631d5ef1e9e5efe57f129cb89e9eb3dad1559406ce21f3788ba25f
+MISC metadata.xml 341 SHA256 630e87bdc9780aaf493286259d4de6b103e08caeb41ec05e71d030af4e2bc27f SHA512 03f0944ad8bb1bddf180e95bbae5efe723f93b0d774043fa170b99813c7837523de0848c4af56f72d7f13d524e2a713e25bd9eefa69871d2914c47e2c2bad1a4 WHIRLPOOL 32105c6995e84e4fdb87ceef3abc1bfc7c72c98c12a41b374864e4e71f09368f68a236b5e20c2f4416ff794187ef5c269eb53bc3b07c4e8ea680e1295d98230f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUjvMTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2fqIQAMXtZgXJisYa/Yj5ouZQI/nc
-xxjqcWf/tmoOB+HPuOjCjIcjHSC8qhESqGMDZZYOOwZskIlTfDDYTpOH97uEtgv1
-WFqoF++3Z/4brokMoX44hPSVpacPkG4wYG2+kpK35XnIinzk69FA/gw/5YA7XFG6
-8d/xlUzuAfNBgKPnH0Ra6TefAYQNnBEkR3bAj1nx1ck1tNGQC4xUT4BlyVeDZm04
-5eTinzOOyBmRt7ofp2IEI//yTDm+NbnwrgCxnkf+hbZ8u5tm1qXqZsriK4BIQXZY
-o/kKSi/Qx+hJJB9bLZ/flNV506TXinTSMj8oY7mGfJvlarscPURnlfrkxhQXwxPv
-aQ4TzOnkgUMaafmk3QEikfA6XdtiglrBBysIZcsO+3cmrjOZ9GfGEyhQAVmZ/LcJ
-7haDssoLUij5thARzCk7VjhGq/fTdLdm2U7X5YNvHe3IqRpZWgZZhpXhfXVaceUb
-qmpHfgiC7Z+9Zsb/H/D4Dz6ojQEHQP/YweFrEfMGc+VWRVDsX+pc36uvO7F4vHVY
-KOW5ewZ/Dd+kapS32jPHC2r+rydCDVb947NhUo/4PLx6tOBlQU/5jTxWBLVm/Xmp
-W7Dwv1rY2bO2UeA8k2pL/oAAUURhYW1LWvZSw3VAhmsduxP8XPKOoLLFRThsDLCG
-PPETszX5OoEaOXrheWI0
-=apGn
+iQJ8BAEBCgBmBQJVf8A3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiweoQAL58m7oJSzOwj3HocjWP6Inq
+HiMsk9pmbkFppdQfhoSk7nqzmLF81lF1chB1d4ZjKriNwbzJXQmMK7Qjxn2QJ3pC
+O8ko4eoQ11irMF2t9CVy97bFDbQXBxGsxbWPfLpU4iqKIK6kovV7ggYzY2vOVFxq
+1TYKFLHNnvNEo3AsUewyLKDT39alvhEm299/DacQ6m8R1ULiXmwKd2vWwspdomTZ
+huk8ZAfMHGikO7ZhfgGDcBN5KyHI03FAPaKJlXBgu0W9sYuuSCvH4tSX7AHvXSe2
++9fjc6FuYvH/smt0BedmQxvUM5eoTCs6MCReFgemOUl9u89VCjiSyPHYbFOMimCL
+2GSMCUBZqkjvtDDZU2uyV1ANZdl6dERvmrv9a0ty55kG8fldfMry0iEBZaYI4Zn3
+N2hZTMewmoZg+pOIa/JZjuGshQBM2kFefG+UkBwrjnzb2DpsMvOFpuCEduxCJCq5
+MO4dr0Q4S/eYAuYA8ht8r2AMaCEx9iXyMT1mCLjs87EMXAVNpdsxfxyzx5O7FOKs
+U3Qvqr1+tyAhWQRwdkD5H/XjIccAQ/wssypaNzqZLqo1KSI0aJrYjgp9T/jAZHqz
+vw4GclZ6f1aH3AVJeMP6KIQhl1ITQCdXgacmKWnJ9kMgrli0Sf61mBgqsth2db09
+mUvAp0arrWY7LzbQGTmr
+=5fsA
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
index fb3e6ca592ff..d40c59e42cfd 100644
--- a/x11-misc/kaqaz/metadata.xml
+++ b/x11-misc/kaqaz/metadata.xml
@@ -6,4 +6,7 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">sialan-labs/kaqaz</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/kbdd/Manifest b/x11-misc/kbdd/Manifest
index 2c0c6d329dc4..a8a86cd6bf81 100644
--- a/x11-misc/kbdd/Manifest
+++ b/x11-misc/kbdd/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX kbdd-0.7-fix-non-dbus-build.patch 312 SHA256 703061828d490774583170443783ae5101918cef0d2cfbf889b82019ae8d5e07 SHA512 cfa2c41c8a6daf3d8e979d6fa023ed8c403cf62cde60af95800aa9d6cca8d1094e80b92e4e1865cfb67bc9e2432224683bf4f54d1acdbfb0a033023ff94fc8b9 WHIRLPOOL 41ba67596a00f2a601368b43d9c6f6e6006b0b8b360cbaee3b41247578e7434e378a7bb949ea712828fb5ed94ac99d974bb3ebab32fe795ed7de0ff751ed37a2
 DIST kbdd-0.5.2.tar.gz 30680 SHA256 fb49d09d8b9e4605ed6028eb37acbb404807dffb09cf8e4ee529abcda9b5e7c6 SHA512 dc911ea9a7c97a986a8f8bfd3936d2ea4a691e3d6aacfb606821b7a458b84011ee6e4dba60ae2cd105fe599b41a8d28e3f0345f0865150005e042c92796bb6e3 WHIRLPOOL 3c2b8017c3931e30fb4444433732901fb0cf5f2f21540bbe889a6e8ea8a1fc8f2e8d7a1f9f6511fac5adc4a07a6b996accff142b3f08bb52f2edc094bcb2378b
 DIST kbdd-0.7.tar.gz 32550 SHA256 325231d4491bfbdb80ce66c1b4db3c41081d915f1c2af8cfc1d68590c640b489 SHA512 959c07746207819b6c2ba74635d737767970ccd9442b728021c8162de01f08a709aced78473ddd942d46159264b89e631ef35a0cd9c5330f71710a55125aeaa0 WHIRLPOOL f16bdbdd21fb8188bc46c044693510610573486cfa058957293a1dcaa7b6a2294735bda859d50fb8297072676ae25bc1cb58282652a5db12410cf389c91407c8
 EBUILD kbdd-0.5.2.ebuild 744 SHA256 5e77d3a017d1d9193da1d79d0cecba8dadc8254a1cac2bfe52e33b092c3f731e SHA512 46737942665034b1bacf0a6f6bfaa2507f184c0301f28b4381e40e78190e3e9d83d034d63ce6c831b2d4bbb05128b700c4f4bf75e818ae53d192cfce5485f1a1 WHIRLPOOL 88277868a67f5321441171164e680e62fe6aae737cfb55f341e8862a379b4199dacc98c551654e8c9887b132d59c6d2e229c44e855c90ca9ee7736dd9d8b7068
 EBUILD kbdd-0.7.ebuild 805 SHA256 35944a05add87f4e0fb64a10916a29c586956e578852a0787fd3b9cc1034d617 SHA512 d6b1c44352b87842e5d2c879d33cf54e22008772757b9ffe41cdf1db03c4d2f1fc47e39f416e55ae6eebaa9fca00c863e3a84add9cdb560df09a963994c0f85c WHIRLPOOL ba32c07722e4ca6acf8fa60b752cc22d3c2b4be2bb28a281683560e258c793c7fc1bc81597fb8314d522f5e8abfac774d33544529c54199a1383b18c94626c32
 MISC ChangeLog 217 SHA256 ed3cce594b87c4477278f70039249452fe991d862d7000adbc13a392cfeb59ae SHA512 26f6d8f1d7def637b82a40c3e78f112038c3e0999c6acc38b7728946a5b19ddf2dc0bd37c0779476b51752684068dd59d4781f0675cdcb9accb3a9f71cd97aab WHIRLPOOL 1f379faf62e1640f4200bbb4f4d7f3f45ab81b2a89f1099e58940c724bc4bda2827c072382b6bb62ad8a04f93b594a2d6673e8cfeb1f61d5aadac2f5cd7332fc
-MISC metadata.xml 257 SHA256 39193bdaad6ed2d25049639ea6cca3c90b0c1e80e433897a2ae8f966aac102b4 SHA512 95131817ee1323a5d7be3107bcea213092758e08f96e37855147a1a2f8c07b4db91c9fcbc14b0ce0e25962e45d0b492af33f50a72eb9f9f6bc41f8e5fab966a5 WHIRLPOOL ca40fdadacf3e1ee1bc600cf2a64ffc7faeeab72502230436e81b3c4ef4d07a22ce7aeea31e4e97af34faced97c9496bb384ca8791c8cd276abbffa32eb34d94
+MISC metadata.xml 346 SHA256 1d9c1e3fb87f668836d29ab72825e15fc5c455f0e062a466fd2b126b9043889a SHA512 b045e34829a370b5c393479f9c346fe6b66ab74fa373980701521ff1785e45e80cec9e59483f99cec2fcdaf00ccaa8b03190fc802cfff7273ace0457fec34536 WHIRLPOOL 73b17954b3f715552650e346844a06b1eaddc15c4c2399cb4d6683e367d1298f791bfa6994162582be943e2190b081d8aa5d38c9d8a52faeddb8d23002b8c000
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8A/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUigP/iA9nM+Wu4sSSVxjz0x9t2te
+vIBDQgE/4xBANFbcxxmhTtVIfSU1rcFbrU1OsDP5yrN86i/Z9ihy1ZL7B4Mqm2is
+HqtG+iIIuNXlmKyng2CqFPBprZilGzmPPJRQrMwKa4eETZQp32dtEBtCcdbW/bw4
+kQME3uExFISl4XSi1u/9lc4ENyxMNyqS2/jy6NmlZiiARO2eKr5oN+bCUnq9cC67
+yczglewcrGoBUaWm7OgA/DiZx5nCFCEWOmcBtuHU+eYKu7o7fv80QoMQF4kpD05Y
+Vbi+GyQvlDUouHLQQeS/BM8SLS4nkUdmJdiEwUsteJ1/Sl6s5+1NJKgfhy2Putz8
+IkpslZo2FemHWwhvoRvLsQE+eI72mgjtai1vjgQbzlpGV+nUDCBTfSo59/wCfCCQ
+w8KbCr4/UmX7sVEfkPbDmBSpoYC4NEGP/SPkeKNllV006wvrooZL6OjYfEUEpTF9
+UMa94Le7SAUrci92uPvM8cKh/ILLOUnn6Rp7eDSUg6+DfsapOo7o6Z+084MHInBT
+6sJH42+v2toDJWA3OTDToEnJH7LDK00WYL12Hl5Ql0ch0UFIaIv88cUUFcmDTf2d
+9OC/XKj305ICziLBQP3rOCRcKiImN46tB0tKiylVtJHA9jxf8UO+I29n6NZA5cJm
+kmbJ9lo5Mog40EgD/Zho
+=2FtG
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/kbdd/metadata.xml b/x11-misc/kbdd/metadata.xml
index 2e3c9a8c150f..b700c6b0f22b 100644
--- a/x11-misc/kbdd/metadata.xml
+++ b/x11-misc/kbdd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>qnikst@gentoo.org</email>
- <description>Very simple layout switcher</description>
-</maintainer>
+  <maintainer>
+    <email>qnikst@gentoo.org</email>
+    <description>Very simple layout switcher</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">qnikst/kbdd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/light-locker/Manifest b/x11-misc/light-locker/Manifest
index e3047c723df2..15d4711bd5d0 100644
--- a/x11-misc/light-locker/Manifest
+++ b/x11-misc/light-locker/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST light-locker-1.6.0.tar.bz2 522644 SHA256 63e0cbcc7ceb8ad695b4bbe7eb9ba5fee32f47790ccde048748d8a47edd32ad0 SHA512 23e10a2d32eabf2cfcc898dcb0c8f98cc7c4e02a3fa83d1a5bd19c0f11251123e618f469bada2cd1fa4f028396c5fbe5751f9943b1be4448aefc2d64fea1eb18 WHIRLPOOL 3d16015765caa8f166a7b1ce8529077bca8809b5d4b66f4a29a852a8f610286ea957f87bc0f10b119083153b2412a77232214b8a428999d5522833e779338500
 EBUILD light-locker-1.6.0.ebuild 1391 SHA256 28702759ce2fae5c5c1e1bab28896a7612b630831f8a5c789880066382f90273 SHA512 443c50a7abecc566a14214980f9e32768032f39fab368deb7bd302a1a8874405a233017bff7b86e6421a3ab447b1df3f136a2bb7ccdacdebef5c40c56cd501ce WHIRLPOOL bef77f014413e597257865c846bc94e4badfb82332f258d9bfecb610ecc8eafdb5930a48013d91af0de0d1eb27fc15db17372e82833c86cfed929b21f1262eb3
 MISC ChangeLog 565 SHA256 0a5b9c178f11f429e175a6ee6500933f189de254f6ae1b88b61ae3c4d61a0615 SHA512 9678ebca6127bc59d2fecea420d01f71a2817e8688738b843dc1419cd5440c3aa9b45b5983a458799435f3fd7187a71809d6170942f49df80403c329b2ee3d97 WHIRLPOOL 6e356236788c56c34978977e4a53c4fc103d187fc1a826490b8a3a9eab48a3405927be1c7f1da8bddb268eed725ec8e167253a70455110c6d121e8287000e8b0
-MISC metadata.xml 579 SHA256 8f8de10cc1b2b039c6930ae88886c9d4bf51389010aff6d835de772d37c39beb SHA512 f6e72815fcdad3d10caa8ae128cade1a35ebdd41b57f487e44f8522dc88633e461cef84615cc9d4345ff59f075b89479d5dbdb86213a9c06f011d09792a01121 WHIRLPOOL 6238f75feb79ff645e99f7b76113f2f6838ea1db7624a690af37d235c17a51a36e49c217e746b12b6b94e4e2b1e124fe64aab2f5a226a2bc8082fb29b73dd2ae
+MISC metadata.xml 684 SHA256 71379381411f30f9bb0f76d0a46b537db4973909f84f34bfca11c99c8189ea13 SHA512 c45642f3837a735972c79241a084262fc247fb11a0060a1dc279f28a8bf01741dfae10c3a92f9cc706cad53c2a7d7078a878e41cd835fddf3983bb83fc16a487 WHIRLPOOL d43f22ba093431d46b4f031860e0c45b6a51de6425609b3a19a1f9a0af6eeb915dcbcc54437fc555a7d03195f197438e3a1e7a9712f693360e60408a9ccfece3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8BeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFIIP/1IjBW2MCbfESmwbLUcIBCnU
+27EqXMS1PQQ+TLdA5AwQh9u/C4lW7nzogtIPz3KFlJHaGNvmx8xEWHQBVZfjvPfR
+Yjx+cFPZOfYvO997NUztvIpVXcKzibtwGoUnKaIRLxp1JUloUURbIjPBxSwl0TJh
+StQlT5w9MjiT08RTqyoLka8wlYIgyJzSKAMP31KA/N2SzPjW4rpiFFSkYkP4UuFS
+pUBf08QhWtZaX7JhKytKEvwS5HWvIcLSnID1xWMXTwHMqMVhFi4aWGVol0HOyNEM
+L+AAKVupI8fQ9byb2cw8y4C9g8zGD1i6VjQuwFVmo9TKN6qoD8N/o2jynMNU0UcR
+P/UAO2K4gDYByuRi+ho5wcURNvauN2+YlTGMaUinDExfQN2HheNrHhCpR0KKZHUU
+8YMwghaCGVXtxsFo5pm/8ZjULHosCJYdIy2K6tRH6lAvm/Ky5hcowMarlTy2xjNo
+uhrV/gBHzVhkymSi+o1KDQEbilXop1y3uLcJIkKUW59nXL7LLXqOm7ARzD1+j1NP
+FmtRNRX4Xb0gwMEfpLf99ZgZoUOZuPVdnQhw2WCUAasXoY98gktmY75RhycIhSGO
++XJmocgdopgMSKUH5DlerOBRK7i2NPujvlsQqwTYVYlpgJh3F4cT5gJqDRDOjq0H
+R44E4AU+6HvXridtI1JB
+=WN7J
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/light-locker/metadata.xml b/x11-misc/light-locker/metadata.xml
index 1c6a007fdba0..b552d0643948 100644
--- a/x11-misc/light-locker/metadata.xml
+++ b/x11-misc/light-locker/metadata.xml
@@ -5,10 +5,13 @@
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
-<use>
-  <flag name='consolekit'>Keep track of the various users, sessions, and seats present on the system.</flag>
-  <flag name='dpms'>Turn on the display on screensaver deactivation.</flag>
-  <flag name='gtk3'>Build with GTK+ 3 instead of GTK+ 2.</flag>
-  <flag name='screensaver'>Lock the screen on screensaver activation.</flag>
-</use>
+  <use>
+    <flag name="consolekit">Keep track of the various users, sessions, and seats present on the system.</flag>
+    <flag name="dpms">Turn on the display on screensaver deactivation.</flag>
+    <flag name="gtk3">Build with GTK+ 3 instead of GTK+ 2.</flag>
+    <flag name="screensaver">Lock the screen on screensaver activation.</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">the-cavalry/light-locker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 5411ad21ebba..02ab0234507e 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST lightdm-gentoo-patch-2.tar.gz 695543 SHA256 5733622609afa67c82e8b6bc4915d6fbbf8470604afe87c4334d418eb5834fa0 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274 WHIRLPOOL cb5137a361f32c122fc7d7013f53e890c0ec1823bb78c61fbbeb03803363a2f94cfd61fba096036930d5c561452ab86bab85a9003b1afe521f8b77301c933338
 DIST lightdm-gtk-greeter-1.3.1.tar.gz 374479 SHA256 a384b6413a52e6c6aeaf3242b2420e857ad7e2e4e5bec47da663e67076c0ee87 SHA512 3a597fcf3dff930c5ed9cc13675c0af6f385987718527a4a2598a92d2c114df5752d8ab7867d027b4c5de71fa76f0127b57b4d73400a096e530835bf9e2e945a WHIRLPOOL 7e78fd138c528e258eb1718ddf2479ebc657887a41c605a001dc14a20965c99d45d7500b5e5194ca364069ead762fb029ea6e2ce03be4cc786ef568b4deef7e5
@@ -13,23 +13,23 @@ EBUILD lightdm-gtk-greeter-1.9.0.ebuild 1566 SHA256 7328b7a949f4398c8d30c579f2c6
 EBUILD lightdm-gtk-greeter-2.0.0.ebuild 1569 SHA256 744a104f419264a6de8455740c49e823cfa5376afd54b75dedb4802bdadf320e SHA512 e48bb2b049431ff82fc55d27fc93ced77cd5b01af61ec4ebe8f2b0e774d7d32bd751c400344eeb04ae4742c8c273f75330dfd219add17a37a10e4ed65160646f WHIRLPOOL fa3594e0e56d942ebd672cb26f396c238c7576835fbd3e083449651aa63d7d4177cfcb297d38dfe364f5baa169f23ea25cf59160b57429b2cef68d127b12bc0c
 EBUILD lightdm-gtk-greeter-2.0.1.ebuild 1573 SHA256 690a911db2c0fbe82e000c30f79bd8e5013d69d8ca576010d12572cfad809f0f SHA512 0ac3cec18df54a409148c165c2ef2088dcb505e5510e5d4e7ec3fe9475ce5beca491c60f0c628166255a0a02ac658c589723adb69d35136380ad91c106e325f4 WHIRLPOOL 5f3202209ddadbf112605ad331d7fc6b018bfe0a62117e7b018d2075756c1b3d51b4821a3b4fe1dcdd1c4b22062c0719f57aa7c29b220c8c6953bebd9d878387
 MISC ChangeLog 5207 SHA256 9814e591a5147c31ba3437f113a30f52c485fc6d8ed58ac82619325f36d6e065 SHA512 a1663931d1b612f7120e45c031753bd8586fc1d778839033bc5bddb244eedb2474b3d2c0e647b1f25ebc184de164d3dd57cb25923475d04b79340c1a054a0b9e WHIRLPOOL 79a60a6fe1139fabf308c14eaf0fc6626f7a8fe584b4bddaf27070b519c7ffc6d9abef626c3826fbd99f73b5e9e5967cdead340c109f27065904f097dd778711
-MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
+MISC metadata.xml 371 SHA256 9ffe9e86663a890e64b53e027a2dce6bcb07cd36e6ecef13d732f2785c6a17df SHA512 78f15483605fdeb72530cb34f9d29f6ba11a108f342cbe023ce15e870798913b3d6e287cc1131fbd09a79049108124c8b3be1f1253bdc519de0862176a01d917 WHIRLPOOL feb4cbf95dab60d72cef7186507363059f4b5f20da40ed8fb6e1877ea68ac50987e82eaa7713f8dbde6b360da725ef33baf001e343159d56f77b272cd998d330
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVauJdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88k/4P/i6led3mHGu/LNB1Pk4NR7WN
-SntHEMe0Fr9okS93NtOx6aOD08Ku3nxKfIYq9hZ/T2NfDMHd6rOe9/FZJ1UW42pm
-zghVNpH8TUDXo9cXdXYyL7tM4MgEjmDt0yiM4SGYys4wOgri0XRP6S8n5lsruLSz
-L8+TRRUVBQxMddwkW+UohVjXQQjDCCK1E+25N8t26QOKSJlSHttb47vpkHcIrwCP
-FMIishps2hPEF7HQH15Iipyu2igcwgHGEi1nVjriiTgYpQUCg4zVPQ61X3I65k63
-1QfHCmYuSz4OsWGxr9LV6Faa/Q0JkbCUyo5VT5Svtcj71n2RYn5+EWHoxOVyNCIc
-+FLsnigZ0cGIy/oBlJix/b3hZ/epp9WptNVDM3DtYi1Gql2snfLKFo2Lz2GtU6GN
-TwTRLvMmlWfhluGXe5Di4qpXuzlzYHYhwOJX2yZFLsoX6vzBXLKVQlqt8l/Wx50j
-rYOjxw4o7XuEhsL7kJRy3OvqcxUIoKG/q6DPqoTb7LGjzAEwsACXkHCEueVknb2I
-+IiyQA9K+Y7nZkMsR3c2HDvYwH7b5TT/ypYGhKHe03aNouDwk/vzsfJe9BOJsPZo
-JWAGqJ2YNMtWYyjWLJL//oOZzIKt3fuY/el319MzVl2cIxMNZiljvglutTpZ76P/
-5xq1dw4vfd/6lruS3h8d
-=L/C5
+iQJ8BAEBCgBmBQJVf8BVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiBhQP/RC1+Rf4yf5VSWhNh78j5fzx
+wHlsSZGVXGb/OMNb06I9JF3FCxsWCp5mV2ZZs7X7P01sxHXPmLujCrp+oNDtBOnS
+GMeHUXY0xKeZQv7nZNFUL5oPlB2zU6Od5XgPjdw6SS0S2is++hp2WzPDdNSTqw2L
++QJmptKjcPIRO6e4OpfPC7NM6H0kxxUXlOoozqKzLshQyeKuFpXjSyiU3hQX94TL
+vullDcpfNGacq6SWN4QOV0sp0fQ1it0lTeylhqOhtVk+Kj0apOsy6pRH0vRVjcXW
+2s24gyMRpLIyAE4YRzM7wtgwQZ98lh0PG2IPYzdGUyk0wgtQ//NFgQW0bSIS7vyV
+lGXghJvdD6COSiK3aqOopavpHhzuS6o7ePRXdCYr8h98KEaB8N+1NY+7z4+nOH3W
+vQDh4V8LH8ZbDCt6x6EYWEqSGuGrb2pcAU04jz63irNdNegSmKPj7wa6UtdDcDtf
+C8xSe5wNtogxDJS2iwUJj5R3HKeg5qLqB0yz2tTrEOal2JGaMhmDc3Jj9j7jQcyM
+nB3uyTACTaDIIpcPug2g7ciIU2+bMmGgJB2APPeNf4EeK+DyvefNZRRcePgIsAXf
+SjuUX2jJ8jFmqkUJ+xi35I36sb6i71bhKnbddXcceP1P00PklQk9TeN8TZpQnAI8
+3EQpkwCEb/JycodEWjn+
+=t3Re
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
index 5e3a61a90139..cc663964ad30 100644
--- a/x11-misc/lightdm-gtk-greeter/metadata.xml
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 66f4c9b11a15..a1228527797b 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX README.gentoo 494 SHA256 6192d8d9db26d97404860f891ba8a1f3aa623ac72df2b23c2939344b6960dda8 SHA512 07e35ef0ac603b2b817c33fd2bc06b9b254a2e3fee16e7ec8fc0c86d27330c795b8d1eae660c42c414de4d721faea2cab1d41c5950ca7a1032d758626011ae3c WHIRLPOOL 7032d5d76eac0c94f8e5be5d7dd517b5b5569179eed04d398736ea75fff0eacdcfd4ab43c34aedb203c2fbc2d6ac0661f21d90b4a09e6bfd1d4cf9fa290dce3b
 AUX Xsession 1819 SHA256 7968a509b63b18acbf720903fe9a3f3da7830845148699adabc29bafac3fc0e7 SHA512 f1f9264ef6103e66ced2d94bdb24dafb71a37ed8286b35536fa992d774f288bb9b8e338e184c955b39f0448da91af5d7c2d12c5536521186d8ee5db832e20e7e WHIRLPOOL ea447e2d10877be0b8525fa84a5886f21aca10266dc26de5e977fec8c53e9071c9da5af5bf3518d55c92f9cb04c8155e34c499a14e92708912f3ed4d98e7d432
@@ -23,23 +23,23 @@ EBUILD lightdm-1.13.2.ebuild 3627 SHA256 2d2c408cd28cfb1db074628b97dc4e3bdb92525
 EBUILD lightdm-1.14.1.ebuild 3627 SHA256 bbc94fa3f6b563ea56dc411f0d9ce0e38c42096cab28953f77a6473ce5276b48 SHA512 9ea2ae58d0ca298da4421c46777a5f6938fabef0534ef4b5f37aaee009a56b1ba5abfe09a47e68e31248404d05c2141b009b20367ca94938c48b76169aca967f WHIRLPOOL bc52c21427c0adfcf2c56c03d55c3bd168395b402670960c47c0f018200ae6bc0878531b4dd9fcc1d1ceff3db76507fd93bc663a9bfb428169e88a2cf8106da3
 EBUILD lightdm-1.15.0.ebuild 3627 SHA256 d88691d8e2937f961427d60267e164b0984aa57fdb4cfba3f9de0c3edb67765f SHA512 398b447b5bddd052693b294dd909fdfcc09549ceca2de2f93ed16862450b88bf398c380efee3fa2ba601327bec9dacbc03baf1263a6bf96278480fb728478190 WHIRLPOOL eeba71b0a9573dbc0d560d8ebe581e1ff85ba8acfa8899624ca006b37e5b8407d501e49f2539d677bae47fc473ada639397676fcdadb453108cdedc4ef110024
 MISC ChangeLog 18425 SHA256 80dbb649d8ed81ac2b14230d2f4fa2551f2c47dcf981de525a1c2719c16a930e SHA512 7972420c7ee03700feb703e850cd3744d39d2f4a7d54ac3b1eb5c1bd1bb094b9a9c494dde4d346f381998baf076fa3bca439c8fb750581ad0e0f8e18fc592b83 WHIRLPOOL 281cc00020c2ac19e81530cff753ceea0f39e0e659730d4d8df2c096da075437250466fbe2887493d664280b7cff3ad30c27f1f62e08964620d18b338a912e13
-MISC metadata.xml 479 SHA256 4e0fa8ca99f6b80f9a8aac474b5bc0392d3f0f63e3f791b3e21d069798e50382 SHA512 b5346c4319d9a8bc194792450bc48b82490d6ee55b2cdf9ac902385fc2c5566fdb6021296fcd34915fd6a928c05ae96796677dd90811d0d3a0bfae20c6f4e1f7 WHIRLPOOL adae0849743226e0cf85711a70de31e9566ef15c2e2f784f7893539991871c9b5074eab8aeda03110272cc2b58f2004dc09f2fd0ac1c0928f35b5dec16f7f48d
+MISC metadata.xml 564 SHA256 b2436c52bebd66ce68c7bfce8b0eaa8a10585748752f43b4bc997156bd016176 SHA512 e27f0b02bd5873bc39777cf61f4291370cde61dbf872a07b9d2f77053c7d53f7289d3dd2d5c0a6315c58885912e74c5b782e43542bedae1d62030ce8b1f18383 WHIRLPOOL 8e9e633b0c255a7920581a7d3d86e5a086eec5da6538f26883070bfe2aec638e6eb110244ad12e8e9e2708f10d249fa6a454fd4553aad404fdefba8b82054820
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVauHGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88pYsP/j/67r4iCUfhdXiyUrJb5qQ4
-m0xZqcyusgzvlp/6mOvFSmGziQG6WhIE8eYvxaZtj8udMnhlngMXaMsqA0nRYbrN
-EtWi89G6g0hS88jIfimQ6JDAeupYfWwEYRd7BBEO/CnzVhc70qkvIBXlY8dux3/6
-96w7kj7mL2LI0oXON0y7L1vKkp/50/02pbGmVTARmDHoP4Xc6I1KVzsvXIkdBtsn
-NDprdOxVVZJwMH8nvcP5Su2y+Am4IjlHusx0NjRNwCuhTs+i0J+iPAdS8O7dUVkC
-837reUFhAvUNCvv5+Ecg10y2a2NIMzUmW7H3UZ10aE6hCyzPinUW5K761WEgGa4f
-OH5l0hTQBPhpr8GEZsbQXzw0dQo37civ4oFVKWKLRaR47na9MAKLvgU6EpZT8YII
-6ffIgzcxgCzQwbnhnGSc+VJT36nYWfywT17jfCAA1MAErPIcJOuP5GjrFXBNxRJn
-VTak68w+fUXmp1wo5W8N2LRwcYnzypxoLJQdJ1hwFOKGe0Ph5T6BaOOM2Sp/M+Xa
-H3z9DqZUJYMqith4yN37idkEnZ6CvEEwKBOIgEV8Kct4EpyUy2zDxbkm+zRFSwyH
-bQ8mkAyzD70iCHCz+zMevnn7h1pgD+OZXZ4lvVZw0scmqPYdvS9BAaQTUyyk3zah
-HGnAx6KFWQgfDpzV0Yjh
-=PHwE
+iQJ8BAEBCgBmBQJVf8BLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEI8QAI8IwxsD2BvZ+/8WufPmWogp
+tIxcpdVqQ/BOHzSA6R8C0HtOIj6BdWY6ukO4kw/b9o3qdfN0BFtvWL8vFX+ukMvK
+fcn4c7/hP7qNUksykIGYfHrv8svn96hTp/o+Ef7m/IdLzCRW2FeJdlGlCMZNgVza
+OWKT4Vad65Vbkpy4v+rAwdt6LlJ4xnti2OKjYdBOuekR45CLbDcLKIjfMcHsNC6m
+GXaRgTGOO0BfdqfooY46tJAr9JlX2CD9QeqbONUc851keOCJdqZiD8gbA7VQwtc8
+CEdOThJft2BXPoNzGZz4PbFwThImK6PR8mBYQueZxB+sF+QtrCoDojFJpUAZy7Cp
+C+itkAYh1ZpPb6jgKfQlLPVeebHaQP6V1DZJf30KoBSNAxp/ossdBLqoHpqzFuXV
+T5nJfmOPhRWcLFDUy7S566Q3j2JK0Gd0rODjKl4d1uNwpWbj2DpQ+rJ8ZyS8G0sl
+KLCN0crzhZWdyMeDbNupCzDpJN/VERcokpNLPuFqjhWFL15hv8LBJ8RjuXxNEPOs
+QVJ6kcBLY2znzKD2Xq43Nj2kTayMDks9anIbQIoHp/QZUpAMMAzgAyOYVHzCV53f
+3NohdvWTGV+Deg8iejSc7dk453CqHWbaBtnbvKTJBWpfoBF1Z+els5nLYT47Q7UJ
+xLCju4UqZOEFZ1eZas0i
+=A+tK
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 498c2fffd0a9..eb31e4ae1bc2 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
-</maintainer>
-<use>
-	<flag name="gtk">Pull in the gtk+ greeter</flag>
-	<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
-	<flag name="kde">Pull in the kde greeter</flag>
-</use>
-<longdescription lang="en">
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Pull in the gtk+ greeter</flag>
+		<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+		<flag name="kde">Pull in the kde greeter</flag>
+	</use>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="launchpad">lightdm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/lineak-defaultplugin/Manifest b/x11-misc/lineak-defaultplugin/Manifest
index 1b6cb883fe0d..dba7e328fcc1 100644
--- a/x11-misc/lineak-defaultplugin/Manifest
+++ b/x11-misc/lineak-defaultplugin/Manifest
@@ -7,21 +7,23 @@ DIST lineak-defaultplugin-0.9.tar.gz 840704 SHA256 3b679d38e32e47c05f13de89b5f3c
 EBUILD lineak-defaultplugin-0.9.0-r1.ebuild 993 SHA256 e3a1844849c23709323531775e0d93b6e1d51f2a3fc130ef46db2db2c4f346e1 SHA512 3aea6ee4159d19b36b11b4a7d517b44ad52724b0ffc1d171adccc4e79690f999e80e9f2d539d4fee0f2c5ea332915177851243ed2e6f2d9880830b559275d49f WHIRLPOOL bb30a0de64f78263337d5db6be66de6c20fd6c9e9933c0e69c1dae7f6636914c99c58371ef755d4ad92d57667f7f81b01946c24e3d18160008962115c0a93903
 EBUILD lineak-defaultplugin-0.9.0.ebuild 989 SHA256 c7d137abb2fd00e2710d07fc216d06ebd2ba8dbb0b792ed5737e0868356c88aa SHA512 e14bc7e9835b87ca97fa7a9967ab99ab8f3f1fa8ea888ab8893fb8fe5b83b814b4c3eeeb0b6a42fdec408d08e257e4c1a6dce6d671ae1dda1ae8130f72230bc3 WHIRLPOOL fbfc4df81cd32f7d9b9b899b64f382c76ca8740faf78678007b6bd0f9ec23cff8ea3a1e46c09847412152855d15a941d9660a636ceb79963713922d511f80fe0
 MISC ChangeLog 4854 SHA256 d4cb9482dc98e8fb0acf2a8c6f0d8355c6bbfce3352317bc4ff999fe2e94a537 SHA512 5dd11d7397c20c5a52c4fc25dd3fda01b56ac9974907095b18c4372d28515114be05e51419aa22e5d121358ae0f3d027d17974da2b2030cfdce4c7259edd0218 WHIRLPOOL 9e9f8a9ddb0b3beaeb4a72c1dc53941f8ead462ac9a5d7dceb6358afcfb74e39a1025fefe5b8aa03e7a8c019247de2b607ec0ff2ad77768a28a25dbe8d1e48ef
-MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
+MISC metadata.xml 247 SHA256 7974164edf8961391b9e8b3fb38a1b262d7d5c2ba3155ba027191e80636f8eba SHA512 2c98baf669e31047cb68cb9592e2bad91c78966ad8d21635f3433f1e77dd59010f90d68eb5c2df2db4175b7e34e994e41d35efbd105e281682f8ad5986bdd05a WHIRLPOOL fd6656b7a76aa9978dbb9f07f53e8f3e82fc0c63e7b19dd2113673f9a762cac962834613bd06c032b8694138682f459b46e2945748457719319ff1de765f513c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCgAGBQJR9EdxAAoJELp701BxlEWf8PsP/A+Zc+xxIkf/VqIWn59g4EO1
-Sgv7jYEpm+IUHW6gk/+N9XOd9HvAayE7NC0K+lA2AV8dUDH/Rn4JzN2feUX8mZIf
-jMPa4xnmDbYLXkSFYs9XTVxYsgKvKf1djNn2fleeTwL71ROB7V1JhHdt59TQtz2/
-dLYq3bTJxWzmLk7NwknTVgqx+5Zg6qDTaf5NpCcguHbzWbDzwnhWztpJcMJFH7sN
-YU+VlkQAS1dknSxc1ictkGsTdOn4f7hOsSXpN73EEUqMwk0QexaNkuWqF6IrKzKK
-B971YY3UMXA3b7SYHXhWRcwblcNnuQTJ86AoyQmE8eEcn0qisYXFPEwijZXVaVLY
-gKdCJbeuCPV3vGCHOXGfx06QpypCAUjXY8Y8RAJDD/JigJoYIFQl8vsuXpc2AmoZ
-CcozTD1QHQoiI7UkpsMMdObEcY8umD2yHvPENDfCIoRdx2dK8buF2dxJbGkzQt7s
-mGWUUrivJJBOlZofT3+IsxnJNOBuoCgBY4aPi9gHLUe9292TIqV7dUAuYAWLGlbD
-bs6JOns4GpuMXfVxp1U+4FpMD+Kh2O5ExZ1czS2vRg+cMtfX/K/8oloXk57kddac
-Dtxef9NIGAEfHalzdM2ae0nNNPJ0Uvttjs9sWsHeUrtCcc0RB4bYZoFsoYOCwmWZ
-HCfp/32PwmMPADPQWAgC
-=zwk3
+iQJ8BAEBCgBmBQJVf8BzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmih4gP/1KCDqA14ORKL4mmNMer28kV
+80gVMOyE/DXiGJO2eXsZpV09DPZ8J1gr7YnbO6PRfszyP57Hzs5e3JZhQumQe+uA
+30zxhc6KAylbIiGtzJ6JIckB17YM0BzxWqQGADPRYDg1cutvIg/PSPBuz8kT6JHU
+4/OiTG6riG1YJPyEtbDzKElleh4k3F+/T/1lB6cEJlLAbQs4FoSZrJ9klM69c2l8
+egUFj39gxtUmTHzSBauKGzNgMv1/8UksIhafBjbJyKYnidLR+2rPXBJ+ohbKsFv9
+G5mmSFTpT4AsJVccJ4CJvBrfP+687IWbMjzccs3cUs5liQ+82WZw1juUzH2nkUX8
+LvnomXQcNJLVkFQjSMhJSdfcOaUehnrpJloL8JhfhQ98eJqL/ohfOfI7KdbWTMhs
+xAe1MeL2PB1URA8/zb/eNnVwW5uYDXUUz5fbrlVpz7jC9hBbqmtmuIW5OUyBtg5r
+cV5vmqJgdWCAuBO7La6LCQDxKBwFfjAG1SOtDkO5+Zq4qKQSrv8FG3HNldv6SXWr
+gnFQj9tDQ4wyww/AmZlI2zubjauAAN13G5lTXneZIbH1zKlcPVe8wrVro3qjW7Zl
+1/HaPrsYJI9WL1INB/mvbhPKTODCzjJjIz426TONjvpl7Mdi8p38g0rMXbgOKHu1
+yeA9Zfzh5CDe276s7ASE
+=xPIx
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lineak-defaultplugin/metadata.xml b/x11-misc/lineak-defaultplugin/metadata.xml
index 540f810e069d..c01576627929 100644
--- a/x11-misc/lineak-defaultplugin/metadata.xml
+++ b/x11-misc/lineak-defaultplugin/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">lineak</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
index bbc40b1222cc..bcca0dace359 100644
--- a/x11-misc/lineak-xosdplugin/Manifest
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX lineak-xosdplugin-0.9.0-gcc43.patch 480 RMD160 924935140c66e91fc5db5a4cd9e21cb451473779 SHA1 7556756c5c5063f5a7736b075ffae725df737d54 SHA256 f372edf1f9730dfdc5502633256b25c2199a85532679d15ab52d957522662ac7
-DIST lineak-xosdplugin-0.9.tar.gz 802367 RMD160 1d9f7da41a9acf089d1fbbba14f1b5a0bf263322 SHA1 270bbc96cfcb0d240f2f8c67c0c40e024d090a72 SHA256 ba83d8e6abc2fd1ddbfb0c4837d9a9b2db82e5f3e9732db546147f520ba1c2af
-EBUILD lineak-xosdplugin-0.9.0-r1.ebuild 885 RMD160 d194c678dc2dd3e4d4cf1cbbba1cab4c24cef6a8 SHA1 b9d7936ddc5032070a657d0852aa6a3890eae022 SHA256 9927a770861474ebe6ec77381c6cc809e6231d258de4d2a641b150e7c975784f
-MISC ChangeLog 4524 RMD160 2892349851ca008816948a21f6a03cc689469c58 SHA1 b027b7875ceb23848ab52ceb837a7914a5a72f1e SHA256 7f78b550eaa7c82b45daf6f00af0268def8958b8245881384f365da3e6662669
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+AUX lineak-xosdplugin-0.9.0-gcc43.patch 480 SHA256 f372edf1f9730dfdc5502633256b25c2199a85532679d15ab52d957522662ac7 SHA512 ac737e37540d39fd664a544afe42ff410e8bb32a0cebebf084b3852408d1140ec048cd290c980d7bac3c1e9623963b5d27aad85e29f415e509655655e61aad8d WHIRLPOOL e868002fec4c3471d8a43543a4e2833cc5a4fdca5f1396fce5558141c1e455bc67ac34f5c52bcf0846c9169fb9f7853e6bca8598b5703d665b390e374ef33e42
+DIST lineak-xosdplugin-0.9.tar.gz 802367 SHA256 ba83d8e6abc2fd1ddbfb0c4837d9a9b2db82e5f3e9732db546147f520ba1c2af
+EBUILD lineak-xosdplugin-0.9.0-r1.ebuild 885 SHA256 9927a770861474ebe6ec77381c6cc809e6231d258de4d2a641b150e7c975784f SHA512 260d3c29874d078a0051642398366f72bc0f7d85c4a8cf1bd697bd8056f2527428ab3e9c623af4e9ea9548f986383b35a6e74b9edafe91bef1d3a24604482fd0 WHIRLPOOL 5916cef5f5f61342b6071301e0468ecd5bbd7dd2c16d37b76d8d6e56a25907d6e0b169cfabaff093778d877cb0a4d695d62655ce2613c0804a8f5b58256bdb17
+MISC ChangeLog 4524 SHA256 7f78b550eaa7c82b45daf6f00af0268def8958b8245881384f365da3e6662669 SHA512 fb089ceb8b96036b19c9133a52952ef581eb490f2c624e87b1b743c7a54b4aee77287bd117e65a3595fe960d563a36c4e8c496fde7093c6fc619ce9183428e30 WHIRLPOOL 62561c5dc5b5952f974ead40e7aa7c95cc4c181d129c9943f1ec8fd9731c46e655f6fb4d2dc19b23d7effa226244308317fb3d056a2759e6243abdbf0f704ca4
+MISC metadata.xml 242 SHA256 7728c26136fc13d3fcc821d14d0717f6bc6c0183c823124ac91d9f88f6a59edb SHA512 a18d840efa577861eb6224fd2c735ecea6a41d06288b973a2976e4e60833ca648797385e61107f3fc1ee3540029dffdef7a93ab5dc9abc5641f3e2f8fa4fe23e WHIRLPOOL 0401c0f831354ff7cf0411f1dd0e98fd848ce9d4cc0103a0d186e511ef4522a85865532a6f0b6d3bbebd2c9ebf71c972521f055d28fe47e52956d5bb52e74863
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEARECAAYFAk891GUACgkQVWmRsqeSphN8YgCePSwl/VulSMbHItq9DSWTcDNK
-WhUAnii81c7/MFnWC9TCLMjMHkrQ17Lx
-=ZfBi
+iQJ8BAEBCgBmBQJVf8B8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimtcQAKtj2S4dvxPVLac3NWBMcIk0
+Cs/Db8/WN/dDun7wxS3Q5B5ikQIl8cJHWiJRqsIFJSPbpQhJHsK3k8407+Qaaol3
+RXyuICTsGmWl7F8ESnXjAIeeCYkI5hqtmrah9pwCLDi2BEBRGGjidMrLuS87izHs
+avi+E0sOoQkwFgV4ndTKFfshPmGzIzL2d1pjvTpPTS4Gnn/eC2klpnP17qy4e/59
+qibPjOdXJQIYR8KN7ID9iJ4hzhBPQziG8FIt0mhd+hvFGSklgrmIAZ8Fka+4GBTw
+eFwZOfhlue90g8s/iZopi9ImOaCuFV/wPDW0Ji7frp+m9ObC6XTvPa/ZW1ipqfjN
+w9teyo0zaoGs+4W0RFry79po5rTRWCZGEmLOfnC5qoBO0nPtxHLZ83y69nfmZTFX
+mdeDFqmTM1ePYlN2QxTXGIFR1WU0x8oldRQauKA5vsdrSjcypaCZnQvEEONk+DnZ
+2RxSd507YYLj11y1Ca4HlOZqAA3+5YgW/iX9gOxPYh9hYLuC4YFzeLFIC25EBpMW
+Lu1e2FgKkJxDBksXLwtXKcL5Yd0UGRgjZt33JEIjAxq4gt6ep5QKyyq1tbDgh7b9
+wtaQJFuQgrAU+/JQQDmxob2fIB0oiKWjX+NYFyCnpjdyIhVV/0EHIxBOOC1v5Ly1
+qcTxbK8JEZe6YM5IwLym
+=JVbr
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lineak-xosdplugin/metadata.xml b/x11-misc/lineak-xosdplugin/metadata.xml
index 731225048652..381a9fd5d696 100644
--- a/x11-misc/lineak-xosdplugin/metadata.xml
+++ b/x11-misc/lineak-xosdplugin/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">lineak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/lineakd/Manifest b/x11-misc/lineakd/Manifest
index 7af643674397..8d8ad9021c2b 100644
--- a/x11-misc/lineakd/Manifest
+++ b/x11-misc/lineakd/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX lineakd-0.9.0-DELL-XPS-M1330-XOrg-1_5.patch 795 SHA256 e97a0d8ffbef1f88c554a8163312e00681ad27c4a1fa89d66ca3c4785acb4355 SHA512 d38a7bc6ddb05eda357ffd487a494302cb08746389e65a7f7b30aaa3ebbbf5206f60cb59b07a6cea285976604b91328a002e893ef0833dfc67e9639b260da0ee WHIRLPOOL 48a59a1c5219ab0e7bf3c04a2829cea1e1a0f3f2d1e70851a6f45e40426ac34f6ac6aa518be92a7512914143cbb333769db0be8d5564e859db06cbbde59ca06f
 AUX lineakd-0.9.0-gcc43.patch 772 SHA256 86927dc758d8e6bfbc222e365607d00dc8f11514c2caf9974c1b5d395749ac5b SHA512 0ade361637b26db613c5a3915d8b364cf14eda14eb744618c03440ead5f0774f853dba7c0518432ae4f872e201d5bb0503fa7e4b5eadd71d049adf5b654c8407 WHIRLPOOL 9068df3af150a81413a60b76b0a3a3ba2b2cbb623e4c253c99d51ee1cbad2c7678cfb6838b705e10e3fea7f18a75102a7a768db8d7eff7dcc4d4a3214fbbfe35
 DIST lineakd-0.9.tar.gz 991376 SHA256 39fd34f8df4d31d16adacce1191b34cef5e510b536701120906ec708be21010b SHA512 e30a2e111832e3f08bbff858647536aaeb75d20008618b8c7555836104fd5a66d8e3173d0f9da76906caf13e9c9753c9140cd22dbb96fde464ed5d5f254d721e WHIRLPOOL 6c6f556c34df24c1fe1c973cd813b7dd3f4b6c91836b49c84b7f1f8d6f1cc9463885396b505feda285e61e34623d443eeea70cfee68b18af8e3ca132b7bcd33f
 EBUILD lineakd-0.9.0-r1.ebuild 1352 SHA256 f746d6edfed2365222ca94305247c5a09b0701a8c0064862f6492fb4dbb786ed SHA512 38f97049eff004050c053d0489162c9ed1d6e6f96c9848b3c8cc927ad57c7d725fab3cc22af931d811bccae7ee126dff57c72e7f19295d732eed99267e4dc76e WHIRLPOOL 7a60006571a7b67675b1e129e6b3779baff81ae48fe7b7b14f7bf48560729d5894157c7dae11dc3de64e9570a04b8857184aa0f3a3454fba77cc9d0b74861aba
 MISC ChangeLog 7760 SHA256 3fad671dcf80958acdb737ae2ce90168a2a5f54d9309e93f398b02d70dd7e338 SHA512 327d77022ae654c0fc59202fa1f007973130c9f5c62b43dbd6b4c9b43fe046e3198a3c80edd320e43434759e205ffe42317ceea70ccda5787158474af864d1c6 WHIRLPOOL 6e6ee9263b5fce1acad001439aed1acd1c081568de4a2bc881d5dc3b2a097303f7b6a5c480d2950928cc0754b6a879fabf5fb23001a21b6adafd17d8f108e6f5
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 242 SHA256 7728c26136fc13d3fcc821d14d0717f6bc6c0183c823124ac91d9f88f6a59edb SHA512 a18d840efa577861eb6224fd2c735ecea6a41d06288b973a2976e4e60833ca648797385e61107f3fc1ee3540029dffdef7a93ab5dc9abc5641f3e2f8fa4fe23e WHIRLPOOL 0401c0f831354ff7cf0411f1dd0e98fd848ce9d4cc0103a0d186e511ef4522a85865532a6f0b6d3bbebd2c9ebf71c972521f055d28fe47e52956d5bb52e74863
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlBP5z4ACgkQVWmRsqeSphNl6wCcCA6swZVY/GeaZhN9f+zYAD2Y
-47EAnRWD6zCK3vWm9l6ifBUf2/0AT1FL
-=wU6q
+iQJ8BAEBCgBmBQJVf8BpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqgkQAI0ab7ph1x8xOqCBVpgZqs2X
+izNGut0xqqDyXCnOoRg77wwkBjpJCjuJNMVjRV+Ehbva9qej83DhHY9jGg/UKllL
+wm+uPHOk+/nIbqIpdRH47NB5s6SxeWtnIdBSvHbEtOkfOZTXIUCWDVlBkEdlZDXT
+WVcmxaVHB6MhsKCA8X8bI6BUeTRUVuBflFQbxNLSbnPl5yUmwTh3diul2lUVey28
++Hv73eYDLipBg8WkOox6kKK87TLPYEEBEV7mQ3JZBygEUIDbdKjiQ8HuHkNrQ7ir
+DRCLJ0p5si/FhkmGqgg/kMRIVfR0RgjTqyGng/2hFTxfH0YVw1oy7r2lzN8FW3sM
+BSRHVdz4L1qAwXX+YTKZQM/ZXkMab09os44Osn5zD/IH54WrfpG2MF8UUT9uZOUN
+lq+acX99cfm5BUiip7rFlPWXFQnNqR4TsofQ/YyMXBx9U1CJyzHXmG3EmrOx9hZg
++8BJ0gMLggtcnsiX+8Sua/vSW4ljZNc2XjtI2ILa46fgeUk4eAhavuaE4dLYoNqj
+TBxYWh4RT5mz6yI7SkhkcNX42WqAa9TW1Cl6Ar/xf72GPVmKoisSjcWQFfiQaEnH
+TNoBG+zQmeFYLiBnsQkfvzBzjiXQa+tHQ2khK88sXfeGiBxRSdoKK7K3n9P6v/GY
+7X0x8VMOwzjJsTQJ/Psc
+=9K0f
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml
index 731225048652..381a9fd5d696 100644
--- a/x11-misc/lineakd/metadata.xml
+++ b/x11-misc/lineakd/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">lineak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/lxmed/Manifest b/x11-misc/lxmed/Manifest
index 346ea8869df0..4f9ff4627e6f 100644
--- a/x11-misc/lxmed/Manifest
+++ b/x11-misc/lxmed/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST lxmed-20110717.tar.gz 68514 RMD160 37abb8ea773b84ebe601fd1ff7d1286bed64836b SHA1 0ff06836218ee507a7daee915142d8a9429c8758 SHA256 d38645de3f133e3ec9f49cc1c56923fda930a09a33244649f6850147d7f4c74e
-DIST lxmed-20120515.tar.gz 80181 RMD160 93edcd5125d87736b2cc22cf46a8e653162726b8 SHA1 93535370551659ae5dd11a7d510d892ebe2c7831 SHA256 156318768dc4440fdf851cb7eeedfa96678382eca05ce52a8766936ab5d10cca
-EBUILD lxmed-20110717.ebuild 770 RMD160 cbd6e216ad5eb2b3586efcf722359026d557ae44 SHA1 c645d6d25a7f7bc6024629f7fb036010b8577267 SHA256 8b65d0c738d73da126f8ee6b02b42746c2235229f2800c69fd4dc4b0738e4715
-EBUILD lxmed-20120515.ebuild 958 RMD160 c0caaa3aec3fc0be01d22e05c9e26cd18bf7d548 SHA1 3b68ee804974456c99ebc8fc7ccdfffc18e229c2 SHA256 d43c719c868161b945158d26f14f333ba9a3c6f02aab13b302643120dae4148e
-MISC ChangeLog 647 RMD160 e0046ab4454539d82e4f3cfbe110ec2243919376 SHA1 32e7bbfc23ad50d40dedd289c18af0b93c614f4b SHA256 c0c27eb9363ef2e4561c80869a7481bb6aea44bd2e3d163678660f5be26c6f47
-MISC metadata.xml 271 RMD160 f5550f51d7c9f7bb15177eeb66d3de3f6511f45a SHA1 13cd5d11fbd7f0dfd5967b8757efd71d4d273e23 SHA256 b0ab8f8a76df2649ab818da3d391589e88d0befc9607eb6c3be7f1746b2d4392
+DIST lxmed-20110717.tar.gz 68514 SHA256 d38645de3f133e3ec9f49cc1c56923fda930a09a33244649f6850147d7f4c74e
+DIST lxmed-20120515.tar.gz 80181 SHA256 156318768dc4440fdf851cb7eeedfa96678382eca05ce52a8766936ab5d10cca
+EBUILD lxmed-20110717.ebuild 770 SHA256 8b65d0c738d73da126f8ee6b02b42746c2235229f2800c69fd4dc4b0738e4715 SHA512 f345ff4fe69754b3bd9c9d50a8429538b36eac69900c48a4b2e780f5b0ed072bff0da39fa538bca46aed54532de3aa4113bcf807448ca34f4ed21bb2847b3d2e WHIRLPOOL 990eb054fd0868862fb9807d221d53ac1cbf849cc7f7d90e027493fbe53eb0a3e3798dea1676527d6fad55efb82d20c2293522068e5a636010f2545888251990
+EBUILD lxmed-20120515.ebuild 958 SHA256 d43c719c868161b945158d26f14f333ba9a3c6f02aab13b302643120dae4148e SHA512 9e1cd24ef1509d1655121ee8275207d3f14e91f65905095cc4576279d7cdd3d32e3ba994781340cdb1bf5adcac15b1a6825d727aebb916775f34fb91d933c719 WHIRLPOOL 0306433a14c58337444638fa529494cc6626fc49d0f96cf3519a631d6281f96eb0da6efd34b366e16500c608acc045e0b8e5a55d85a3750cf83eeb1842310399
+MISC ChangeLog 647 SHA256 c0c27eb9363ef2e4561c80869a7481bb6aea44bd2e3d163678660f5be26c6f47 SHA512 e0eb878b752ac7444d1e39408bb1b44cfbe9374b618dc1456cdeb14a036160a222ff70c9311860780b7b1f3c5eea389538f9d00aa743813adf60135c925d4e19 WHIRLPOOL a1961488b1f76f949e7b7aa45afeda377a7c9fb557b5c2172e3c08267eb1b904744c620de457a237b8c1208b87729074ad1f5d47d35a153991de2cd916a8f16b
+MISC metadata.xml 350 SHA256 cb8a8b44ec8d249c13221cfdba241a0cec76e838fea65372973c82a5010d7190 SHA512 f3ebaaa4f7e55c55f1240c404090f4e69beea95667ecee32c26f5fcfe404ff9512130ea976f63f4ca1a0a71fae5e7561e01b1c4a9e310ad37b4cc82b635b2381 WHIRLPOOL b10656c3d65622208e2bc94198d2e666c5461965a62109107c5935fdcf159b17c1aa8e9b6436b52b52f05b26f8bf97f8a4203c2924c2ff01f27f41ceb225844d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBAgAGBQJPz4VhAAoJEEdUh39IaPFN/X0H/jSXVM/dq2P+/eKReSJiBBLf
-z0o52kXRQihbgR/JH0vepROazU1MRe57Y/4CiLqFeoPD0xtFmvlOMNzwwyfUqiDS
-Bgq6BRJmr7vamJpbfXp3nr4EJUUhNQZ+ThaTffxoyndRoV1LssxiJ2szwm8y4bee
-c9fw5j6XEyygC/sTUE7rM74ZVruFBlhUKL1DMQpnHrXCT3Lo50iEyTavPIc0hCQM
-c54iOtSAjs8NHXiR1P47UXU8qJMCEO1DEqLPBbYykmla5S2x0IRsIXeuvgeWmg0q
-gCdnCZfzVcY86f+blXBtP2tT2FQ4GoKi3svUjhGbv3+9TYKK30KNevSe4pTSL00=
-=DaHj
+iQJ8BAEBCgBmBQJVf8CFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/8QQALcRzxA/+KMsAfqVJlzAQrtb
+btXXHgRfaWd57RUbu4t0s2A7FUwePhQ6UXUI8RTBb70JgzTnTJXZ3mkVd8oD17IQ
+P3150AxRc2NiXT3k/zDWXWYpYZunGxdzSjruCAxOYnIeknWJe6i2Z2nq40giN57Y
+3FrTCMbArAuaMnGwG0zf4TnByaqCik4gmnKGic/I8RBjcdcpKZZLJ7vutGeUYGFC
+cma2L39Kx33MwEAU3e/qMnoRwBM6cutj2cx9qwbnPYHLJ+E7eW+u2p73FmSX1X9g
+8i7FkIfpP5lR2osJCVqYEoD3F2X7SS8XuHRh3pL0AHIZ96/obi9fj8f7+FBsjg9e
+i7L8rhu7b1IDJMAQEXu2BlVrI4/4gjPRELnfdPxotrCSduLTUWvvf0OE2r31I/Tv
+yQLrCU+c6hX3ZrM/wHyBOHzBYmhgf5x+Cq9HxoB76gfG69xrUhG2WIwIew3/aG/I
+C7b7BOTmof0IlmdaV2+uGKZ7Cfv6eQKwMUkRcNT825bODqBNP5xIqOvGYkquXavz
+e1MOKh8VGKSBEHwPor6IYmoOLDJqxoCqIyFuxYKOqtO44CSjUeyo664QmTx8XaIO
+y1CHtsDtkV2G+Moon4sJztDR/N/Hal+Wzqz9JxJE2OqyfQP6Ek4ept/QeriNtLU7
+reJljKhDogOvlFGNQ+XR
+=rgw5
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/lxmed/metadata.xml b/x11-misc/lxmed/metadata.xml
index f1d365960b36..09cb6b0857cb 100644
--- a/x11-misc/lxmed/metadata.xml
+++ b/x11-misc/lxmed/metadata.xml
@@ -6,4 +6,7 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">lxmed</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/magick-rotation/Manifest b/x11-misc/magick-rotation/Manifest
index 7e0958742baf..6e6c2fc1925d 100644
--- a/x11-misc/magick-rotation/Manifest
+++ b/x11-misc/magick-rotation/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST magick-rotation-1.6.2.tar.bz2 103389 SHA256 e0decb8ffb6bd5b8ffd0f01df345f23041abe78cda97fbe7065772260a1a2520 SHA512 40252c4b57d304244f8f7a8b08448cb498efd9044406235f2d728a89c8b4888009c4e7a9f50cbb61b5620336eedf1abb1591e68e94a57b051f4d823acbcdff5f WHIRLPOOL 3aeea34a2a7cbf966a7c0ea3bd13810e2a7a2015bc1f068566ce0515636bcb661e728af6682eea80b39624a3947a8219b9144a296f7c7fe9526d952d21cab49f
 EBUILD magick-rotation-1.6.2-r1.ebuild 2587 SHA256 f06407532e7efc1940e4a55d25b2f3e68bba777bfd7fb74c8fb4c083891a9887 SHA512 b8081477d4d7d00c55075258f945e7645da670c34a671d2a1bf82c3feb9bfdef5cf0ca922bf8e746706798813b0da63e54696beeb12f7e175b781170d9dc8e6f WHIRLPOOL 0d6c0056b0b06db1ab367a5b394605bd16b4e1d5744576013c00172f2ed16a1cc39e02225196650db94b46872e2c4ef8948f50c5f89f14bd02425db6e46ddfc0
 MISC ChangeLog 1525 SHA256 10fba231b42d7fac511dcdc261fe795b2de8d062b0c435b4b3e618e821fda00a SHA512 d0054a9a6031a50a9d55b09ef1c5c9c6d3ca97d66d83e29a116710576cb9d6450f39a8fbaef37080a58822e3ab7b9339eeeffcc735c2aa4d34592affef90b72d WHIRLPOOL cca156d41a6b2eed2584d5c66594cd1cb5f3e7cd79dfec3a8af7adb9583e45eec22000c40ff03e07cf9169006dfba1ad636bc9278d01329d29ddeb5b4876be60
-MISC metadata.xml 478 SHA256 80bfcaf0d1647e99eb55925a790279fc385df16148d25c8e4b8b1770593ca34d SHA512 197c1d0b0190c9af8a4d5b39cf46a4b42ec4df851b4bcc07abef2adf02196b452addef1cf2f12eec42b84742f9113727b754cefebf283887aeeb562cb5b9b9c1 WHIRLPOOL 7e18d32ff9b2316a14e40e12a21abc85c09042f55903fd64293477238a9bc8e9c3c7ec4fecc8da9c54f9cc6d1a52935960277676424fca5995c0e192d4665f4e
+MISC metadata.xml 561 SHA256 acbf245dc2ebf6043e78427129179865cbe179c0d015f171a64ea6dfac3d0177 SHA512 8f8ac8f8391ddf97e75c165464dad7a45b01cb3243fcac7b1f40ed8de60a9138944ec4774bf947774110d981366de991577630f1f655ac512a884c7a45052a3a WHIRLPOOL aad2915c8b085eaea3264a4e72a64f413eb2bb7cfd87143298f72d1daad7ffc84843f2d1a68ba30256f1f8696965b2abd7f3e7ef82ad4ae8a32b9ccf2e14ddb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUtgEJAAoJECo/aRed9267RJMH/3G2Y5BBQdskrxDLnATT0qLW
-y7ZeLNVbYKCmpI/Xpfor6llIA9Q2FOTUoqdOzmhBEroPo80SpWYnpZY6yrF/M5Eo
-s9xjeSbQA2eELhcPn5xoJwltffG/yXT7017+/ICydXp2byRy9Lu80R0GTPjFvmn5
-G43OJO6oBnov5GPDdFyeH6MRBKMuS4ll9VWqHKjrkuu/5vDGZg3FZZu1JMxfOkk1
-nmRdHvb0epUw63Nfosmf9T9zM1+2ZyAi2/3GKOa+habvB3W6ZULd4+CoAFsWMm9b
-0u7aBL0HFjtbzEp8EUSaAmo1Iay1yMkXwRFvczl4JEwkIRgSmIgt7dSp2BmLjD8=
-=kiNQ
+iQJ8BAEBCgBmBQJVf8CNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEwEQAL5F0tHcsI5Yz6+VvvzU1iaU
+vEu0jM4OwOu/6W9cTyjCT58EAnEAm2cuO7Xhix4O60PhWiowMniYYNDd9AsLLXDH
+nLrTBySyhXlmEwZX/3LShw1PazjXzJLcE9kFNeh3yX3lcUVjSKjgP7QaRY6kLjdL
+wNs3gvJ2yu00JvVLhiNlhPSbkeTGHrwurDPHrCp+L1IbmZ3RjOle4akVAllLxk8E
+tFbd956nRlATUbGAIY7iSMHk+1SJTciGQAIEfFFjSzWPX4GypBPOs22zgPvZ0tQ2
+IlpRBKOXFeVy/UZ9w+gwiSEOayA9JFLhFlphxk6v3NgoxOAxjdAL3ksKCjU35Jrk
+MMLPNEWDMYyVa2lIRWZeHgVsiPPCPL/RDJvg60lPL3C3c5gW0yPrbZY3RojO62yz
+qWqcEwUVpdcX/b5hZu3KiR7mLKrsrHgr+RcSYft1Q+EQSVcjq+YA11D9mEpvxF58
+4/I7+3UWT+v7znn2qvvEv82NZAH82GBNUqRjP9QL0rRCoLfOSHhInytaoc+GgRK5
+FcYvbJW/vPmtlk2yseoGtaZH1l2HcHoAukcJvMD+6hgDu7aTFF+wot5O9HVSUfCI
+lPPXRp8gNuofnbeTwT2t6RgE8PeMOX6O/AvekzTYAoK3bzX2BQY1o1kbeBjLKGwa
+YH/gClRnnQZXrhD2O66r
+=W5MC
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
index a8880559d4f2..7e1cd0d686a6 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -12,4 +12,7 @@
 		<name>Sergey Popov</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">magick-rotation</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 9aa667c82df2..d5ae7b64d1b4 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX menulibre-13.01.4-GError-import.patch 411 SHA256 598e0a92ff69f681ebf5823ddb835b2820733fd85531ad000cb19fa32b179c30 SHA512 36f5c0427024e348917d9de3106e815aacc595d701d8e30d6df1b84bfec6f9942150e4b094cd4125e93608340f736985d93404754d03d970f4ccd4318ee476ac WHIRLPOOL 4f1efc2266f9ff27770280211c80c8cc65fada567fa21a142c562daf9611d2c941f085d80d95c7f7deca29a263b8183c1fa4c287203e10cda296f10aa9b3bd42
 DIST menulibre_13.01.4.tar.gz 322686 SHA256 2329b426af55936dc40c7d1bcae99f98b674d06e3757657bd47dcb93d1ac45f3 SHA512 c3311443d00901d0c80078e4f51f81cc2bafbb8048a8eb1f0594e4430e9d8d1c563f4ec6b423952d3e8523f921220bb9d6fa0e4a62453d07011ae781070750d4 WHIRLPOOL b419f3285a97918796c08d0cb7681ada8f6bd19297bdfaea603c2e6256c06d775369d683f150f9c708d26ff2220fceb97d37541143bbcd9d08387e5ebd2967d5
@@ -8,23 +8,23 @@ EBUILD menulibre-13.01.4-r1.ebuild 1938 SHA256 3dd788252c95b1ba6ee4a5346c7d6e834
 EBUILD menulibre-13.01.4.ebuild 1871 SHA256 d8e5ed5dbe48ae9297e1dfb6f0e8b409ff565f36a996f184981b3c48a06a7d93 SHA512 8eea36d6ff8cf61caf5d787d1f974858813582954a55b1964f09ba33bfe6143714c734a8dff79fe6cf8f728123a7497690aee7d589725d9e13e73d54b5075852 WHIRLPOOL 142106d08d881c3796ef41e4d7e9b7489f08e127c7c413128e744532756baa2e845981547955c83ef12a163cc8722ecc9fc645afa5d20514d252f3e9bd36baab
 EBUILD menulibre-13.04.17.ebuild 1963 SHA256 806a484108ec269aa1201d3ff9615a213b496f3990e0201fe163beebaf00d6a2 SHA512 83e8cdbf33748e49e6240474243231aa834a787652c64b75aa1b86f83100d91ba4ccfd25bf8013e9084bb967c2ba2d4b07d1aa849498f38e553cfed9944f9c60 WHIRLPOOL 35df119e6679b3a39405b103bff848f695d6b2a51336ac2e7ee3cb44fc58036c77753b5ba1decfe5e421fd2eebaa0bfa55f24060e432d9b2f11c907ed41e6606
 MISC ChangeLog 1294 SHA256 2fb474ca073f5b1a48dc5cf0ae470b38db808aeb2516d10b3dca4b269b55825e SHA512 b7682de97bbd29ac8ff8a152543e88cc69b4146af3eb7a4e973201b285ebbfad258b76160300207ca2a39f1e9b8953ccaa99bf2f7cf5a14429971efcd0033d5d WHIRLPOOL 70002870d9c1f192d51bdfccc91b9449f7af5e442854b60d625e7459a8307ffaaf8dee838c03f60101490e097dc7ac51a8955e58782ca0db09577526feebf523
-MISC metadata.xml 167 SHA256 6745af5c6bb1ab7aa7b28655dfcddde79f68ebaf0387d1326bf70d9c6d1d13dc SHA512 ffe7b480297a02c6d2aa42ef39046d5243ec5d576367715d59273137704d9e76325cddbcf740f603bb16b873e84855865bc083aaeff57ca99dd5098fa9d2b1a4 WHIRLPOOL 460b80710d95ae018c03efb92e1245ff37fd62699c94eafb9f8239979ff0211b00e48645e0be3ff47e4b68c3c33589ed73d3a431e70c3dd582718f303b350dd4
+MISC metadata.xml 243 SHA256 cf3331347d29cd6c3bd72e5462ac1cc6f2632451a45c3ef5e7c9b2e623d15575 SHA512 6106e4b45825ec64e3c89b228db569ac5a7c06a86d3a9d6a48ba8ce356ece812156814cb8f1eeccd2c19d7a2dba73882d9781d6682e2a54b051a6d0d1992db67 WHIRLPOOL 0cff0ed6601ed937d58796e3d13f79ecd07ce23d400f62202a5fabacb4e7089057491add6396deabc00beaf8a1c8a3b8683d35ebfafb40ffa1298ff9bb6202e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUdRCYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgjr8P/1UbO7m3NUWprq9L/Y/O4EMf
-WNnoy3ABpUIGcvQmeMN2X30Y54FhNQ+ljNDRc19zpwkMti0kdKCcRKfQFDljxAyr
-IP9iSpKLJjYT8EkQ42iX1AfT16uo8nezGAlLAVZHZUrmdYfoVSJmeqaktVBdu58W
-jas4NyZEbTCZqCZ3Sh8kKwrOBIwJfUNLd9ZIY8LdB3HQQemOKmUzhUAsmZso5rlE
-/2xe07LzSZWn/tWJEO6/sB4yFX5rKfQJL4ZWNCILGbFja+vjOnR6xrB2tITMui5W
-MjmE71P+HVLGmh+KwJCZG0OVtXq8hbx+59UWhRXSz1F1uvfg48etTtYf50+UGD9n
-cvOzN2cd5f3SLBm72orpzMT/e/N3B5Z5xJgq9YqnJa96ppyZn8VCHjsfStpPH+BR
-nvMtyPkcgaAfm+nkDmfvWU53uBMXEyIOSg+OnVsqbhF8X0nEPV4GFlEoOhQ6G0v1
-xk6JnI/6Bc8T/8QRdeaEhWkBdSNa9FV4OIiWurYpj4mpa5VOJFm0h0ibFFjCimCq
-VNi01d292MvTeXQ5zYgSyuU/pZlBmasKATLS3GR9LXmkfumaEdwYOLCTT8NuRBZ3
-5X38hede2sLFz0iEdSEHsJ5HhthoVS1cYotU8XdBr5rlK8TnFNtbelJBEx8usvkB
-6NYO+2smKIk8aJC21Vx0
-=XjQ9
+iQJ8BAEBCgBmBQJVf8CVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiibIP/0H0NzHrwG+9YfMPGji57R3Z
+4Lm2E/IHjKNssFl0uSwIx52cYJgoYlS2pDF9KCPxA+KlEx+Uf7D57eG3eznn2gbN
+KLb/MWd+SAEJ1YAwEMo1EdsX1dIWCSt125aflIKWzwSnOdpiYRIo9dTNdC/YJ3sm
+rispbgBxuUM+8pI2KiOfjhAkPcGF5zNaK6j53Mvt0EAULxGgtP5q/90evSMqAL9n
+Zdxm5yvbJ9wtCzS5eiSVkm8Ilm+Idrd67JMySJKIjWJfDR3xxOCS17h/kUAvrZzF
+qwieyWSdMVYUzEhXbz1+6iFvjzS58KSNzbtKTa4XPdyp399QXSX6dlGmb100gsUk
+0vPXj9mfjpvLUlxoi96hGqEGvKUER/TrXwuo1x58nEiBe7WCyTLrGdr7DomfddSx
+Gk+9M8Hpf5OMim+kEBIkHNxmmWV9qpIEphDGbvEBU3wMA7CkmTIs1YWKwKOFxiNj
+K/HgPOx/cCSgH9IjYmC5I4N1H0U/S9cJ1p87+6TxTydQRJxEONHZdNhD+Wn9wkXi
+uTUZC9QoDr+QjnHqCA4CrqrWT0PbRO8mcU2Wbd2DzSzlL0O66kOOc5vV+wX5Ow1g
+gJ7A/DbGG5CGJCSlMZP435mWDt/ahd6vZdLGAG2h5erBlvZJFYYvQ6TqiHqwp9OM
+3h67xO3GuqXQwcJBsN5B
+=0hxb
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml
index 9360f354d02a..15139ff6b48f 100644
--- a/x11-misc/menulibre/metadata.xml
+++ b/x11-misc/menulibre/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="launchpad">menulibre</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 4ed7d8680b7b..d39e6948dfff 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST menumaker-0.99.7.tar.gz 138857 RMD160 cc40fc4fb64373a7adef716af89989c10816001a SHA1 7ff4ccd77fac895460416115d9e0beb07e192649 SHA256 dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445
-EBUILD menumaker-0.99.7.ebuild 1254 RMD160 98818b2b4dca166ff8c31b0ef2a4123ce2e09234 SHA1 d87a4f436c1f64a58090c0a4759b3d0a7e87f7f6 SHA256 7793c9d35e92d318dbe571d087eed5504e1da9d58c9f19192521c1f0849a7dcd
-MISC ChangeLog 2468 RMD160 c15e55e4e51b32b76a6259a03007e8b411d915aa SHA1 6837b8680ece0d3f1bc54a4f94f399b6566d4031 SHA256 ec2536fbc31c77f83202005dd3e00c39107fc128944402fddf615d9fb07062c1
-MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+DIST menumaker-0.99.7.tar.gz 138857 SHA256 dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445
+EBUILD menumaker-0.99.7.ebuild 1254 SHA256 7793c9d35e92d318dbe571d087eed5504e1da9d58c9f19192521c1f0849a7dcd SHA512 a9d3ce6abc042645108d9604b336d244c9bb69b00308ef871cd2eb51e47e66f6137cd57f1656b8ad88af7a560e299ad5f837207c31b28a9ee715ed9687d72a1a WHIRLPOOL fe67ff20e9b406d054440b06fa1937fdc2e6744c67262f2ac5c04f9f5804341de104d695e4e56a7c45c6521f35f83b8d69f9733d047070a033f67526e1ab19dd
+MISC ChangeLog 2468 SHA256 ec2536fbc31c77f83202005dd3e00c39107fc128944402fddf615d9fb07062c1 SHA512 749aff0113f3ac5ba8db4fe276ee2b1f81b98cb7c1ad96451fe752d5e3ee264034ab571ca1e804c3e34d45200c9d48e448f0f5c3e79351b1ea821b46272871b8 WHIRLPOOL fd79f2330856a59c720829152ae23d8b719b5e87aa2b8324018e1905d0daf54f5c98dfb53e45fd2c97a3bda232fc684a48499e6e987c84dba62466883ca75217
+MISC metadata.xml 239 SHA256 f3b93c4c788f3943259ce4b4cdb272e5acde29153e79e10176a017e55fac2898 SHA512 b0b8c451489689c7fcc271ca69b67f0808cfe253e922f9ba8aea56eb61ceee78bed6e641a2e165e60381de4e423ee995dda04c6beced438e7dbfcca2d8d23fca WHIRLPOOL d01df02dc5eda42593550dfa0c742883be31b00b09073faa6005ac9bd0b94628bea6befdd70b70308dd5974dc984847e2da68831b6575381848da09279dca276
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAk8t430ACgkQC77qH+pIQ6QAagEAk3YQLnX0IHa5N88hjFnCWaJC
-5gMqWeJLZ7CQdgbOWnkBALOzZaCyc7aoCck9GoB0TN2WxRA+Dp/A+jsb/30Ba3s2
-=GHPX
+iQJ8BAEBCgBmBQJVf8CeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAG4P/R7/xPHCGi2Cp8vymdPxd2gE
+Sxs9zsRE0Pa09X/3LsSzL6YC1wREh1aBPGp3eyY/oFDJ2ZtaRuPM7RHRzhNkus5N
+aOL1lv6uG1RKS/kdcGW4gf5c/5/czRN2TMUIbrXxy3Zlt+x0uDYALqWoXvq5zd/r
+PFSr9ggdJ6onAevph0iYaOk0l5rpBXpYSKMMEYw6c074edjod7YHBV7sgPYfAb+/
+AAz4kppNu/91r16DRuEfbWnPsiB4JFP+1T8YQF1JK7FP/rYpsXvcn/a3OS0QS9ks
+oataFERvZ+ZIUMi4eNq0tVLahldl4dbctIu8Jnmze03MCQ5pdMS7OrR8J1mZi4tW
+Y5IrOlVVQzb4iALDA0bMKCLBG1x7RYlSGs0GlIfAZAy2N/zYWtsyCYSu3Y2IhP8t
+/Q6N2JgKA8pfMjp6JEQX4s1tjUIUgPQjf3cfP2DIlRoHS6ux6x2nIFi1wnJkph8l
+/CttD6cTNPSSFhMeoKhA3NANDdHoWZDH9+M4KrMyZSTaGUBuR0Ar4mjKXJ+KLEiQ
+ytW5rc1psn7cUPsq67owyHKq6TlfC7ENhhizJMuyuKyykHj0jSAJJZC9D2BhU+rE
+m+gbpsce2eG9ri/6EfBnPkm51KaNxcglt1pK73DAec6r0NidQ8Td4CdKbBmmbqDi
+EBEHQkO07PJX8tJqQi/Z
+=b1+U
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index de483c53568f..97202cc660ab 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/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>python</herd>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="sourceforge">menumaker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/netwmpager/Manifest b/x11-misc/netwmpager/Manifest
index cc23a3a454de..c855ba73003f 100644
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX netwmpager-1.11-desktop-switch.patch 395 SHA256 f1e9b0047169a282a2291ce1a71f5ed0e2cd5da56f48883a00f1572b5bd3c0fd SHA512 fcc68a8b26f2032643f37588600fd9aa19df6a7ef2fd11eb6e5d6e06fdec8760c6815f0c22b5fb29a0aa06e24b0520d36e5d35777a826f9ebc43d7fd12c8ce45 WHIRLPOOL a3c9ea1d72494004d8f23d5e8977aa560d10dc1c461b2e7754c5a4e8313df8d36b63b8fa36b0f08ac82451748918bd0837cf1d2ec316d405f5d273641d53ccb7
 DIST netwmpager-2.04.tar.bz2 175696 SHA256 d1507ad1d79e9d4a8ff00ed9fbb7e909798956d45b562ddfb690ebc0ab8a96f6 SHA512 06e42bdb1cba862faa50716962c7711f04350146c524f7699086335c491c564b4079ebab423932efa5eea757facf5471c60b787dea4c4a73e02574fafab1259e WHIRLPOOL a40ffda11940a1fb814d180a1cb7de8339a4a9ab113c0f9a3196db88909739f4de29c99f4a904c93d80e37503329c6b1e6713d9949a781127ca47cec2a2c7de9
 EBUILD netwmpager-2.04.ebuild 862 SHA256 a25b731fa187181bdebaf9743ba1a8de0ee41d33e83ee47f8b1e42584f80c6de SHA512 e451e889495c88dad7182fcd18219ae4d1277e37b9bea2ab7402cb480321a5d99b83e4cea6423691e625650517b01a31e1af589d5d616f951a072ccd9b5d01ab WHIRLPOOL c91d51b9b7c2115107125d69d1bc2b46b6038b79e82eeb6d84dfca77d2c5bde15db92cda6f110cca8d137ac36ae80691ad765104ea5a0aafd1bfa1ece95a2a01
 MISC ChangeLog 2967 SHA256 992136da2921811b3e2a7f28c0774863b1fa1ddf04b8417c3d1b22c05edf0687 SHA512 74138d89f49d9c911cbbd3d1fe59950f68a22c59a20f433a3acfcbf46e3fb307657587d4b0e02b33c7e194783a4b7e5a6da45cd21cf996d8d7ccb9a044fff0fa WHIRLPOOL 61891b9d2ffc240596056ccbdba6555e1889284d251a6d335d3a513c05a5a3e3e22d0c39e03b87f1989db53a1a8e0266a6dc1a83907b74fc5545fdf3f34f58ae
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 293 SHA256 54e142a2a51abaec747087c317701ec3067069497f61d5f5f436cb6c3188d237 SHA512 21dbacee03f93a0fdbdeaec49cf0c26d2afff56e1628b41450b6b65e311a608c5ea420e87fc5e3e3fa014d58d6a1abcf1357d820e6d8f0f69cdd8f2c82359c3b WHIRLPOOL 647563ddb3b253ecb45c2cf2f276bc2f75aa76a970c6a6079b3bf1603bfb00c67089e6b62c41ec066a05549af47b7b8109b84c0a26703c299f26a44ddd1ff9ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJioG4ACgkQCaWpQKGI+9QdrACePQu/VV8rVyPxwTnrPFSsOJVz
-+mcAn3E4Uzd56h8yPZDGdhm4GaIn5Q8N
-=Kxtn
+iQJ8BAEBCgBmBQJVf8CpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmijk8P/i6VFNM/1qtDUzodleA9zyam
+M6RIt9Sjm0z+bs16q8242iVxwzMpMBq5l4ZNeoJnzFRvzPcFvP0y0FZP6y9SbYlb
+nVKLsMYPECzx1Ysp5ctLvbxPMd+wvy2SwZ6hEQ/hbHl/USTJ9p2O3FKVUc8HpDXQ
+JqWnXgdA/yw3I5YnTo8kS/16xH0PneRHXAK/cjizhdIEjUHv3LZvqlJvC2zGysD9
+2BX0dTPIhJ8bEwUdzK94/lKYOXu4V5U38AXRyN7xvQwboeeyoC+Dczba9RJzHSei
+hzcZF68WmGdYcybC6Ah451iZh+x1RLf1IISiuIh4HuSk5T1cfAWWWqIMlSIzFNGN
+sosONU0/mjuXpXQnvOEgvQBGiBVzGEb/XRTPLX9rwYJPzInPZJYNuCWpSj2q/7uH
+Ud0IyeJW+LUr1Z4tV3ecBTJh2h0xB40D99O+5nXzQ8UiMQz6bX+J1so+STEoJ5Wy
+GnvQ1qcrIyP+vBbLl2ioByNp6gPN7p1SZXDajhhR/hVjH39IVc+HFJixMGYY6mJz
+p4wJqeVFWMmBfqtQHkqKqXrZ+wy1u3whnFVHTCNyaoTH8qg7tJ4hGfgsmtPo1Vd+
+h5XSkmYphuUOLi2ulAfCOaXP/QZFXPGidqSl0mjMmiTggx0+XD+ORMOmJQDuCOpi
+dhvroSEc2p6zMGvRhPQ/
+=eMUK
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/netwmpager/metadata.xml b/x11-misc/netwmpager/metadata.xml
index 4538a68724a6..402a82e8c6df 100644
--- a/x11-misc/netwmpager/metadata.xml
+++ b/x11-misc/netwmpager/metadata.xml
@@ -1,5 +1,10 @@
 <?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>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sf-xpaint</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/notify-osd/Manifest b/x11-misc/notify-osd/Manifest
index c83e6f10a713..012e17987a4f 100644
--- a/x11-misc/notify-osd/Manifest
+++ b/x11-misc/notify-osd/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST notify-osd-0.9.34.tar.gz 635387 SHA256 12080deeaa5e1e10b420117351c2bd5db3421b0d1efcab8ee8052c808c3aaa3c SHA512 60ca63c2041f129d5139537242c2260908cedef633df977a608e19dcb01b75b2280ec80abe2b6da5eff76621107ee9d294742abfae301bc24eaa3aa855c56ce1 WHIRLPOOL 3a1aa26ed5276e6cfe2501585effb8825bfde56cadb7a264ebf084a60f520e423498073c86ecce6621599f8c7d383962d0a40f1096c5afb8830a91c5e821171e
 EBUILD notify-osd-0.9.34.ebuild 1559 SHA256 14ef767df033eac6905cdeea7c7321047aaea926dc068de3467b3019d05f5b94 SHA512 c52d3859ff3af79aadeaa0ebdac0fa15fc70dcb07ca5e75782b593b08bd6890e24cda042014f6cd9b2371d960a992e0a9c97484183870169b2d77b118c1e57fa WHIRLPOOL 62fbd6c819262170945cecb6edca8d8d9a6432bca24ad9014df1ebee1e5b36a3aaff95eda3206b62e089c81eb0a08f0bdd05fdd5544e127526b4e59eaef4fb38
 MISC ChangeLog 2678 SHA256 5962ff5d1cff7b4d17f3a6844db5535cb15eb4828170b0a1edac3de95dfc06d7 SHA512 c5919d381fefab0b34994d9f5100f76ebea45ba83ac6ca5b84e2c5a28090da156b45f31c97bc28eaeb19ec687a482c107ed6872846210345b0236ae3e959199d WHIRLPOOL 85f844a1215128ca783278f2621cedd5878182fdd4f22c51fcda873ea3aed3a3c471e035c14814e25356bb62a9f19e23aba8dd6692b96c877acf042145f271ba
-MISC metadata.xml 236 SHA256 841c7a751616fb3cc745c4e54baac7f0b57ab7214bd9b29fee2dcb9d563d68db SHA512 e5350552b5cf14c15a068ae18dfb9755ca547f27cc52ce507b78929cdaf51113a8cedeea0ea68eb7b518052105d572adb9f6d655922586234b3ed7204f48a49a WHIRLPOOL 88638c1accf1b9e8f50f638f67399baadeff5cc0646acfab1f76d894605f4102533391769f604ddd7cceab1bf3b01044265be9c1df252cc922c00e4bf0fc2d4a
+MISC metadata.xml 318 SHA256 1ba168bc6cc4a144f8b27828e457e911f71cd901a61b3a34e1c7e65a82360f1b SHA512 ee2bc0252570119a0e16d57e574f4f450100b71d9bca16c37dfe4564c3bb39f3336586ae6738d34d07df515fda964b3f864586792278139901f41bc021763fca WHIRLPOOL 98e73341f08b23b7f2751622bf22e48369324cbccae96744ad5d4cb9d712ee641958edb524dc5dca5b44ed1688f61009d87370606be570320e9ddbbe45540a36
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBAgAGBQJQFvYIAAoJEEdUh39IaPFNT0AH/1pb2WGfUWFcIM35lEBh+yfN
-zda46lLLCq1RHP85Mh1iaZa6z+SVaikNNpkIsfZn1aCxFkTQvCl80UwXzAK/JBit
-LBrH/ND2wsmRLW20mgNr7GojVA0yntyx+pMqWYevCXix5mT/5Fo18RiHWRbilNUn
-JJsFrj0eA5EhVMoaWi+YkwUXdsvGg+GdOYZLPO1YulEhJTpC2ZyeDjMuArdBcf98
-sUStwZkJuL6nywjCO3DYxvBLl5OoyD+Fvz7qtHGP8QgZ6Ao+ZDlnTFfR92C55YqE
-lXQQ+RX5enMyHXGK8pK0PvIcWxjxPEkS3ps5uoItM9Ia/Y2MyMcF5o5O3OrPX7Q=
-=EZGl
+iQJ8BAEBCgBmBQJVf8CwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/poQAKy6yoBOH9xCTepinGRI0DQb
+HJxByR9wHjV4uMQUsEQsqFnVp/E3239kzKH8L3xZsluVTmBRkQ2efbSSKuQFXhUu
+uBkwRl3v9Zm3dF1iT1lxotVil+iM6WFIHFafu2zlnh+urKtmuHSVivBlVoLgRTbi
+ISsV4chHOKx253+23sDmTaxVi1Y0HzhxiNyq59T3Z1w8BZ5GFSQl7dSBHIlDG9/I
+JlSmWH5zeNjjsbLA4eyaL48LYMf4gWr74tQv3XifzuY1CJMPx59h3kzha66w5nxa
+9XYksgr+EhY3NdDIGAPokQFg7Y1Ujk7e+SIPEnxYeGTbPdEsEXQbyRNwdNHi/fdD
+qUZX01HMLnvp1ASyUAxw79IAfYNj8ktQVa1Mrrq+rrKfxe6dgsHDq8SNem81o0T+
+oTHCQMFqF5HJyaTh0EV4fOIJvsyFkV0/XI2mST8gH/yS1ZMEL4HOx4lRaJiJ0AvB
+Ni+chbveKyqrrxo+DvafSvbdNluOz7PZFUlZO9IaKfiJPzbakAyC0bhNkOzX3ri/
+01XebklqhKos35+H46aMpydbjv0StpyhxryhF613YROKq801OcYxaJVVjkmlKd1e
+aSJGNoWNq0PHL2gmLPDa0XzuHrhmzWvcsIo1TsERqS1zfo/RM9Ib7uPkbRkojlPs
+S0CpZYEVbZMImT3KLBdT
+=pD8Z
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/notify-osd/metadata.xml b/x11-misc/notify-osd/metadata.xml
index 99dbb45dc755..650c2a2edb1f 100644
--- a/x11-misc/notify-osd/metadata.xml
+++ b/x11-misc/notify-osd/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="launchpad">notify-osd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/obmenu-generator/Manifest b/x11-misc/obmenu-generator/Manifest
index 3bd0caec0a60..e5dc38a44a09 100644
--- a/x11-misc/obmenu-generator/Manifest
+++ b/x11-misc/obmenu-generator/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST obmenu-generator-0.61.tar.gz 19371 SHA256 37a5df166675a71ca8b700709d73b76f38a5e600cb04f8b6e9183fb6bd08cd5f SHA512 0211ca2d84eb78468b4122945efe4ed34fd61822f68a5797c29f9a59d7bd80dc90df6b0602fff3a62476a8e435eb6deb23b0caf9e0e6036d2294228b62b77b9b WHIRLPOOL 7aa48dc3c2ddb5d93c71d37be1870e8565be2cb78ca4af1d3286fc12e533c8de36342a1a8d5ab55a0999dd10b996442617bda114c5dd446cb45b64b37bf17ceb
 EBUILD obmenu-generator-0.61.ebuild 848 SHA256 49794ab33c19824bd0bfed2f627b74536fd66999f587d0e36cb60a7991e830a9 SHA512 c4e0bc1669a00cc4ad712d009e5614fcfc310725fe693ac620f8ed63b8e90db7c43d1c3812a0b32994b73c45f93e5ce0b391be4b021e97322a70b9ee956680fd WHIRLPOOL 9ce142c949fc305055db7e188c51475801f85187e3270766dfbe18faed6ad01e062f8f896b638e05c6c5d74e821364d7ece09a2c1cf8c16a1e56c0b36db95a38
 MISC ChangeLog 2298 SHA256 dff1d66af363014320a2ee43a1f95becb8ea577bd8503415df2f2b7692bb3ed4 SHA512 56567aed95d126405a50f2472358290dfd44202486c8ae3ec30c635ef4d84cb2c366ba8abd71f20f94c92fc9fb7ca750b089c5ba7e43252d88efb50164ab5150 WHIRLPOOL b649206a112edc04a04c84a9fa154a7c0e767bb7a7ac2cb89c3c93d6be98c4c09cb714796257b822d5662dd073b7c5f72e060b608c22a605259a152824b18c5a
-MISC metadata.xml 334 SHA256 b6624637af71f48e0f20373590d271e54c146e0b994cf53aa20e5ce8d7ac7d67 SHA512 7fc6b37c904f633206cf0784f951c45f05f94e5296e46a6c198e91c6e8eb3a4702801e84a87283c3cd23f29f2d76d14691451a64d920d59a01024ae92cc6f174 WHIRLPOOL 7f2c51641be934f65fed7fe28dc127cff3afc753b304c6c75eb443efce4563f64497987d81bacaf68aa2266e41f7766b858f49037b25438200fd47a71a67e7eb
+MISC metadata.xml 385 SHA256 d652cd14835d1786429dad20d475d8625ee79ff149f9885f82a50f1a88d7250f SHA512 5846f22adf749d7667c048becc8f6d0acf9b8bb2fdbab62ae4474d3eab0413fddc89c2bd53e9ac83b77e6d0d0cfbc84bc39b497f6000ca48281403e1bd19ab41 WHIRLPOOL 459750d81fe7c2d3d604f98ff9b1ffb571a9e90a3eafc26cf054eac749ba98c2b33881f454f02ba740175e39a328493caeec8beb165ad995e31570351c79452c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8DCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVCEQAI0fi8dy5ds9YZ9UecsZlruC
+Z5b3InbFwvo1wRYdD1nttNb0VQa1pj031hxCMJouQukfV2fOPA6NVAfj9BrlZ2sV
+9NDOeSUdXnB9NBZK0YKB6J04VOzufvhtk0ME0azAaI+iLetzFoOd8f16sNF+XOzZ
+RqLxNOoZwsnJ/C8yw0kRf0AD51pix0oPo83ylFxFQhtblu/R8rmrFPq3T294/69Q
+Ylnhkq4LsrXZHH0Z38Vj231ZCu86RgtR+9LEPbVWlv+FPbDp0lq0WV0xOOHvgJOt
+333aHxF7food+euKllwiO6fBzyqxsPqKxZN6aMIF1LybuohBQ8gXvbQvwtYLe7We
+EDoiAxd7cjhoo/PKOSsiJ7CL9TvRZvZ6/MolxlBJTU346d3rc8DqmcAKBgMB53kY
+CsOEa/JELA8JLtXFwJrJGJ6ajVb5x6+e7Nn+3e/SOU0ce7zbJ8rvm7AIJXhPh8lh
+E7XuHPbJk0ZK75cfBgZpLVXCqAbFGPyTXz/uxgQyL1OwMguyYyLci0eOQ8f53/tg
+0jcEa+U30m0UoeGPKLyLfdkOR243mHzwUBsaO5H6mkuzN/yDynXVvD/h6cX9ht63
+3EbyLF6LKyS2jO2WKRJp2fZkQXsoNsK6qTH50ygWMssiPY8SfZ4F0SZyy9ELUpMq
+d7TZKlFBf3kNAPHR/Ds9
+=Unoa
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/obmenu-generator/metadata.xml b/x11-misc/obmenu-generator/metadata.xml
index 5ee7155c5be5..f28aa89d7913 100644
--- a/x11-misc/obmenu-generator/metadata.xml
+++ b/x11-misc/obmenu-generator/metadata.xml
@@ -1,12 +1,13 @@
-<?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>
-	<upstream>
-		<maintainer status="active">
-			<email>trizenx@gmail.com</email>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
+<?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>
+	<upstream>
+		<maintainer status="active">
+			<email>trizenx@gmail.com</email>
+		</maintainer>
+		<remote-id type="github">trizen/obmenu-generator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/obmenu/Manifest b/x11-misc/obmenu/Manifest
index 5811a77bd006..d3e0c3c06e9d 100644
--- a/x11-misc/obmenu/Manifest
+++ b/x11-misc/obmenu/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST obmenu-1.0.tar.gz 26375 SHA256 c9cea64d40d461a34ea3bdaec9867487c819d5f9814e1cc54db607d4d3c20e27 SHA512 64f36c5847c9e20ad989ba1e5a1fd780e420ad52ed3c188b06910a5bebb54373ad6b826621916fbcb1f900a34569f1d7c484094de99a227ed31cd2ff87ef78c5 WHIRLPOOL 3ffc97d147eaed207f19e09c16c9558878b84b426e31c72d568b1ff70eefbcdb60cfe5f31fe7ccb0c78e546dde005ea85cc506277ea54e455396878c088f1b55
 EBUILD obmenu-1.0-r1.ebuild 510 SHA256 6fd182706b418c5a7f1499d61eb6099ec755ac7be1d0d2dee836f3f59c58ccc6 SHA512 35fd0190bfb965fe9d3933d51a9facfa0ca9ace71ac540eb3eed5b444fad9ec53fa7174fb45e0df09bbfcd27ee006a83acc1ceb5af21367a265c941d1dfbca00 WHIRLPOOL f6d468ce4d99fab071bc1388119bd34d185aefe37229060c989ff268c10cf78ae630e548f4b3ba0726cca0930a8a26dd0c490e5fab7f50b6a37d4898f1c98598
 EBUILD obmenu-1.0.ebuild 583 SHA256 90bc5af7c25bb729574f8f9f839516f5fe1be1ccd6057778362804ad4d86aaee SHA512 7bac6886cdafdf0933308b0e4f12d6a7182b8e66ce568f12285acd4534d339c0a68d3488f15e3bb599c57fa5d001e88201e2f1484bace26443654c1a8d8e9f5e WHIRLPOOL cd50515f674a20790313374276c08d1645647ddc43db920f3cf2fc41e7268cd1a96824d4f701a52fa34cc1f43e7e1200afe74a66b27850aa10d3dcd6bc225f7c
 MISC ChangeLog 1522 SHA256 8183b1f87f87d4ed77537eec3c0fe8df3bf4a42121540dd9e62a92b7d50c0629 SHA512 e579aed80167a58e099eaa62aa18c70898487164a7b713f2e9fea67953fc8441ceaae8ca4987b48ba99ea4e17b2795c659bfbaac25d548825bb9d5a377c1689e WHIRLPOOL d04133c98b44cfefb1e732bba8e76ed0e05d20af38fb94d8022d84d241de9eac6d4afd1982c20db4e997aa11d6fdc64fb9bf97187eb5eb2c2d51099ffd5ebc27
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 290 SHA256 ba343b04e0ef0ca7d8c4e79640da45d44da276e5896aba0db520cbce4d3c117f SHA512 b67ce3df56bb035d9377d2b7841527b3fbffba39c0d9b562b0db63fba6605a3be8516332929c123f56cf2142050560b3960ca34b3a4576f2485d4b980d2e0247 WHIRLPOOL 156fea076204b0cab6a21b6a402d4746c411795388343bf20ef2af0ef7ca5f5d09413951735b521bba65ab0c0b56fd386a55d9328a0b24f7bdb5e55dd7fc026e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlShgvcACgkQVWmRsqeSphOuJQCfcUKoBCS+fcYaPVKbnvMFHpMx
-dYwAn0T5GdlgrNk0mkBKqCx9Lkn0/Y0i
-=tgMf
+iQJ8BAEBCgBmBQJVf8C7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNGgP/juuL0PR9OGdhdXbXzYswJrl
+jDM9RA1JNOc72PVNhCwCz+saCBZ90fdn7KIMuXOVotdygeAflDaqHv6+sKdMtBAo
+6j/Fi+TrPh8Hk1FPnPqxmBZ6s/V1dLyOUMl0JHNCt870JyEiDqfyB4rXWej81JAa
+IawJgikoVN9dO3YGRgr6keBW9pYvqiXAvMsNQNpmtoCqPaFCvgYvvhQjTewfG0rS
+CA9SULXF1C95ErYAaVcFaLK5UcdTLXmeMaOdyfj894BPE3llP4QfywKUYZsiuSuQ
+0MdzZddS92UWnRZKpoY15jnBTr2sKGiE/65TJg35VcDGmWmNcf03GweAiiwWyDyO
+c/SLoCvbpGEGyPJbOrar0GUeHJDjmHy3w9Vb8FkihMMT2z2Lf06fBCnberx29PM0
+uPSl+5hTbG2z4JV2fklILPmFf9hJBVpiaUd3Dmx+lakfys5r/7Ui3UlKyBf8s9HU
+oLB5W5ipSYq39PS6IUfadNlG2U2SxxeP5c8d0lr2L5/uUSu5krZftJ13pokif36R
+vJAKaJK52ZRKj+imdqiPm3EX2SHUBEw7E0AuUhrPWZ/6OUkG56aR0PkYS5M9AtvN
+W21/yasHGX2ZQafYvbt9c9bc5R7sUqQdXQbfgndkm6pmPEF3Sv9li/7qpRtRmWGC
+VsQrvp9yXRQANiVVmerK
+=GeZd
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/obmenu/metadata.xml b/x11-misc/obmenu/metadata.xml
index 4538a68724a6..7b6a9e3ef397 100644
--- a/x11-misc/obmenu/metadata.xml
+++ b/x11-misc/obmenu/metadata.xml
@@ -1,5 +1,10 @@
 <?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>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">obmenu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/outwiker/Manifest b/x11-misc/outwiker/Manifest
index a4d30b01d20e..6c0132b19632 100644
--- a/x11-misc/outwiker/Manifest
+++ b/x11-misc/outwiker/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST outwiker-1.7.0-src-full.tar.gz 17740708 SHA256 63adca029e5f2384bb2e865bc72b1a89dc78f2495396acb519a4aa663a4dc29c SHA512 9b776010847f91302c4469462124b7c986bb9fe58ff998c5979f00ab1ba03064fb8f89135406ad050346cae5a3403742e173561193f0c7c7676859d80a613d6f WHIRLPOOL 0e95b6548c1185ec06233e612019ea8487aefab6215daf5142455906c7bc0d38e71aa5c4a4c9d166a4f5a219435019de9004a1711033e9057e4602154e4d75b7
 DIST outwiker-1.8.0.tar.gz 27931330 SHA256 b000980b7c744000f1876860c163a27b5c9513ceb04dc77f4fbe974bfdf1a060 SHA512 d4b669383c8c1c95683e8f38617618583076f25db4c3eac778644c9bceeb1e78a7574a1dbea962e2d513e5a0349fced52608a470eb7b6c84dbf83a09c0256df6 WHIRLPOOL 10f0f13188a7da3bf12c15f64b23ba751d74d0fb4757cd3ab4db4d0b64a49177c0cb792f95b6dfc7d716a45b54671ca72c8642d753070e3aa071371a9f5bfea5
 EBUILD outwiker-1.7.0.ebuild 848 SHA256 32ba317823ba96d5a7883bec2a80930ed11d89558b954b1e2b4049653599f5b7 SHA512 fc629c321520d125b28887e357739d4f454b616bcbb5d6ff580b12ca0d64740d09d2ed15741e8c6da38a81cab5b8e00dc0ef67f0453fe4698f71d12c048ec48d WHIRLPOOL 8bf7c582df0219e51bd238c3d9db205c63345acc943cd7eb936db675e48add7724a69a1ebc84e78563fc7d9825ddf98d453d23b6aedc0fea6ac3291dfe956361
 EBUILD outwiker-1.8.0.ebuild 938 SHA256 6732c11631ebd5f53bbabd06dc011f3babf18979732ad5d28753bd4319e2c8dd SHA512 533feaa24fd268e7daf4af3c51a87edd1c1ec097796f6f89eb315a7898ab55d5e1aa78af87072c878dadfde428b9db2686bc272da5904bdc3f1f4ee005f3ba1c WHIRLPOOL 6873d43e2ff45ba749c5bb5db163fbc4c6f55e6dc0ad891472c27d415c62050e4415e3d14d8d9a30d4c7b7229401515c5aaf4b64dc14e2b9f0e61df1bf490ace
 MISC ChangeLog 1366 SHA256 abafa79ea9ab5a71d94ba1903da92e77642a71627f98c7ee39909c0c5665b5f5 SHA512 d09beb7d98982195168323e72bd42ce743fa952710143d3f01149c2451331d610bf0ec04d89f0db999f4b404610d9a19f41f8bc320343075db0b55ab02b5319b WHIRLPOOL 20e16c85f8365ecb60bd7845b47e5e057df5a7ba1d4f6e2b5003e331b9caef2479ebb9c989c977cc2cb88c64d41ffd961beffc524cdaab1f35d9c57341128b69
-MISC metadata.xml 239 SHA256 606efefbf5491811d2cf2d48f857647eda6da3c2ba0623a7d32057c1bca3d83a SHA512 6dabed70d7d72ecd9603417177af3b9997da2ad495a47520e8f00b6fd31188cee18485a62983703f3b14179b7b7b18403617d63a0447bfbf4e2302c08156e729 WHIRLPOOL 75ebf082a13ee09e99c8db9d53480d31f3b2b3a5d2b46755351f8443d2a650a10afbd66e14094b372d20019ac59d26b162a3641bec9ef98b70f4e2359508cf0b
+MISC metadata.xml 323 SHA256 8062f51c890f6fc600e1d6e13ef9345b7890bc1d6b1787594fd05e25e76bb2b8 SHA512 1a2af2661ea4d38282b2b8cdad9a8601924a9d7afd51649532e94182095c52afe4682d45c526549d90371c9fda06ce8e6add8277ecc7e030f1b908c2d4683604 WHIRLPOOL c22ce33e08b2492e6cf0fa5f632a96796c8a57cf760c3dcb256251a1f2de7585f654001d08e1ea67354138aa725c686d5bb105dace855f6448bef39899853eab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJUOlthAAoJECo/aRed92675/8H/i+kyJsivbeacTaocU37cIJq
-EdKENZxqi/b7aOtoEiBkcd7pWM+FRvWEQFqEu2gHAiW+TfGDx34oGtcmVMRY/Bh6
-yOZVIcKaP1WJSB410lIbWfO1hIy0X027FMWs0IXHrAwua9g677htymv4KgzJadIa
-wKA6I2doIQE4PqviXK001YorfSlHsYFl1KiZLU0H5JHmWnE7K9KAvMDoxjmbaZ1F
-Uq69h8YPTd+Hd9glqpa8zjuDo8L1Z79tEbiZASCT2AlTgHucgxb0znw/3m7r4Gj8
-G5TP6ppV/HE2p/4u3DDrWNiv2v54xWudQAJajPG50aSMlOygpetXA/ysIT90oAE=
-=tULn
+iQJ8BAEBCgBmBQJVf8DKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5JAQAL4dIpc1ebC0xrFcvAr19uhj
+wJrJsYeYFXeaZ6HcUA2EyDcqsmlc6aN2p672wtZ86dWB8kIr+t3OBqyKzFYvbRpZ
+ebpXfim+JN6kewBvNpikRd+vMAiQB4D9ftCnO53K/LGHyidU406uuGPR46nfCKkO
+/DERC1xdSbzYksN4dxvydEmJQFNiXn+THKix6eLpuZpeDZaanIeze50WGJpLldLE
+C0rWrhUUy2t8d14l3teTLJq85z/Eh6F/3eCXy8fJkBHdXtG6h7IekP390om8E/RN
+4FZWBvvFfSFCvi8ISJ1lherdYflsWKmxlYu/vRkYEka81nTf348RJhmLuOM2eA4U
+/95Z0Zy4Sxk/EDdjuUuyvEdVd7SXfB1adsKa696iU+M+wvqegIIR4KzNwF0T/cUM
+hIoTgwAvIQVR/jM1hhq+q2VZY/pjYwIxqwZ7e0e3Y4QuO8Dulzfl1MJPCG8F/kxa
+kbld5L0RALfrewWaflZlIAi76woXIGcjaDR2Wb7u6yDaitToqaKLDudmSeNKNhR/
+Mu+gmYFp/dJDOXAojidF60KuT73jml+jP1ve6Wtn0HmuHCJ/yqFzdvWe3lt7GYWl
+b+ty9kTV7URY5e8Luc4mZVyTLU8SSkjTczKBrxT4/EEqqDsduz1YKN89Ut/KRcog
+bFLyqawc5JPsQnKBhXPm
+=oalr
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/outwiker/metadata.xml b/x11-misc/outwiker/metadata.xml
index 6e94119e6ad2..5c22da2a8ddd 100644
--- a/x11-misc/outwiker/metadata.xml
+++ b/x11-misc/outwiker/metadata.xml
@@ -5,4 +5,7 @@
     <email>pinkbyte@gentoo.org</email>
     <name>Sergey Popov</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">Jenyay/outwiker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/parcellite/Manifest b/x11-misc/parcellite/Manifest
index 86efe0b33322..5564486ba7a2 100644
--- a/x11-misc/parcellite/Manifest
+++ b/x11-misc/parcellite/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST parcellite-1.1.9.tar.gz 720177 SHA256 cba89585082eebbe848ac1c0023cc71a0184c0db24ebc5f8a21039e46d7f11d4 SHA512 24721dbd4f049f65a40f4e4c6914344062d49dfb50e3cf6496c6f14d9aff02bef5b88d3a714e8176955c84b1324c9ca1f35b389e8033d1232dd3c802c40e32bf WHIRLPOOL ce605b7fdb000840eada03e6c29d9ea86a9a9f1f7461e34206bfd10960967bad3bc7b093ce32a8d337cde07337ebcde5cf041b50bd8785178c4a70426482e130
 EBUILD parcellite-1.1.9.ebuild 990 SHA256 0f18a9ae4b3fbd97cc714161b6ce445a32ed3d6e355ac44801bbbc68043fd8b4 SHA512 c19955e0a9875927ec479c62dd7ef85137c4dc0bfd701f066ddc0499c27b4565de4ab332093a47f296853c560eaf21d24256ac8859fa3c38da5a480cfc577285 WHIRLPOOL 5afc2dd7909560580c4a76599f0af8ad84a2853a8eed2bff2c56bd6ddb4e763616704df13f2f84d13484f1dafb8297c4178265dfb1ad8a51628dc7ed86ecf982
 MISC ChangeLog 6299 SHA256 422d8b8c75bf7d1ea7c4fa51702ba55eb77a2ea271704d0f5ff1260b8c4ebfe3 SHA512 a5bffbbaafb9d6eaed79d43816705380893449c67b6cf75ab4caaa091fbc74e84125115e554021fa9b6c62ccbf13f18d79283e05eeb52ad66d27edd3254158dc WHIRLPOOL 27af2bacb9a0fb14e75fc0b7cd852eff236bb7a3a41b99f6c613ef02e394b9ec86b0455e545affbf32875528bd18ca344bcd01893a6c20db7f047a2cd1bc92b6
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 246 SHA256 7bdf7debb333c9113b8380b49944a521f2a352026ff9a8140f187ce97b283e44 SHA512 d6c84df497b432ee6a25b5b9d4f5d71766f1811143dea4a85a4ea1f1d133a98b095c1ef07b4bbab48089a7161d3424a46e05cad6bb89769519fe7d3fef59378f WHIRLPOOL 70e8c4d39dc8308a777c862d0db88cbf5d64ee363bfc949016b7be1b86c254ee7ea811c2a97c66740a7f3419d0f825c7280122ab9791d331e2621c877f73856a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSByZAACgkQVWmRsqeSphNCKwCeL88wJc+ipHZLM4PePH8AMjrH
-iVUAmwfopMiJmIIK/AlY6wwz5sA9C7Wr
-=hdCW
+iQJ8BAEBCgBmBQJVf8DRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiB1cP/i7gyHs9UXGdFYlgDt8lobhp
+dbRz4Zv4oTSevDVnwQhbEuWFcVMiYtFuoUjZ3DC+jPEShXg/PFoNDATLs78Mrubu
+mZJTqOKt/uPrbh1VX4hN5qNqHGxyl+CBhCcES8BcxsRdFZElu0qv/QL9hi9Xw0Gq
+4gCiQFT6QtO/o5tet6KjglQod3DgAEy41zeO349d94wUYr1KwWlhZrznfNkWCLXe
+Ej3FxXRkqlyw2yIYiovBy5EUut2SReI5FeIzdaCqjSBjZLz9I4ws+zFuGKxhaQu/
+95UGPZhettT2K4HaPV4CA/0LYwfbIgQJUvqbDCrGa46oBL0GehaW+n1XlpOjUZ62
+63cM2jNwx/+Zmvpd0I0g1yFmCKa3Q0V+MmxSmlkEguQmTW/feJ7HD28hhSWGXin4
+Tx/BOpNp1+9pKkyGIwG0S3akARgkkePQCHtv2NH/RGcEHnvMsqFnJGzMhh3fzv9X
+EVcc4ddO5IFxShsRkAsd89i5FAWUIzi0RLJn0Afmrnh1W0bmkOKb5+RLi8uC8VtY
+jS0I4BhN3an/L0uqL0vrqMM/DtBo5Gk1hJTkDDpl6Q9qbj6B7DseHI+u/nt/l15n
+z1+Wkxflr4MjWOXFGhYmLCWQt6jBzimK/N/WJSPBYXO6dQUGChcm7LB80UPyZWhG
+6A8oWkKfQ6hGly96nDtE
+=387b
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/parcellite/metadata.xml b/x11-misc/parcellite/metadata.xml
index 731225048652..8e77238df625 100644
--- a/x11-misc/parcellite/metadata.xml
+++ b/x11-misc/parcellite/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">parcellite</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 5e2f2dd96856..82a106ac7fca 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX peksystray-0.4.0-asneeded.patch 790 SHA256 e0e7d4101dccf80f081ccdda3d64a4a77de36be49a06dc6b68e02b6fdcc4b13b SHA512 024ca181bf0ee5a2577000f9951108e2021f10130064aa89dca48f77a058471e55b5ab8c46d3dc06a54e9d4fa269fb510f262d2b456510a687d9633558dc7b3c WHIRLPOOL 4cdc493c64ee9720ee07bc81f95fe55787250cf41697045c3320423322ff25dc8525c2765ee424a7835194930b5e9e665fcdab9843c79ead78086f6ac0f33b35
 DIST peksystray-0.2.1.tar.gz 70261 SHA256 1642322c50c893467c0e48ed0ced258e17e0df5c2f0415d6dcf4fe906f530793
@@ -7,11 +7,23 @@ DIST peksystray-0.4.0.tar.bz2 73810 SHA256 30733b349bc7919171a6fa31023c8704eaae9
 EBUILD peksystray-0.2.1.ebuild 713 SHA256 98079b3bd98122bdb61d22e9bdf00b35ac891e5ebc0dac85272fe2bcf29953ce SHA512 f3062d6352a129b362a0da16df6f79354231b7fad7bb5f1c6d9dbb6bab3c68eaedef728aba415e00d8a4f6f344a663d5bbe3c24997dc2869f948ad2aba730bb0 WHIRLPOOL ce830a10b3d8f1526d03b1262b2ce23ce58b4266d25b86493da727acbc0ac28d2c7b28a0b8bfc6b254ecaa9f22d6bfa5725dd8ac0e10db4517aedd83e7773739
 EBUILD peksystray-0.4.0.ebuild 720 SHA256 37d894abe7d33eccd47abf3cbacf1481deb0c2bf594799ba7b096fbe618294a0 SHA512 e464fd2ca283ee18cccf680d95cb3f7d8681ce51f7c180c33005b1ddf0598f92912b0464225a16c5a3e57347653050fc347fda07b9f90bfa4219b94f537c69d0 WHIRLPOOL 09ff32447a133b2e45a88ba1ad40583b33ce19531987f331be01f1026da70c2faa2d8461d294f5b448516cb377c17f8607076b55ed33a88779c92c03b7ebe237
 MISC ChangeLog 2791 SHA256 ef77d11ddb806b8cccffb9a05ea8b9e7ac9276b3bdddbb8eee3caeae6b3d01b2 SHA512 c5c0b7c8a8973be198aa0c8ff86e9e30d3251e101e60467159b869b964bff8197459ab5465d2ac8b2f008ccf366fb6905381065ffb40e6d75c55d31745f8a78d WHIRLPOOL 406465cd6afc7bb6b72097e1a999ec4852078ae41b888fcec035a949ac8e30f1847cef91f5d76aa2c2cef39ae3062249c68b104866ca05c9e4154ac79d076a97
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 294 SHA256 f22db11ef8d21d1c443c5bbd95cf51893d2be44a1b146c55240ed90e2e4e8016 SHA512 206db40af0ae8684bfe7bd86199a0da62262f0efcc5f5d1a9d05b55e1a5d48e80f643653166361de54f2a5e997fa2bc9ab1517f2c8096d8f779ffd939943dedb WHIRLPOOL 755b9acdc7162bdccdabfbde6f8e03e587e1405980fcf12393166f00ecc4e2761c6ae03cc994b331c47c60510abf56cc8b78f184eedb1520cf7c1b102185bef3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJioeEACgkQCaWpQKGI+9RfjwCcCWEE8VBn6I5cYy4+Yo+0ezTC
-HKEAnjwsHjC1QhV2qbsW6b0Y9ToIMMKA
-=EAW2
+iQJ8BAEBCgBmBQJVf8DcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6ZoP/0B706ILmZfJcP49YT6BISQT
+G6bmy3xl+RgL7lR4WJLZZyN6gnGXLomUEUnfDbUJkS0nIeLdC/CjSBl1Bqo+fWvK
+GEPiHm+pZfB6oPSDrZ0o8uMwyDDk32XT11hlAsuyku1L+CN+9f5A5TJNPh1dJeSv
+e9+BuVUQQLqSzZVbeiZzV2okxsnzsDDOmUJS6icak2MT7Bp96KtLYQJNdahbyWeS
+f5Ow8iRh07k/bhkNxye+T6fg0QTEFqMZM06OilclV63115XqkYK3euac6s7aw/gY
+icslqCars9Kk07GSGRval4NHEV7fpweyUSwg6018UUkK4Jd7J/YHjnoFBSk0F0Q+
+MnRZBmIt+oh2M9ysgIQDl3K8IkInz0YmTt/nvHYtX9aZz8w2e4cUz7svMDSuMRtc
+wwaXzoyAbcEQo5O8y5Sw7mTsT4EhL1iUaSfaqDdvMOkz3zb+2QqEEEm7yi+DYgIV
+SyJsBAVWbVvPqc4ubrnfJ9r7knHSAzqwW+nlCwqOT8C6yXJeIf3n2VXVhBvqe2b1
+o25jt9O/OPAxHUGoTbuP75jIQaNoQh0zRkouez4KLcKm6gRNvvWaanSRcZl4k7vZ
+tlmUOflZQAE83YNJh0/ymG1bJOtns5KKlxf7FTti35cgIkWdnUraHPzc5XfNtLQ3
+Nzcx1M+nKr5Uilcf88Ij
+=YJkn
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index 4538a68724a6..c45a76de0a36 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -1,5 +1,10 @@
 <?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>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">peksystray</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index 7e39bc2ee0a0..df88183c103d 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST py3status-2.4.tar.gz 47991 SHA256 35021e5d9085f6d99de0e406d961cf0f79415ed9eb933181b3cf08b3ebec6826 SHA512 e2ff8b438e327f494daa94be283907049cd12722aef1a96300bbc21124a11b2c072a893aa7945584bc4bed84e27cc09bba7f17065e65265bcaaa2f3af3b3c944 WHIRLPOOL 35978385988e24ccbf62b3b1b167d21bbfbdbe4e6c481980a6fb583e8ef5336105fac2fa321fac832d19c3ada83aa40e3aa865e8701b3c8998c0fd3a569cc047
 EBUILD py3status-2.4.ebuild 712 SHA256 a4379b7e0ee5563032b883bb38b1309ed4c24ff29f2bcc2e37ec94a625dc8938 SHA512 cbef1dc0f3d564d348ecfdb69f48e0bec96010999bef8682cf10b6b2be815d97a3e9400f76e97f8e1eca934837a14288bdb782798a1e7d882bd9956ac9ab81bf WHIRLPOOL f5b6ca42d8d9a767fa764da003e5787edd51e7965d0db7911cbfe11f617ff2b7d2773a60eaf1fa02d2c335be666ae3a335739be327002c8fbc9d2a80a65aa125
 MISC ChangeLog 2444 SHA256 f4864a57c0923e2a2cadc4994a620c1bf34bc5e9fc3ed21073ee560dddc0f620 SHA512 2a19de0fe574f217027141e43c7426a1e9b9cb6c3b367c01173790dcaa10dad88e1d46ad02f36da4f0888b10a27e118ff1a3c827f24c2077933640a8c1217ff0 WHIRLPOOL 50fcee5361925b67ac3a5e82d1e7b94fe1e8be1c8b797bb467c628bbc94ee205f5363887c9b9b47b05b20389adc309332719afd1ca7906bdf5228acb60cf7422
-MISC metadata.xml 414 SHA256 b4b2fc8efa142828bcbc195ef7cd35dd1544b914c6e188e4ebe2156d9513fdc2 SHA512 c7d22687cd069351d514c8a619018b9ab530a40763efbc81d419fd263b2e161f6f1fb2895ba91f4ca58eeefa07ef0114ec5d35b3ad2e9715fff00e5f4e5a82e3 WHIRLPOOL 3399801354b5df1dc0808f24f65811a55a4b56bc0c8792c2e57839936cfa8129a7fd33677c744c942e89cdf74c393a1c0ae8e0e7a74939cc81ba9a9de91a306e
+MISC metadata.xml 472 SHA256 a078f1d635b2b586565f2e9d9ec4e1417797facf1d262308b633963fee6f116f SHA512 b0de29371673482f89022120ed3fe92ca17681b45a03d1d49a45ec4002ccdd77cec3adf083d0d4e14d32f8ed93d47dbbadebbc50d22e5af7c5898929834b9431 WHIRLPOOL 7e2c1eadfc140c2b11abcdd30134e09a68bbfc51452944ac457f6d06c4fa9615bf2c359520a5a5990aa3c6798c7c0f0679e35ee0885a678f2039846603dd497d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWUDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOEY4P/jBRfEfwBjfjBH1/1ONxEO6W
-o2Zvu47wkfO+Nd6SZcLDvHdicwtfzxVm8QeC5Gk8clI1LjYrLonc5HbZY8yJasE2
-rxg3qeRd2J8ASTKvWTdfyEGXyQMb0LUOcLS76D7OREJlfs05V/NMv+cgh1O8/oqk
-2oihvih+n+hLnBy+NdyFXQKDmkfWl64KZpp89YUGBjR+0QttGQx25d/7a4DUdhnd
-lCS1Q0hfdeD97P7YjHxOheM2I8YxME/KBDacqelEi7Dn5cKWRKwMA26SGzkSn2jf
-ohAc+rjwZAXI3WE2zM/+AwJLlb5eidTBE/3NpeUix/PzdqRuKNokq2byhNDNRThO
-xa/7YPCrvtWMgdcPtXk1W7lmIGYGtAnPvxfehtWGdcVLeyyQ9Qa1b4P/qg1Aj9+s
-ap/PUGNFe23lWfo09K8rGUcX2rI1toNY1R/LHpjAv4UCRJ/4jrKpA/m+PII0eJWp
-UalnPLfm6MtHncPRaIhd1WO5zFTYepC8nkJmmieHuK2B7tRWMDs3sAZOjXBN4vYj
-BQbrbW5igc0gi3x6TULcJugpQdLbQ8+OdJhI59U2mHs0Jq2gU0aodfIVZphp1f7H
-wFWtlpI066HQc4Aop/cn1AjgrqtRexk4Vfktoxr4XjMlf5jEclq+9JkEVvOgRAFj
-sJQ8M7bgCC7YaSnSEJDx
-=0fXx
+iQJ8BAEBCgBmBQJVf8DjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmieBAP/jyyzvryUbsGUfcDb8aUTEg2
+8VQzS255jKrUQbd3fVDF6uy8bvcWZzIYIMescqO5KRBAxzHX9rX2ZzF1h5e4MTlf
+bQ11y6z8OrYwb8euSLqUvTyl8tKWPFElS730OkfWgbA7jnUBvHfG1l0xZUN81A1L
+/hmlxrUJSdwuoORtcUJ4X9seteA4sFDKwZl238Cf/RGIgqRSIMutfL5Q94CVbfwW
+GpWnWZL239WmMhfOsRTdRfDGNUhnrf1TLHiYGXFZysxCzgnxeCGlVae4CsS1t7al
+9zSYsulWMCAO6/+yg2ovahbZ5AzJ3fBnsQLECOTd7vDeAOCQ77RYJInAjiEIZkEV
+JDz6e/xpLQw/WNptbNJlIR8cFIxlqiTvKv08z9jEha96HQoCd4EUvBAE3NyOF0mq
+7kfIraOuw151R65S8e70sIoXR5UEJv6Sl2yxG+VEAWzV4RSflFpxPGs1w+vTKvLt
+HPAy3MXwhhU3sLC336R58p++cn32wIBfJfh54gsAvTPKoft5t2U+Dqop5PYem/X+
+5gkA0yRphUu8fE4QnBRtlqAKLnQWtBRWfn4JsQ5jjPfAK7hrnOeBpori0E0vSbeq
+FAsBdhU5g1Ze/rLUN2zb6xNiOUEeUqacZwT/hQXbzK4NhRF9qdJ89om5Ktry1WiG
+xpPZycMDDXFqqOd9Sm3v
+=E85K
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/py3status/metadata.xml b/x11-misc/py3status/metadata.xml
index 9d539c9ac5e4..0387375d488f 100644
--- a/x11-misc/py3status/metadata.xml
+++ b/x11-misc/py3status/metadata.xml
@@ -9,5 +9,6 @@
  i3status wrapper written in python</longdescription>
 	<upstream>
 		<remote-id type="pypi">py3status</remote-id>
+		<remote-id type="github">ultrabug/py3status</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/pypanel/Manifest b/x11-misc/pypanel/Manifest
index 5f9cd090a1cb..0fdc107e99ca 100644
--- a/x11-misc/pypanel/Manifest
+++ b/x11-misc/pypanel/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST PyPanel-2.4.tar.gz 29857 SHA256 4e612b43c61b3a8af7d57a0364f6cd89df481dc41e20728afa643e9e3546e911
 EBUILD pypanel-2.4-r1.ebuild 729 SHA256 a0f0b54314c01c0874312475a78bb1d845cfc9fae76313a7e21360710960eef0 SHA512 31cefa1bc823f9b1ba6ff32a5bb84cfb8ee6b7ac8ada1aeecf00c73083b75b81a2f03d70a3e8f2b605929dcb537096a4026bf48684f82867e59bd4744ede8ded WHIRLPOOL f9fbdaa29e48bf589f7c1a5df601c0768064df519b361db033c3215254be89de4bbc66425a7da387f6cc0b98e0749897de246771b1d61bca46bd0346eba71686
 MISC ChangeLog 5445 SHA256 06d004c97712ae74c2d105f562276d33936d7be1f04609dc4c0c13f522a07a38 SHA512 7da0eab0224ca8ad947ad9a4cc08a02fc6b97f0748edd5ec0f72a26fd5b0bc02a0b9a9fb8a3bfb5874471879a92a1b40adf69db4c45e1319fde34a55fc18ed83 WHIRLPOOL 01a051f279d54057cdace31463e6b0f92c2839a40b83a377e8d828b3e2bda40c3436c992fe2286522142977c91449062aba143c8f95a5a299877428f57a3c1fc
-MISC metadata.xml 654 SHA256 b24cabfb32176e75aaabe0ed3b0edb809af79c03abf5a7245ef8ceb0d1cc3de8 SHA512 fd0b8f5780fdc29090141e5dfb800d42e5162ca8a1f9adb8483861db52eba486102e82b472ae154537e3191fedc0f664d6567348120bb0e112aa7cd02401c887 WHIRLPOOL 3fbd1bb73c8ca395317172e136b7b4949143954ae4c06ccfaa3b8897526023ca99bfd3a0ff6f833a2940db005dff98ee48d430fe6dd629d94ea2b5c74babd19a
+MISC metadata.xml 731 SHA256 8e2d70056d2fdd1c72737a0a5f8d29d1b0f4c83c8fd4dba2008f284b4cfe40ef SHA512 edd7e17a618f67012677f06549b1a76c01eb94b90eeb034975d95a6f8a79391e5d0bef1c1c2a5841495929a5048e9f81cdf0f7ea3ac3e91357a321bb526b827f WHIRLPOOL ebc32cba47b9ba6921873d7a260fb53298f1d877cc585ea1af6561cdd04fadb4083269a7a1f3948b5fea4f7e57c4400c80b56269c841d3aba7bcc4dad0d49256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJQzB6xAAoJEEqz6FtPBkyj038IALBCaU2G+fni7HuyuVGNdX38
-QDqOC6dI27hbgOLYjQqO2o7Qesb/2YK1Xo6ZNljFGi3AQsoYu4lY6ZI0xSArThiI
-AKkt8Z0dkNUG6JToIQHRI6d9QnEqPLzp8KQO2PhxgtCle5Ez5gD80MkkoICPl3RQ
-wb4gNJHpMnQRRBLjskdjExHBDHw7LCkg2TJnkwnOb36MRfpZGZC9MubN9qnTjpLf
-vffu5SMLCMduJ0nqztjOwq2cwOWTk7xa3XLSLlLejcxIO9OiKH1rGCChqYK/Po4P
-rt1cUVsDqExCdJFwK0kxbagSlIqbjmwHPMhzHkQGedaUfSF6Cak3gHe0MUJ9pqo=
-=piYJ
+iQJ8BAEBCgBmBQJVf8DuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivPUQAKoQIS4MbpJ0DXt5RMp/bxfk
+ZAuC/id/a7eLXcD2AtmAHoiXH1gymp/FVHqL80qXQOLGILd4HXs79gPPq86fPiFF
+UnXYvyDHKWs8LQtaBpYdc1fwV2CUwYYsxd+s1V2AFDitbhVhg/ZDmBIP918aZNsE
+o/FxPPKaOTnMOIit9522PrUgfsZR45dBc/jZisZklEau6XXZSiiJBdX3rSl+7AQ6
+ZQRvido/NRZ5iW+4jUepvh1SCT34HymcLD9jO2Miusdz3esCCk4dOaL0dQSMmLN4
+yIxP8GmKxYapSDpIVo0pguujCU5BKory7s+9jP346/DCcz/vR2tdow11AX4v0+Ab
+56HeJ37SfEDpdZZWwPt0zAAqHeEOYPI3UJkTyK/RtlWH4LHNN2Hc+hCS2B5I8Mub
+ZGK+jPHlqjv0MRq3+HfDExHZXbNgnEMngQNc2q3Adnyfn6gl60SI85QWI+xUSDfZ
+JCgyZVkkZQ96uC/YEZK4CuvslsNgxb1A8g4qMVPYCLk62cEKxVV7xwLzQ/k24gEI
+JtXoVMaVzUZkgLrDkBL8vjP6PmBq7s6KsCZsWGxipxUSZqNNCvJfYwOnynQMwdAt
+yLBKpXevoAWzsMp18X3oWhnAqW4DKH0eWrQXRlz+iXQmdlFMmh1UCS5oZ6MjbcuF
+qMnFosZQVnCb92mT9hvR
+=5ZAF
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml
index 01f4c8915e23..ca302fdca57c 100644
--- a/x11-misc/pypanel/metadata.xml
+++ b/x11-misc/pypanel/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-
-<longdescription>
+	<herd>desktop-misc</herd>
+	<longdescription>
 PyPanel is a lightweight panel/taskbar for X11 window managers that can
 be easily customized to match any desktop theme or taste.
 
@@ -14,5 +13,7 @@ clock and workspace name display.
 PyPanel should work with any WM that supports the EWMH specification.
 The following have been tested: Kahakai, Openbox3, PekWM, WindowMaker.
 </longdescription>
-
+	<upstream>
+		<remote-id type="sourceforge">pypanel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/qsynergy/Manifest b/x11-misc/qsynergy/Manifest
index 74887634a9ab..278ffef50fe3 100644
--- a/x11-misc/qsynergy/Manifest
+++ b/x11-misc/qsynergy/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qsynergy-0.9.1.tar.gz 158259 SHA256 3ae886f977cae04c2152cc9f0bdcf88b17bd6ebe6b003c3eba58c68b1eb24630 SHA512 90632fe2a360e455b93aee4725f0130426e842a574dd17b2a36b6a23a646ded4f7998781e48599edb3ad962b0cb32c7ae5ad3bd2275a1a421c143f9ea2cec55f WHIRLPOOL c93fe5c53d289fe2ce26818752b028686830e156b6cde7dffb5f754016072d9327f1f7088a9cd7d044fa3644fb3b2969c381713c74d069b38b843b335a989d2d
 EBUILD qsynergy-0.9.1-r1.ebuild 577 SHA256 173cb06109453aed5da4970c3e480f3f3acf89ed14e7a16dd4ec06bebf029567 SHA512 357cad5f1433cc10e366b3bada01ca8db331d99e245efec60903bb8825e36398d0c01722591221dfdf6cf9df4d5f896d15774da477e433bc8f3603eb5f417404 WHIRLPOOL c05d76bf2b099530d4bf046f552d5bd18db77386262574304d5a2a0819343a437d87393e9ed71b9aebf7b4f2dc96a6f930842604658388b8b9d1aba1c7181905
 MISC ChangeLog 1145 SHA256 6bdb6a6b0c0303896d0cd98b16d136b1d80299f755e46295fe6e851a565c7976 SHA512 ed1455ba336ced27bcf53de957c050506c4e22085c1e90f0bde77254faba804b24a97fd2baca1397077c14cbf32829f4a7ed430547b8f0d83e57d756b2860aab WHIRLPOOL 4a29c40d737d604e63897464e952509291a676e0c50c13670b71382f461ee51c925166a92675f69fbffbb25ae605ea30b75cd2728b57fe1fd0c191db248d7f02
-MISC metadata.xml 157 SHA256 94b6a379608ee8b74b175f0dfe5b2312658faf5eca74bba0787fc02c3d6859d6 SHA512 26fc63cee9c56faf4fc05312e73145581c620cb8811634624ce0ef8428b0c7eee81b31c915249395d1c27bf733dd00d149419144937f430a7097cfd9dcbb75c8 WHIRLPOOL 0fe3bed45a2a7cde3f7d0dfa253ff8796b043c6434d0856cd645541320a0d0e3411a28432dda00cff05eb5050df5f2a792fed617fb36797826611f0bc41e7b15
+MISC metadata.xml 234 SHA256 6e74e808bc20aeff21a3039ef6a81594fe2e4710aea0e36107310c8cbe4d96d8 SHA512 f61686883adac6d33e21b1b17d1e6b58cf34cf528371c3284ed2f8603d6f41359a12095012701b7ea8aa51557a4ae709cf018207af763aba1556111e2ada8c7b WHIRLPOOL f2b808a6b50347447863be0d0f0e91925beb516bc53c2612bff3b48979306505fc68b9b24ab64a332a803701b309e68ae26d288d9dfcfd28d52ef6e07d5d5f05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0CMACgkQcaHudmEf86oVtgCfSQwUp1El4068rzWnUm0kuGk1
-eecAnjHQgXS5/TVbC+xzOPKA48CVKthb
-=0bVg
+iQJ8BAEBCgBmBQJVf8D3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFM4QAI9HoX2FmyH8mhQ0OKLcL7uK
+RZjyvCHlPS5FCoo91dTkZy3HLU/CVjJBAP7CJMQD5b2as5xACU5NknIM0rRmQioL
+XMNIjpuR5/xbi1q0VCm+FIFiKOIorM4GmfTpOaE2NNunoVaULc1z50Trboy5Guyj
++b8oI1CmFblY4fRm9e03eH3vYcGhueFTQ6K+nLz135IEqS7izk6C1kUjX/yloDqZ
+wYdAa6vkEvb8y2QIO+agvhY8bgyJ2sWDCUWCYsL5q7o4j/Vro5p4Ahg2wwZ6Xu7w
+wrse6mtttfTZvhHMBgv7Y7/bf4musF+TkvDGxTRpJdvRKP4Cff8iAHVgyM8z1yWO
+DRaUhmpxKe1Tjzhht4EpKP1TmqRrGnB6KFuHZhlQIV7nFOV2UgGzeSk6GxTkj7in
+xHDsMHzIn6f6/7l0r3dB1zIzF0Irqu1WhJecva+RPsmyUkFP3WUUtBPuUpv+/l9M
+WRcPEEwg+2Pyc+pINpcrgUnKjKrzwF0plXaWOO81XY8PILhayeKNcWLgaBrvBy3d
+/ikjVk/GyRUvQd64hYLBEpfK62W5po1nDiDED8XGWW8/FUm2xrqEMbZnT9N8Xirx
+lc+d7JsJYJ/AiRHanNAIZoiTJSTACGpz69DpQOfN8G31lzCcEFd02M8rOTz82dJG
+AYUEed0FI9WE0wTLXhfW
+=dk2X
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/qsynergy/metadata.xml b/x11-misc/qsynergy/metadata.xml
index c4db62280a40..6346c424e69b 100644
--- a/x11-misc/qsynergy/metadata.xml
+++ b/x11-misc/qsynergy/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">qsynergy</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 02be456f1f54..eec31c50ab5d 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qterm-0.5.11-gentoo.patch 352 SHA256 e1f67ff3f067f122b525653d1b9a95bdc5ab2253c0eb3fe56d0142a2c27c1851 SHA512 ab7485d4b3c735d8d512218654653a51641145c1f6e4bdc744e9d914a529fbc263b748e0b41aaef2398ad3d37f79f1cac4117b2bc5f0a93f5d70d09df188a700 WHIRLPOOL 5b05f372ac3791de766c2bdfb8d6f00897e3d3de25fd5e4eb4072d29ebcb9ccb147721d0bc8621ab10112eb7ef29e06bf229a0c1b285b61aa7403bb33caae12e
 AUX qterm-0.5.12-glibc216.patch 313 SHA256 63b9b27ff7dfc3c439779a65d6e57986974a36a928db674d853056ae6d94b174 SHA512 083c10738bbfcd6a67c251608077d9591f8a652678defd2709e9fc1987b1f8de15bf14b50380db85eb3319ac37c44a48009f1642bda1ecddc8bd6e327f1e6537 WHIRLPOOL 0fc253d0530ca9d5578c769d6c83050b7827907361fdf860b76ef156ba108aa52f3a04efe453dd8d49a6615de74cc918dac96a7af1bbcd0ba263dc22939bd277
@@ -8,22 +8,23 @@ DIST qterm-0.5.12.tar.bz2 749254 SHA256 bd31051a6c117b05fef3ea163480143837c57632
 EBUILD qterm-0.5.12-r1.ebuild 906 SHA256 e40fe76cbb7de0cfe052ca9c99931554cc04837c459ab90405f9a2781ce14cd6 SHA512 056add9cbdfa3401c1dc3ffa43e498c66cc1815b428c3eb8761ed0bb0a4e95132b8469d7b87cfae80a1a7bbea4f1c01d81cb51f2d349f536dfee7e59b3ef6fbd WHIRLPOOL efc092782e3a50cc81a1327028b41217750e6266ec99e40d4456cc7c340e3e2658941188bcdddf306c65204284432875e4c399e2c74945cb465978da12e05e7d
 EBUILD qterm-0.5.12.ebuild 831 SHA256 300295c6c80e00a01e430993609413be97640ce7eb2418ce1bb87d0690afe2ca SHA512 28558628858b82fbc1a0b4ffe9f741a625fc77a190e071d91c438857fc002d3b96bb603449d9ff2e44b91047798f4b8b15001c36ba9f6f5ff408948d9031fd6b WHIRLPOOL 24ee4780abc4b955a85e576cdfa57a568ec07f7a3c69aa348fa37e16f70005eb7ecea8f10ae799d0fb337f4ca180d657b4d3d81c669451ee419a3a3941ac12e3
 MISC ChangeLog 7531 SHA256 3967267059e0c134a894c8874e727939bfa24f2e0aa8fe98a02e26773acf6e7e SHA512 348fb9582accfe0aa98db90bbeb2e226cb00aa265321ad5727961d82f694ac192c39fbd45ad75d70619387920f9f17d2391ad9aca256bb52768bf651b8bfd5f1 WHIRLPOOL aa1ec3a802625cef939ed0012659f82d324dbb27c684289cc488ce9455387792fd0ca14354d15e97909bd500d442266d09dcd1e5142dfbae1527f9cdee5bce9b
-MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+MISC metadata.xml 232 SHA256 0c5988f7f3ce3c0e5251057d4c0c81ea011a560ea26c716d1df1d8ac09097eb6 SHA512 0c09ed0df73733a9d93d8a34957d3fec07877f0ea23a0c86f3cf1774663fcddd0fb8af3ae163f9020254a6fdac2367a1f500a5fa86c58da016b33d25c0ef6d28 WHIRLPOOL c02229aebe5748775f3c571da5ab7906e7b33e6dcbf727a15f3e3c3348c6a484d87b09b4d0ea24ff2622293f430a335a90d564b1a2bbded9e8464e2e71767f2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVIV3rRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7O3JD/0Z7KXuKSL8R2YJyzXr9aeWQitxis+7XrmXKnfLwW87DzJCqA1e1IVP5bhs
-tuJm6dFaWf93aOjmII1T8P7Fp42WIMmC8k5ot566oVT1zVXUaM6+YVu3G6pwb8tD
-x8onwTzDuVG50FRH+5Hlp3XzS8dBPks9JH4gElAQ2FTnx8b+4lZlMSDuYz5E1neb
-FBhpMyfnoeBm7ogMYEDu7yEZ6EIiucotMgKUfWqbcTHl85PnaGeZuXFKB3rtPPyo
-hppmdyBHwcFkDf1P015jfFTMwJLFpMF3SaZ2ziwFpLUXCPl61wR7CsOURGfP6MqH
-oGJ2+4Jsc5bHfmqXpmFd0FVpKawiDtqhjGpgplGycgrcEELgnyKLA4fefkR5TS+d
-E1Wsb/lWyB7IjTliVIdjV/CVapyN/vWzFukQ1VG37bqpmigpnHpDlgzGO/UJKHro
-BAx+n6DuizL5Pc0Njcyt647pYRvvVMTxMD9vNveeIlgNauAd/JQvBifGT0+xazpp
-4eyiLm7AHeOmLaANrTnfsZcJNoXyNdJobNaZj0Oi8/6iuEz3ICXqsLQ4u3juYrhZ
-U2j68DZgxaeFadslAeezIXScgL57zKIiS/DWKHwDvTObvI0JIS6WGPwg+sFJbo4R
-oVfkZhos9nSMPSSAyLEdJj3/VjFHNdFY/lz+ea1kf0sL8Lyo2g==
-=8H3Z
+iQJ8BAEBCgBmBQJVf8EDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAM4P/RGlLEjz9OSDVrdK0sgt7q0l
+7BfjOseZOpsRSrDHWnt56LstOqzuAoKRRPxELQfnFcpaZGlmrx6Bxu7PX8MUuBd4
+3ytYFRB9RckaDgLxTsApCOH4xgdAc2bP0gDlfZmSYNZ0Znkawv4m3PFo6GCCl4DR
+7DhsrCWMvx8aoerTOo90Imc2hCo6e7drtWVz6aBiirnMnegkog/+rd8VxAG+UD/E
++4NcSobTmO/YLqbwEkqQmJciMzUJBkXPJa4fcYjRilJ7jFfym5D2eRvjSS0mJPQT
+BpzLo67dDfs4YLa+M2EHG5WG827Y9wl6HcN7Dz3n39AjrupxfOVjiMA3kIbhGi0q
+YAiBFs4qBcGzvkj0Fjtg2+a9kJsYPqSK1ka4EwF322pQTkpRFKemUBHTD69VqyvP
+5MgZi8jxvJdRdmMRo3ubnyoc5LCRv9y70TetVB1Aapy3wS45uS8If/aft5n7bChc
+WXRG3Y7hzBBDkeEGjm1BvR0Jn8iGOQlUKlEeo0xfwcLPggC+1dEHjVEkClJwGuF9
+U+OAfXWiCX4EncMs1HKiYSU/bSen6Q7FuJTetrmXq5RvnHCLr6pvSmlky+0arKDZ
+uGNFn0AUzxq93wkk3gif+qzHJbX+sZw9VIRbWjKCC0qjU0IcD69C3o4p3cGhSJRG
+GDHSYYLu2B/yO+nY3Mmp
+=pEBI
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
index 2d5852c16c60..734d356f5763 100644
--- a/x11-misc/qterm/metadata.xml
+++ b/x11-misc/qterm/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>cjk</herd>
+	<herd>cjk</herd>
+	<upstream>
+		<remote-id type="sourceforge">qterm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
index 2d297f5689aa..97161da8199b 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rednotebook-1.2.0-disable-spell.patch 469 SHA256 db13324d803102d8af5facfa1de8a22292130feaef57275be5b1aa99e5bbd470 SHA512 747f21d327f2dac06a542d3dba135986b68c5377123bbef254c63213cbf3741642b1bdb8dc19043ef5d3bc3d78d6456bd7f38874f7247ef38cb2d691c8b7ed1d WHIRLPOOL 503aba0e71fe72e7c77adbe1cffb6e3327abb04091f70d412738b9666184f2a1d2ff7ac21872e3928d7386d2fd168dc4a6982dba18ce4d340f567255c5180f71
 AUX rednotebook-1.6.5-disable-spell.patch 458 SHA256 1b894b338047bb43a1d75ee42806df2690c401083b2b1d6285f6f809c5c79d59 SHA512 73f1e94828f88263bc43ddc106c2fd1deef25c45e2864c06bd68cc70ae8087099676011b026d7eb07f5269226028515761475aaeeae702478a2caa61555af98d WHIRLPOOL dbf9f8c643a0ffca8f53ab613f55d2f0360b0ddce1f62f439af01bc7b66e66aef6f3824ad0d2a867fbaad43bffef5ad89147df8d39692e10b3b9e688a55e2339
@@ -8,23 +8,23 @@ DIST rednotebook-1.8.0.tar.gz 500452 SHA256 63beacfdc738a9640bcc7b35ae28c18c7310
 EBUILD rednotebook-1.4.0.ebuild 1307 SHA256 98b2edd9947ae738622ddad7305a71caa6de2ac972bd21ffe8198c506bd8c04d SHA512 43c313e722d6214d610c70ed3b255494ce1ea91ac8b5b01c62d157145153c0931330e07dda922b477b92f67ca5712513f55c82d1b4c2c39701142e1908fa8dba WHIRLPOOL 8332e1415aac321e5619b6510bc1e2ab23fb411749e3ae5b55425c954f0d956613426d003af9c0d692f405188d1d6e830e713586cd4c6e44ebeacb9b0336794c
 EBUILD rednotebook-1.8.0.ebuild 923 SHA256 1e1f592be47cc97c1ee046fd9176c12eb013e09a2fc0b4a59c21e99f687b350d SHA512 3743e0e1e6282eb19e30f4b740bd0ee2a1155ca4fedb08dd0e9fd2350de5b01a99a5540115937a35bbb5c05605c6365e65b1ff8b26e3baec8fc2f97a95520590 WHIRLPOOL d8eb0e7504407f06b715afe1eb699738028e8f5e1e99af93edcdf8871dc03bddd354e477b3b4cabc76cd72be595f86f1ff5bcf72dece43f14e8f987511dd1cf4
 MISC ChangeLog 12423 SHA256 dfa59d5ea9ec8fb32b2edc198af8d1f8889fcb06b00e7ceb53a1f61201fa2f11 SHA512 87359f1eaf5fa5e865df79a4c53f89a4aa110481c00a7dedf68040fcce2e4fbc19d6305626dc302cc4220aadf55f5a98161c8db5bed70005269fcd6b39827ce2 WHIRLPOOL 294cbc0e5ff58bb3e2cd48f81a5e37fa950dd7da889f6173845acd8c74bcdd684d333617431ff3c98f3e3aa4d25198483f88fefb0a1dbace5bfa1b23febeef6c
-MISC metadata.xml 489 SHA256 32ec2dcb773445b6ae609bc20917bdaa539547df5eab022bd8a85ea32ca4cab7 SHA512 adb6f4a0b842d6357e5e8071df3a822f8d13842a9cf9d245de3f748561ee2ae72606c18cdabbf46b4c2a60bb51ecb569a193c779737cac6cc5576e89f78090c7 WHIRLPOOL f58295995d86ce740e5622dbf0b1316b65caa7ae8468196c538e7af2093b84abda7f2b7455245c50cae517ce82373a35acc3a2a8242ca86203df525f3970de00
+MISC metadata.xml 580 SHA256 1733ae6e9f224cce380fcb5fbfec09525d1d9034954aaaf4e19f85bd5b6cf7ad SHA512 919a3095e5eb7c7ebb6f3fffad54c3ea6fee97037ac2943bb8f2a81d91c458d675ec674bf229b6b87d826ed5dde04dc0b79336359dbd98a233e4c7e700ef0b7b WHIRLPOOL 1c4047aa5593b2634a8509219e7366bea86f2e16bc81796939ba01fff210c5aecfb2492deaf487456456311a6286873472236a8857712a2bb92e1ebe8a6792e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUpcoBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2lAP/AghLtmrPiAtgtfwgUxRMJHq
-LIF2o9sKqEyTwp72SOj7Wotn8gQUeYnd/sOWBH1jwYs0cZW8bAz0tEyyoTqFCvEP
-+W1FKzzK91bqlSQ9ywsmeWQ01Lr43oH6CjulAPgYrNbdOgBuCqueDzz26/BqOfNE
-8qOGkN/Ofk8RESSsoFewXohUMWga62uX1ZGpQjbn4O6MXz7Oy3sz5z61rB9HDVMP
-flVG4AXZbkT0vmBXuZSY9n4bTI4hUVG11l0TQ9sPZnwIUhkL3ARQafOnULAuyMTp
-Zc8ld8P1wNW9tzjepCud1F8xRkQiNW0fMkTcdEdngl2Fj/Hvq+s8AONjzcynAoUv
-CEEgYdEbhXxEk73JLoEeCGqlBzneyaayff80yNM5ixJTVHIr42G6KwUZUZds/hbh
-c3DsUMhXyXbWvm1tXCGymbWwBax8u+RUDVfdLMi1qYaHuhun0mHdqa++enkv9P6o
-3KJYuuhXQwxB958TQlH3oasAbUIja4+7glGk18oBRpTZYCG7AR+mhNjhUP6XDCXT
-CPluPVzJ1ow6pyHSoKbyvUqjZCR51xkSgPTSl3DdzZD8yy0CJoVsAJITygTg3Ku2
-FEkmx+OF8NLahEVmH8++ks02D0OXR7sZSj28Ch+YKoKxZ94Wz5md/29IRZtw9tCO
-rzhFZWjgo5NTgc/PVzdq
-=qzV0
+iQJ8BAEBCgBmBQJVf8ELXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuqoP/R/a4qnmxQVctUBn9qgLDmqx
+VRzT8kGZ0Yb+Vp6m2/v2yR5WPIl5k0+2BHogy/aPOGRru9Eo1Ju+f85ua++llK75
+zWZBhjT7QQRWtAWB1AU/bp7J7Qp0ymhY72x8N26/otEAvkcCnAhxCpPzFVyfkzh0
+0nFsbzfX1aHAqrooDWOBbOhaxnZvXsugIbvAIytT/Pn9V23O0p7D2EARri0OQU6P
+t+RP4APddyDnEUMdCeHZPxn558cRS7T5jKvROoyeWiEmwPJ6njgOEqcUk7Yi9oHj
+Jant7eZG28oQmXNjekz6IXoQUlEEJsEmL8R+U3juUGTFutqqCAbOoqksuPAMTQpx
+SEEQJZ/WrJRHEu5aHi+o2FdJNRSne3L0+OBhxxsKfsukaXZjxyEMlVgNsc+zyccZ
+z+sKHUiAV+E2Hhxn4rkdt8LQjJEVqSPVGkh0OGoyt/oQGXQNYplbQu1zl9m89qyM
+u5iif9wuV3851b4MNDASCk3WpZkaATi5Qjyq5+yVoYVsxBcCQDcyTZzFo9Xvtir3
+zjSGFzS4x+3kMR6IlLmPqhfgMOmfaoWnp/EuX+TxbDKk3ltj6uXxrSdssYo7yF0Z
+xycz3+mteuwlGy93bs+5kkiU+dHcoeQc5jAYet3WCOANWRzlNOeuSIQTNpGngjyC
+ibj21tqS8VBl22qUCekh
+=5NyZ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rednotebook/metadata.xml b/x11-misc/rednotebook/metadata.xml
index 007d479e65e2..0b1b70bb42e0 100644
--- a/x11-misc/rednotebook/metadata.xml
+++ b/x11-misc/rednotebook/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<use>
-	<flag name='libyaml'>enable libyaml support</flag>
-	<flag name='spell'>enable gtk-spell support</flag>
-</use>
-<maintainer>
-<email>mattm@gentoo.org</email>
-<name>Matthew Marlowe</name>
-</maintainer>
-<longdescription lang="en">
+	<use>
+		<flag name="libyaml">enable libyaml support</flag>
+		<flag name="spell">enable gtk-spell support</flag>
+	</use>
+	<maintainer>
+		<email>mattm@gentoo.org</email>
+		<name>Matthew Marlowe</name>
+	</maintainer>
+	<longdescription lang="en">
 A graphical journal with calendar, templates, tags, keyword searching, and export functionality.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">rednotebook</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 5bddbf158efb..f4a3b5a1f883 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.6-bonoboiidfix.patch 1504 SHA256 1e58e4e9ae99e44aee8de9bbbd5efef3e93471a609b1aa26cd99d3af6ae180b9 SHA512 5723efb760f8435f7ca3118308d6d3e6e7b7109a3bfec27d127590aaae465fd90cb446c4a5008886ad7da8561222e268fbe21fc0591ce9dad049e36c06170f9c WHIRLPOOL c69a5370c4c9e52ec7f77ccd423bc7a7b1b6c1287a76624b151db91482674578f9a9908aa0c1a7661acf23a93c577d2b7477578a47d7149c993edeac59240c8c
 AUX redshift-1.7-make-conditionals.patch 2248 SHA256 5d18ba80a1719a9c2f215911785698056ca67a90d2e34d2a1fb0c5ab9aa21717 SHA512 2e927b1a2d874de444aba7098a3ab402247c101b0a12b52b3a504a493b9bae5ed10c49bf2db59cedeade7b4d1f7b5cf9a06cfe398f360ffac7538f1d8f8f0446 WHIRLPOOL 1b98ce658eb06ec6ff3088152c295a701d5dc2807a2efea8de220e584a4b366f7c7f078dd4ff94a7ea8b98ca2ad1c9b1df61f90bdae40ba5debddfb9fa88c01d
@@ -14,11 +14,23 @@ EBUILD redshift-1.9.1-r1.ebuild 1819 SHA256 2d03e52509538bf58f38104511705d9f391d
 EBUILD redshift-1.9.1-r2.ebuild 1886 SHA256 1ddf3a7f2ede03fe072bcfdacc152f160de606d908b41ac36d6febf742ca6fe1 SHA512 327da777e207e925f42ce2f6e4316f44bf6a094d1c33f72af11a227405d924e4a1de106dc20cde669cc1204d1f6387055e599ad1dd32210afdf7634793e86670 WHIRLPOOL f8d437054c96cbb4d303e3becf10b691dc70a9322661e591b0b6e6bda326dc24c81738652c6b313593ec943b3dca6e32f0ca5fc1688ec31746065a0a0ec962b0
 EBUILD redshift-1.9.1.ebuild 1724 SHA256 2d1b20757a83dcbf6d01ec8337fa3f3791b339b821035342aa3855653c8b14f7 SHA512 8f6d70115f118ff29d343bfbd7b3615dc74d2877d8ed9920c4923a5752bfe4a9ba73451d67976cc5dfe19f69252e06d349838a0006662c7ff16db3dac783007c WHIRLPOOL 09b7b35c386384cfbc1e4c82b072d99701cce405f948b0a8e9c09c31022f7d91d8511d59964dd7ff6d28c95f91708c40f8a19ec7278855295e700f3a69fcba65
 MISC ChangeLog 5462 SHA256 1afe863ffd2837a7c818dc886beadf7f05051a1a270af53ea81c131fe304c126 SHA512 e456b75e9c8a68d7a71f37773f0d6c468bb5e51a6dd2e3d6d8f96a9550555909b8ebf10fdc6a0a57d6a05598d87861954ba27caae89b285ed75f7de1e8b51ac9 WHIRLPOOL 3f95cae2890b567b965046c4c49fe82272f4e90e8b6203a62c6a7b88eecb2c1a345caee48d15f02e7462774f6562b7a5e97e76a8256938071669f474202fdb76
-MISC metadata.xml 447 SHA256 d6635059d008fca4b98dc1f0e7aa9ef3453cabf75117afdbe9cfe3d49c0c5289 SHA512 090bb9104ad7af1342e648ad71d3f54e6bc74b0af5bf7f9c139fcbae052041ddc38caf1010845f9b82e747fa5d64722486454f362a9265a50ceb26248f6f2fbd WHIRLPOOL 5d98e5def06e42a59cc50821611ba6fe9c9197109b164c9b20b0133f58d459886ed5a3e4cb02b749a32e9e58360dae5db78c16c3539fea510ec0c5914691e67e
+MISC metadata.xml 550 SHA256 bebd5fa39c220e61b262690cd89cc7a03da7ac0f02bd652290c0ce434efe2c11 SHA512 094283ed2ab3c0f01b16c12c5fa7b3617d38cd8d2b94f0886f126d295ea881cbab5d5850dda32466fd865455457b0957b28d526d8e385f94c3628b588d14ecb1 WHIRLPOOL 1be08e2e4cb31bb84d8e7d9ed85abf7060a8b7bfea67b4e9433c9895d7e974d004c602995beb4d32d2428f69117bde9482888a69f07df30107d1272e40bac45c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUzes0ACgkQCaWpQKGI+9QJXACeKYVyjdYqjgDuqWySlEmO/5CI
-o6kAn001xADsfcGgv/FSn5CmIbL6vmoO
-=74jx
+iQJ8BAEBCgBmBQJVf8EXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOHIP/38/NDH3MM93NDy16stW5BrT
+yPFY2t28Jjh0ka86bemwUqmg9cPrtHnvdIiFpOCMvxoVRH2dWzSfVZsSzo6pxWod
+yNkaYLSD0thFmgrRwzeQaxc+a/b+w5qubO92K4SF39oLCd3oVxOQSSqfb7szqs06
+qiZvRMia7ZJJU4LFH4yJlRvj8ECJ5QYBc6p2ouxniSMHGLlbvMAy+T4BUp6cwJMh
+8NN1HXtNnUb18a4omhr7YkddKjHDxvwtpNDz+AlLWcofZfDSJ4q1mUywVCO8kJSy
+XO6RNe/7QAU0nvdtPDb7sF0Ovs2Gn6UU5Bw7cPnhxO9yPhwFGxQ96L2lghu7jNgm
+HDCxXtfUKNMKtedhwI12n5DBo5wWvFmrhWyHVOWWEIRwXrVBxq9n6E5dmE3sdR9W
+Kq/8eh/95zVrD93WFw0mfHrqPdCzJ+JRpL5SkhXAHPO07tlaK01paCnClL8Vf3zd
+pkrcEFuvBK3aiKEJ4aayDuiYCBDEz8B6hc2FxnWxj+N15EcuLjThi81rUu3s2YVE
+dCvcnFVYziuj72Za08imHXxFp+GdCANZjO6tuv/xE3ttFi4looE1ecqvAAXnsBbc
+KEMCCfn9HdL0nfRLJ9WgCx4QWlnkSd76rEJl9hipfcr1LoR/TBM8gvvnMVuGuMnV
+TfKvJsBILEsdMerLvZYM
+=Y1Yf
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
index 0fdf4d11e1ef..5232af440a8a 100644
--- a/x11-misc/redshift/metadata.xml
+++ b/x11-misc/redshift/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer><email>sping@gentoo.org</email></maintainer>
-<use>
-  <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options in to unity and KDE 5</flag>
-  <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
-</use>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>sping@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options in to unity and KDE 5</flag>
+    <flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jonls/redshift</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index 6c750038dda3..0a92e5042cb8 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rodent-4.9.2-rupo.patch 490 SHA256 46c784882da1b3ff79d5fa5755d5e72a3cb0720897f19d2aaa47e04d02a894c0 SHA512 bf96f4bc6c31ff498bec5d7d5d72e260fec5f388428988d83cea7b2eca8b6c703ae764bff1f01272f57a035b14532e95116c67e4c32d140deec9590b22639fe6 WHIRLPOOL a78e9a940094039d853b18dd6ab25aee6e40fcb0390f51627c6c24f2c2fd2ddaf55205057e12d32b80ab95693413cc9cea8ce49942d6a056f70adf4727abb7b2
 DIST rodent-4.9.2.tar.gz 12061909 SHA256 d1e892ed22ad5eac65d915b0ac81d1c01b72699667429e7bc8847cc8c5ddc001 SHA512 776975bfff4e9e7b51e4f4b6f2d3e78c2fdeb949ed144dce66faa32b5a20f085201050500f26eb4af74ec63a354bb71ab39b8dd5eb9f95bffe289bb71bdd33a6 WHIRLPOOL 698facf1ff82b1c1a668437d7f0af253084e259f69459e00206ee4630809549187be89cc576534713376a2ab848a35b77c00881e2c5021cbeccc4e9e1fd3b40a
 EBUILD rodent-4.9.2.ebuild 1119 SHA256 5de9c7d309c390cd006a5e042b541f575024e30b9301bdc75a547d9cf61e6fdb SHA512 d3552472300b0689296322857e71b9606f11386d293ed8f81d703a524ed342f09e8b021f49683d0a183166d2886fa4040cd4d79f8485fb093ced69804ab39854 WHIRLPOOL fec42adc99fcba887334a40e6be3fb9d6a91dd9b08baa9a574a19bf1326b13ab1583225c272038b5c249f23beb90438d29fbd2fd55090cd9fe3688cb93ffd5ad
 MISC ChangeLog 2275 SHA256 ddbad132176bb601f140fd729e5521f5f86f1f5cce3eeac2e745839af760ecb7 SHA512 4cf1b430179c40ccf973ce68ca03a2a4158c486a44d3e670a59e7733bdee591dde79fd103a80c884357cf66be6e0556bd65e049b3b5e9d32bfc4886564d2f77d WHIRLPOOL 3632dbc2e887326af81f50c54a0b42d6a1bc3b431a494bc9d4fea9f8df76750c4f2ac0d21b57ae3e2301fefaf9f765eacbe55361f60747d8ce65ddbf8fc2ca22
-MISC metadata.xml 549 SHA256 bc15886dd223de266963e2b6943d9cb8f16f1a9a10c79b16325af8008d55f5ca SHA512 8ba9bec45b8a0a264eb8189e9875e92fb8e15beaec439e96d04ab11f1745dee5bfb703ec96e7dd0dbc096022c722e899cd62b1770162e925b43d8a07ad4fa110 WHIRLPOOL 459e84f0ed4cdf2d66d92212096e9b09e1685a167ecdd99c6bc0dc6e412594aed1e58d8a828251c91a25f336685aacbc2b3b502e59f5d78d2225034b8ec4fd77
+MISC metadata.xml 628 SHA256 f57a8f74a8a3ccf9a5fa8cfc1571004076c8a2c7e38e2fa9ef6b30b6f795cf80 SHA512 1e984f0ff50e50d88d1cf9deeb6b1aac2c3410fb572e7d08e98eec0cbcce3f38ca867d853e3940a2c3d8aee18d4e309e392308c30a7c484637e7ae812e427502 WHIRLPOOL 7aac014ebf27d8cf003bd14c652acd60789512d88a3816a25ea541897afd267102e2deb32ebdf33780f05f578fc708c59c410b9176e75d126f487b3740b08c8f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRhpVPAAoJEEdUh39IaPFNijsH/jrWvD/pPWLVvx4QBCDe7urx
-sytOpEaLPeh3qCf/vzF7/oMW6RZ9VlEy/jsVoSNnOIMaXXGTF8aiyoJruhghD6RB
-BTddiV0R1y/rvju4I+84PKzmYKMUuUM6K61d/xL0I2NvIF7cl/x3JuWt1b3eZLQd
-zp9EaXHNRN3LRDkOtbGSb/1zIkvoFBDppH6ZHVU2j7nNZxzw3sI9lrEJHKBZepHx
-GvjzPByzPZJwqo+aGr8a//rBVIG8CSnmMux4VjlZFuKF/W1TcVTHRMrhBvkpW6/B
-EbDuXyVvEll4QmYPJQ98T0ENOy3W2MDA9TgVABwEsfvIEEgUxirJJxJzy9ryko8=
-=Hall
+iQJ8BAEBCgBmBQJVf8EfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyGUQAL+GHSWcZDOG3JcqhIEzdoev
+ImeBUrz8n4oSWHUJ+29BBoWpTFAidgi33MN19vyP+vj7E+yUXC8ZaMOVOMv9/U56
+h9qUmMuxmm/tM5ng8XIIE22eqESMUCXutXkGPs5RVlmGvpoPeUIembttHkvL3GV0
+R9Ufvle/rpZuijWN6+HZIVT5PfHllVxbX6861KA5oGMPOs6XJrMl6jc04c3S7bNb
+afqyfwx3to8FG0tnspAl1f5IIQfJ7y3tN24ggd7oT7sNMf5SMVicviXJQy0nsrzt
+JNZ8QGhxsYgEPBv6y3P8mvb+sXi+Fx63dkH2TYjF93kS6P4E090AQvJsUnyQ+vGw
+Y9eAfCLHmCemRrfz/xMM7c8fzsQLfl/rHKvbHzqayZuaWMZUcsQ9Jj1tIeMASZpW
+j4a0kHVyqpmJ0ivNB7tdYiXpS10rPRcoTdAx3sSzSlRAfnZ67f7dcDX71g/Gqczs
+jHq/uoerRZevtVh+LWpMAUSjvY64HeGLHwIhy6tF5mI5klvsLe+xRzWWHMhOEah/
+IjUGkcY+zlTd9u1/1sGVd9jgVauCXnMgCucRW0cT3vEtrzNImt5WtqTQe+G+g0Hx
+tnZnY4VJc8Kh2Z+lpOnCre3+FJ/SinWddju0HJsswrFWCEo6y+sWyUiTgI3bNJId
+AEmYokieCoCun0odsZQU
+=6r3q
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rodent/metadata.xml b/x11-misc/rodent/metadata.xml
index 7b818e716765..b62528b629da 100644
--- a/x11-misc/rodent/metadata.xml
+++ b/x11-misc/rodent/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>xfce</herd>
-<longdescription lang="en">Rodent is fast, small and powerful file manager for the GNU operating system (but it also works in BSD). Rodent is *not* a filemanager for dummies. Emphasis is on ease of use for the advanced user, not the computer illiterate.</longdescription>
-<use>
-	<flag name="experimental">Build experimental plugins (obexfs, curlftpfs, ecryptfs, cifs and samba)</flag>
-</use>
+	<herd>xfce</herd>
+	<longdescription lang="en">Rodent is fast, small and powerful file manager for the GNU operating system (but it also works in BSD). Rodent is *not* a filemanager for dummies. Emphasis is on ease of use for the advanced user, not the computer illiterate.</longdescription>
+	<use>
+		<flag name="experimental">Build experimental plugins (obexfs, curlftpfs, ecryptfs, cifs and samba)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xffm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index c945ee32c33a..df689d595988 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rofi-0.15.4-Werror.patch 268 SHA256 f5f6d8b244a6c1c38871381897e5bc560b3b6ea916523a47f0e11af916606210 SHA512 b431ee4224a0df7c16244ea40ba4aac27944bf5492309751ad1e738661d638075339be1e337bf7fba7e5a0a57f23f572db545dea0cf6790cb6986b79c8a59190 WHIRLPOOL 24be82ab38ec5fc21e21b8d22af9ea2879304dbc6a71ab2351be33c31ca7ce371b2e92eeed4799cf43ca254dd13616e472575544c641210a7964db167acce272
 DIST rofi-0.15.4.tar.xz 118912 SHA256 b4a9417021eb0368c257f86b5e89cdce419360fec0eb510206c05be271ac7bc1 SHA512 cc725aaceb685b45dfe3c853cee7781e37d6522a3d4fdc5196b376e8a724009458b2343cd986ca4c0b679090180e9244cc00c37c8b00dd8a39b8977bf3c25278 WHIRLPOOL f84ad1b8e9dd3a15c3ba43648b110f96f90f97d836182df138374b953ac7771328ba8af0234aeeba498dbefadb3814acedc3c7439a34ad5fe81ce4041bf04575
@@ -7,11 +7,23 @@ DIST rofi-0.15.5.tar.xz 124952 SHA256 3d7fefc986003527237ffc59a27158e4680e8c6daa
 EBUILD rofi-0.15.4.ebuild 937 SHA256 1927ef35e82b8667a0b9b80c101de354f84e31e8b2184a235dc279131052ddbf SHA512 9f3491cd051126d0163e24598cb7f61aea1e26a3ace3b8d7edc6a2b0cb0540269a92ca1540f05687240b84993d1df3a0899c117b095484f44ac6cc5a07874ca8 WHIRLPOOL 618bddcfdbfd3e8a9923d5ee5463cfa6d024d8fbc80e52c0fac9cd6c2ca9dff3c7f4c005af20a8b3644adbb4c7674e207593af5fa09a3474655535540fb17ac9
 EBUILD rofi-0.15.5.ebuild 937 SHA256 cc955d56ca6115f2faa797bc4c2addaa0a07d448751d744391f4bf40dec5e817 SHA512 4d89a64edabe567f425369effd302fcdb3256b953cef9b1a30f68dfab0c94e46c3f6364ebad6bc5c968f8ec25cb0f7b7cdc120f07a422e98a34b663129cfe80d WHIRLPOOL 13d5d93e43c8d0e59a5040836785140a064d526ae518a76394239a32a133b932746756aa289ecec2c31b076ef3e75feddf9d56416fcaf3e15d585b0168f04395
 MISC ChangeLog 1484 SHA256 175245407da48f1255c3aeba55a61846eb812aba1a47ded1a4db0117397b8b30 SHA512 84cb9a14ef645fe5106c85ede763afbbf72d180c835d9da8c88fbeddc5e4a2b09ca907ec5ce3d095b745e6a32180cdcdfd84641e5222e84a2bce83b1dfc5668f WHIRLPOOL bdf2da647e0e67356043ba8c0c814a00676c9547b664dfab5120394bf15c551033d83ddfcd4985d622a077dc46794cd8f6ad9983af5980faa1282c347f6c0366
-MISC metadata.xml 349 SHA256 7f69d55c450d5650f8843787a86c4af46bab477ce0efca378ebf5f9574245197 SHA512 145db443c2fcb987651ec44eb07fc8e32c560d01c25a39522552eee7ee0db17fa9a622adc3ee983f5c7ea12262f7e5829e8cddb6db64e99365fca9a5e66212b3 WHIRLPOOL 22e13e06a19f59849a1ec2cf3cf7ab518a4bbefa876e78fae0b6433bf97c2ad8e2e95cb731e8f19025ffda4ea00dad615c4c4e7db79bdb7f24997bd4e0162905
+MISC metadata.xml 443 SHA256 089fc6a015d66ec50714eebb2df032d98fa9048cf4568a9e6f843ad417cafad3 SHA512 fa06656c0593fdf8bde553e8f04104dbd7cc7a0d6862f34fdecd142b76f97b216b0a1abc81fe55df270da58cb293d50301d8c2908d951551c0fd62ef1d9d367e WHIRLPOOL 6b8b34f2a4d2ef79db124903616ef9d9c74a998183ebd779e8f36a192c9c8d2aa45efe4fe6c14ae268b189d0f25b4a0e5a6c68d3a7754fa729d80780ea22526f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVr5CsACgkQVWmRsqeSphOksQCdGF4OFNT+CHBQvfunrlpMU01K
-AIcAnivcZsGM/nZr32Cx9iReyxL4InXy
-=EIuA
+iQJ8BAEBCgBmBQJVf8EnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCo8QALtNI+UKoNytOwFF5kaqVW3J
+X+wNb4rjW3ZSLwTyt1Sr/PPfxdZ9bvFNIQib81/Mzm6TRwlgJU5Ddg5Fta2P1oz4
+HteeGaORUP/RjaPSPPSEI2+zJfZWAkdv/+U7IrR+XgsclYg9/QRYG0IirlWDe92L
+JIySAOICT/Kb3wgGbBqRxfN1dBeSk5RtBB4dONT45nZsjJkcT6Kl0dlRDZPLGLAZ
+Ks/qkcNQ0cOruxwlf54OaO8JZdfagYKuzKIuXoed6ZZfO9v86G5fJD4g5D+HNXm7
+3zpWsvSPJebD8OOi5fWfKYQfPRyszQUMR99d3gfoqCR8MudQFMYxDBYcgzyvJULC
+VJpgBpjC7lebPYALhoZj3f3ElBmKJAQ2I40tCWBadlW+5AP6IlatCKKudiorsBg7
+FkXsF6jQStvibfD1pUrulqAynXE/j26SW1IakqNeLFTT/yqP58AFvvyWYrZMq8rm
+/7FBEIoFPoULO6Gz3+3JnmzUVsFIfTW0+Xj1Kza2sWskPU4iQCmTLAHxx1xtkAz4
+qSmJ5zDtIHSV5YuTX7/naGVBX8Vtrcoy9mdYmHY5NXlE/bHwXzZhE/FEaGhP5J8i
+Olh482wiYWKr4V/xPLr5uwaNOFSlEo0EEJ9G4Cex8pdl5VmGlUsUBXkYj51LPEe2
+3m/+vznQsztZBpLCNp1u
+=A6zh
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index c5cd0a06949f..999093b2ecfb 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-<use>
-<flag name='i3'>Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
-</use>
+	<herd>desktop-misc</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<use>
+		<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">DaveDavenport/rofi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/rss-glx/Manifest b/x11-misc/rss-glx/Manifest
index 1b9a3acaa825..db6b5b11af2d 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX rss-glx-0.9.1-asneeded.patch 263 SHA256 c6079699d3faff582c311fc48b62f56812e886c03d759f9ebbca5d90ca3a21e0 SHA512 0e863458e14b97a1fcfb054cc0072ded458da4d9c9bf237fc91aa4937b41b207f024bdceca59dc1703c75405520afca8dd55ec9ef69259d52c9430bcdf3c045e WHIRLPOOL 9224ce6a98e3becd7b97faa548cfda16eb50d2ddfd0a305f74dff1a20e6fffb70d36c1cadfd6325d26af29079ceaf7acb483f637f8ae3d4484c1697e44566989
 AUX rss-glx-0.9.1-quesoglc.patch 736 SHA256 ec50dbf7b0ffdd52ff7884afc216b7f679a3815352e99775bc3f0d0e3e3683d0 SHA512 9e71e5f15017593a15d72f005cd365a7bde5974fc0e7555b6d4a61c5ab019d92597952af7afef0cef8cc32782a1ac66ab74d11df3fcd4dcdb716d04d1bcb1b4a WHIRLPOOL 2a6e8f703c9138137dbe25b594d513c358972a0c71feb16e41f23a3924b2d24b99b063423e10d0406c7f080d5f452dcace7afac4e16cdfbb98d99d900d18a508
 DIST rss-glx_0.9.1.tar.bz2 5435799 SHA256 8f8d773864695fd57e6ff21f430994369ad74c69a5e66ce510bbba8ca55333aa SHA512 3293e6446d6f85e895f1ba8fa982a1ab1873f60714e0b351458ac12117af2427b7cc931185b9485a2af6dd86ea9ea5f2fca92eaae9c0dd5290b5108bc2360961 WHIRLPOOL 9acf336481697ef94f2929b766e805aa805f8e2ebb272a7301a46bbbd2236350245b3e699972a0fc969b3d03182cdb1e5c38454ca8f207ddc1ab9f5676bf0f7a
 EBUILD rss-glx-0.9.1.ebuild 3799 SHA256 695742c38d1cbcef2e097ed8a39d3f03bff338bd89c2d17364dd83d01e03c16b SHA512 b2546d2a9ee87d689204acf2589ad1a6ea3d4191863020bb3e613eb825be2c8916de33de638a85582432749d6893084b4f52c8c18cca06cb61fba54de100077b WHIRLPOOL e8c552ec8e984ead1e0f4ad312b71e79410f1d0ae99c6325aaeaa18d57cbc483b06be5d6072b471c6de13a2b860a6ab18128795fb6ff1bd55f954dc9f214c609
 MISC ChangeLog 13374 SHA256 4ea0ed828bca3587d9dd5903a77ab3fde0525ce3ff6b4bdce952144bf7e0d11c SHA512 84063c5dc6155e7e699af6849cc897e7e024981221cf1b9997dcea59d87336b8d1f24615bf810ab389c6e3f38b1dd154a0ffc67dc9523f4e614a83b1b16855b6 WHIRLPOOL 3cb2177c902b2c389b397bb17dad49ac95880fede544d180075af3409978bd81b73d840fdcd790b2362b9e6b899b713cd8fbd0d6b1ecd2e9fd6fc7e6460c3d43
-MISC metadata.xml 257 SHA256 770a3be1eb3e38a700fd714deb3f97bcce3248be5949c3b6cc08df97b6f56cf4 SHA512 0cf5b9136558d19039796543f740c2a66f86f497fbf395422211f622876fb401ca946cf8c5dabd987bee9ec84ed97a7813410a93aee76eabe414b78d254fd5f8 WHIRLPOOL 15cb0edcfba7b1423a4dd40bc1f62fd1244d86f7856798b8bae46ec0418dbad9d9f47345de2b272003a263908b5eb61b6ea5cfa2be35e8f5c20aa9fb63bebfbc
+MISC metadata.xml 334 SHA256 25dbdf6d1c4ff9a54df256011497a120fff905c6bc12f18ed160aa6d98e579db SHA512 068140136778cc658fcacd9578967bc5efcd151683de1889c8b8bc150e500a72b30868b8bf2fea754987e8a7ec9a03ecb64e6bd3c935f5c21f26670807a66600 WHIRLPOOL 3b18ea665d9458aac7e34cbe6971c492a39c01e4c6f6d9e83b22467e841b0f7f40ed692eaa7316ae37a134cb58be5833cad79a0e8b99606f8f1da2e72c024a4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlRYrfUACgkQVWmRsqeSphNL1ACfWHVHYFYvCQX7DfMLt9++DwLO
-9SAAn0rKUr/O5wz4xg+K329HbT7YoabI
-=lMUQ
+iQJ8BAEBCgBmBQJVf8E1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimDwQAKnNHAIjgAPX43TIu7hMVWvz
+Vs5YasHYVYFwv3olPbDxyXLweMJck6Y7eQzsNBMQvRs5y1cCGo2ZuUq8l08bOddl
+yml9hR59WCCmr9begb9ar68ael9XOdZRdoiRgg82JZU9Y+eEsmTDqM97Sd/u34/z
+DORSq7MMoTvWJqU+olRH2ijTFEhlo5h/j6rDUIC0tgdvtDYEkNsdZvTsUnjOUSIF
+4M/5eQhTLSttQBr+ASZOvwJKjJKDTtBxTWEzS7mbMN2lyZJrsH9rGKKyJh6vtDmV
+I9b/W/cIdT3qn+YSCdAPvq3EMAVrJit9eVjHpFvcDcvg5iS0AD7L7OnxRpAs5EDJ
+wK/9HE5VuE9rwaXFB+wyN0Ux2OObtNYrhFjHJPoGchtrZGb6QrjTupUCsZ+sgka0
+Lin5lNrT/atN7UHHzrWH3HBZUHVC0D4//7wR1QY3fN9rvYyxN4AN4iQ7Y+JQ0ven
+kxahbPwd1X0j51xQFEhqEKnKdkkx9Iy7W2+oj4oblh+ICcUzz0nRA4br1NQSAgCT
+mH6VpqoEN5bhsLBjqrlTMjZy0cDI9IorEx83Te1LzUUFe4jK0LkJ0PwcZAj7wuy0
+BubZGR7Tq4FvKGCsE0QOen5IiF4I5qVnBkcymWnSfQokqKYBHsZK6yMHmBX/ti7z
+HB7ffsDJ2O7IcNMhMQfB
+=CzXY
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index b0ceccd24453..b5d864c0bffc 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 	<use>
-		<flag name='quesoglc'>Enable support for OpenGL Character Renderer</flag>
+		<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">rss-glx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 5b929456909f..de50dc50f4b7 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sddm-0.10.0-consolekit.patch 429 SHA256 4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5 SHA512 59959087fb31368dad6ee815f90f85d3440abb671a0a10185c1ed1bd8ead5430275ecd9ad16d89c2df55494ee1e1f1412280c0562299bd7a09c7d1af3023d121 WHIRLPOOL 709990539e053d66e2079174945b883ebc7c88a8b8d90a46a4bffa8e3bdbb24a3cc711a95f193045ef151be1993fec688050828039f7c3b54bea99b62c5f322c
 AUX sddm-0.10.0-upower.patch 553 SHA256 6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f SHA512 309fcea508b7ec44c15d527277dd895b0bbcb3d118d4fbd97ca02ca7b022c995f5a3434e7a37396ef1ff80574b1dcaf02719b56ad3976242ad82d92fcbfa3db9 WHIRLPOOL e26d2b5df7b6b3983ab43c6f36dbe7a0fe25653605aacc427b7e3eae9a0d2bf1473c56dc745820f897303bde9742212369b69fdfde2a7b2b834db6a14a710700
@@ -9,13 +9,23 @@ DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e
 EBUILD sddm-0.10.0.ebuild 2020 SHA256 d36f49b7d6d07cb1e88e32dc9404c7c3e82a37734917d4070cf6858d958ebf54 SHA512 994428982943dc10dae2111236ec09073d5f333f441978d29e16405d6880682f14b3c3b05d8332a7a4e36644d372eeb6a1f4d896bc41270a057577791784d387 WHIRLPOOL 1fdf11e35eb71dc9eed87b29b732defd350de390e83447e455b8c7046d982c297803676ad3a4d17db3569fb634c308b211d7d7af9c240caa20e16d87109c6ea1
 EBUILD sddm-0.11.0.ebuild 2033 SHA256 01bc49f309ceab0f47b98a9c6f3df70b3dae2ac9b9c7178e0116d7698135e6c9 SHA512 728c3fd82ecd02439ffe6e77818f047f4820cde7042f57b519e95ebc8910aca2678a4c82d681cc3294580f170b94c2f81c4ebba42f83dc5956c8a693f366718d WHIRLPOOL 7315fb7ef8a6768190adab162e28007463677ef6bd47768479b0578ad5062bab48e5c5629cd78d966fedf93d841afc19b9eae30ba59dc7b8b12c1b3be5bf8568
 MISC ChangeLog 3117 SHA256 e8c2b56a64bebf920b571afde9c2dd9949b2c2e604be63eee24b36126fabc55f SHA512 0c4aafa9ca9b54b8aa4051a227bbee1f55e72baef98d2fb7b0c44e01faa448b7eada32c00b73b31d3ff62a1ed75ad9a37162c2b4d720c4c5d41c6551f2b36207 WHIRLPOOL 7abd8bda3600961d67743a18f8a8473075a0c200f8d7c40c8df7a1ea725a252316bf72e0a66bde7131def5ab682d37ab215e90bae192535f68c603aa872a3a86
-MISC metadata.xml 684 SHA256 260a9c7c0edd03a2986bee9e483994c9fb135707e9c02340a03c49cfbc2d3f2c SHA512 2cb1389468e2879bab30fcfbb21bc38cf6c35cd7927786cf4293e7775e838a660f488816f1738e6ecb1420b44b8fd1039541614dfe6d2d1d8c629d4a63b1e558 WHIRLPOOL f26b41cbea499725954de851b80f1815b62b6220fa639da5d699a0716a387c279b8a5ea9462a4ef008f407cd777be31859ad43cf77a9c48ab1a0dd6e14fbbee3
+MISC metadata.xml 762 SHA256 04f7ac016bf0a81ddd81d0dd28a2796d9e44e7111030154404d510e3098ae854 SHA512 a2db26e3847457ebb41de648436313f901451022bc973b6cd0245eaa05f0f6e271eab69f19b9711cbad51b8c58272f48eb66a9772e8d1daff3567b704fc26681 WHIRLPOOL a16bc6b0adb397c09b98f6fe01dfeff66eaa2ad53de0b79eaf1c889f0a28bd6dff7086e55985975545939305d0cf6b48d08ff4a9a2aad14e6de042db5200cc9d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlTP0LwACgkQG9wOWsQutdbzJgQAppdSSryTZsIwMeXtOPYJL106
-5bc+IOfVcCXcqTU++QMelTz1gcLqZTiaWCz5tALkeeerh0ftrVSPA57D9fmjYwF6
-1JFKyiFbcc+2UQeIz2Ice2OG0M9FH15l9NNizgp7tPLWTcVsw5Wz9siJzG3dTO+D
-JZzFbfGYW1TgDf5Iu5w=
-=o2jK
+iQJ8BAEBCgBmBQJVf8E9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5s8P/3ydIJ0bNc6/v06rgCWWwPqI
+eFkk0bWGuSjfYueVN5FR3Snfyn939+8s2H+mIotyyrR56QJEU0EYNtIOOf9cwE+g
+gqTm39L8t3u5IUtr2AmwvzrI2Ar/aA4g74AJ2NfCKn3YghwmdOb3STS0nQrzpckn
+YyWCiCwG3NPoDsiCPrtWQhkFcafdJ8r1iGtOnYGFr7VdYoaV63pGuaKYCv/Ogeed
+OIAVa2jOMkMmJzf+FooGZO3vkwfZ7xsx1ZTe6Xpf42KHrCh5HQHN8+FlosHjHzRC
++IwjhYt96EzBVPucHigS7MAef3kiRjl0GLsK1GGZJXNEj6WQiC8d3aTEgUXRP7ki
+VxK50OIrkWpdJKO/9ncbXR5T7d7PUnxuQ6/3jAbCqH51qb08gendeWlc/gfH3e5O
+tfR1HfjWGwVobEMDYmrrGEX8+QgTFNvSXmx6gAXVRhH/GaFWe3MiCfJ3FT15v0Iw
+kIRksZ3vXFoa1trqM1kFwY2JZNr9dgpEY739Q+nK78vDz1gxF6ggqj/fjC73q6Sc
+Mx/aBgsVB9CTE4x5rzJ2zY9AJZ3hlzMQplRGa/4ihf6N+8oK7YlkTUI3+xLwDSO3
+jCDP6fBt2/qa8rSs3v1Mb5tdRIDC5Z3BLoxAHhiGKl1DPaFe6gpDh/GLFTk53Yd4
+d4YiBXBbdiezRRajaknn
+=3m3w
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index d867da74625e..fdeadb584e84 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -15,4 +15,7 @@
     turn gives the designer the ability to create smooth, animated
     user interfaces.
   </longdescription>
+  <upstream>
+    <remote-id type="github">sddm/sddm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/set_opacity/Manifest b/x11-misc/set_opacity/Manifest
index 837a4c2b9bcf..1aec40c08b7b 100644
--- a/x11-misc/set_opacity/Manifest
+++ b/x11-misc/set_opacity/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX makefile.patch 615 SHA256 e658eee86f3a70a30c115a396907ee90e9e2d872b53452399a5e186a99d44335 SHA512 0cf5899024d56d3dce485171f3d455c1ad207d708d15a7a8c72be442ca3ff669a795838fb894753f6edc279acc9158c1497191b0e05bc5c38c937f65757f3231 WHIRLPOOL ce09127069b3f7ac1455853775e16c55b9eeb2e010662eea3f7900dbb784d2eba81619c64828c1030e04705f8438c15cdbe02b4692779376d249d7dd5db16ed6
 DIST set_opacity-1.0.tar.gz 5115 SHA256 b3aac6b47107840866f1968e346f59963de2548d7d583a919c95144cb7aae105
 EBUILD set_opacity-1.0.ebuild 788 SHA256 dd4df4471df5dbb8da97204cd37a0dcb170d364211dda5d93808f305f501955a SHA512 de2a0fc0fbd683664eba00bf83419e7c8d52bb2d0ccc1f94e154c49edf0484812183dfff5da246b898a522f51ef56e7400d0a89613569451a98e4d8bd624eb5a WHIRLPOOL 395d52151e7bf9f1797a1bf9706e86b1a2aa2027374e25e8d7a2250db692476e38961c9ebca08ad68cd36dd705a3410b5b5c43abde943a8264a6192a4cf6d701
 EBUILD set_opacity-9999.ebuild 730 SHA256 fc36ca82bd31adf5b4885afa8868ec108bb93d8d110b6b91767b29e3bc9869ee SHA512 eed5c553fe51fe59e612ebb53ea297e59eceb4578d697401ee86527bfcf9cc42b555be66fa9d6b65f027bbf2750232ddd0e248a4f23fedd8e3f4504c4415cfe0 WHIRLPOOL a8ce12cd98b256d7fe1eb9eec7df588f6b98923d1ba227403c0a6c2a63069ac5fa88d0c40cc25405e8354582a83f72295c2008446217829ceabfae265229da43
 MISC ChangeLog 1084 SHA256 6effe715d7fb0f505961bd585b758d7b7f8369f080f77ae125c5a0a8d066dbe3 SHA512 c2d06459fe001b16d36eeb6c9f6c7c11b429ce451e31b8d088761bdeacf2f01b4613090aa7d0838cc9a1cb4befbbdb7fe2f371f82096a5c2499e7d6b66f4b310 WHIRLPOOL 8ad4af8961d8c8346923686641bbc89d6b7660a95a8405d187dde1d8d15036389d11d35998a2615ffcacd68bfafc127c7122e62aec14dacf04dea615ae7687bd
-MISC metadata.xml 231 SHA256 3fe9ca6672aae156f007bc2f5a00f0f49e3f9001ba0a94b03629c901de5ff94a SHA512 6a8ef00e0dd9e85eae4407cb9d1868ba614ed6ec0d515266011b07e3a3007ff0ff53b29e5ea527452861bd15a6a7e4b0b76aefc20a9a920f08c1e14bbd5c885b WHIRLPOOL 5aacc199774ba49de0d11d859615d6f1f9131e736dcad8c735450d9cc9cb466c7b511315f14077b78db1590de77cb5da3c4c557b970aca891db16a2dfabbc61d
+MISC metadata.xml 332 SHA256 9f002ade00ab2ba3b4891c20e21d0ca5f88112f215bcb4fab1b285690def5e87 SHA512 62468438986825f2a69d237ff05b2cab8efa420137eaf33da7ba76519a71529f665ba288c485387dc3f39d7b4e22cfab327946fae60982d30d7f046fa5fb84ee WHIRLPOOL 7195c3a79848b30330a2c7c8b9120bd51ebcbfe52e56bd32bbffc7779256ac1ef45fb91b5472213406f8738a96f521ed7ec00e1799fea161521654c30a4a3d5a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8FFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHHQP/1T+Dz6XYn4CkrW1/OiycHm9
+ZQTQeG8gcoJApP9m+xRR+HNIU5/CiB2hYxjvqC6pLek0wVRcCpLcuVJCMKRG3iJG
+Zts8PZRJNOSkummzvVtx0gA2FyRtXP7ysgs8TWfpvIu8GceeE0mroUmXaE3ihHLt
+z0WmRC+QQJyZnLQIRy8iN1r2AcWXGfJSejctcabfHjRnqawJNmQ2A6OE3OG5avDy
+5VAXLaBmuyV32qIsODw4Mgpik5fvrlAfRgGtStxdrgYQGv2e7niz9elxL2VOSxFM
+Fi89QBGe29KLZRCUiYj3l7v2rWmR5367eNYktviqxMtwr1hgXy0/U6KNHScTYgDC
+wIMyyYi/4TVqL0gi064q6ULLh5WfTxk2xk476QeHUbg7PSt2fSQ14GMDDOu8dM8o
+ZnPRIl1CaUYceU8Tvtt5Ax7Wgo2MmU1TRsR74nJSNNhtCpWY+aGiYGvn6vDE0jnf
+y8DkeDX4oRB3umzbwqJ0eURoCjVX/5WTgN8LnGgFD8IQerd//dK35KmqZRUAN0C5
+S7MVXq7+im5O5LP6MzWQA1YPHnt3DdDUlQHjtjwkTHm9x83qyGFrVydhGoK4qE5O
+HB4Qz0e6sObn2MQ3eagWytp06mW4S3sF9ZT9yEuRBmb6adbackXKJmRzTnCI/x9b
+GSK24m+AHgcYXeRmb4Gq
+=rpRW
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml
index 28cf25218f82..57147d064d19 100644
--- a/x11-misc/set_opacity/metadata.xml
+++ b/x11-misc/set_opacity/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>pinkbyte@gentoo.org</email>
-  <name>Sergey Popov</name>
-</maintainer>
+  <maintainer>
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="gitorious">x11-tools/set_opacity</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/simpleswitcher/Manifest b/x11-misc/simpleswitcher/Manifest
index e57b365c2dd7..5a5155f1806e 100644
--- a/x11-misc/simpleswitcher/Manifest
+++ b/x11-misc/simpleswitcher/Manifest
@@ -1,13 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 EBUILD simpleswitcher-9999.ebuild 719 SHA256 eaf6082e2daf55fee66362d9b9e4bae94831a2d06b5afd08ea9678d0f0a157cd SHA512 92a537b06bf7e49d3a77d3ebb5363ffda5acb3606c3cebe2f519a146b1e5ff4ab0b2c7c10054da5d85f67f1623f66e7e0c6558ef5c10b09e49d6da86ac0756ea WHIRLPOOL 137dd1fa8a06e92bed9e23771f17f6cf2396194253cdd70e7686d97b29f31075a96d66bc28783afd14faea2c9371a00073aa60a1f9ef36518b1352ed3f0f58f4
 MISC ChangeLog 526 SHA256 0f2750bc5b6721ad8adcd61429034d7498a609a46f59739ea5d078425eade055 SHA512 fff9132ecae2545f8a270a847f4f0515b8f2cf2819920449c967918d6718f01f366a038082ffea9e9da4aaf84cbdd2a4ab8eaba74d5584318bdd401ac2082edf WHIRLPOOL 6da0957da4e5e63885af418166f3ad7965d8ecec21ba88b0631a7826f365b514216b117fd8f5af7c55113eb70a8c93ec86ffbe24813709406c988edea051c80a
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+MISC metadata.xml 320 SHA256 f82deee2f4c3a4631f3e9dacadff59ed4c5ae011c4ffda773e56c79dc224f202 SHA512 72da8e9311d0e759d4a3ccd5b0aad9b1bbeb22f1979ab036449bf9f002bd69e69bbc806d73a519ff26a4c0090bbdac7844a16fe2be3853a7648adcd975b5faa5 WHIRLPOOL 98f1a6240b4e5522862021641558d75e3a9dc10539f96029d9a806da2439226fb316a946ff6055aff611cff4b07c55b6d514db5b17c8ade1bdc9b3490d01eda0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlBDOCAACgkQknrdDGLu8JCNEAD9HMi0llUMoEBIUdZWD+M+9M6j
-vY3Dg8JSFAQ/ReGssTwA/RhW86+JAYSHGW7fcZDH5mE/odhZIt+jZEUMB/EN9ui/
-=UrZD
+iQJ8BAEBCgBmBQJVf8FJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXYcQAKeGHSIm+/lY5wzlc73RBQwd
+E/G8aUYexVKa6WNX/eNJT3CdnSxZAmSiiJl9IqFwJ1rUgGUshVJY3GjrZ5ltQ3eK
+Neh6GYX+9A1hEyn3ZklgdbPp972IkqSRQ91UELn1JLwwekBju1qn4HUeWQ2yXF9T
+VdChn504KBTM7fCPCo2TMR6yTy5YozGwObE/CMqg0feqoH/g9V84K0ALDpzB8sCA
+rk0FUfU4hLrtj6D4jTAqk+87MI7cD7v8eMLNwxL6ckWpi0QQJkked/ESHevhG5Re
+szcCLFUf9ulleB9tlJHWADCs4y1HHGM5ZVqG/J56gs7FPbuJUieCCrc9t1dxvzoM
+TrJDahX/g22dZbbitJZ3PgY1wIo7qaR8ZBcDqm2ILLAm+SRrkfV1/aopOHcmN6g3
+FeoSm336VHSfYmAAdWcnSMveI8fIVOgRZykpuowH8coJyMDaeVvhagkji+tZO53F
+Y602d+mbnsF4Zs5+OpOT8HuDU4+no5whWpRoi6yzvcf/1EKiy8vjRJZGZrw3/wtI
+bgJCylGOqeJTrh+T8UqIvG4kGTyFmTF71qBs+OADwoEh18AtkPMLT/VJLEEO2IBm
+K++j/7meeupqmvu1eLDDBUZIR3iR7ivxc/icUdr7ubfMqN/36X8A2nNdtbCcscYF
+4cR/eWyaqtplfiD2xuTI
+=vqWw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml
index 59acc2cc580e..dc4e0a03dace 100644
--- a/x11-misc/simpleswitcher/metadata.xml
+++ b/x11-misc/simpleswitcher/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seanpringle/simpleswitcher</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index e76c1d7ac2fc..3bd6441de67b 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX Xsession-r3 4045 SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af SHA512 6c0bfba4c3f00b75d6b5fb0e0e8a492fa262b2d0f3c6382861d7f3a8c657e803151a2060e181439952649fd2acf6fa71b75811565f1156018027ec14a761f7d0 WHIRLPOOL 4808e5a3303bf4e8aff965cf1e77e4ca45413468f54dfa163ced9e848a53d19f705b203054002729f05d2efcc303b8456fd76644de8c1fb28613a43599c815cb
 AUX slim-1.3.5-arm.patch 289 SHA256 95c7be21f8a176ce649e2dd804b8c2fa019e5e206a2532233f8b76bdbf201fba SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308 WHIRLPOOL 54cb1cff534d30c157460a729a054cb4089b39dbf950b7d78462f6cc8f1dcc1770b6943fe0e24198ad0313cd2c359e0684d35e99155e3945fc19e14638986437
@@ -19,11 +19,23 @@ DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d
 EBUILD slim-1.3.6-r3.ebuild 3847 SHA256 f7adf9228e6beef4a9adac6395993b50c63f4d6fd7228b56a01326a89bbe5308 SHA512 efccab834ccef27d7d1105ccb80b9d840591e974a864f7d7070135504439da6df727a51c693163690d86be0e23d106ef0068d5a9bca72fe7e17c9812a9f98683 WHIRLPOOL c047e756160d3e617d920bd654b7149c564253155c6f360116d00d38844ced2e72bbfea98f4701ee882efed64e53fbde5f7b73aa56e0de7834c80f9c8a56f532
 EBUILD slim-1.3.6-r4.ebuild 3855 SHA256 844d9b1dbb502c1d0303892a6570b5fb4f763102c86b77d709e7dd812b207a5c SHA512 8df29a5e09ca5e0341edfd1a0b6835d1881ebfeb0a68933a32f642ca4408a967b9cd39b0f91de9da76d6066b3a4cc17c161ba56b69aa74864d25a8aeb6cc8b81 WHIRLPOOL dd68fe1ef98fe0dbd3578c5333a4de5f73468c4f5131aaa8fa17f7ad09fea0de9357d75d7c8230eeadd1b46ecebf5f2bf27b787281864f66817e83565720ea97
 MISC ChangeLog 22739 SHA256 1e67ee4595a1e8158ecd11793aee571869c36ac957cbfcee33568fe3322567c2 SHA512 b4b057c02f75ce35393919f66b30bdab9e022ec3b4c84a3f2b1df8326cff73544242a7f8e89573158f4c3900de3445bca7cadc04e7711238ab5671d93ddbaf9b WHIRLPOOL f14e454abea01516a1fd930fa599077b09e0f53984fa377070e2ee706cc44392622793a7fb351d492cc7a6d89dec11b78293dbd0fba3f21e174aa55d43515097
-MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
+MISC metadata.xml 390 SHA256 65c5706a6d5137dd7a718d98862215f7c6a6590a9de29297c4eb2ba442e6addb SHA512 9acb5d11c1a2740b815d4d51e25a03d7da927d652c652f2ebb4dde3e11f2395855611e25932c13a08a4bd67ace38c6980b34706f4564bb7a5bae3c891adbd8e4 WHIRLPOOL 42893039f4ddb9a50b522cb02f92cd3df550f4ca0ba6a6e327bd8ee88a74bbc5f1a3f312243dc4a94b75a397635f2365240ead87dd2cc90e829e0d1ba1aebde2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlSCHTMACgkQ2ugaI38ACPBrZQD8DsMYpir1EBwt479hJ+F4W4zF
-QbMsBxVeBQeyaIZI+QoA/i5vFEAb71R6AIz8Z3afw75gob35Pl5XuOXOQm8XpB5y
-=4JOV
+iQJ8BAEBCgBmBQJVf8FWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUY0P/0d3m8HgAPGHSEscqg/7OXND
+HkbN2gXw+m82y6YhXiJ4XpJymimTx2h9uZqkXqrmeSS8yIi17Yj6ZYz31GsQMszB
+hHw6CMeXd7rQdpCsA41l05epP0hBp3hlWZcl3MWOpeaUuYRuiLNBJq6raLV37cUW
+/z/btrU4cWetDXUdicqo8hd+6mjU6qP2VnDCvQ2Mu2MECCEUo/SUFWMPR2NyKtxq
+YhCUxEHufhFA9x7QGjh+ZnBDay5s5vci63MOs77MSLCzMbJLu37MzPBGrcEwvqMb
+gG3kH70J8egDYpDfL9gWXFGLZIdBnFDALVur+vM7z6l7RzHCt3+hbHn9rIHrTiax
+RC51xOMht9OGZ01fqRJBPy7ZK4a53vXIFcluWmAlmEjkGqYWFi6VRKrmYkj6zIl5
+lxnX6huto6G7few3V0cjLJ+qjwN6XnuDLTdP1haA6qJ8Dcz5cn1BpLTTT5WbkySe
+7ktCulALy//tnTN7hyLPvNqNgt63iGI2QzQVVvB5ayLVMzROIObouDBHTW8GyMdA
+4kgbdfnwOa0wbguzV4ipFNcdcbPXpq0gHWQBPOCqS1hE0RmRSCs8iJ3HkOQvsm86
+3XJgCWYrrgDnC0RVM6xtzlKo+hoNGtx89Lbs9HDNe1ivfMrZWEFtXNv/+iqgrk7V
+ZeWiim0eVSZU37k8vpvO
+=XTIm
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index f6d2292aaaba..56c5cc2069cb 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -5,8 +5,10 @@
 	<maintainer>
 		<email>axs@gentoo.org</email>
 	</maintainer>
-	<use> 
-        	<flag name='consolekit'>Enable native consolekit support</flag>
+	<use>
+		<flag name="consolekit">Enable native consolekit support</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">slim.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/spnavcfg/Manifest b/x11-misc/spnavcfg/Manifest
index 02bb4fbbf4e5..948184e57a59 100644
--- a/x11-misc/spnavcfg/Manifest
+++ b/x11-misc/spnavcfg/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX spnavcfg-0.2.1-custom-flags.patch 1336 SHA256 975eca694315dc7f4fdccb1ffed43312c0dc20f4ca0113fa0beb143a1ddfd2b6 SHA512 25ca40c6848d6c6796ab9ae035496c5013b86995a7797e62ad89eb7f5a822adbcc130a0906334c1ef17f2b5ca46c96c1088624d8cf80896b23470f307916cf5b WHIRLPOOL d0a21f2e2b786ba1e99cd20756b51403a26d66946cb9c02390bf3fefdf2953cf3876c359be976eb3e116ab8d97aabcccaec652008e3afc554a16af058ca8b16d
 AUX spnavcfg-0.2.1-destdir.patch 542 SHA256 573f5cf902364f1b7cab5a4168c3e2e30b1160d9c7ab9aabccceb5e57854b8b7 SHA512 c3eda78673a9f1b110058476efa421ff0b042d87ec593f4199104df8882e81a3e4b873b6074b855555d54613528fb689b30cf04bc6e9f09aa30fc9bf30d69ab2 WHIRLPOOL 7f2855e3a7194ba48052a91e84aadfc8e17e22ae7ba69fd0a51e4aa33c44cef214cddb72b61109c1ce8705d0d89a3e05cc56acb15c9bfcba8b0490f621b1386b
@@ -7,23 +7,23 @@ AUX spnavcfg-0.2.1-x11-libs.patch 520 SHA256 65a396afe6690817c31eee7682f4fd4beb5
 DIST spnavcfg-0.2.1.tar.gz 18717 SHA256 a26d4478480f2fb65217cb0d88da5ff81a38c27aaa74710778ea0b999259c4c1
 EBUILD spnavcfg-0.2.1.ebuild 963 SHA256 448fc34283df0e396886cc3ad58801fe4e91389acc0c00d93dd62b915a793ab6 SHA512 b86e3443f9a2594ab20ae4649caf23f1ef06fe4aafcd3f71b150647a3cd621f9f2867f585d565260d6b815188e905480a88fa502f554ae3ef752a772a1bfcac9 WHIRLPOOL 4ced67f98e04414a0a75e4e4d6ae99f96bcc0f5db4f5484b7809e6b78defe404cdbbacf47acfb531b445e62ce13a2d8e1c6aebade5e2b5b3cd80458bc9fd114f
 MISC ChangeLog 835 SHA256 46cbdff09f848412a3256345be5838997a94076e669f51dee3650aea9bf7d224 SHA512 41bf40bf1e76f075506bf0d577eb7ab30ef2c2ad0218413ef5a3cc9135ae87c7f813a1499659ad2e8f82689120145441ea04f4934bc6459752018141481462bc WHIRLPOOL 44576821d4edf750373dc25f9397cfae140f011d0832291f138ef61ffb3186292e990810842f5fc4224d0d817294d40eeead5a5d928a17e990d49e50922250d0
-MISC metadata.xml 502 SHA256 c2afea4155f10468c7e9816f34c1db43cf245e711442bf589d198e592ced9bad SHA512 2dae729a7389f20cd35fb3cd1d65152eef26eac02701a6635aee716aa577e9d50248a683d2eb5d0e42a00635f7d05e26948dbe278be5c0eab6c8010e7dff2de0 WHIRLPOOL 1ecdebaedbcd7e1e636fe7ae9a5629e48aa2e81b1b440951e08fb986f12177f593aeedb94bc9a8667df96252270265a6417151d75448c96c1391d5e093a948ac
+MISC metadata.xml 580 SHA256 5e30766797d3b926025f08f551f3210f7ea8c3c63f9f6632eb6150115cbba6fc SHA512 62b2800b8eb03132bf2034b45014e41a60804cec81758b2d729871f20b773d2f7ceb24ff39aae451f9590e739f0586dc944f511759aa233614dd6583fef40607 WHIRLPOOL 612f7da8777f8e7bd3bc9312a47c4f57abcc5baa38a248e52184cdba467b3f07c255e42c84f5107ec8e31f8b1e3d98b87e6e303a29b10a7de93f9debdfec4e5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJRReuZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun885RwQAMUWs10E6XJJLpDeLKsMTpOq
-IvvWQYz3/2PgZ+rI650CgOE5x8MlIpY4xT/E8PNk1rO7ub2cE+TvuDJdph7R0xDI
-Cb5sY/mVsYvXTxZzjqlJCHYNmzY2QlldgEgVxO7dDrxzh4FHUK7soaLLOy+MS2FR
-n3kG3GaZNFeNSug+Z3eT3uo1mqVUQrHAyKSy31WeJ2aTiAC1ttxlR1CBbEuQstUP
-A2AUET01Y3PQ/AwccBH9gMZG8SMeGPAtTUVCSAzJoKWK4NCJ3KpIdwy0ieFUAAHZ
-PEfjntVKNqaQJmBIlwvabvGX9EHGS3MIc/kd9vNHMD53xxv56P4IuJrv9tfOFfUQ
-X0QivPP00BAoPhV2JFko3Se4ZbS3z9SHg5Js0aLqaXgsEaTLulCFtwS4kZipPP8x
-TB0+Ihq5fnuZky2TiLKjByr7wPFPJG/VcTxMYO9N+873kHBgRr/+mUUYppRYC2FB
-Nxg/GP/aZmjFlUIKw1AsAkWZxtLdy1iHnx5PMieVijsL5OgF3Vo5nIPMk4mjfwrb
-xi5JR8Y9KwfuoQUmvDDsp0mAMzN9BHVC79mfZFP0pqjKkSmnQGyvNgOWTufDphOa
-0fCYIprCZFZY/DPI03h2SGVDHfJ8gnfnAC9+Pndu0wFmoLb9Xc6WXrABo68WPdoj
-K3XzpsEjZvyl/SavZ1XK
-=J/sL
+iQJ8BAEBCgBmBQJVf8FdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiESUP+QE8mMq4nc5/SzyiOMUhAO38
+Fo2ME6hANcJAFjOnM7IJU1020J1lKRa+0hpyEAYxGk8N8+Ce6HuFnH6X+HZA+koj
+TCHpIksv8zTyANqLaXmU0M65EOvUCNVK3xdFvr3xkrWBTp20dCE5q4fu7P1uWcyy
+jYsR7BD5d5ItEQDIRyaOq+aS+hWm8Q1a7Cy04d7A3WYJcZ3HCaXpYl/KPZOOSlBI
++NYhnMF4Zf0GlfJ39V0IDmp0jS8f+3yo2rZZldRctQ2EBU9v5jcnWscUz0eMmazR
+N5RD9h7uKhWlZlbzcRCc7E96/sQFWgHJvPLJLGeGB8c+nzhuflz+YMAtL2UTZEVs
+nDTJouRYpxZhuHd+raTBOOcivFnWbEsQZ5rRV5zNpi8+x87kUMuUJ+m98oDO4UvF
+r8HPEpxt4l63530mxB4svTVQadK3uq+hOmsLRnga2WMJi+ZKsM5nb/IscICYbTrA
+vsDYf+3E1uhAvYe2TCl7HThgQ4oK5m16qJuDAbv0tRxO7ItbGAY8DA3VwX29a591
+J9iuudyQutG5gTejz+foCeGG+EyXu5rURYG472dLYLzuqUAFTY7khG4ktvrSv9Mk
+Uk5o12XQkDBoYEHrpsMSHZ0ZZPqNyhza+gkFeZqDl7MLaMuzu0sSNcXHjTv2kZXv
+3t9Q3VhJ+f2Pyp1P33jP
+=FdVN
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml
index 6e48d5d95e1f..691a96f7a8d8 100644
--- a/x11-misc/spnavcfg/metadata.xml
+++ b/x11-misc/spnavcfg/metadata.xml
@@ -14,4 +14,7 @@
 		The spnavcfg is the GTK-based configuration GUI for
 		<pkg>sys-libs/spacenavd</pkg>.
 	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">spacenav</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/stalonetray/Manifest b/x11-misc/stalonetray/Manifest
index 9c018d89eaa7..a7959078026f 100644
--- a/x11-misc/stalonetray/Manifest
+++ b/x11-misc/stalonetray/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST stalonetray-0.8.1.tar.bz2 150814 SHA256 94a2f80ae211a552c2d379b5b41e2618f3e906b33bee207fec8793b1a9bde8f2
 DIST stalonetray-0.8.3.tar.bz2 155276 SHA256 36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c SHA512 b1c50d844b6497b586c1ad56b721675690ea305a4e3a2601ab5305af0e208c215825eefa8fa374ae0c392252156a8dffd5882992c943344f5b6a674fe6553942 WHIRLPOOL fc0e1a01b98bc4475b2137242a97c58d20113a23f7fb2fd97c94e6c52105080beeeadf6d8f5b1b0da99aa080a1de90e05db3155a7c7d051966b5c6ae8b06e397
 EBUILD stalonetray-0.8.1.ebuild 856 SHA256 7ea7f645121284186d5feb1b0b08e37b65d74147aff2c64f978692b5325636d7 SHA512 abe178040e8fd6409d74107ae26c345b0eee86845864ceacdf0bbdf9df96dd7804f85323714148e5c580fdc74382cae799cd761ddeefa1b50c69942074ef3418 WHIRLPOOL 1ce8ba40ce2959527ef70a7814188cadc3a47427affc2b7582b1aaf0023d91904fd5cc1cdfdfdcbf1311f0881fd437b67801125ab6f12a99c590e228c77e7b4e
 EBUILD stalonetray-0.8.3.ebuild 860 SHA256 d298f3893e531e5a3efc233e3f219cbff3dce4b52b3c764d4fc4eb19e1946035 SHA512 35a631f83c5579157c6497011153d3de4868af04c9cb954f5cfdb8b90f35017821fc9162235602cde9683a8f880d7208df124818874411e51e765bbc868b97e0 WHIRLPOOL 12ee9fc19452150c36c3edc7fa5d02057b244e932bdc6686145d86c91c6de52bd1ba35bf3e0df1e29890f89ccb99c9c771e204d6b8ce3b884bcb3d41afe3def5
 MISC ChangeLog 1963 SHA256 accb7ec861e033b2dc4c311bce4510946b2ec5697d35cff79bbc6de4d46d6733 SHA512 44a080926536ba622729f2cf70664b5a324daa46e6b61bd705b9dc666726d4ce9ed0593c22b5e09b3f4d021213bdd9d278496b32f239d536f9e46d558b049cf7 WHIRLPOOL faa86d7fa0a401bbf7c0d3be494ad54f9b0e805febbfc4c47b588fe5768eebe0d7c4d8608d99bf227043ce2a8a08fc65a31b1fea9f82ad55f08e7f62a27e65cd
-MISC metadata.xml 267 SHA256 3ebef880fe7a1953d2db3aed0feab271025574c930ef5982dd7b480a6589c1c0 SHA512 118f6e9dd5dd4162ebcc08ca8aac1557e77489e846196d61faef81ccc9de380ed5ead83d51e10d8a5da55d6a62e4ef49338d1405a590103e07f067524c548d7a WHIRLPOOL 31d377b5c8c70abf65e5fbbddb8d695b5ec9b11b67e43350065ee33408acce9e693a35bc9436718c1fc6e055dabef2b20c2f89285c4c890edfc547caa50afd88
+MISC metadata.xml 348 SHA256 ed6a85ecdff7b1cb1eca22088fc7ef2b9b9a84948b1be38a77ce75d4f05f38ff SHA512 1408d173fd009b20dc3cf21b15aa1c94170fa96c3ae7aedbd9149a01f9a22dafba0e572f77319c38253b9945e7e0605bcc62e41bca3f63d008595a61dc7d8770 WHIRLPOOL 650a7d242c7ca1a1b2f9531a27fd0aca1a7c04691644d031b184adf1c71424a3089ca1bd0fcd18d64c2256089cf36136c6ec0842485d2b759bd4f639e11e8736
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUIH7gACgkQFYEBGcdFJfJqVAD/TUM7+OMcQDos0kulI97eUnUV
-BBe/HxmGLMJdCbaPuccA/1KLepXSzTU9nPH5duTWhZt0XF/gHBcFpyM82agqILI4
-=tr7i
+iQJ8BAEBCgBmBQJVf8FkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidK8P+wflBEQ6WnuSTXEe4IrRl+mu
+RyyR5zcAAAKVlkeVEFTjpBNfy9Vv4yD1UUNSH55NFAMwns6RgHSKkbJpBPutIVGJ
+CP/CEO2wDnZNMRLs2Oug5uPjIAgWY7hiz8ntx8ozCfQzK+0nWh4gtEvw4qOGkCkd
++JKvAcF3T5T5lanDdZLu/JknYSIvkVMfWSXw9ry2l0ng+cBEhzO4I003afFPd53G
+Y3fhKK8YmU7/cpyQlDw3PaEYjTOeYgtmVMqdr20p5exJMSfxc+KKUaxt88Fbs21G
+Twx8p7xJfQvTx3/Q2VL0uQ60jBC80eA929Ip4A3yAGywU0JYElJ0InD+bQSsGQAJ
+D8B4868I3+6+Sapda1K7hSOWNExeoXDW2iCC3otfzgjwF0Klxsa70UWGH3i7FtPW
+Za/PykEMjccNnTbV2Y9UkRDZMqaMxQb5agSQvufnrIYwj688LYuRIZeLpTJJRFC+
+eBVWbkcHWhG1Bb5JmfU39GvWYzKaaUxMkz1IEndkQL44Ufn9Nmtvl8wZfeOyrIc2
+Ey6RJkOn3NXRlgepnK81uvhaT04Zt/WTW37q9uz5mWxSeqSZTgrZAS7wh2tHhJ6F
+45QOlPFHm1gqRC36RbAw+LqbTvgjpDZwwXOM81q1SRQWwuQftnXOQ4qIFLArv3Vo
+H2Op0E7nK3nJtvv4LcuL
+=4AHO
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index d961d9cedf01..77344c741801 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -5,4 +5,7 @@
 	<use>
 		<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">stalonetray</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sw-notify-send/Manifest b/x11-misc/sw-notify-send/Manifest
index 81c221f32ec1..591e686eb7ec 100644
--- a/x11-misc/sw-notify-send/Manifest
+++ b/x11-misc/sw-notify-send/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST sw-notify-send-0.1.1.tar.bz2 54661 SHA256 b178554b2359ccad72aefff3c986356b96a541602d08b819565dd8d91ca3e4d4
 DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
@@ -7,23 +7,23 @@ EBUILD sw-notify-send-0.1.1.ebuild 942 SHA256 4518bdf15cdf04b1b1fde41e0a9b25f422
 EBUILD sw-notify-send-1.2.1.ebuild 847 SHA256 e3f0edaf9a26416eebca21087fedf1940597b57c89a58fd175404a878a6c2554 SHA512 6a5956b11587b8a8a60254236e68f98d26cc18996bcf2ba7c7ea36eac0d3cf0202c3ddac5aa378f060670b9a956bbb6aae3c4774dd0ad65670ea1a5bb35367de WHIRLPOOL 118c942840a9f2913382fdc75be72e711e8c2fb1fba6705b96a71080823b632c82c7d011c1a060215834b6e5920b8eb18aff397db671525c8164cc0e69777e03
 EBUILD sw-notify-send-9999.ebuild 1091 SHA256 554bbf1247ae890196de1a3969515fbaf4255c85ebe877eedb4f1af1b69b9d32 SHA512 6c3bf0e5c816087c88cbcb84ac5985f302fccb6f6684a54ecdf9361f0bac3a2ca705cea8ced52cd3b8d69808e4cb392b24b869471deb6e71d5fe6eb47a75fe95 WHIRLPOOL c3366851991001b6092e049a683b5d23e3689e812031148811e2e2ae08cbed8ef92a6b03e8c72bd25174647e8c1549ffc95a71ebe555a9795a955a2442bd1cc7
 MISC ChangeLog 2228 SHA256 fd612400d22f6f2304729bc7f59652942d329dce01576dab8eef37fa964edcbd SHA512 63655bdf6641cde88fc68b20ae2ca483769ea9f78bd99eb478233817d5eac2478128ab3b425e0f35b208d8ae14dbcde2a0e11ff93946d559beb25b3b67bff780 WHIRLPOOL b8c3cfd82068d8523d3fa2f416740b401aee6f92514bb5b7c94ff698f2fa7771b08a6ec70ba632c9f331248458f79c776cad5ecb11b49e460a77adf240339a2b
-MISC metadata.xml 446 SHA256 67aa370dc5abd99c8ec781c66239f6678c7d94dcd217968254a9963c9be80820 SHA512 55f8d094df59065c90068f37054ede7db52a8df48b324c085954d56320ba1384d0815997e3c62567f514300c08c7b2509c7c153e69115f6080a8753b3e0e8027 WHIRLPOOL d71ac05b5efe6e7e014daae7f8d596520c24b0ba3c223361e1f28d6d7e47ece7a8479559136f5a664f229508f5685f70bcf27a1529a968a05963944971dd9d00
+MISC metadata.xml 511 SHA256 6df0be859fa57ceaa3fc90ec894fa25e9bc6d8055bf372901258b83ac05faa75 SHA512 cd857afeefeeca3a2934e6a0e25c607a3ae8c259bfec0cfd643d277df50e905c2acada07cbd9425d50d4a21e30023b6b55e905131952772908011d00b5b1a903 WHIRLPOOL 99dc96868661e71a17fb2fc2c3afae5da27af436be32cd36682c6a64f1a7a4698b01f459b066c779ff42399781524d107ce4df39dfddc6b081d378c3e4792c14
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTuU3/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO1+UQANzLoo6eK5V0ZuHHUh/eL1jt
-fuc9LgT4DVRPammGm7pjKCHVKhT+O8hQBCsr7JVWEqg6w4VM5mZuG3yposPiowCC
-1FPmjitNYSO2YxwX7A70Ky8ypVcYBYJpBnuIABsF2aaSjvOGIhCk1euIBw4ZLQeW
-8Fx+SeGmlXmsyJlQDEVFO193gmbSB8NuVQsqVx1WrueddLRrp0/xfYhEURoc9qLA
-dHcYN6FwR6kSwXWvANTysydOu+eyR5R+3qAFf8vrSjksSUT5T2thGS9EDkLQYeym
-y9T0yYe6YWOrkPC/+e8s1rTBft/dE/58/Qbu1J8FufswjZTOxAL5540YeGN+J/4a
-Hvkj6vPmsSNekewONxJ89AVu1ip9FJKo0sZqiZvFyNKhC8sQUx/pB+NL74tA5FrD
-jnzw/5JRIWiS9eV3vFVcr11DkLvzHZDMUsa3+vRdw0Hdp8yFh4kJjoDLtinSRyEw
-XXJtHawRj8CIc3yKH5/s/w6NpKGLLM+8k660VBFJchoIOOdjmutrl+c7ZJDhQ0Iw
-frAikbkyW5Y4FYNlusto8fZ8nWTyFX7UVPyNOFpuBLLaRnkcKwqOvAXaTzq12mgj
-E6Virx02uWOpV5giV/yzEU83SHoIMs7VCWMhAIPJeLQhIc3RDraM4unrIslNbBoB
-98O99CshMNuSLOyucWPq
-=24Qj
+iQJ8BAEBCgBmBQJVf8FtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmixfsQAIOL3g9L9bjQFL+vUhT+L0wS
+V+nWgPkw04Dj/vYTt7TFUAtvhq4xwR8KXOrFR7IvKP+Fro8hqRZ6z/e4wpb1nrUf
+1KRr0m4Dz/hBUcywqlHVsTOWLKzuoKklmFjxrQ+4YOGbdagbSLiygg2ZObzdBfr/
+KEW+7b7kjE+UbdGShsVAgE3w9ETDAAYpK47dwCO3jWX33+LKqYWmr207E7jonPoG
+F/2wkHl61aGC8Crl3nX+4GoLN/gXjEgGbNjJFmPkw5htAM0kDpQ/QH3jRqONNCBU
+BSucH+ToURO7OLt9mtof4n3vVnhG9Ub8HNDwGxKIFOzwcyvkWX0i1ZM7Dye5A6Mj
+Df2Htr39wYPSVplPxsWendX3nAIh0EubjgWPzIH5NKahowwQmljX+2cm9gU6ap9p
+eT3bnzW5v4WW+K9yUFmgC+WQWaMHq/ceqZBcK+nRegKMgl0BLh3ogoYJNDI78RvW
+rBCkK9GlufCLvvkeg2kZKhu4ZmXKKjGU208b5IBUAW80PW3IKPOoNtJMgp6s0cfZ
+XLjVF7WSyUIIIMH6qExacCCxWRD7ZbA7GwJ7QwaGVe4HAW1WWpUo/7vfjH7r50gg
+u/WkWWHZXw3fVcq7X/5+5LsPb1pTueDXAFBtuSoLgpBIXfTaom/y4gk90u13fJyG
+XhllLfzbPsnyYW7Ek5qn
+=SzxO
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml
index ffbaa73c6e13..feaa57e4dc77 100644
--- a/x11-misc/sw-notify-send/metadata.xml
+++ b/x11-misc/sw-notify-send/metadata.xml
@@ -11,5 +11,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/tinynotify-send/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/tinynotify-send</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sxhkd/Manifest b/x11-misc/sxhkd/Manifest
index 31ff9f5ffc29..4aacd33e742c 100644
--- a/x11-misc/sxhkd/Manifest
+++ b/x11-misc/sxhkd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX sxhkd-0.5.3-flags.patch 531 SHA256 31eeccffb6f211ace3634cd39ddc43dd10f2c4a1d8d192d79153ab9ed74f1b9b SHA512 f9d628b1e0f6d488e667d96926917fba94a15f350086fe7e8182d45d3362ceead83476ff2005c89d38700a0f54ce2b39dab721e2681235bb6b03275c8438647a WHIRLPOOL 0d3e29f8eb10666332c733cd27e40f60651dec3c8b3ad472e2e995b80caca7d9b1322d7179b307e1b64287a90c9f434bb2f6a9c3c1d9b79bfd2d38bed4c96d03
 DIST sxhkd-0.5.3.tar.gz 34128 SHA256 4f794ecccc03d2ecfc2fef074a09195d16ec7343c514acacf71ffa770ca4a977 SHA512 d573117abae5ca1b2643d6405ed032f75b9b67bb15bbdfc6f25e2fa69df81a5b75c7ae15d835dacc6e972cb8594ccf300fd0881a153302b12eb04c3437cf795b WHIRLPOOL 3e3c2d6f846a3ac6ea3e202bf7d279a76038b120358f141170d0c1e3d7e1950f38472ed87f474c01292f9002c3c5bc02070b7117f15dc919536732ee8fb4d9cf
@@ -9,15 +9,23 @@ EBUILD sxhkd-0.5.3.ebuild 797 SHA256 5cd6dd1708b9eb7f1c52157fdcf1c0d697464d81b59
 EBUILD sxhkd-0.5.4.ebuild 804 SHA256 4eb9354de8bc20c5b234ab752a67763bb7e75319db5cff3790d57b365c43894b SHA512 79bbb1819d235d2047b31443d030983913473466e5bc3de6d50d84318c0366f858abb0dbea9097f69d83ecb9fd69998ff59300b55200d8dbd8a0238e0c71832c WHIRLPOOL 61d0e78d3ce738e60a30fbd0564e5a447fce05913b81debb3634030c7cbdfb65cf5d046882494ddf03f3c8a9ebee65abfb66e911086c8f88d6d671732e44ff35
 EBUILD sxhkd-0.5.5.ebuild 804 SHA256 79c4a21fa1a2f62098900daf85e0a04d4404e0081c170e39dc16a7148d6ce68b SHA512 5980c7ec5db4e941e1947f7b6a89eb00a0011ec53d1ff3c6721946ace38a44cc3bcfea92c45c08115c2dcd7627bfad15c79f6277d1ca2450ce707d7c23bd6e30 WHIRLPOOL f2f2ef6c2ce244ab51bfbd10b64d5ed071ff6309cbbbfd540bd866a00a049ba33325ed0006aa9f9cb091ac32e66f9ca3d739d4d8308f5f96ef76352cd311c4c6
 MISC ChangeLog 763 SHA256 80823a08db9753f5b22d715f204cb23c5b0cb92a5f875e9fe96a4b6927dbcb59 SHA512 e63cffe16e3dcf10aa1998256d899aa0e7b25361f6cda2825b85700202eb62e61fc6083a9b51de5cf28907d67d96aa056fa2bcf9a5f7cbbcf08d0ebc928a2156 WHIRLPOOL 45342195367aa08c339f49b33461fbd623ed372c78d31d7be2431e9092870de87715e9497688f43161670decd165bfc92cdfb7f91472b4eebb805c1b396c45b1
-MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+MISC metadata.xml 314 SHA256 0f04350e33961e9f50b55ee89b9a476b94657d5a2d3e4bc1c92c5c694ede1ebf SHA512 fc80ac37098ac791ad75fe5124430528b168bee7c436a01f63fa8e17c1e91ede3fbdfb4bfb9a0b80f3c0fddb6a7ae819e6dc95fd329fc0113e9929804bd4d57f WHIRLPOOL 91039f5d3bf15f600bbbe794a6ca4dfde87a6b6647b10f564c3e8bb4b080f11757b74ace3c3e518498dabe9e41e39d1b3c5b0f12714d485e10ed42760cf58fca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVB3jQAAoJEEqz6FtPBkyjQ5kH/3NB0Zv6zHs4iR5iCRiqGqqx
-HRvcYWidbAqBXbs9eQUcLwVvJE6YTs2IVRKEbvb1gUXwyNLWHHtxjeOhPnHc/iDL
-G5HBb0je+IbKRuxDQtcRynC85tcofsWOPzENGti7n02GHcC7INYf3UILADqgckXQ
-VCggno+mH4a/uh8mmOmdkZomyT7ZaJqNGEWZibRDiPOZ+O49CG0zvs4Abq7RoOvp
-DvE8dZbS4bmAy1KvwfENI1fYiAnx9Ju5/KnP1s8jD8RyornA4c/bRhCxohYg9Xyu
-7sD5Uq2Pb2kiq8bv+j86W3t8JXz+Sg1TIB3kFR/E5VXgNhds7Vdju4m06+PN8FA=
-=w9uq
+iQJ8BAEBCgBmBQJVf8F0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL44P/jmlKLl0qDacHEXg4h9YwtGW
+K0zMbPfUMjZppKaAPx/AYEspQ+PehHk50Aj3kx1nv97kgpri8JyEtOVh+93/UQpn
+vtZhC1xhoes5wsJDnkCq8GKdwcgVPNWOeCyTa+APRa92CJQT2LiZgH0UjzihBSvm
+atBkuUi2AOhtBgfT/mvaP9QTK4wJIz/svnF7Wa4zN9YHUIDNh8wthNMmLtoup0sn
+5vFWl8troB1UYFzLKntL+O40ISXIz76waNNjRh3JEj9fIcHAv73BRSglxaS/89us
+Lybzw6fOKL/fovqzmYN598jVRxCO0v4MBeoNC/MxgG05ivFefgCRpabvaKCCjMxy
+NwUJkV0hf7bMjqZQVyGWFdE+kNydZ/D/E3vmjBgSs2x2NfVsETFRD15325bsMhCS
+Q4W2OWBf1QmRd0wDDJ+946eaCV2x9jB5wnWLjiYcDcJhoUbn9V5LGMud7GLsZ1Tb
+/IYKiRtv99cgRzdfixTF46vWMZEA5iFa0fOyHZ5LrxVfMXMiPjJyvdZTfQnkVu2/
+uuUoC2QlOcZWqqm3U5VRBYWl6Hj8haJ2u1HJ9vRivbvi7ltu1rOpaXbupBG4g8c+
+4NYtqW+JjbXyE32ZrKPJS8t5YKGuIMKAYs6BheMpzOnrU67lrB6XhZARgzelTJ/a
+dEwEOxRXaJI5/z9L89EU
+=pLCy
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sxhkd/metadata.xml b/x11-misc/sxhkd/metadata.xml
index efa5eb0078f3..f7b524e66dcf 100644
--- a/x11-misc/sxhkd/metadata.xml
+++ b/x11-misc/sxhkd/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">baskerville/sxhkd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 9b5601a69deb..09f6eb220503 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX synergy-1.4.16_p1969-pthread.patch 350 SHA256 b25728a13742beffb5b1526740eb2f41ecfe6605d972c20fe22209b061a5819e SHA512 c0ab4dca5cb0ae1963c20fd72b10dc958142ca7881ec48caffd4172cb89f47bb69bde1a1e61566abb61f8b953b7fd77930c4fd3092b65c13d3d04ce8be9fd91a WHIRLPOOL a2ef3514c3f58d65af0f5be1431cf4c19e478e801b3a2da8d2f67c741ce14997103734ac24af6235f1b3746bfd7a54524a0f2d3d2ec07769b28bd18ed8a01bda
 AUX synergy-1.4.17_p2055-CSocketMultiplexer.patch 427 SHA256 1fa78e418e8c16a3fee03351cfaddc00417cfbfb69d517664c5c99551c9ac9a5 SHA512 10917823af9113def5967721aedd637326f7e432231c1bc68a4c1795916fadf8daf2e06b436e0073da6c461d38fa00e444332462e7c95f84a97f1ea7d54bac31 WHIRLPOOL a310af036438365ef01ff404b41496fc881e70bf2ff019d8e5608a87d5f0fc516a07f08950d560a6d954b2d12db8ddc0d3c4ed67421472fac527cbfd3899e8c4
@@ -12,11 +12,23 @@ DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0d
 EBUILD synergy-1.6.3.ebuild 2542 SHA256 3effdf681d5410c11ecb6322db9c28e8e9812632562adeb9a30caf8d29cb3d2b SHA512 5eb211c7b9c127b37c042f35c9f605785773fb19df5d36e3875587686c631346ec0b17ec47035c1680998ad7ea2390bc540d54a7cbfecf74d63ddcdf3a9269ec WHIRLPOOL 06fddbaf5ca4c1f1bdcd73342097487d471e92b1664a3753e5e5922691c920c7a6c37a36a3bef429a6125efa55187be61e636bec8b2ecb85dc7b7b5dd3a4547c
 EBUILD synergy-1.7.3.ebuild 2534 SHA256 b1fa21ef70f5ae83631d3ccb9cc5ed8f5e11b2b0b7ef75ab6016be5bda0f38f6 SHA512 4e83ec7a5faef5d1e72244ca46a5f6239c1a90fcca5951ee4f0c87c8031b9b042267a9eb6a377ae0826fd8c0e3fe0156561880aaf0af1d2297da3c6da80e21af WHIRLPOOL 008f833004afe11f7156e1e44b2036d219e6abf86dfba61bad8384fcdd565acc723ef66ea3a6119c232b87fe4de0ab5c9e73a6ff638ea0230c2b715e7c6d293f
 MISC ChangeLog 18869 SHA256 caf5fe851c88bb36d54ce05d7a590c1760fd497d7360c6b34b0f6abe743af822 SHA512 df3af020e364df58d84c0d136b29296de91be3c9e52b389c131ee5a19c527738a0c423ccef6419a77a94a68868ac220e9c02adc90b2c33230fd03249e3e150a8 WHIRLPOOL 2c1f8a6f67bb28f2547ce4ef19e06dce62ec895bfb1c5e323cb83b0d5ea295d32c889a4e54114ae6af78c0ee20e2a514a1fa0b42ed597b6a182db5498f805455
-MISC metadata.xml 243 SHA256 16d6a09278140777930f22eeaf42238d2a5168e539c14f8fd7b1b2be1132539c SHA512 86dc9a5aecb9dfdabe223750574bb8469e4dd4fb89e3ea5b2a683de1f68c5829460c60d16d8a748c17f2b6daf3561d054aa5283f6a37c52a8a60fba6ebbfce14 WHIRLPOOL 9e7beb2b0a4715dcd6a1d9d22c0ce9f82b9871dabdb2693dc4f11589bb0a1aa807855fdfda2d415b0807f5e31c3e4ced43e97e2c761c967452e5bc1e52e81df5
+MISC metadata.xml 298 SHA256 873f5716fb000c4dce698500905c86fb210e3dd25d53d0cbe83c8ee2e2ee9f2b SHA512 c12313187b34831d7b493a9d3fb1138a9650fce2dc328cd9e597076c1270828797ed701cf0e6819f1a23765af0cc3f7d6dde69cab10fb89c7a51f65f5c520382 WHIRLPOOL 07d8288acc5c36c2a5898f7d20b0c19c1d76a5beb3e29b87f0613b65ffd2690866ba7920a9e9749cb758ed48018851db48a3d5d425197d5813ddd6daa0daa4e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVtOLIACgkQVWmRsqeSphPPwACfdstni+PFmu+Dfn3k0MYRN8n8
-bM8An3NNrcFTcDGUgXGFe8HxXjIEZ0IB
-=VITI
+iQJ8BAEBCgBmBQJVf8GDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWFYP/iO51AeDoRSwCgyYmpaVixpY
+D/PY3vXXxNyxpSBXAmIo7fswCKGp0EyyXj0UlECOf5Lzd4KcCssUdjTDrdkMwJqD
+NkIM42N3c3FXSjtrq9+rd9fiYyuKUxuOmylnoi8pBlfqoz4xNl6OkWFnLGd5iTfM
+KvA6iM24FQ/1R0lApvsoy4fQPMLRIsYWxL3SB24N4arn/Z4NX7f2uivmPJ4vZhKS
+waXrJC8oPIodSvxIwfm5sei75EM1tmuIu7arJLT155wdv18nmpkENQhkf6VmyanC
+IhsJ6iBSz/o2ht3SZjrI8AMHuT5cxRAhhtWkKdAQhgjjeDtfTpbduL3FIQk8oGd0
++QFmwvu/3qhx9M2GAiuFa76CPu43RecMgLTJ9q9BThL5fY/KZwfWPxa+efbZICO+
+qnTivIJvKFa/pgvSF7ci6aed6NWwCkdhdHhjRrXA+5qmlUhGrTXcPnZcpYU05F67
+mzZUjajuskmohXF4BlvUJiJju01U8axPKrqYpveUxXoV4FBA1PF0pUfF5I904PwS
+GbwZBQZzmBf4ibqoPocmuEFX7NEFTRzH89PbZLVNWgsVkBVrRScmAKvBkHxBvzEw
+d0OMV8NjZGBskd4fjDrKhn5pPsYU/rhSYEpj284Vd7F6yfQje+WjzWK/Bi6iad2z
+y2q27Tpz5d0FW+plx8BA
+=Bynw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml
index fd27d9f90310..e3df9aad5ab5 100644
--- a/x11-misc/synergy/metadata.xml
+++ b/x11-misc/synergy/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>desktop-misc</herd>
 	<upstream>
 		<remote-id type="google-code">synergy</remote-id>
+		<remote-id type="github">synergy/synergy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/tinymount/Manifest b/x11-misc/tinymount/Manifest
index 0070e5b0a3e3..dc37a3d4b83c 100644
--- a/x11-misc/tinymount/Manifest
+++ b/x11-misc/tinymount/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX tinymount-0.2.6-libnotify.patch 365 SHA256 299f235bf9e763f3c64c7cd26bc1b678605bef16c18b0f8ca509b2571d0f2452 SHA512 cea5382db0bd40f0ef92ff3c44944f067e35511d710391a8513dbc9c0868caad0e8d950ff56019d47f23acea49fa1848ed3df7fe72b896d3c5a9a0f80bc77ca1 WHIRLPOOL a8b9a88d40006e1dbb00e7671b706bee49005f4e0a16ec78df1555319200ea02d0f4187057462f0c4ce9cd577db7bff437f4fa07be5795321dab457c5378badb
 DIST tinymount-0.2.8.tar.gz 28176 SHA256 c3aae8e77d32818cbb52a186924bfd0b22fdf45e6e5c73bff56ea478c45fe9ba SHA512 22a958938ce4b4d34d6edd037594945e91d37499264d7907c79c220bd38243b9e4e7b422b00cacc0af991fac9e7d9022d932042df7a65ef9339f351e9b94c758 WHIRLPOOL bbe0e3a5e7b8b595b0c870e0c68fb99bd2852ada2c5f246d5e3efca7689c57765e6f1f1bb1f524ef6367aa26a3b48c4f3468966f21f7808ba108ce28e3d4cac0
 EBUILD tinymount-0.2.8.ebuild 1367 SHA256 992165c12c358dc5396f7fbb0d288ab9e850097d12b3d8d43d566a4b58d91733 SHA512 fcbdd5ad6df05f3bf604564ab8c39f1912bad956c3d68fa02764507667166068458bb64809b9c75996090af009c62d7fbd626f3fc87ae51561c62ee7584f016e WHIRLPOOL 1a9b4d316b2f092b569586ab89836202cba1e85d150d0d851bbd38148b189877ecb77a7ae1ec5fec240a53df8cb345610d6d00afcde0cdb338e0c0fb5203b3c3
 MISC ChangeLog 1637 SHA256 b653d8cf9ef898a441810968f869fec5ea8e8ebb6eb8e1bde37385c69d637f97 SHA512 f3f35eb25e36606ca91f9705ba0a702c2f68732d60e0cf4f4931486a564f83b7a66f6591868c084b25be83b2dd4f93dfd21a3a22083035af4bd455a65853f83f WHIRLPOOL f6eb9a844332d09150b3cea3487fecaecce52a42b9be686d9c791b5cd7396b1054302ed2504e39bcdf5c2e0c5ee5691d5b7f7c2249fb41b4ab16dc6961db790a
-MISC metadata.xml 484 SHA256 3d572a6b36c0939fb8741c059c5bb814b471f29b077d5b118fcfab2d210177a6 SHA512 2f856a3e074f2b5e47e3e49e1cbe6e0ffe87471d486568170999e6682f6a59a687b90a8b5c6b531693c2e2830df7455c5a9af10f896f277c83422a7790fb47f0 WHIRLPOOL 36a732e70f4d86a5366a1b7c42487b8be6c9b14720f9c1e4e8eca0991e68913ce083fabe67dda2400461e8054c19010282acd40452351afed0caccdb6bb7d8ca
+MISC metadata.xml 571 SHA256 21c7f94c46d3047354a64beb0e24cd9a91dc2f34eb0b15f0025e15921bb30c22 SHA512 d62396d210d0af5fe15c86468855286507529310c72f755fbdae3a9905860b7cb30b74d282f8aaceae6f47f30f8946b7d5841928a4fd843aadfbb44677d8d4e9 WHIRLPOOL e97f40cf677ddeb069c3fedc545964632ef15dbfd5ac0638404e8027519bffc7392db7fca52235927ba1bc43958b6921ea660445a4430d08d5ca476ad84be156
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVcJMcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
-QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9TzwP/i0kVVe5G69BA0J3kZSQp7pV
-vibMy7SIhZVial8eIZuty21ODHEegmxsu+MNW94m7aEDssDP6ieKWJoxSM6DlxsU
-0wQL4dxTSg7WnqRuSSRqV0rHlXC23B8insC1gxu/Jsa4Ofpovr5hgLtfOaY2Sb4z
-3H0Nc1hEWD39VSDiX6MKJCtisbM0JGpQ1v7JhhlnW43l4fb5ivwpqpal4EzNQLPq
-r36pvIGTOI4fDQp/dD+nKpoc+n4m9yZIDTnl7so+9eN901bnjtz4Gc0BgzxZTH7A
-C1WNxOk/cKZWAPn1Rg3XKxjfFFxjVYj7GU2jQRBrqWOz+FErQiBHFBX8iSM2quQX
-WVvhb3O/2SAwd6e1cO2KpSzVT8vlG3fNEJdV71gEH4ziDsEzPSchsVDophjngjNT
-qqio9PgZ1DUWRXA8AnX1/XnmLrUgz2ipBO8Rr5PKF3T2OuH9pm8v59oQDgwsTZ8J
-y0FjbD6DQ5b5HHphn1tbT6+rUoMNJ8YOMDtL9s0nDlJY0E6cZwPVJ9SRBcGHr1hM
-r8MxaOgqp+634Vwm97s3q+qTlgD4ZAv8TPo3GrJFQlR8nW5fyiAwdeeuK4jfdzRs
-3yrX/gzW5Z9BYuy4QggnydTEYwh5lPOAnEHK0W7oj3meUkNVw18VPpSde9RJeYSF
-pbh48IAMXKIzAN+8GcFV
-=opvH
+iQJ8BAEBCgBmBQJVf8GKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/D0P/1m5clhl34lNygaah/1YIvFm
+reoUzFaBUQKOnJ8iLQgcYhN4euJzaCZdx6UfLXzX+loE2ZS5pxj/+2cJ//6C89Pl
+DRRZKzvP6kj9hy7yfQt45z7/ZwkwPVMroidyoL3v6VAiQOVWLpF5cgbRi9l3fwq0
+JlBb7MM9vhxm64x/ebOrio/IzwzfnE3K7CLiDFpUKudX+awE1SXx0DdX6uscLOLY
+InaNAZqRo00KIn0Xp4170njN6pn26mQZRrdrz/VDs2wZwN33mzI92iGL8/JSdprt
+nQmUFdes14XgONxqOIe+Fbp8EAH47+MYvdZHDvuTN9Oxpqr3bFQVrIK4pskVO+kI
+KBmRQ6lerR8so2d0dfkiRNd/e88DxYmjo5zCRv7evzoAiE7jRsZiboEYx0FZgDwZ
+/UGpeCY51i0khFXZgcKbTNlHvoMmn7n/2nY2cpaLRIdY8mbPNSFBPLjsPi+PnRMY
+nO4OI4Lok3dVE1rAZwGSw/MSPBrMj8/CgA8Nqhab01lxfeLllEzxxI2G0OJ+fh/6
+Qa8Ptl94aG/Ioa8vNochWElzApBsvDmiu3wD9oLmi8cbw4pcQRsAlSXoDDTc0iD5
+hT9PLaMGbxWG8jUDRld4CSBerpYJISK8GbRX/MzjPq5eqxNHMgupehVZZ9aO2MCd
+yjZpiU7U4LmL6DyTrR6Z
+=K0NT
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/tinymount/metadata.xml b/x11-misc/tinymount/metadata.xml
index 1fb8c7f138a5..102f7269c2c8 100644
--- a/x11-misc/tinymount/metadata.xml
+++ b/x11-misc/tinymount/metadata.xml
@@ -13,4 +13,7 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">limansky/tinymount</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/tinynotify-send/Manifest b/x11-misc/tinynotify-send/Manifest
index 7d0d7e037801..4a31c4b655f5 100644
--- a/x11-misc/tinynotify-send/Manifest
+++ b/x11-misc/tinynotify-send/Manifest
@@ -1,22 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
 EBUILD tinynotify-send-1.2.1-r1.ebuild 955 SHA256 40b52a0bc795af105aab9dc0d08925abccb5b921e44136703e89c6236c2df788 SHA512 a772330d24115a7877a1eca9c5081186048f558bb7d1a737dd8dbee9cf73ec34f203363cf47f3a947f8110b425708b7966fc386f4f7aac6dc0bf6800fa426bc4 WHIRLPOOL 1ca6e91e2211fb77b71e91cd144c37fd4b1902f78fead14186b441f003174e0c60889475cd0015f5bf75e76c82f9d5a65b4c260cd752a2875fb86a92ab0e7df6
 EBUILD tinynotify-send-9999.ebuild 1139 SHA256 bd947c991d17af6910d73c73c913a27d958825d32bda122738320de93b49b4b4 SHA512 604eb4955438bb4038174d20c76f5f45ca56dfe13f15e7c713620b35358bbf0ef73a216ee6d4d0c81f040ffc68d5bbb3bfe9cb75563d6d6bfca5e52b0f73fee3 WHIRLPOOL 7e8dfd63267dcdc391eef9dacde08261ccf3cc393c5c287dcaa9cdb58e44614bd80019731ccef35fd88267667dfc72274cfd736de9decfed5b0158dff284da01
 MISC ChangeLog 2796 SHA256 dac4badb1425adf460faaece288b602dcaad9dce11818dbcc364c2f19a95865f SHA512 b1b190e1733fcad0b6ca0e08cedc61aa1b174c9534dc2b1680a56a3bdfb4da251bbafd0cdbfc18dedee2183cd57d2a3edab65d9f9f93be3c2cc495f46eaea6af WHIRLPOOL 0d067bade52b4888b44fcc1b0f92be7ff3f7137f6e914a1ef8140f3d3c66866c6b95ce1b295b2ee6815a5b5c8fc66222120c037906d9370090210cb98caf3a7f
-MISC metadata.xml 446 SHA256 67aa370dc5abd99c8ec781c66239f6678c7d94dcd217968254a9963c9be80820 SHA512 55f8d094df59065c90068f37054ede7db52a8df48b324c085954d56320ba1384d0815997e3c62567f514300c08c7b2509c7c153e69115f6080a8753b3e0e8027 WHIRLPOOL d71ac05b5efe6e7e014daae7f8d596520c24b0ba3c223361e1f28d6d7e47ece7a8479559136f5a664f229508f5685f70bcf27a1529a968a05963944971dd9d00
+MISC metadata.xml 511 SHA256 6df0be859fa57ceaa3fc90ec894fa25e9bc6d8055bf372901258b83ac05faa75 SHA512 cd857afeefeeca3a2934e6a0e25c607a3ae8c259bfec0cfd643d277df50e905c2acada07cbd9425d50d4a21e30023b6b55e905131952772908011d00b5b1a903 WHIRLPOOL 99dc96868661e71a17fb2fc2c3afae5da27af436be32cd36682c6a64f1a7a4698b01f459b066c779ff42399781524d107ce4df39dfddc6b081d378c3e4792c14
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGwM1AAoJEJQzkH1pP7W4/aQL+wT0Fxy/LWZe541/lDxiQ7jk
-RaCi3aCwA2osHP5wVl9YU/9N9wvl535c2XztOgjs/DKNaJQkl8u8CwI1ii65flzP
-NXEzFW7mXBltsiT3eIhkY20nQjWWI30HmwH+AH7b2Ue9QmhWKF+q0z2Etw1mGqCQ
-57qnhemOnlo0hPWCOmNlbnXY/L525AZL0C8WaC/nsQ5imWu9ku6WiA6/D6/ZWF4x
-gJXFPLxYv4iUMBNT1Y+PfNU8g7JqgKezbaANDA73NxJr9aAovsHRgTS/mVZAt9tw
-vztm4OFk3ehYDwaKXeOwm/ebq6nyYb59Hc5LygZM0bgatCvDaP4+5VxqHhoLZsOn
-JndGYh0fFrKhfuTdEwRLUymDIcEGPYDF5teerCGpbFCsizQrw+39MeANj2L6R8oU
-TcioZg7CsPm19hEZ64ltbgIf0RV/E/iifckldk9Ic73GBi7K9IDSk7hXW/Dd6Utt
-r+i3DIJm7DP3T1NSvYUmykDAA9nArawYFonbMimsvQ==
-=Hksi
+iQJ8BAEBCgBmBQJVf8GSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibzgP/Rax7ubcih/Wwi/coyhgPR/h
+7tfLilkAbxRdXClhOM9IxEnEaO2W8sYP83SPnXW+ccYKu46nMn5h/iwwhCtu8VN/
+ru3Ehxd4kc3Lg9rc2AOD7gdWeLFCGiwBDHcDqBt9HzaC31pvJDS23rOZQKa9lrxO
+SJuvFU0ugsccx0HhxZHA5jglBqogRWZznDNWnwzhE2vG7wEqYjtuG9Ua1MZ7moEL
+Q9AnZoK8Ib12I2cLTnaBThQAR+7dDGz/lK7MxN58fdlz9m/wMgiz6ERUm+c+5un7
+dEW2jZ96+J7C0lnpSxUVQGrS7KAjEXzQYuXdFDvk9C1KOFiSk+msX+erkDO2OwJU
+vaiApQ7kPAnNKx9A/TDNWhnwtCJdaHt1clmLAkIGaI2zoJxtt8nZtObM0bx+iWsD
+L5twtThv1juD9UqIZ0Xuj7PpLF5eYA2+AIM39knjCrylB4Alo+Q/PwkyYEYGfB4T
+MfMWvElBOaAs1z/AUChacp4UeVvr03WwCuuPko9m/gZqDknqGjt7Qn1UbJjEVNUE
+YBLieiC4f1pZ9RFn0BSETGiHI0/mLTNwAYp1ND0vhri1iVe4LTOypBkOjNjvGmhf
+c8/TQK5QdvZi9eu7I934LWAYUVC7g/GwQRYjCxwY7zkWRvNBpE3GUv79wRbzBz8a
+9oTmn2bnMmPon8IN65Xx
+=WiEo
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/tinynotify-send/metadata.xml b/x11-misc/tinynotify-send/metadata.xml
index ffbaa73c6e13..feaa57e4dc77 100644
--- a/x11-misc/tinynotify-send/metadata.xml
+++ b/x11-misc/tinynotify-send/metadata.xml
@@ -11,5 +11,6 @@
 			<name>Michał Górny</name>
 		</maintainer>
 		<bugs-to>https://bitbucket.org/mgorny/tinynotify-send/issues/</bugs-to>
+		<remote-id type="bitbucket">mgorny/tinynotify-send</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index 168395b2546f..de608c94d990 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST trayer-srg-1.1.5.tar.gz 27322 SHA256 98804500188c0bb99c7389ebea4b2e4dfffa2f3d06dc97e633b4934cf7c29757 SHA512 143277849c19f0caf8fcfb7c0e49f6caa1aec35e12a52cc9a92bdab0f64a9112334d998eb107e587755212d4421ff303582052206ac916b35f1e06e3e1d23277 WHIRLPOOL 37be63aa199a3c9271a7dbcc18c7b6639e81c746e9ba8cd772eb3f229723fad254c2d457ff6120278401124d98f0934857c2fb46fff5872518edc20d8af5fe19
 DIST trayer-srg-1.1.6.tar.gz 27576 SHA256 70acdf466e03a69715f8b90296ecbb14c5e8594f64a94d4b1ad1f5ba6b146a2e SHA512 456af94277dc237c516fff1589060b0b656040811ae48bba3c021be6310d104881c0eee7391d228d197db78e9bfb04773d4282ab2fe31717a4779b38bdb6739d WHIRLPOOL 6dc5394db31d73e6f8e28b4a86f0262108f946e2f0b111af3bd7c774cc84ea0b90e0eb0ba869c24b1dcdf477280dfaed10cf2c598ba5d075c372a28736434574
 EBUILD trayer-srg-1.1.5.ebuild 803 SHA256 2a58e56117e5f82a409a47aa588a9793d8568fdf612bf4d4471e93d7dc99fcc9 SHA512 6e2b41cd0006f90b658085da2b2ed9e84ce49f133e3757c3d0b3d993ab6e5a655eb5863212b316807914aa80b5aba63011f204234d2e3e9c4d6f5ca336ceaad3 WHIRLPOOL 3b2cdd3c0023134c67556ef1047c234049c69001e5fb81ad39a9645602d32ef277d78dd15a38faadd3549c0c7760e0ad6d9fd6253795936c16864a5ad7cf4cb7
 EBUILD trayer-srg-1.1.6.ebuild 800 SHA256 2d8afb2de86d16ba7e52c07321a85b29dde159b251db794693dfde465c4d447a SHA512 7eeabce83ca72f2c80aec675b1918f098234347c0e7022ac3be86302b0d271b865d41e6e131f76dedad209ea238b8b131b4d8a6cc4bc92ef8b0ea407c30abeec WHIRLPOOL 5d0abed721272ec04b179f97c577926ebabf4cb1edba952364cbb29e33d819a934deeb534221276b49a2c92102b7b07a53ee1d9db4b55c1f4dfde94cc0021a97
 MISC ChangeLog 1639 SHA256 faacaf76e530bb1bf59ca5ea05b14fe4b5dbc5b2ad1270ae2fcb84049013f89f SHA512 7b285fa9ab56038915d3ef23bc4c57c24c0d6c5552a391b3f3b019a16e9c1774171b236317fe3dde2068aae1e137ccb2b717419f0c8550da527ada3c02df5a41 WHIRLPOOL da25c6a1d27287942d297412ac370d6d014e9dcaa76e349b78a6562fd4e8c8e7a6a81d508c019fc1ca32c00b282c5b3048cf53799e7c9b56f43f2507cc914091
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+MISC metadata.xml 311 SHA256 c77aeec34fd197d60f1c3d3ca790e1c23903a1ee044b7b8ef0af5d7d9da45833 SHA512 1529d8660431b1c9f2e4f08adef14fa4289c0ac40b6247db758086b7a9449146f728dc310347f2ff4babafc187a5d477be9fb0ba1966ca29a590589f75d9a3b4 WHIRLPOOL d736116a8171ee9e688377eb71da316ab951ef9d99286bb4974570e6e51d0f6ca477afef8dba37acc7138b72a48cc5692d31e2c2bcbb463836f0dd9b5b4f85a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iL4EAREIAGYFAlPZaFlfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky
-N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JCLFQD/ReNMxIutuczh42evdcuTHQlx
-GJrXqBTU/mbxSA6uXyUA/3UflrSoIbUia1ELw883V4ssXUiz2soXSXdueWvf6wEc
-=9AuO
+iQJ8BAEBCgBmBQJVf8GaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTWgP/3s+nLxd/Nmu4G9XH54d6F+I
+sEkinaflK8MV4NivkF4ZrguEGpjbGedp3AJXyZg7fYxQONsKoDxbNAmUwPgQeI80
+r3T0b9QQ9ng0gGAyXfO2FfbVPc0wJay/JmW/3SJlQxEHj1b+sUpeeGU5dnY/41ed
+3hVcBfocuo5jeZ3bz4/7GUVMSBQYyiJAZ286/Y4aQ7NitpUmCKpyITeqx0US4u42
+gpgTWtnug2ztRUnHrciEjn6hR82CYfwykgEcc3gu82fqrSS8B7WufO0ICX5oGH73
+yNCuBqetb6ZgRRGoP3Z33gJ643m/TjF2u/uyAWhXhb/8VRVFjwSd/lrOpY2QDVZ3
+na0scOWRGOH5XzJXabquv2H6NRnRlYRwa3c1B3oAYQgsm6keCgTMVxz2qzg+F/E/
+aNo6B/UNI1kzv4FiVy00pJ9Ry9TqtnvWb1x+cIZnRC5MdvCRK19DGZtuxI+NPhNq
+jpqmXhw2LD2F+zyKlKXDvHZu6Cz1fIbtU2Yu+kYWH2PYTKptR9uemlMiNyVi+8VK
+MLs+QuUXTjeoWFH1i2x5AsxiEVOWFtMQqF1RZOPFxfGWJFG5TqVPR5s0pf8cX+eK
+1GKIVRKoUhL6ToEp0jgA3NKKGSar0p0PRSt7dWJYWz3AXYupNzW3KF4Kvxzd9A+r
+IhpbXpDsF7TYt3vbPrSy
+=0imP
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
index 59acc2cc580e..6616aa14aecc 100644
--- a/x11-misc/trayer-srg/metadata.xml
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sargon/trayer-srg</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-misc/treeline/Manifest b/x11-misc/treeline/Manifest
index d8293379e055..5043cea1f89f 100644
--- a/x11-misc/treeline/Manifest
+++ b/x11-misc/treeline/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX treeline-1.2.3-nocompile.patch 532 SHA256 8ffb81cc52a4192defa340c0f77c01806291d0feb66a81c71b9e4ed9a24cd1ab SHA512 26e792d6657f190e13267b1ecf5a7f0c51b7702531444cedc4b90471b3b673e840e93578c4c0dd84e3d0d9981281c8ba1bb023829441843b18799f2df3a06e64 WHIRLPOOL 9fc67555a888210af848c119dc99470053be0d2291e7bf25a30d63a77e2f8f8725d86719f7ae7cd4ba8b6dc84b8750301b47bfcf63830025bc32cdafd8707570
 DIST treeline-1.4.1.tar.gz 499500 SHA256 d66e0fcae9bcb5e54f664381f6af73f360f9ff46c91787a126c7197fbe685489 SHA512 85e87d4201eca19fb4255eacef89b7975f982a32790e74b5a35ab37e42e316eb45a1518f093097141dc5db1a8a090537f42e35fddf3f51b3ae4cf4c812f9ea95 WHIRLPOOL 7f97e943d86f6f94fd32dbb2836ed9a5f1cd38c777322962b7809705f48886ad4988c3739907020976ee0aa798d5b9b76302d05fb753f642fa839cd556175312
@@ -8,23 +8,23 @@ DIST treeline-i18n-1.4.1a.tar.gz 279797 SHA256 891f086b0718336911ef118a4e25772c6
 EBUILD treeline-1.4.1-r1.ebuild 1429 SHA256 56cdb0af6d6aa68c92ff1d8a4e93c18a7f342b76f49091a84935098366c8eb53 SHA512 d3f151893a2e6315946a6f37fa308ca7065b4a410aaae931611a5906b4ac69d7857e590fda6f29e49295c3e5ccd0f0c3e4dd3141204c9bc3e1c99ca3d8b1cf64 WHIRLPOOL 35db1a78a9dcb5deb08e1ce76d93f95c3205e1a9cef3d184c06b9351e14c51e0020b69cbae7132a586eb79ea864403854a630f49e8d85ef2ed6c5cf1b2c0757a
 EBUILD treeline-1.9.4.ebuild 910 SHA256 a0f49c018479f9564a55ade8a35973ba520729ea0cde59a071b74035b787b64f SHA512 feb4af148b884e21705cf34d8a791dab95cf953e7aab0fc24aeff90c0a73f5fd611bfb0961eefa085f4dd2a62e04cab2389e422760e802280cda7a3eab9027fb WHIRLPOOL 3f40b091399a39ef2e2a84048c35286c2d2819847c83d7b4b7429c29bc261b75d8bfd7e9add08928120a45d097814e87a6c606b58aa429b42ceb6b918104031e
 MISC ChangeLog 8845 SHA256 8fb243720181d765bdd1ccac566751ec7254f77d26cb2d82b136f2786e47cc8c SHA512 76628fe3345fd70e488feca183d7ce895a13a87fd1d5012f2f22e8c376bf6570933ad1b6dda6ba4c4d0aa6b1ff9839f7da814966bfa4d6056f2371fed3efda63 WHIRLPOOL 32302f64456bafa05588dce559b3119ca64555465b1380cfaa1e84b310fd7e44ec27d58af0717703e7e6c91d664d49af83ac1c389aa15ffa568cc884c98697eb
-MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
+MISC metadata.xml 244 SHA256 91e1c3ab498cc7bca0cc6e3fc097ebc7ec2d3fbaea8c34b2ef8bc8d7b2fd495d SHA512 74938eaaf85ab36808a484d6d8c645abb1a7dfa88d446a0a01f7d2585f48d520c60c225bb95486554d416457a4479379abce0a106feb2ca0dc51f76b99a47197 WHIRLPOOL b90af1c720f837052119823e2ecba82939d1c4f1faa66f0ac0adac856fc753c3adb9a88eed380ec125d9340a9937ae20ab7fe0d4a64ec089b682119122ae7ef0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWUEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxOgQAMWQIM4K7u+pgyiYRrUt01uh
-IKPVhIorgKf4mP59uZ67pcflICB88/lyWM0v0og9mXWEtFvHPnnTIq5kl6SXCAlS
-UYCoAhl8dAbF6Qy909kikUFGc9G95jGe66PodX9oNXgAUB7n5EHBPsMTWppYLq5N
-idtrSRmUAPz7sMrOC9WAv6sF5tTzbiqqGoDDIgRO/0Oy4AWFFEKKoV2lgRBsIwRA
-GpdIyyIoZkbeZGQPdC52xoO9ftyjVATwju941SMjxek+oY3ffdl4YSwgCsiPwYHZ
-47zhh3AS3IiVgLaYVQahuAw+BDLrdX3GZYlcrjqMPo2dyy9XBznsQ81s/YqkmX8c
-LBg4pyyhm74WjOZ3GC/TbWlNXpChfE8OON34cOXwi6R9v8RANHrRNJ5P49e4wHrQ
-UXFClifwIn6LrTs+tNQS8c6osSx7pLMLnL3bqILzjnmkMgmqIIw9bsRUK4xZ1zNp
-Rl7nt7tWrdSnb0Ijnn2Ml7Clii1FFSYw9R56W5H97kH+2jP7pktk9ltOPkpHoDZL
-PKYVSx21lCpwh9n3Mgz9fqDgyo5fcbvnQotl0p2Vh2/n6t2ZU2KY0BDdmr0EVoti
-WcCeGAesjR+R3TtqtLCFFWb/hh4gravsh72ZBa7OTk+bzy//pQy84ylUOLuw0oB9
-FfpRn9uSrdRdhXRBlQB4
-=iFQl
+iQJ8BAEBCgBmBQJVf8GkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi20sP/jBQmLjz+IkUVCbJ456/ZKqw
+ST2nbDF6We9ZqBqPoUS7iyQs1wsxmSiD+dM+Jwct66h+RkbmWZU7ZtphcJcPLt5L
+DlvZb9ZLXEKncjZdHKu0gxhd3PDZk4EQtm61RVjBlrrCOgNSSVwmUWHshol2ywBR
+hmbyMDeXTokg6dX4Tc6f0xiNNpQFKgZv2+bxfcXlrOms+NyWUO4v86noJ2Q+OPVJ
+Y6Qe6/50NWo4eBSPzKCrHJvm/Aoea8YFxCQ1w8IEczm5ako2Oh5Uz8RXO7cz8Uzv
+o/crTs1Ou/4NcKa1sTTsI6IR/z6BVeqOye00QdvT9QuNH+lDBCoNsqB4p+ngtHLe
+yHk8f83I9r2XmU1/At9v/CTxZb7m7yp19Jqwj0CUgccjBgrSKkG8dUpIWe/UU4c8
+mUDuTmDk9BHyP6QyVhUrBaZ4vipwdBE4pxHyi3DJXfmncSWqINvY+DRay36t+zb2
+q3PjLNsB+1srOPd3TCdEbtyFLdjkcXNeA5yRZ/y/53boQYIVrRjffD2O6r3pfRtl
+XqGAPg1pv++PMN78IY6cJi8Z2uQvbQzwYVAt/8zyh/UMCjewguzTkrh+GHHJcXDH
+3THtJHOqVjRJSt7zS1W7M+RzU16ncVqkz830S2mZW6xhnEQtjpaujj8obZ24N7oh
+6QOquyWzUGg9G5y6lgfh
+=MGPx
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/treeline/metadata.xml b/x11-misc/treeline/metadata.xml
index 40838bc36783..a3891ce6e178 100644
--- a/x11-misc/treeline/metadata.xml
+++ b/x11-misc/treeline/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>desktop-misc</herd>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">treeline</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/viewglob/Manifest b/x11-misc/viewglob/Manifest
index 5f059387f744..adbbb1baf7e1 100644
--- a/x11-misc/viewglob/Manifest
+++ b/x11-misc/viewglob/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX README.gentoo 550 SHA256 a701eba1b4d39015f3184bd9d0f43318af2ccadbfc3113554fe0853dd646c8d5 SHA512 93a0a08cc7e3c612c78aeed2794ec66141aebe3be974605282e52d3adea48c79fae0a16bc427b2e80a83dc5914f009bb9aa7a241142d4976085c56768332fd0c WHIRLPOOL e3f8c4e561fd039f9c12862fa048bc7edcbfe986173e65570a31bafccc3e80977d2595c3fc6410c4449c5e70da3ff400b2851d16d23775d1dc3a5ebef2882b38
 AUX viewglob-2.0.4-format-security.patch 1112 SHA256 dbc1224c0934b3165cbb18084ad3431599c0ac5094d737295aa8eb25f6961efa SHA512 1273b51c4a4bf67c53630965d641a95d30916026e8307878335bac95cb1982c3d3705954a3caa600eef27b41c8319131fd00ac8fae5fc85707be90409e064945 WHIRLPOOL 590a095798ae88b55b6558c08de005d2ed9378a41fede3fc97cf0635222319196132708d5ea5a96e4dc4a14b21b6a4ad15632b9c9eaaa9cad49dd8d705b70be4
 AUX viewglob-2.0.4-underlinking.patch 5015 SHA256 12fa5f890a386590fe0baf8b3148e10fb666d8bcff67c97d1864e179cf8e637b SHA512 3dacc19e362bf5e69348eff097daf55c25bc4b9d3afe589ad49f28f01394da29f365708a15ce4c662918daefed95cb059b9d45d44b8269118812d5945a2997ee WHIRLPOOL f91bcfd6b4449641dbe337e8e979db667f2b5be335cd9f9f2c0e3563d4dcb46156daf2d71e57cc6d686b4e6ba2556b9fcd62895b1bbfb265bc1a87923ca9bd18
 DIST viewglob-2.0.4.tar.gz 324752 SHA256 69ef6c62de26b2fad82ddff3fcc72e15ddf7eed7047492218f7c6387c0e7c6f4 SHA512 95fb5ef6dc412804cbff6a961ec08bf8e114eefb9ea5430aa1be2f8b2bcbb7e76ab8392e31148d4275debd6f4cada81d1ebfb08a741b8a579f749efdb8f7adb4 WHIRLPOOL e22d237e736283027991a9e2c5bf61bf275b61a34ff3f6b645d46bb69fe2c524f14b07820e03cec526b2268e0ad88c81f9b82b299df253b79d64f1e0ffcb8979
 EBUILD viewglob-2.0.4-r1.ebuild 840 SHA256 a7054d053d8992996f0bd652ab0e68d42a860deda50ad547bc4ade4c9a28feed SHA512 589f4331ae0f4e4269183549ac5862b97c99fe7a2a87a74d1b335393453dd198a72eefa5188b4dd698216533c6521b3fdc0eb51772f69e144b2bb972f10c1aaf WHIRLPOOL a73bfe88dcf835328e701e04c0d680fe7fe896b3da2d164908dfb04f7c46ecabd539108fd5d3a22d09c31d2519aebcabebc9c568b3e70e9b6fed75d04199aaee
 MISC ChangeLog 3216 SHA256 2733c8c4e8839be4dbc9f5c6e9fe0f45fe97c8121796de99901e7e59982e9c8a SHA512 fb5085aa397fc3a0acb13790456091e9a1932af673545d44db283e62ad7946eabbb4ae9c322627aa987241cf83e7a66d44f4fe4aa11e885f49377aa7c14ea2a6 WHIRLPOOL 98a05113e52a090d1da7a16095d8e6bd2ee10ee7f77ccb4ee6521ade776b282f1b6b4d711406e3db0627d4eb31237016efd202b21abbd0c9838a49e31ae12b4c
-MISC metadata.xml 554 SHA256 cc19ed31cb2d3028c527ba525407c0e2fbf99d9bbe30e477f26c9c042cc476ea SHA512 b12396bbea47b2a7a4a1a19023415b56483010a1023e6c03e94d4e143a83376a0cfe872bfb39998272d4d3f4f8544417ae9d846556e53474df9983e9a5602ac3 WHIRLPOOL 1edbe13240a40b2475892cf55eaae41d17d6f5a535c7b1230a8566edc1923592d548b97fa5682d06a9a3664bcc209c366e477106d9ce563b9f8bae9bbea287da
+MISC metadata.xml 636 SHA256 a96f0eccf8a767d644ffa572b62f3ab793490a944faa951b4895a6607903a7a6 SHA512 d65ee498f7a5391eabb052360d07e65e913c3bfa6119ac0a3cfe975c455ee3ca755d1d211c6019265826a77744598a6b1faee4762213ff9497bbdab145c06fe7 WHIRLPOOL e8aaead5868bbf3ed8b396beeef12393d070d3f09b893e8070c84cb2d2d17e84b01d8862549deee13c4b250b2219794d5f5f11b12296aa90d43fed10174c03f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8GvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZVsQAKz0xbJe2eXIrYFdGjakrwVV
+LzL7ujHGfjg3ko2M3fK4fxLM3FcumcgvbA7DHpEFbrapA3dXQzOMwhtiOeLfwzbD
+wPMNjhRfTb2VuOJSd4jwN4Ozwbx2H9Ff5/HJL1ztR0dzltx3q8NZsQDHSM/iiaSO
+DtElioHy9kMYW/WOHvDMHCUff/3D8cvRUZyit6DEU9hfTJs0RA7yX+vEF3nFTeCF
++usKOJZVOWGAE7hT4P2xeaCSSn3EWpQGXv7kO/fd8HCijr4fHwh5GoHI1DauCWjv
+og3BXbyyNb9VxkF7EAY1d+WbJIdbJ6yhZaMMth859fRUwF5SjnJkzObiN/qtaTQl
+TcQ0yq8KUrkiTNmnsLlLsno+DGQak0Hk/pjtjhj/QLEuPq9w/h8MojTLbIdcCBwF
+doaT4oFezCz4Aktj6YWs84A7BHrMDSiekfLpJXktoqzrkJ+UhlEoudCfWTb5k/vI
+HQBV++/y51b6H8ZP9+8bLrEbw6TJaVBQaTcPLal2Bi1Yy2QnZSSgWG3yvuQxlpWD
+UMTCQE0amhecenYBluOOXrq6MK7JaJPU/hHPN/iLT4SHckHUwWENi3rh8I2Vwl2b
+ZEqtMRltl+ihLqVxYDXUJRQ++5/r535NjFKPDxiyY2DCDmIYbX1ZekIUIurwwWpf
+gIH4pD8zEd/kWPc54x+8
+=NxtC
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
index c79f5ca0f480..665f68caaade 100644
--- a/x11-misc/viewglob/metadata.xml
+++ b/x11-misc/viewglob/metadata.xml
@@ -9,4 +9,7 @@
 		tracking shell directory changes. It is compatible with zsh and bash,
 		and helper files and documentation are provided.
 	</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">viewglob</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 73efa26913d6..d197b348b652 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vgl-helper.sh 881 SHA256 438c928840fbfb9274604296b8178e7f97b42a3428d115e1de6e609ea3146497 SHA512 d3940abb0c52957e8ec4ea15829151876384703ee5cff7a4d306d6de28f839ff76a9090a3af2106e7e8442104f3e16c57a8430b36d718490cd2637ecb99d9c8e WHIRLPOOL 19e5dd127ae329c432a54056bf901e5a62bd31ef5a51e2f2747968194a156405f527520d766d6b616c3ba057066fe05bd40faf24f434de2322e617fbf6fccb63
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
@@ -8,18 +8,23 @@ AUX vgl.service 254 SHA256 86fbefb4f77967f7fe7b0ce10915f5d5cf7bac504a9a65dd7f72f
 DIST VirtualGL-2.3.3.tar.gz 2614988 SHA256 857fd5c51c64016a1687cbda62ca5dcdf7073181df86b57be010501b565e5d45 SHA512 7bab5145be338d9bb2f9b4952ee530e84ae195185d55039cf10c89ced049716756f23f4d9c41c82f032c6e6a57bbbaebf023b3e501011bfd5c6aa3d59b22dd8d WHIRLPOOL e903172545c825b8df1dc6678738ac5e7ac2a104ec979668e522f46e2d2f715a3a07cb3cbac57c9e848a6420873f671737b7bed9acf50556a4aea08c4c1355a3
 EBUILD virtualgl-2.3.3.ebuild 2365 SHA256 f00a5562a5fd9a8191ccbdda68a3f353482e135c4ba7e1ad658fc3d3644c8338 SHA512 c6c9c27dc497c584c96c1677e0d8329ac6fe1f49b89614e8fd649ea9d7ee3d06871dd1a4b4505fb359ea8507ab908c0d48372eee262fbc1e166526684a0502b5 WHIRLPOOL cf79bf8404cfce539a4d1866a60f689646c6d639c5525e5703d5dd05ca9a94f9ccdc7e6e5c5c500831b0e6e36a878e901b8eb03638e38a4559f7dc4173cae45a
 MISC ChangeLog 4454 SHA256 98e092684b052f38192459af53ba68094cefca630a3c59fea31827ddce0da4e0 SHA512 5f3441412bd91b4cc28deab424d09f25cddfeb3f1e5d2d55e9f349aa5b738958ffe1fe56a7f3cc41e7a8e70603e55cc94239a850948c37d934aedc0c62c43c4a WHIRLPOOL e88f1ab16d4b1b6456c49c2a0a7390dd8537d0f8cc06667d20585875416475ce46fb0a9c2c8a7f73501af28c65c39f1519ec6ae3ce55e4e9a721cefb25fd251e
-MISC metadata.xml 623 SHA256 316b53ddcecea522ace4b473d03979f84564878170296a7880a1d5474c105a29 SHA512 9904123fcf4f4bae816a0e924ea23f7650696e9b39349e044d4cab398a2c69203544ec8dbd01367b535931e41223b81cdb1d4dc5b80e829b2cde7b58d6c2e25e WHIRLPOOL bcb470a607923f0d79d091d9f7835d232cf15fcb35d4467a43bada39a18f743e0a2b45428f16f7fb8be52a271f075be7e42f477aeae0c5485cb9a23779ae3a97
+MISC metadata.xml 716 SHA256 4e47398a733914e8887fd946870176671df88f406399104b9cc28404e1f18b26 SHA512 5c0f74a7c8e48576ff930339115a1f1c1fc1f25d0e967aa9367330d5162f993024bc374cb3277473ed7a32b7e7d386537f462c67d715560d6957ec7c1588db7f WHIRLPOOL 75d8d12fb3c662f351affc7622b70fbf5a51ecfc26db322a50615dfd8910bc3bcb89c1c3ecbfb340610f603f16829feaecb517fb88a4d6e0697ebca201c2d251
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVfa8+AAoJEJQzkH1pP7W4iXYL/1xT7ZPEm1usQi5wzEx6oXzT
-DDWG/oA8d7tvI9H1ea3YI5rFpK/iHTPgRvS5irg38oMiEtn4h0IQUc+9xSd4MkI+
-Om9vvriCr/iSVBWe5JPY++z+rAHg4cVktQMFgFTDMUR3VJ7Jaw1YwgsNtNhIUTOc
-dkjMPhaEGKKi5xF0+MjO88mnkqtcIBEZ5GdHnX9FU3+Q2nQx6+yTlnvvegSDqaH/
-mMm9ulKgjW6HZT//j3b24RJYLwCNfxsBfxvpZOxFrHpjXR3jT94Mtttay7YPMcM5
-dotmYnkqRcUEnz+Z5XBJSiwS0gNprSJJswwIfgIocIhubAVMb+ZB1Cfj/jpZb6KC
-/eQEmtpZi0snpOYtkraPfzzIKcA4V/7UtC8rEeKqVaib6VVZvcdGiO7IS4r6PwtW
-eQKAkVUMZVQu1lNNp2tc3ifNPZUBqGXvMXZCWjWkJVx1Ho/NVEXpl7nnc3dpns13
-mzjMbrHRFItPh4VxEm2s858a8pkw6TGADHwHqiSuag==
-=8uk6
+iQJ8BAEBCgBmBQJVf8G3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNqQQAJ7LagT3Qng9gQux/t4jH/GW
+dpiy9JIpG1WkAMj8pfW+spZjM6LSpI80ckV6ytv488DTazDHS0jTV6dDusOy/H3v
+0LTk1PnZUY8Gn+vGPz+5SIrH6Wv1quGOa+RmkZyJM2gt4WOO+UJ/ucB2YuI66hxX
+ay/F07zt0cp9sUsbwv24M+Yw0SWwARPYpbL6ktpDGjQbPXuA3FPN5QVQSPQnIIau
+aR4ML1Jqf3cf368z4wpeO90Wdisf8PsJkFpu8aaiHVByoi398Zogdhi2WlCZchiS
+V7qU68Rn+lUrG2mc5Kq8HaMdeFKHCpXlc+jtZB8aNPQJNAxN8rjmloR9O8skgZ/E
+PvytKKzNmKsDoAMUUHdCtysfd7Vmlhkui/k+PexlaXtnnrCk1B7Mf6JofSoMmC0y
+koP5ds81xLc+zZj40WFmL4exVcuXLoN92sHt2O5PqKCm+wEsjJHEzKAScf8f8os6
+YVxflaNybgx5loSwHTOtEiCyKL+iZeP2yP7AfrFx/N6UuLahNN+Pcz0J0eYkmmcL
+sE6SWVfcx2iRtwAq9FDQU+HT0K4pPkfS3A//5wEMhqcoPyzBbnej7iKEQTiV3Tjm
+rwMW3+HO8o05Ii8qEAf4duEr+PZROnof7Cbuk/k+YEn9haGcyPSZMRrY/DgjnOth
+MZAo+VFGYsKiikTS6+kV
+=2vhs
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 1ae68f83e603..82630efb1696 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>pacho@gentoo.org</email>
-	<name>Pacho Ramos</name>
-</maintainer>
-<maintainer>
-	<email>mva@mva.name</email>
-	<name>Vadim A. Misbakh-Soloviov</name>
-</maintainer>
-<maintainer>
-	<email>rei4dan@gmail.com</email>
-	<name>My Th</name>
-</maintainer>
-<longdescription>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>pacho@gentoo.org</email>
+		<name>Pacho Ramos</name>
+	</maintainer>
+	<maintainer>
+		<email>mva@mva.name</email>
+		<name>Vadim A. Misbakh-Soloviov</name>
+	</maintainer>
+	<maintainer>
+		<email>rei4dan@gmail.com</email>
+		<name>My Th</name>
+	</maintainer>
+	<longdescription>
 	An open source package that gives any Unix or Linux remote display software
 	the ability to run OpenGL applications with full 3D hardware acceleration.
 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">virtualgl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index 0d8ce1634abf..8960aa090852 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX vym-2.3.22-arrowobj.patch 406 SHA256 2083f777f6ff77dd9e2701ac2be22eee032f346a260b1449cbb1ed813309b9c0 SHA512 927978444b0aca3ea0fc83eb84cc92a658f62d327259959c0ea3cad80626275015a6ed9817b6505ac20eb66c1fb412b9bc3434a7fb0ddb0bf08a1628612382df WHIRLPOOL ef9055eec18133e44e6a3b9bd3cd1de98b53513aa39347579a5dbb045ebbe8b2e81a3f9e9dddacde6f9bfae5d762e9fb5c7aa90ae5485d42db370f1546e19eb5
 DIST vym-2.3.22.tar.bz2 6737848 SHA256 92bd267fc2aa404e0f0887e780bae422be922c20d8037d743f32b16a4f8a16df SHA512 c6b15da272190e877d519153865e60f967a67cbdd4a0f56519f9c5a330605b97ea822f162ccf9fd57d1a4ec540d46e82c3004fa8e26c31786691b037ecb1c63e WHIRLPOOL e452abb36902e34afbe5b637c769a2bf17a9bb0d940ff72b46d55b19a821b26bce6ebad9bf125edb088a4e3d922a2fa2ab8dc096c378d1bee4efcb133519bb7b
@@ -7,11 +7,23 @@ DIST vym-2.3.24.tar.bz2 6738245 SHA256 b719521b97cd1cf1ab881a46325519bd9c4819153
 EBUILD vym-2.3.22.ebuild 1391 SHA256 abf375aef2af633d60161b8d8d1012d7be75a19eb8d570230cac1fa0ee57bfa6 SHA512 5e4497e08797bd2670fc68d55ef0e2d04be35d903a68bc587c0c6c3fdd0b70e8cbe5aff87752b154f6732eccff430db1a344c5b912f7de8690d857ce50c32d71 WHIRLPOOL a35237df2ac376240563d4b142b69c58deb04bcdbc1ec8c6305308754ecff21c98b1adeb84905c0d44933daf111ef424262e013881ef20f4e87e8e8d3c1a8d58
 EBUILD vym-2.3.24.ebuild 1400 SHA256 a8b901a0c46e2da08038250ca7006a9e16d3fcbd4d342a46ffbaecfb2a3d22c7 SHA512 8818447c04b9f097dda9cf199aee68c0abf4222d6b336fdd02719204667753bd8f0b4b8a5ac4272001efc9b77eaf5b081465bf8bbb8f647445bb218c0c9ff255 WHIRLPOOL 695f15555599df0a73c2c383633f82c7d7675104daa0d871c4ebf0e7cde75810641b06a607eb5c32edf7a7d5bfba0c53371defe95ee5b0cc55a4366c4318fa8b
 MISC ChangeLog 5487 SHA256 71e5e01218941f0b6fb1a74fc6d2e7f44b0d5817227f67a9be871aac01551e93 SHA512 92094f183ed1d43ec736eb219b2475c8dabd0760e81e2aec75319ba3592ca0c4a15b9a2c7a91187a8dc963d2fed21f01a92ed3a1b88074b6ae57dd898642b405 WHIRLPOOL 2fdc6657e3838402aa14d66078b659930d3165e5544cb86af4145aee43e872da834f57713f873cf289170be5d99121ca6632f75efe3039dfb568732159c614ab
-MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
+MISC metadata.xml 239 SHA256 2d3160c4ace018cdf4672d6860b7df8ce86912320a3e2fa97977f6c5430dc9ae SHA512 02d4a92c4ee09060895a1556f2dcb5f0db215709abee3a6d90f457345b5f294d8969c216788490366b4b323f933b1336bb1e84fb30a981480c5ba435109f3d03 WHIRLPOOL 3527757ac5bcca0c1ec8e8b16dbc4d175f43b7ce18d18f4f381ab3409e8a0fce0d3bbafe137a43eb4af649d43802da3260a3187023ae8a7ee470f85d4391b1af
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPh8QwACgkQVWmRsqeSphPt1gCcCGFouWe9rz6MaR6j3ldZ+uUX
-qP4AnRZ6ZI2Wg59BPAmChxj3R3MJla65
-=SmEX
+iQJ8BAEBCgBmBQJVf8G/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3RMQAJjSl8nlFmjjKoROa8UiRIcm
+QRniLC7Z0rGqDJVC2P+j/QUXFwh86TSzKieXuHRWMBUn2mS9t/lsIHJ6OYMbQPup
+y1A3VLhm2yoNMFL2lMH4mcCe8hVKnN31qcb1tbJUQ4mfPaoRskkGuDLzjdJTzbrZ
+9PLJyqyFO7w1DbYDAam0aY2rDwnGIU+7cC1ffciKNcNNIb4DKw6N/8HzqQ3ziyWu
+bS1ECRkX3Fp+PXdfysGRTnC3ZdQcUnRgc+7sX/sneZwnwkP4UcJcGxEa1CoQzEL8
+tTSds4b4Sgh1NDfF4+8eHqIPVJE9Cp53H+BubudqBcVaMbfGTj6ag0NuhRrmkh1D
+b0SObCCXNyHWbHfjDlUylYTsowouV85MVvQNMHUWx365GwuXSfIs2kes0kMIfCoW
+AlDJcUOGYZXwDswiPQRzKUZhqJILIHNuAvfeQUs4uBKVQYXxgW/rjyWydnkj73Jf
+Yti78H2zoR8UQcYl2dX88g27HbkuMz6XkSSA6VKXrAhtFgGmsCCIFUtWayVMVFCU
+eh3cOu45SCdmRQRzaWEvVPe6BHTscKWRK/XeuHHygJ4MhWGAtUrKnQa7FXJaP8HA
+5pl9pWa8VpVcnID1jhdZz9q/r5/HpineqD3KjWi/tknKQZMzLwaTMkx3JjEvBg9i
+uQadYyw9os2zaerzBmk1
+=e+3s
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml
index 40838bc36783..33d6f84ad262 100644
--- a/x11-misc/vym/metadata.xml
+++ b/x11-misc/vym/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>desktop-misc</herd>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">vym</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest
index 2716421dab45..d9de4157b971 100644
--- a/x11-misc/wmakerconf/Manifest
+++ b/x11-misc/wmakerconf/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wmakerconf-2.12-wmaker-0.95_support.patch 3548 SHA256 26fe9da8c84437730bb0166077449e677843b9cd287929d25b3fd97b7ca38926 SHA512 be084d96f35ef6c94a1994abb75b5b71a68ffbc6e3ba9b122b380b632d42da743c94951618094ce42305f87ff238a0c667c76859a320229992c4e0316fcbc79a WHIRLPOOL bd6843c3d758b0af7fce5641b17c5a7d67294269bf1996e143fd3ee3f0a8f15acd1452eae6cb03370b6b0c7a4c5ddb191360fc2dffdb9b5e806a4a93c932a12b
 DIST wmakerconf_2.12.tar.gz 830156 SHA256 debfc3b2a26fd4bd2dab4a06155b786e1b36e64145012410eb0de730a79a9bb3
 EBUILD wmakerconf-2.12-r1.ebuild 1434 SHA256 5f8f8ea722a1503e77a619975e8bc5909347ef305483ba46e90dc59b1a34409b SHA512 f61f2f75b0136a52e6e980895ff6a9e2ad3c0d4225ae88f8d8ac44a3eb1e20f35304b134c8b3886bafb02363e81bd4f48361c6ff1cb058f847d1d3ed0421cd6a WHIRLPOOL fc5e16a105bef57d80ee8bbe5673a0eb54abc7be36abc4bbf81e9acc6bbedc889fbfe40f1085b59ff870e65415190083cc52de815a755f82899c6d7365ef2d97
 EBUILD wmakerconf-2.12.ebuild 1187 SHA256 6ccc08229bbff4b0a269e12848de090b33fd1ca5102c3b6db026451fff108ca1 SHA512 7b8f0d0ede9b237fcc453d9fab82b5b4e55c0ba3574a9bebb4cd6e36cbeec03a745da65eeca66295f515d8552dad8f3a44654af41b3c47836107bdc8b3238f51 WHIRLPOOL 04766fe4dd939aa12822216d7bd74bb3469f64f32a35fd5dc26796fc9e70c4fb75e6cb3fafd7a8a313e716d3e382d961ff0d9e09fc9b114e0dd12b536333fe56
 MISC ChangeLog 5550 SHA256 92247e80043752f49a76cc8df05c9dc5a20e7da7bbc6f9225750083774915c84 SHA512 373b5c21e97b48b2e2efb93d9be6fae6df25babe3561a89b8cf95e667277e090e44a90356b90a7c1115686d9aca6cd7db2399fb33cf4dcc997d08158636989f8 WHIRLPOOL 15c9e9903ec73a6753b6fc746c7da181eb48dd2c9bcc2bf4da516d0e6ae017afb237e7c7b1180cd812baec86bda5135ffae3c6a3aa7a63670ab0a2a634ca2184
-MISC metadata.xml 160 SHA256 264f651f5dc3c8c2d37605e94abe49e6b29b7aed9131e82b473f27e12d67ebe7 SHA512 7682db6fd62665192588134a231e87e320686690766714f443ac5abd68d7d851b084839143795591d141762607c8f3de92be7314373996e948e25f27bfd3f955 WHIRLPOOL 551ba2e6d1bf4062130872585cfbd311fd569d006526ab528f40397d6cd3820b5cb3406ab27ee63ee19b532784d4d386f50d41d7c1c79f285a593a7dba6fca85
+MISC metadata.xml 241 SHA256 388e62c61155643c73fd69ea752584b28a48d087976e74d4285fc9e00c8bd8cd SHA512 dbbc05f0deff3da20a166f754d3dc1a6ec0daf58ce6a147180583496c1a6b463903f86dcdc82b3dd40a5f6355ffcdf8357bfee7fc516cdc29f1301cc2d74b5c7 WHIRLPOOL 6c4cffcee3603120dc827c00ec549c2a4b6e151473011148c827f337bebe81eb800b59ae81467af2e7a3255d82bfb6840f6c72e87c8765d754240a5a66b1770d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0FgACgkQcaHudmEf86qPewCeO8UYPEpSNkaMHGhED6P6Aof8
-Zg8AnAiuEOrUjbIEEuFPJdINIIqUtZnY
-=NLkP
+iQJ8BAEBCgBmBQJVf8HLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmieSwP/2OTA0JdrEKrzX1KplIDbVev
+JrwrIw9/voKv4pGyjsVrrf2C//+qS13iarhg8luKGJW3GoR6BEa88sA0AeYul3TA
+s9IajT5kCbaTO/apheQHVf7cKkVxK4n1WvPdpbPkcjgigJRi2qTpl+ZX4rmVg99Q
+kQIy+VHJx/bt9UntC+5DsNBJWgul8KQRvGXDkB6yK4gLbwiwQs5xZEK1AhASCr2t
+YU9eUxVkPqAoVb5XpYExS4GN1YABsd1nwpi86yMGzF63WmfLKj2Uy5ZWU+20DY/a
+WhYoOf+Cm7tNMxn95DWy8FWuEbQPdKRD19pw+I7Ztoc2+zpEsOdQCw+8lUEpeNml
+FABL0BZM4FiascuL/msbFVbfukmzCfquzzfV7xBpgG/78EwhKPTMFtOyaBU6BJd0
+4gdT1LPRzECdu1gwhSBw5kkYmQY4b58fxZ4dAvsEbA+71LCTE36YyCdRec89IeqC
+5F7oY1fhnfg4fKqLdMfnnBrfa5GA2dHkJJIejTrCVtqaB1FzBUjZHTPMeMQap/z/
+mzMBUrIWRE9fhARr4QE0CSGaR56aLeHDqD2tK2e1ofEGQU+sLLWBkkzhWIxppQ55
+X7jmbNM6In8FLHxlo3vrkR6i37NFIr3B0MCjhTRoDr1t7fYiEsRI5dy8rSOcUw38
+0TVKwYrJRZUkuDlNVxzu
+=WD9V
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
index 16a214bf7003..1f7c89842d5d 100644
--- a/x11-misc/wmakerconf/metadata.xml
+++ b/x11-misc/wmakerconf/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>gnustep</herd>
+	<herd>gnustep</herd>
+	<upstream>
+		<remote-id type="sourceforge">wmakerconf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/x11vnc/Manifest b/x11-misc/x11vnc/Manifest
index 63beff8feee2..c44f6e6429ff 100644
--- a/x11-misc/x11vnc/Manifest
+++ b/x11-misc/x11vnc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX x11vnc-0.9.13-shm-cleanup.patch 1262 SHA256 2e69b15f9d3a466181cef7ef0e5963449d4fdc473c9933d4349ddf37a6ae3521 SHA512 fe63d11e1f81861438b9d6469cbe6545c5351a5791f8d2ac4367fb540ade1e53e51cad8369316f95bd27db47d11b8e925bedf9941128133398d2bedbb61d2946 WHIRLPOOL 35467350663485c803287da7c467652bd096b88434ae2cefaa9a9af4683531a9a2102687e48a95c3f2285758140e78461036273eb2f686718fc6486e691338ed
 AUX x11vnc-0.9.13-warnings.patch 1363 SHA256 4db7b0b699e009362eaef6be222041cc333541273cf47db52dc71e521a0c4ffe SHA512 42de5aaa3f5f67f3f7f0b8af693811d6070bb05270a3b41e88705c09e436e37beb343433d5a4cd2d6922f2eb7e67c1584de1278b0ed0f92b3d01f2f233050ab1 WHIRLPOOL 408f7e7f887703aae39c9ffff70cdb7334cbb9d410d80d9b36c9cdfbef0aeaca8ff1dc1d53fb7c1f53c37cb90959b3e8815d5dc077eadf66deea5bb799ff8de7
@@ -9,11 +9,23 @@ EBUILD x11vnc-0.9.13-r1.ebuild 2102 SHA256 8014ee0fcf38aade53a65b15b59eafcc87765
 EBUILD x11vnc-0.9.13.ebuild 2047 SHA256 82a2e0167e43ab2947fa8314e7165f93475b8b27fa4b9b50c4f2fbf0a9ed9a63 SHA512 8445604f172f4650118d3514f619529eed39576fc1fc4393b118025c1eff98b56ec55718de76f445c4b5ac32915291ae4ea7171bf4e7871d1131d8a06116d9ae WHIRLPOOL 6c1381128ee558b796ac512b1d284e2480e5d84e929a856e9984fb2f98a965d23f2aed22743b93f47b1d06e68ce109c743831bd1b6893373b65fd02fd5ba8cf0
 EBUILD x11vnc-0.9.13_p20150111.ebuild 1523 SHA256 7ebb0f2bcfe10d50af66cb7662b1490d5ca3ddf6b0812cce37839f6a0d86e0aa SHA512 f1763f5465c4f17d45a0709de194677cc38908baa7f18a75497a605b59c29c513961a6c173c6ac2a5ff88880416bd05894e746183ec4bf1658ca7a829f138797 WHIRLPOOL 3ffab4880fdb94a745984b1a87ce90e8d589d5f81ba7ffedd2b5fbce4dcb95d75660dbc6274c4ac537e47d47a7ecf2c07b042f4e7da9f390a2f495cf0f01a002
 MISC ChangeLog 16419 SHA256 387ef900e814e2c3a22f8916ce16f2affcef898fa791092cd4f5afd4cadb0258 SHA512 fd0d3c13ab797cfbd38a0e2373532e582572d95efb6909cf3a6d69fbebb4bc8d86ef80ef3a464b912246a972e87e14788ab74f76b6c7f33be0ba1a5cc98417fe WHIRLPOOL 883344999966fdff227ed7eae039c11b2c7eccdaaf303321b701e80680373a758b6a7167323f5f29ec75dfe6d8e61c3886124f125fbde4bb0ecdbc09794cd5eb
-MISC metadata.xml 705 SHA256 fac045cd46b98cd7457218dde42e78fb61cbce342a6e08b9eabc862594da4f80 SHA512 9e2d5e5e2ead1464be5495d2380bb9aab20570e97d13db7225bf06b08144260db6f0ac3f4541ab18aa484405a961ebeff2a329027da02d72206a41f318f964bb WHIRLPOOL a0bafc9ff691d9dc2e31aeeb2707fdc9944b351e69d7a6b901017996f813a6896ebc47eb37621a9f63edcc74b4b6264611edb2321d28d3b2828d605637d40f70
+MISC metadata.xml 787 SHA256 64ad995b0b6204b341fc98ea1653e64672ffb3f809f355c2859a02bee6867945 SHA512 3a4e1c0cfb53204c14f6b7da7e577640dcb78515cb08be0f67de9768e8ca3243c7fcd22a1794a8d93a7c407e8bb120c3331e567f5a0839fdff61176540e86706 WHIRLPOOL 0137d373d8faffa0d58e381ff6668137d0125063c9a61acfe3494cb60321667cddd0a94434b7d5a1f88f5fee54df1b09b3d0e8d20540fe82a7b6a9c88ddfd0ad
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVeBawACgkQkKaRLQcq0GKgHQCcDNAxvn2Jb8wQ8ykthtxe62Hu
-C1wAnjB+PoazFTTugVK3OFIOq5MDorlf
-=ueah
+iQJ8BAEBCgBmBQJVf8HaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyjkP/ArkkEepftm3zo71KlEEhr7v
+LgPZCFgHdvRwJ05+YyRAIHq+KZfXtFR4xJ/vq7HJXhfjyR6vVpn9JJ5+GlBhXLDj
+53RGrNYdtMNfLyCrhhnUjV2xP6jYd4frQJ0aJ4d0CV6K0+Y5Sc58CBZqQkAkxn69
+7BFDZLt5EvvybvZaMJ6qb8DKjYcaAznz2OhsSy3BxGJkR8aaMRHMpd9VyOCCUjL8
+9gFQQWCB3Tc2yOD96CsMBoPFoMgScZ64HW5Xn4UBzoqI2HgLk7huY2jB9C5vTsR5
+LGJFykhf6SpKVe7gco8cFSuckBNmSsjsLsL7fNG8XvQVVf1p3u9Oe36h4lOsKFTh
+L5oHHDlzxA7NxPTTDAFvv392Osf5TVfWy6XBbzVn1smiBgafY4huEW36b0TgZQeM
+Jf4OuDxM1vBkJFQvb087tO/CIgkARkePsowzBEEY9d16+FiUFYQoAM2SZoCZUb1p
+fbKdvVqZFXpZorNjaSj7H9nU6m0XQmIs5t6EZ3DEvCJ226pwvkqSD/AhnCgJmSzC
+mnHO1+RC7zgquNA4ylbv0EHQiX53Y0B4QryshGO8IDon0DNh43w0UKo3FIvVgEmH
+z5PXtFbSzRj7958n83eJPEI5sl3e/87Xwyiy6ntkTP40o/giGsXdDHNuSHEk25o6
+TcEwISKG975R3b91p6m9
+=zaag
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index 4f5a2761f329..65577dd2b8e6 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -17,4 +17,7 @@
 			libvncserver (experimental)</flag>
 		<flag name="tk">Support the simple tcl/tk -gui option</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">libvncserver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest
index 5749a246f000..e8800ec40a3a 100644
--- a/x11-misc/xaos/Manifest
+++ b/x11-misc/xaos/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xaos-3.4-include.patch 216 SHA256 5af6025bab16b6da5619d83aa7ef58688625bcb2ed5b1e1d22832c534675c078 SHA512 d3ce4cc8a792ca22e63043d89a427cf46be2dd7e3427aefd364dacb7e721782ed8aefa7eee338fb658d5a2f13704eafbcd03e18ae589186d1c1718ff808337c3 WHIRLPOOL 23061985dcbbd32927c9a142a6ab25a8e644c6b371ecc3bcc54cae9416983ab07933a0d91ffb616ab82cfb7277b25ee5a476c60a48b21676f802faee4db3b6af
 AUX xaos-3.4-png.patch 328 SHA256 4e20fe771648e8fdbfacc3525dfa3341f05b93deacea790c23bb27a7a8d4c3f2 SHA512 90ab707e2a6ad6fec1467afe7ed0f6cb44e5ac965eece94642966010b871fb7b7ef71745485869c7a94c4ddd73b176284a3b6a66866e9539f1dfe9b1934ef26b WHIRLPOOL c590951fddd88d330b9a4a80ba915647e171c77a04c2cda984037b751c6c21e7fec9172787707479ed34d8fd863f1adc70ed4984e35332a558048654ded3885b
@@ -14,11 +14,23 @@ DIST xaos.png.tar 10240 SHA256 23806369fa304bf58439f39d9c672fe7f2b4293b3b1bfcccf
 EBUILD xaos-3.5-r1.ebuild 1919 SHA256 dcfec61a45e8daece1698d839f5eca37d72f85fd8f74bdb77ffa7966e5d9f9e2 SHA512 a194bd2d79e5b4da5389caccdbccf91056254d01a444020e90a558c4e72cb30ab8f6dedbb1b7982e1c627102925bff7ea298a9c5393f2cac245458fae0de1155 WHIRLPOOL 99ce5d4b995e2916386f7ba30f92a01c53b6189e7cfc5cc3ffd32ca929a2bc397a87d54666bc3f699102d43c4443a56af00c6658081c9ef40b98138a49e1ddd5
 EBUILD xaos-3.6.ebuild 2320 SHA256 83d6163d0d27737e07134e27e1e291f30c519a16408c69ba5656417253590658 SHA512 5d473aa9e7d06219078835cebe2c4ff8419ad31a6fa8e37edcb20a8adc804ebffc9368f9079ebb9090f65cb256d7632861d5e67d711f2ad97f28f5c439aa0c92 WHIRLPOOL 180f3a89d0fdf65fe77e2705f0b00ccb8e924f05e2b3fa596e48f9fc82dceb2aa550aece5f4e252c75ae1c779e6cbf5c38da6265e3902fa1ae1a3af9d9c9583b
 MISC ChangeLog 6451 SHA256 733f6fdbe0445f31212eef1e7b6c3b472f167ff4c704b5789168e74ef96eb8dc SHA512 d25350354c4a585cd6703dd56af5e47e2a2ad6b0b8d29acc62de6910463a46ba38c01c6eadad778117e7cb1a039cefb1aa29492d178bc691c23611af511773a4 WHIRLPOOL 0209dab795c62cd48606b07d14ad824247d084ce7e48992d6786480f7b38ce75e39ecc7a2fec232c962c08969a90dc99ef73d29e669f80e2ddec8b3f8f8c81d3
-MISC metadata.xml 583 SHA256 2f0dd73d7c7fc6fd74d7a430ca50e03d390a200346bb9da765fefb8cb901bcf7 SHA512 a278c564c61ba9608f6af4231564a67c215baa61e3b6250e82497b329bd5c509c5ecc85c406547fc2849c241dc736d3e30af563de463b01c0dc9ce7f9b468128 WHIRLPOOL 6da8be5a56048891fe455bb4f69247b940dccf6637bb8b17001398a0fa370d5583ad16e54d4a22a9e3997bcd027e4150bdfca6a5df4ee5f77aad81b426cf565e
+MISC metadata.xml 665 SHA256 618edc217e03bb222a48e33f74fb3d1b3caef4e632599c6a93ce178b86795a12 SHA512 a725efdd9f8b840ac6aefcb64b5cecb6cde11ad4c47f7459d5ef883a030150339c28491353f5f3e73a12993214d72beb6f5430857f30ca586743e1833305bf49 WHIRLPOOL 0fb827c25abaf798a50483001e65863908c56d8c4e7847dcf51a9f64ac99384b05c45019ebf2deb313fd9ffa91b9a4001f58800883842e972980d4179479d923
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlOWAFoACgkQ1ycZbhPLE2BazQCgm8nGwFR3jMSwMl4K17j6XqZK
-QG8AoKgE7BuPBseOw571U+VmPLE49eS9
-=qihy
+iQJ8BAEBCgBmBQJVf8HlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2gMQAKhqGyw+kNs4gRdI0UJBrz7X
+PcB8yGyUCyzatGRarY9J5WghCgz9WAP0QUmnCy+Ft85p7LLqQ8CXIUdtDzsEEiYe
+yMBHuW7Un0xWcFlNtHiQykmxhCAoVFFsvz0HUQf5QD5mj2YORzUdVSiH2Ve2MkQq
+t8LrrpPY0zaCbOJAVBZHPI5ImkMHMCCF7QV8HEsGfELHVM4ZPdiYTMOCYKN66w2C
+jM9KrJzR/4adJlV9KnCTO1mqIok7EmbDFFe0DtpO9/fnCAgn4MonGSevOQV2RRzw
+HpusZIMPX6Kj9b2K8AayT9TWaQFKvxvOyOABQEcljWKjA3cPc2oXClc7BY1c1VEE
+gfB4l/pDuJHRlbHxzaCnrfaf/bFyXrascjIPZTrAp3TSB6fE1GiFc3UjGG94WYjE
+CFOcNdDNJhoEXpb2EBBUXT1LYwASZ6gfRG2lEN1iTvG5ZDzWiTr5gQNcFtGnKQaI
+Q6h0NwVxQOonAa53cj1NNv6vEPQNH0ikPDhzaGteZemXEb4f91T8mKlcgJQ6Jd52
+ZLmBkROGz8d9W1WFOUv2h71OG0JjmYgmGaDSI6sDJZ3/HRfPu2ivDzwkKsbWzCWy
+/kyDH06QKEOo3OyGsPi0lwA34wz9OgiHiMv9mEUm/wILzsuTv2cX7Sbo6hPMuYyO
+o1MfZFSPwppUcWj0W1Mm
+=LY3b
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index 02e05a435d1c..a359aa3b27f9 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   XaoS is a fast, portable real-time interactive fractal zoomer. It
   displays the Mandelbrot set (among other escape time fractals) and
   allows you zoom smoothly into the fractal. Various coloring modes are
@@ -10,4 +10,7 @@
   supports switching between Julia and Mandelbrot fractal types and
   on-the-fly plane switching.
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">xaos</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index c0201fa2b811..c3eaa4a1edb2 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xclip-0.12.tar.gz 63420 SHA256 b7c7fad059ba446df5692d175c2a1d3816e542549661224806db369a0d716c45 SHA512 6c769878004c02d87b9eca2b33dc34edb40acc59be767a6481f207a74d52fca3725a040b0c8deffa1419b687bd73cf3124a090413c06787c0dd137b0ede795e0 WHIRLPOOL 9217c3b278557bf38758619e4895a3ec37a4debdf194dc9ab7073e21f1257edd7fb6796fe32550f6d4900326a6eafadf47932d22d1514fedbb03b2db2d1220e3
 EBUILD xclip-0.12.ebuild 722 SHA256 dd3a7a8c1bdf0f2ba9835732ce7a2a0c0ec612a448bbacc3ea5b4dc0d946317d SHA512 8e5baa3f4b49fc97b681d204cf27ce0c86cce5b727a1806802c7c28aaa8c747933d07df3a559e4ac1c3de138a1abf5eb19034ce036b9d9715ab8f6ff344a9249 WHIRLPOOL 8d2ac0b39508489e074ef00e4b0d529101e8018c3be1a4561bec5f45092e7a8fefc319c8d7bae60c582aec791c5f79b4656ef96fa1ee54a38811d883e3fcd61e
 MISC ChangeLog 5175 SHA256 ccab4d8824fce0d16a137832f0085aadb6e8099a04ecb952bc612060d69ba712 SHA512 c0c6c7611be9b6f6f4f499e91d356846a3d120b19ef1e71e37de04de7a668153fe020a1c86e2676d0cc3acaedca6cf882e5572bb19471c03fb2f1af892eb4a8d WHIRLPOOL 2d140a6da00dd2933a0e64a6b2ec886ebabec43d05df152c56b0f8083a7b7509bb7fa313526866fb0b29de14570217473aabe557f6bc757e4ade68f9ba413aa6
-MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
+MISC metadata.xml 246 SHA256 5147b5632cdb5809eb6da30473becfd20490d23535f936c548ef88cb836782ac SHA512 a6f75d5f54ad00badbb56075f4e3566c31cd677b9850eff2d6d66cd1b2bf3b5209cd9ae047c8d47aab9df93675cf23681c7c01cb9d5e099a241ecab8fe26a688 WHIRLPOOL 0b7607622e2ac1d97b561e5cee98e8f3e15d2f0b29019c44f6e33faa34865ce5348e085db8bedad5025409c7b03eaa4296289eb128809f07928c59b6536511e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJRNHqfAAoJELEHsLL7fEFWhyIQAJvYzHC3jA4l2oKf/fXyTbI3
-A6Vo0xF/799NHgGFsh0wvulD+dFow4n58wRxb94GEZ2OnohxJFKCEXKDOvJreS9E
-P6RwlkvVQorf2+0RYdK7RCruSNocV809jwYy0ffNrnGZG6yqbdCy9cT9hYsnfwZa
-KTvF7hn1+RachGRxocI2V9XXEHXW/tdXmD296RHnWbDK2SKWZn9L00YLnxfDnQzM
-vROQaOpfmFlCiFL0m2Zh8OZmhuhIr/PmkKGma5OAmcgiY3US1O/w+cA9Ni8dhn01
-U6fQeZWAiXaX+SqKo6FyuLOWO/I/1HK2djB2zX4nKUgf322jRjbTMEdsQlgvUvZ/
-tQszduwKRsBjMF9TWJiwLrffUmzRFG76Oq2Ps2VyFQeszM/JfeN2u9Fesf0Pl0yt
-kik5FgIvLOiGQjmHY/r5bwdTQrWxzf90tqqoVVfzvpUQCESs8zCDyf8x3zKB35RR
-swk77og4OQkPVNUhNCqyYTVk1CYTaIDRYWNppmfPdAkHYgw+BFds6f+liXf4Gmjj
-zo0LI9o8yCtDYmny+5dVaK8nQmtb0xh90MbckwpWrK8DIIw3Sp/yLyryIrWVFHm2
-2bQVEMbG8tq4P5pihvvvtGFcbyBt2ucKFjOu7NM5YqyIRCQD8/UXRKId3uMdfhqz
-gev73bNNzUKXA2VpkYVI
-=KAwu
+iQJ8BAEBCgBmBQJVf8HzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6ycQAIkKzOtxtuh/XL1mP0cG8AJY
+iLxOjTYVSPACfK+VZ96YisV0vwQB/BLFAIPPNwkw5UW5V51vhnNK/DGTKqZRHXBB
+IjpT/JS6CXYn/qazcFc++a6BGQgB6wYj+86odIUAQY+qPKIiv6knfcdtKSUuoZjk
+UUcewPa92gkWrI7+ITJCu7g+t9s6kmgVGiTYHN1BPwjkZq6+oQ0JCzzoDHVGqG9c
+7l6pvBRIUkTgcS/xXRxGI6c+KD8Fr0sjH2CaZ2+GwMiC8DtvK3cJ0nQGkpQcFxqh
+0CwVLhxoAr7GMn3mBYtdRdGmZL0lZu8sZv/YE/WP1OLvX68EHqEk/n6OwQsC0JpZ
+UKfs+ueS61zFWBRswph9QNJvxsJsWRmMBSKpGfYIEevHGpgYeXQMsves/j/BwiL3
+nhcAhzIvXjf4910xlCUZuPeeCg4PqvDM3FvW1do/sUsl+032O1L56gnVdyuJ+e+6
+pxNkP+uMK+YtWgxjeWd0o+GI/biTbIPF8u1e2+MAWF4YI5x6PcnoOTd+JLT9Mf+3
+2eOr0eW1QAqenAC7TPN/ONGKalUu9YHUNhzfLOSRI4lYI7Ncnf8kdLRlM5fNlKtw
+bwI9Z/btzk55bntFN2MLLLBS/cgafoXRGA5NifG7DxZDzLtg03bbZouDTgmTxA1w
+HO2P0zFnSOVqTH1guYxa
+=TY8c
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml
index 540f810e069d..52b5463d56b9 100644
--- a/x11-misc/xclip/metadata.xml
+++ b/x11-misc/xclip/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">xclip</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/Manifest b/x11-misc/xdesktopwaves/Manifest
index bc93be980413..7073c5ec6fa7 100644
--- a/x11-misc/xdesktopwaves/Manifest
+++ b/x11-misc/xdesktopwaves/Manifest
@@ -1,6 +1,28 @@
-AUX xdesktopwaves-1.3-gentoo.patch 1166 RMD160 94f20fea97c3786f6b52cf26e835b28439505888 SHA1 70fe3c51c092baac9b8f478fe5277515a420d2b8 SHA256 fda0edda69eb62f3dcd3509af21fa02c83edbb7519e6cf3be0ffdb64f0e0c947
-DIST xdesktopwaves-1.3.tar.gz 49302 RMD160 9f0756ca3cb836ed8f0505ec1214631dbf97ed09 SHA1 96ec1ffcc163526901987c82549683b48cff0f14 SHA256 185a1fe56095610e95580713eec491ad1d93f4c89015ae612f214e1ccee51779
-EBUILD xdesktopwaves-1.3-r1.ebuild 1158 RMD160 dd804fd0360c6b7095c1ab861b8cd3553922f7a0 SHA1 cdeee8001d20aa2b422866d5b46d94275389358c SHA256 6269999b9d6ced168aa973b0c6a950fb390d4cda9a20721de2be7ae4e0f8057a
-EBUILD xdesktopwaves-1.3.ebuild 1054 RMD160 0acb19c81e4d08cc1fc83b6ecf831c8d0b49054a SHA1 dc3c48b768a3fce320d793576d0aef251614666a SHA256 808838dfb097c6ff7916d4705925b442e4343af822785da58025903c8e8c7f61
-MISC ChangeLog 2812 RMD160 4ea1f60160198e5f42072508e244275338b1cba5 SHA1 f51c08a4bf3f76ecdf606162dd9157737bc6020d SHA256 74039889574405e8a607ead25d1c54be67fa92c1fa7c751cd476b74daa2cd767
-MISC metadata.xml 471 RMD160 4e961b33f00947d1d9dd2950a3d48579e32631c4 SHA1 6fba4fa6edd7fa28320b498072f4726df738a6ea SHA256 354d454f50bb1015f8aa79635f7b4d5042d08151d6c367ae636f7c0a6fea46dd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX xdesktopwaves-1.3-gentoo.patch 1166 SHA256 fda0edda69eb62f3dcd3509af21fa02c83edbb7519e6cf3be0ffdb64f0e0c947 SHA512 03543f5244d6c22da32d845546db6ca36cf5f9c59dde9d248ef160d2824556055efb57f4becd84541b16ac82ae1bd661272fc92e8c0ac096deb32764cc849f05 WHIRLPOOL 2e89f0681bc19c871d5602a3751ee94363fec4e88e22d79d07860a7b0246ab0a512d2417f8ce24d274ea111937733e69dccad0f4b46cd1d8c6839cda0864c501
+DIST xdesktopwaves-1.3.tar.gz 49302 SHA256 185a1fe56095610e95580713eec491ad1d93f4c89015ae612f214e1ccee51779
+EBUILD xdesktopwaves-1.3-r1.ebuild 1158 SHA256 6269999b9d6ced168aa973b0c6a950fb390d4cda9a20721de2be7ae4e0f8057a SHA512 0625c6924111a12fb60e82325f2f439a1ffa6c5421dc3176d3e2aba09943f5ca7c638ba7e7c62d7ef071a462031633cd378fa331b7b11fe91b60554e240fb32a WHIRLPOOL 998b22467b7348a06fe646cdee68aefa04803c5b414e7576a7cc72cbb51848a9a16e26711bcaac40319f33898f1115db4b32d7710aaab4fd9fc997f9e403cd00
+EBUILD xdesktopwaves-1.3.ebuild 1054 SHA256 808838dfb097c6ff7916d4705925b442e4343af822785da58025903c8e8c7f61 SHA512 0dac1334dbf7d0d78ed62a309a8f054d0bf507c6b525f0d7b281a52041132757ff0d892b73da78e33264c834f8d808284714b2e90ca5b3423b59aeb51b765a74 WHIRLPOOL d0dbed4b952d85fd39c6665c7e1cadd7f7e9e25e037a38920277836baffdd50a3b7155b228db7fbd1c03064dd8a844ab6a2eddad84215c03aef1d27a0f976295
+MISC ChangeLog 2812 SHA256 74039889574405e8a607ead25d1c54be67fa92c1fa7c751cd476b74daa2cd767 SHA512 e0ae67cd59a947fefa97d680195d7c7f8ed097009c0093f48f08f7a8d0348e8b342179fed5b2924743c2a2f6c46854a6812ed58ae5a8af213170134a3097c7c2 WHIRLPOOL a7b325c262b0bfa0c1a8ff643ae45a508ca211149d17994886652cc53d80ed2a0874bf054517468d77ee4cab0af10bd78da6011b6b61f3fedd814956a0536453
+MISC metadata.xml 554 SHA256 aa06c1dbea17fd5d9560b6e2da4b2ce5ba4284561c34cf7839721c94418d596a SHA512 2eb3a1f71abb75906bd73e98b9a5e45217a149714c22a3f932f939f5b094bc0e7a77e64154d9c8ac29874345359ca0e632ffcbd9c0709e9dc79f562509758e8e WHIRLPOOL b958666e58565e688837ec7081f9520534fbb1b47f8568e20798b70d4ffa6ffbfbdd0ee723fe9311b2c8d7cf1286ff62972b6a3524d26073c0662ca8b76a8ae4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8H8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimygP/jLsSu7yQoR7q7iqJ4bKhJPj
+TXMemIaYXyTJRsmxwto+gDIdPqjfuZq/TMcs4ELHSvOY1/+wx739+kiOp9CdJ7d/
+bKH9z7UEukva3gy4+lJJvEhJTVxQaMzvyThzlDUAvgD6FjMQ6YTvHVUTmPDA5mCh
+2xx37TyJxFUzQPLffKrR7vATLOWdozoWUoW72YI3KrXO+EO2auEwLSujvqxwQTi9
+7ZMH7jvK6gLgo6BlN1cWXfNjZb7IClEpedVD88WeOd8ywz4NFJUaawB9cLLGK2qo
+vsTVpT0XkZOGSqjJTW2RiwQaJ6NSetpax/FoCMCb4He5JUxfEQhqhZyHJRd6B2LO
+3KCW4cfD0RwajbVbyGbvsxi/zzehfBH3BH/IOKsl2cQHeHJ9Lw1qtJAoFMbL/A7U
+SNyTwNRR3u1Jgn3GNsiEntNlQYs47bdfQ69oFmjnzQhc2Xci4r40kQ4t7MB2zwIA
+lcZj3zWTy4nki21cPCFOF/gLnqnoxHVLekF5Doc6hCZbx7liCqZ2fazUK7fhmRCV
+xa9XEU2miWTJiVT0W6VBKKh/iYXx+edPlNW82bVlNiluXGcE3yvKBxh3hkzZZ4Us
+QCeb+rrYkUZkAGiJ6XNIUmhK4LgE8q0p9UHsPPjl/qZP3tU4oPAvKO6aJ6Be86U8
+Kgoiu1VyIdb8GLe63Eac
+=z7RK
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
index fc463f327cd8..e6f7528ea31a 100644
--- a/x11-misc/xdesktopwaves/metadata.xml
+++ b/x11-misc/xdesktopwaves/metadata.xml
@@ -8,4 +8,7 @@
 		sea. Each movement of these ends up in moving water waves. You can even
 		have rain and/or storm stirring up the water.
   </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xdesktopwaves</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdo/Manifest b/x11-misc/xdo/Manifest
index 8c6abbce12bd..4509a5366b81 100644
--- a/x11-misc/xdo/Manifest
+++ b/x11-misc/xdo/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xdo-0.3.tar.gz 6927 SHA256 4845d2d0ba6c55ca657b7fc02483bde26545502ee81e1495ee313dd5bca20e89 SHA512 b900d487f7daba67466ae2a3c318dd64ab2aa2d5f9954af8c93bc30262b23f86972c93e82df56da0801b60be5314e7870df6d7c4252ec00f4705e629d1197d31 WHIRLPOOL bb80a95872f646e97fb377ef50bf3be3f471936b68bc505432fe9d5e0eede0e0c13a04eb86314faadf63c3334af7a3006a88dae55979aca0473379d439eb0f6e
 DIST xdo-0.4.tar.gz 6544 SHA256 0b3ac57c6127799d18d27aa58b21d837b96525c6c6ae2f1433dc6d0a371e74ea SHA512 2299023be0abf5eea7c71c4513b9a7a6175a287ede233110291d2908ab417a389efe31b26c3fb8cc9e0017707b7accfac6785c1e1fe4154dcebceda3a6121cef WHIRLPOOL a5670d514e5f4279e088b2d4e3904d01464ff5864616bdbfc25ff65e1c3a160bc862441e120fbe313ab7ea9e16d7077c4c7edbc3715d6c39dec18c835182b6e6
 EBUILD xdo-0.3.ebuild 772 SHA256 e5046c8ade26426329bec4fd962a5701d454edf8fde02fc6af7a59cb44567d98 SHA512 24e348532f4c625906e5a6d3041793a65b6df6f7840d7f1e59819bc9577c13ef434cb81bb314efcc050bf731fcf0a83756e9609827849d39e660e89e0616bcdb WHIRLPOOL 4d8c1223804f4c91e9c12bb9c28535e0f3b22ba4db0d8675b18ed529d45676db9b5b75b696962d3970cab19c577c9da8c26998b4f31151b2448614c3d4a9a163
 EBUILD xdo-0.4.ebuild 772 SHA256 03ac3eef763ab48d2f1a2614d0f40a0692ef1025dd224c5899c7f70f8a2c111a SHA512 2dc5bdf5b12be22249930b26b0970752fee8604ff5afb4b0f9c1f8c216011904f1411cba838ab5e9e5a52bccdf627057c72a6294b6364f5f0714c27fcf7debf1 WHIRLPOOL 7346129bb86dc32fd0e637de4a5edfae9ddb4bdf23688ae13b0f867f34154a9466bd8a95f08dbda9bdbe53a0bf1c7fa4db8058f5f8979bed7f68f3bdf0296455
 MISC ChangeLog 433 SHA256 78270cc8a107eee7d1cf72b3974320ae465173a7e81e72323193b59378b876de SHA512 cfc8a5d596fcdbd4501453daa38029a7e2876bd1183fbe6d97c3a1038277f70aeb18ca0569973ec64215e9921c097bb3d6225f2b9d0c8568e9f2ee0a5476377a WHIRLPOOL 43b9c68e82d469e9e24c7163fa6c574e3379c3c7f92aae51731047c4e640961df9992b1856101b0d9b2d561065e117de519887afdcd439bed39cc7b672417d4c
-MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+MISC metadata.xml 312 SHA256 4a8815e4c93092c3896968e910592f03f536011138e3fbc1555233f4c70134fa SHA512 fe0a49d8b6946ae1cffdbe1545c7f3da838515a6def2fa57a3373247e1e5a6262b1d6ff2aeeb838aff97721e7018ed00e7aaf07c0f275185a25fede7425ddcbe WHIRLPOOL df476fea4f447eacda9e6a7cc555baef22ee833d33cdfebfb5a99adfd31e28b913e0cf7abf69d93db8b5f5cdc2cfa042866f761810b4a0b5e11808a4af2f3d70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU/IBQAAoJEEqz6FtPBkyjbIIH/jbpZT8zDv7CGZ2gk2khEMoN
-wvYNxuoiYR4B7XazeitO9n/pZojcjEU3Aq8RKmW8juv3mcFPK1u/scpsuS/KzOCi
-z69dV7LAHeWebKVUEdNAcfQO3iNiG7byADXfDrMNTrHgVn7rp53qQDgQ80iFYJvM
-OQFcehizhFWWWIFbBD6wThVLBD7RD5m6I5LyVaIbfw2FuadmjZneEWnioT4ZmS7R
-DBFXSEK5bfNwer1Luy5rvBAQxt7ILSXZhP4+BdFcLj2S9gYcP0rI0Kv/DiV7Sbye
-Mzdv8ZtTpc1DYcu0H18e/ezXfnoL/PQN3ceYBqB9/uVKdy/RnTAz7yvJ7p0PlOk=
-=9xgn
+iQJ8BAEBCgBmBQJVf8IDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6x0P/1Dxl9pjozJvLBraXCXx6Clf
+DxaRhft0NFgmvsyLrZcgx2e6wUYbCv1TjKdKoCojwYNnsq/KaxZub6xqzc7tg5J/
+Dvfw3kjZ9rPzS1J+4meW0d/MWMP7KIDJEpMBfOQIt1BcTM15/Ke2JVrMxfmUJ5IA
+nmojHz3ybrSXnxOmkU3+nik+hVOc5pDP4fhQQpGirpWUwODC+vazqPaLq0WDZKD0
+L0UNdycsMCKnn31MrL+1c57ejzyNIRCLWroXmxmEWTgrDez/niIucfJcvfC81720
+6nsRKyXadVRe6BFyzCM7gkZ2iDnU2H2SR4+DY4xZrqeEmNuYeRgbNHl7xWqyOlqt
+ECc362qsQLE03otjguKfg+1E58SHrq0gRfBiI/q4LJ/c7vN6c5ZYcQTzL+7+sIyO
+9BqwlgAkpIDSjMVqIfafNsQpNBAoQ+HqxINeyQ0nQjkxNFW/eW7u+d3f8MB0SpVD
+EcNNz1p6TSNtu9XPyU0L/qUKts//thOtIJatKspopz6pX5b3OYg4f3rALKEAQHCa
+QIgpe1Hqi1dc25RLzba/3nXasjWg4rCpNzUSiVmVn8YASAmoUHHS09nNMCEhTFQf
+RHWEBgQc3qmJ6LeZ0bQR/eR60s+gzcHDqdaPCAKPLkLl78fJzZ9uE6rPSNV84Z4y
+b4mRIQgVf5qNKERKEbcv
+=dx8q
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xdo/metadata.xml b/x11-misc/xdo/metadata.xml
index efa5eb0078f3..41a378ba7d91 100644
--- a/x11-misc/xdo/metadata.xml
+++ b/x11-misc/xdo/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">baskerville/xdo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xdock/Manifest b/x11-misc/xdock/Manifest
index 1a70c00e9354..5a139674073c 100644
--- a/x11-misc/xdock/Manifest
+++ b/x11-misc/xdock/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xdock-0.2.0-ldconfig.patch 130 SHA256 eb59ec88b81502932dfc24d59b4fe6aa0acce9fa1173add4dc782e8585a37cde SHA512 1dcb07e5aa82cbff4f6728a419587d4f661ef7d89fb63ca89949d89b6bd03554a3cfb0401d6c1eb3dc2ad214aba40235105ae95b49d3bb215ab6062e22a095da WHIRLPOOL edb1df804bdbc777705e2454f8abdafd78be467fa61227a9a2f2943da3459e80512b020a7e7adb1d45f5e04f933ca48f1a318d1a9cdd8e8123f8f2dd949bf9eb
 DIST xdock-0.3.0.tar.gz 345753 SHA256 eaa70e0890cde23d2dd6821ad4825a0b096d2def4a437ad01d2b6bfbf77f3d75 SHA512 72fcfa4ae643a054c2ea1a4a4bc2772cb961dedfbb8d85acfaa997bea574cb6b2df3f88bc6bb9dae3a2a27a7a0136887c79e2508ff2e69998c4c985d34080e88 WHIRLPOOL 77b839b3eca278a6fe602de92c92a54d76c928c2cc17ffe3ee892a98a55d5d4560935b77c9f53a052e94b778cc11e86e4677c92cecf2fc0e4df72785698b98b2
 EBUILD xdock-0.3.0.ebuild 707 SHA256 6a3d78d1285df5b80c100601c34b57d1f78e8bc7938364b7136525bc8db4624c SHA512 e1ec2420a6f67b8a029d676a7a7d7a56e723f30fcf23d4d294e9f95ee526bc50465765aa7a5a2e5c2780a65683baac9524ff6f96c9a40f81743f3a3f4ce568f5 WHIRLPOOL 8749b34d370bb6435a83fdc8720067f65a064c707e6118747d3673f2919fcbf7e347844332ddd4fbd9b76bc3d9142258d1c6d7e98c6de8cfed222bdff9378bf3
 MISC ChangeLog 841 SHA256 12edd3350b5bf31bd59781b8509fff0588ece471c274e4a6af12d00a6f538917 SHA512 7fb38528762587d7eea8bb5137dd4f38c50aab6a0a1de06fcff2eeaa2980c0d1905dd381254b4f8238346d1e6c771ecad6555e28ffd2714ec3102401f23458bd WHIRLPOOL dc8d953f0b24726ac5c0f4acfce9b23f03a17d7d7924939974d64d65443fb6ea80d8e726ad91b38a168c328cee0e03d3be42516b52425396e29089ca6fd4ec35
-MISC metadata.xml 166 SHA256 5dba9ba575613d6cd1d28f1c9819cee44869bebba3cb8a91294bcca1402f5941 SHA512 85f57124de5c89f57dfd2f9c969701908554ebd07f50a084835ae35d91395fe79c6fa002c040546854009e700e7c65e9345fdb3a616978fab14c08939721f616 WHIRLPOOL 203631ae3c7368dbd852a4ae2d6826d6bbc02a3417f816c84c8b16220aafff00a62e5b3bb46d231e4702fbce62b4a172c8db1aac275b6c8975dc669dfc9bd7a9
+MISC metadata.xml 241 SHA256 d5f6550d868eb4bab7bad38a5f27ec267530d2deaa2b2c73ca3b03fbed804232 SHA512 dde4279f13ab63b4679e0dab319453cbd8fe85100dcc9ed5ff90f06cb73e7e79394a6daca4927cb8a731f6072faf0e742a3d67c908078834cc7569a878c60626 WHIRLPOOL bf812287e7e0b5520fe6e82e1fe0de7053538c034d8937f3016d6dcb2b463a03cbf41b631e244308f8dc11f44c19c5374dbf38a294696bc7841d8ce3ab371093
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlIaI+wACgkQVWmRsqeSphNPPwCcCDogemSZNr+qsVHR2jGI/bwv
-vqAAnjwSOuQIRNrrcIXNSfpNwNojIwrI
-=JmEL
+iQJ8BAEBCgBmBQJVf8IKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLS8QAL1Ag2qSJZtqEMBPp8ztwXk0
+prv4cvyr2LjbkUGLDliPcmgwo4730TLJQSy7vprGHv4gBgtcZKUm3u+cdZf3qwnr
+BVQ+rCuxTPqp2vVEpY5eqo2wVc1MVa4c9Scr5BYi0399oXVsnvAdEVTXXyXKb5hP
+RISup7+uqr0XpDj4w8nqVsjYPWsQ8ku7Hmg/26/RbTBXRJvVvTWkUl1C4WQj469L
+rMhhtaSoFziLTDt84ABVOHi9jyUQytOxC6oL62EOlWmAFQ+Yp9se0mdVE1tCDA39
+UK1EPp+kLoqUEkfcwbrruLpIftVulFquYwM6khsWTEnWaTE/TFKlNUHQW81d/15c
+O6jelshzkLHkqGQy7FqONCrGw/s3EknEq+TX2YtBX+4HCrFnLFuAbq7O3WHVCpdy
+1wP40b4G4a3xS/mjrKYp10dwhgEaD5+E28sdWiOH2XjRBmmnux4fuyXxz9IGnxbZ
+vhsK6E69Zop/LEmqe5k60lQNRP1oXQuY9qSpap/BYSA+Kliaj7aPV7Y/dFenimTL
+cC5wG0j0lLCAgjr8m/hrsQGRCYZ9Pn997DpF6MMuF3uRGS7Ufw8WUmF1zB01ku0l
+pN38vWeFbXXgxwiAoGB6GCH9bRbq3CRznG5b731DO0//ez1RRQH36x3NUzeFbjaQ
+Hd0xf86tlxms0M/d3HX+
+=J2J0
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xdock/metadata.xml b/x11-misc/xdock/metadata.xml
index a03f5d8b381b..0e065732328d 100644
--- a/x11-misc/xdock/metadata.xml
+++ b/x11-misc/xdock/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-dock</herd>
+	<upstream>
+		<remote-id type="sourceforge">xdock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 717af25b31c1..d4ed029dec1f 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xfe-1.32.2-missing_Xlib_h.patch 605 SHA256 d622c9ea1abc0c0ced7294238051866cadd01e80761783b74997180d1489cd41 SHA512 58ae2b347b4cc386968df1ed0daeec2aa805835ca7e1548c1dbb94dc8f4950626bc770a3d593444ff6744bf234aba18a491433f0b83c158752f5d845111f6269 WHIRLPOOL d27c5493c5d4ff734bafe8187649d294eb7afc504ff7115e66389fbb0a6c48a2c9b5cbe95e3b7d2c10130696095358bd6fa3b2bc5d9cd4568a890e027cd5f9e1
 DIST xfe-1.40.tar.gz 2574477 SHA256 2b476f15beff1a1ce85dd4ce6559bb7ceca78b866c63fb4986456862a36862a8 SHA512 22cf9fd60dcd4b594d7ff39ea78d10a8c71ee2433025acf32b7e69457a5e86852b54e448ebc1e3f63f39bf720767064c74c46eaf2b999c14ae76417d33272892 WHIRLPOOL 5c3ce54db8ac3c7e99f590100a493e3611ea2cad90b498d0b673d1366a85ed0280c8aa664f60f9de633192964a5cead4efee65e6eee69f65fdd0928061e07e0e
 EBUILD xfe-1.40.ebuild 1570 SHA256 061f8e66f5f6476e7d73568b25910973922b0385cee3c8d16c5d7ce0a9ffe66b SHA512 e53ce60e004bcb826eab374d99d1eb1fc3b17dc56a739585eb6d597e3fff992855be17b65e95780bae40c71ca8af4ab5caadefb0f363c9e1014f39ec0a0b3ccd WHIRLPOOL d99ad8cf806d291ef97867851c1e9a0f9de86bd39df997761d89d474d83c8f587f3e47c3b596bd4118563aa53bc2a59af7a9d2b7fa798f23a0b8ecad03041d7e
 MISC ChangeLog 12622 SHA256 01227ca2257b07132db5ebcb2fb2a647416a07d9fdd1bd74a53584a414f75ef1 SHA512 345f46c58ffbc681075e33127feacd6cf8e9d84bd8449708cd949d0835a43b55a60b26cd45a8ea9d4db913fa722be15d2563abb5d36e1a9c1b4e80ff52df3d3f WHIRLPOOL b6d4f8a6693ca051ca8de14e05d87afa756bfda3dada20418df6d39e2677b4ee3a06cd7f7f9305927ecae375d3b69b251fd7b0676229f3a6e9109838e7164642
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 239 SHA256 715d6a0ed0317e805730693923ff9ad6c8010ef53688ad8b242bf2aacf9f2db9 SHA512 4bb03cca976de1337fea020f32a42e56fc742b968c286338ff6379563c4c4553f5ea21e4eb387295bda5b36b169f8d0900f5739fe328bb8f7747615691fab74d WHIRLPOOL 82344f241bde52ebf15d866cccf3e4b04c6d26e472d22997e1368b65e94244d7631eecbdce9ddb112aaf8152ce5e2ecbc030c0731e6bd7b9d4fd4e22e91913cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVBwH8ACgkQVWmRsqeSphMHTACfRXPqxCi5vI4z1pWdZNVLPIuL
-90QAnRvn4KwBOwXxN5oY0KsvZkefb2M9
-=Pm0R
+iQJ8BAEBCgBmBQJVf8IWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi78gP/07sUnvXvaRYWB9mnkvBWPB6
+XlXwl5wouKopy/JXYRxhmJXvrtrK/YLyuLGtGJo538XDeHyCdG7IU0CdB3EU4Pwo
+Umhg6yyYgjzJ4v4No4vZU4HFmCNckw5lGgFlB5/VtCfj/83nz0r+X2el7nST5GtR
+1xnIwSs5URtHDJdZomMtBFUVo5HAfkU6+jPSSzQkIrc898fcC29MKg+UishzFXuq
+hMV25pyziGboAmyYBzeBd+wLnkMEbp2UhdF7Lqp+e5waFAn4WcPaxJsp2TFjlTT9
+/CG2zhGSHLj6kLfDNUXfPkM1l3YFwSMqddgCSFmLyugWSVc6I14CiKMGqUiDESd5
+WdQ2dHTV7hY8ekY7srO6XR6+iIOVN4MEarE8LJgAEUqueMDcE0Jd0sKWR29yS4c7
+BBxG7YrkUMKATR2RDn3IfPpAKR/Jxkgfle2mpm13MP2qjdMiUcLXMJImp5SV2enf
+rbBhdAVUDnDWm19jAuL3SwcEZn9vNAv+aWkZ8UB++VHk6P4ioAMb9/Jmi/7mlB2H
+/bRXptH3WKqkxMNNoQ0C5juNM4T1XKAT1PgP6A2lCI+XdCs82Vqysgu8IK1i1EFX
+rrV74f2CiXQnrWTOcvhkp06lVCTPuKYD7JXDjBKNCMtGBdtm1OqbSkeZZvfWoMm1
+0YCA9e9oxYf6Kl5cEcDh
+=uR7m
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml
index 731225048652..900869d128f4 100644
--- a/x11-misc/xfe/metadata.xml
+++ b/x11-misc/xfe/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xfe</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xgestures/Manifest b/x11-misc/xgestures/Manifest
index 8e8611c6ccb0..5cff672cb983 100644
--- a/x11-misc/xgestures/Manifest
+++ b/x11-misc/xgestures/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST xgestures-0.4.tar.bz2 77902 SHA256 aec17a79e411abf00388f78adf8ceaaa1f4cbbc18e0f5c1b81d48ff3821459ca SHA512 c61108e609fb0f28affb5d5cc4002a7f840f123bb96b79265a47e74a541b1ca8deee016f90fc801fa682e61b9df008c0323d36482abaa83f8f6d4a5c73137abf WHIRLPOOL c3088c2a93b211c06737a7f18b9c0935270df7db91a7dae0d95749bf06570ad4a0a67c2c052c68e842c1e5b741f5ec185cfadcb709b7ed30d5c83a8f97f3e044
 EBUILD xgestures-0.4.ebuild 816 SHA256 a7ca05d5ceb73590ab90c7a6a3ec43f0055c7d23c52aabfddc1ff62bb4249ab3 SHA512 0f7a8d389bccacdfb084436c33e0b245b5825e9c5b8a44e83484737e4acf0a3dfa12aed30b220d012dda42fe7f0422e2924539b2ba85ac6db2c8a2840ab93993 WHIRLPOOL 490dc87872a9e1508d84ebc50d140c1472eb2ce61e12e3fecb3e1d0d210a0247a00b8d271766831adb21a2f3fa6dea1287a05a46c3f5d78a8bc5040eaca3350e
 MISC ChangeLog 425 SHA256 c054276ecf6fd210a01730168538350ef3ad0dd51eca85d83f29141dcd1a235b SHA512 6c43d27e9a57d41f20836f050091d559cbc8ad5250a30023f945dcc7e767f9b209e9e8085598130669b7dd9392c5e7d95584919f2c0f5b0b50fe17d5552e1e70 WHIRLPOOL 28f2c2452a46339ce2d9027c8e57ebce6777a99421a9823b89b28fb34994ab0ed21b47bc2c957d0bc32c6b0eb89017c38a14db9a04fa083aee44d386665867db
-MISC metadata.xml 233 SHA256 a93cf5c4e554b97b2a48b92f801e3a3d87833cac311db0160a387a757ab7054c SHA512 704c94018edcbc53edcf0a41c2603dd59ea217aa5871f35d4d17f7df26156b8fb0a735d2efb11b74256565db01e6790a833242de39c29a9e46ed8ed96d505334 WHIRLPOOL 57f455cf256b91fb72e642f5a861e7367961775f2ab992b8afc798ff376c9a2bc8860d09f2bc43c870531248484128c966f25a081b7789a31ba9fb4f52b5519c
+MISC metadata.xml 312 SHA256 48fd9775072ee515d7e0b5f7f53962fb52e7aeeb77fc5cacc7c90747e48f1d55 SHA512 939f3dd0d9b90182eba9ad6515f7a59fdf9d4861041c565ad0e73821ba8261fd29728684f6338127cf188d9136746853835e94777f839eb5c2dffbbe869b9684 WHIRLPOOL 01ac0d60541ffbfeab8a2a55b2ba25c752f648aba1230c3cb3d8b881286f41446db6ca9871f0252babdeef909985bc41afc64af3aa9344be2dd1a5f5adbb5056
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8IdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmibdcQAIXkM/Pfe7ujulX8nd89vizO
+Z/O+wPJX9IHj89EhxRYrI2AD/KINiQKYUaS8n79CWtP2HI0tKTl5v3kyjFEW8YKU
+TUBee8BD5z3kEHXBrfPxUIDNTY2arVUOFXhB0sRfNU+G1o4+yUohBQLhXdsFTYXZ
+2rAp8zujp7LQ2PmLLtay5b9X6x07eayiRYsvshqJfatUFktQ4xe37Wvrzmx0YytA
+W0gJW+L0bViKCEeijTaqZYuxV0O3ctLz5aO4lGvkuHjoIyvMrM7mWshLgfZ/w4ym
+wALBYViYokJlFPmzLXCF2qPFyWXGe+z/+j9WjWhYYVHCtwz3Zj36tbLHFhkur4ZH
+D9TwtR9eUmRgsMJ8Atg2mllVhdIlvwEJ5M+yrr0DUdEw5XTOfHUOtVC3Bnf0IDF2
+Hb6W+71PyCfoFy0T0QVAijwckncXg7pX1Cu9BHDI4RGkq85U3T+q/gN8M9AZM6JS
+gZHuLg0he4CI1kqkHrv96nFW/btYmrtgMJ2xXHiMTae8a+OAC6fGqkte/Di37dQN
+F3m4KVxz35HCWGw8geNn3Z82jVu8RqsqkPtRWZsUENWscAbAKJc3zv+3SljTbL7Q
+Sqv257kV5Egcxt4cQ72HRb57zfVAvqLuLgGm2Y8ZA60HoV7APiTQwaVXHQFaxham
+TUwlwxyNLIn/qLBdxbsA
+=HNLR
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xgestures/metadata.xml b/x11-misc/xgestures/metadata.xml
index b6b8956cde34..acfc446191f5 100644
--- a/x11-misc/xgestures/metadata.xml
+++ b/x11-misc/xgestures/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xgestures</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xmonad-log-applet/Manifest b/x11-misc/xmonad-log-applet/Manifest
index b7994eed5635..91c8674972a5 100644
--- a/x11-misc/xmonad-log-applet/Manifest
+++ b/x11-misc/xmonad-log-applet/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xmonad.hs 1801 SHA256 c41e925429aaa0ca4a8c9c7013531e76008e37f998a33e5b213964cac2a7c6e0 SHA512 3d20f037dabff24c69811672850734396a4c4f57a9e33e03a15f93d8e5b4edcf43dadf9d95ab82c310dbf0064e8fb7a6a0e8e330c5b51997e0dffe719dd0cb21 WHIRLPOOL cd6bff95ffe7de5b9833e223d881720f87cdaf9deb0b38907d80be774b8cabbe909d22764fc316743aae569b4c507570df6567545db1f563599e0b8820be2133
 DIST xmonad-log-applet-2.0.0.tar.gz 82881 SHA256 154bdb5b857195b318837ef086ddd3091d100884ada29a146ff18a5589549fa0 SHA512 1885ac97569d909ab1c6af99d9b271d0f782de905dfe035df27524f428d09cefa20a468103477132656dea8945faf886270fd70a49e5a08be538e04f3f05baca WHIRLPOOL 87bce2156b8a5f7a2c3b8b0597d24eee5238333e6a10c161a49e3cab08f3e1cdd3facfbf60ab879109b151143823e99d2d2c3470904e361fe892f950902e7d9f
 EBUILD xmonad-log-applet-2.0.0-r301.ebuild 988 SHA256 74f9e631180265cdf317788476544ff33a8957d22c0625f567a01180c429e04b SHA512 2634867852b84220027ce261e58dcea8fc293fd178e7618a79f814aa759303424ebb4ab8a4e62ebe3752071459bddd32d4b5bd92a3acef8eeefadb3db3e59dc6 WHIRLPOOL c2d9ea14b7311c9aff9cf92a0b51c8367aef833a5a14ebad65f25002f0700f6a77c5f3708fff10a7b1483565dcbd51693e394b7ad3676eabe92f8a6fdf587524
 MISC ChangeLog 1394 SHA256 7fbbcbd6c871595d6aaafa6752df868054af0449fdb35acc8b88117d2bb141ad SHA512 a7270c3e289087bac23342e3ee00d3fe5ccdcfae0b220efc32fae772fc8cb4f85c0eb6563eea57200392bc68a15203ef6b1a48dc6ecf4c2dd91424b1769f4813 WHIRLPOOL 7a28387c3d24416d4b32c8c2a3f725b31b2b16c6c9b250bfed03706ca7c9772ccd50d2393c73663ca54a737220fdc117921d0441435ed33f5603845434df5b5f
-MISC metadata.xml 598 SHA256 255ec959b7fa47febf08999bf89993c97ed0481df8c77fe13abaad93d4755a6b SHA512 8a6b5079a2d2dba619fdb895cff2782edba85d036b30960a657698c25b42dfa486428d3797a35c95799031b54f07667f95f22778695bb2e48da19a3b460a0f00 WHIRLPOOL f36666697018d15fa523e3c4ed458097763b9d18922fb196cd48e967d49d632b424aaba02d3fcf4aaad068e13a90f110b2afa75071611facda25a6a04f59fa0d
+MISC metadata.xml 710 SHA256 57f8fa7b1ba9c6b22a0a592bfe553f9148922330c465cbdf38b648cd26b5f917 SHA512 582d6f0edc408af4e257dd5ab9b74381813ca1c65a1bb532f6d6bd4ef5826cd37e7fe56f717b711856e491dcfca51947db942ae989ee6e541d11970e8c416743 WHIRLPOOL f3b925439f4490f6e975ee75ce98d747b54f45d7997948fc6bbbf1f2fc0bb0cea2b496f8f4624b38ddb2252b35441317eacfa4033807b62be4e6843247a65032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTgrrYACgkQcaHudmEf86rzRgCeLKa77hHvXiuwU/NodjL93rBk
-1r4AnjtHTAje6j4DskzEdttYndubrdxq
-=fbMX
+iQJ8BAEBCgBmBQJVf8IkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiuHEP+gOZaGWUEDJDNvox1LvVVhCc
+EAHkh4f0YzWF1XjXLqg6mtWvXgSsd/YHvUV+z6H9d+mPKun4bvMgJyWBWw0sgq1B
+Xnk31RU5zqhcSY3/viPECvrvnvBbmHumiT0eB83Jgr5aiTxfjyh2lAhC6UhtnYrZ
+7bhI8vJH3qI2KuViGINF65pSGr0gTflXyjPlNx9O/d7kRk9nUDdJ4dQrSYsPJhGf
+yhCsa4BwKKVL1C9Zg/gei60QBIxQsDLfUf8wiIlUNu/vxlSuVSb2H4zNRT1CoxkT
+WxC9ksj7o5tWYv1Uxz24gjLc+0FPuBcok/37SuDCQRJvOhCJQ/LyNB/xuchmcnVg
+slAJmlHOng3QtWB7NOq2wXcyNs7fEIV1at34tcGOCtDTvIGAcx1K0pD53HPY9XtH
+JzFscNEZUf5LYQXUPQqNTDo9/RuCdiXI7NRAWz+9ha8wNI29GZIfuwgpZSVJbGyT
+tTpNHleh9YhLBUAxpmbEszpr61OqSk9N4qTiiKYPOf4fHvCJlvNV/UPoJFoa5TOa
+u0w/ARO6ZalZk/O2RcUv04sitaEebvzadNByJSAlii7gG0LE+u2CoewX5bgnRtQ5
+xD2HSMKcSG/wOaP+vdEfxLCvc9StczLRY9bK3duX0StCgpfxbD6I61caHJjXpZhe
+XvgLFHMDxpkjtaCGuxSq
+=7fhh
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
index 30cab6453651..1e501a4b3854 100644
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>haskell</herd>
-<maintainer>
-  <email>haskell@gentoo.org</email>
-</maintainer>
-<maintainer>
-  <email>flo@geekplace.eu</email>
-  <description>Maintainer, CC him on bugs</description>
-</maintainer>
-<longdescription>
+  <herd>haskell</herd>
+  <maintainer>
+    <email>haskell@gentoo.org</email>
+  </maintainer>
+  <maintainer>
+    <email>flo@geekplace.eu</email>
+    <description>Maintainer, CC him on bugs</description>
+  </maintainer>
+  <longdescription>
 	xmonad-log-applet is for Xmonad users who find the GNOME, MATE, or Xfce panel useful. The applet will show the active workspaces, the title of the selected window or whatever information you send it from your xmonad.hs.
 </longdescription>
+  <upstream>
+    <remote-id type="github">alexkay/xmonad-log-applet</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index 9b316d059e64..5e6176c1ee68 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST xnots-0.2.1.tar.gz 41442 SHA256 80bbab0334880f79aa12cf17ebffc5730a85dc537e8e6208169720656ecd72ca SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c WHIRLPOOL 1ed783f7167fd8836bf939ec09eabc7e25a229e6f95c3d3f5e52975dc97e2b94064d48f5a8b03ec6d55121292ff661283943e0c2b562965b7bf74068232a70b7
 EBUILD xnots-0.2.1-r1.ebuild 1017 SHA256 a05d883e620fbd599bf22514090062a68878eb1be1be0868ecb392321fbf2bc3 SHA512 a8936e39f104f6f202c1f8a5206b9a11a4e85c5f342221af3727d234641a948a431d5d2f8c9e542338fed95af67cfb65817a7f71d238fbdc79ce3b50c473d3d4 WHIRLPOOL 845e254d3ad4907a99fbcd46e0d2f654a36ceffcc3d4301e23271fb3a10266f93c6eb66a9ab9e4294690379fb322f8c1b9de51f5183363203d31d03ad092eafe
 MISC ChangeLog 2074 SHA256 918d3b007c32180fd1ccaf6c7bcb3e0b767378570504368e9c0c2822cdb0b28f SHA512 890716d1b7a5962bcc60d3ee05b68488757ac6f141947d9dad0b262a0cec957a400c03ceb57ca9a0635b3204fd93ecd116679b6351287b31e0b3229229870c56 WHIRLPOOL 8a11021295dd6337639be681127e54eeefde9648051d752001ac86d8638227b76d40043f920852456ebe96be2d98ea5fc6bd1462a6f621de4ab33681debf254c
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 241 SHA256 02b99f39abb0e693c94e3623bff6a640122c706b1c0afe741d124dd5a65a9d0d SHA512 a3bad1858bda60e5e6d7c7a0d26691daa90b8242edfa1b09034187b02e87a696cc4991f60206612473c8c8b788e01d6422be4087ded6146caea67c40aed9f3e2 WHIRLPOOL d2f67a875f6b892e8a60f324bc94a4b3988c91733fa66f7fc0a8fdd8249ba39e74d9e922ca7d9388c4683af78c3b5fdfad0e34c60833f707b0439ea09ecd4e47
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVqv/0ACgkQVWmRsqeSphNwKACfQIsUE2yKixA395rIlk7FZT2l
-htIAn0kTPPgtreUsegZFdWjFAS69wVFd
-=exu4
+iQJ8BAEBCgBmBQJVf8IrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHJkP+gMTx+1elPGW7lqSuBhRZph3
+lOMD4vGT8jWy3e1j2WHi8eqzxgvrohpWwYXWTw4bxh2gmknmJxkaikRbrBMvVi6Y
+wmbXjN/0i5+rpmvu65xx4GHh7AEzL5NpHvDE51yOr/smQhLtR5PL8ju/NNhOjSn/
+7ApGScPkkrJ1cJj3f+1HvMI684inprQqL8Dj5AOSkovjkPxP78cfd1/7yAb7B7p+
+i368sHuO5OuGq1+g2K28u4mTx+/3gd7TBYOL0I+1sWamqtEz2bxLpq2abr87B8Cg
+We0qVM6wZs4m0gk795idG+ObV2U55LnrpRTPzIIgxxRr3b+LoydicVSr2X8KW+53
+r5HVvTB68mpTRkj6Xz5iM4KLmaF8CP1WLubAi/Rf9hmX1G191yLmZXuPydQeejI2
+GD3zKZdKN654ZtfpUlJVEA8Jieel+mzduENdBLmMGMq/gcPizuiMsrKosJvRetvw
+e8hejkDMPpoAVqoSF4oKzYsWLy/mwjgFVNA5VZtARcHPjrrFW5OW6H4VL7SvbTay
+lSkVe+F7jNUGWef0GV3Lo3DnulQh0SOeaMPtPgkOXUwFFi4Et+CE6qc+Kh9h8/pS
+9GeQCdkdhoA1eGgEQnhA5JFcNH3Vyv2vkfISIQygok83JQg3/iJfHyJfQPID84Wv
+B7jLMPKzMMFAQQFlProN
+=FT6t
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml
index 731225048652..d62a9e754cd5 100644
--- a/x11-misc/xnots/metadata.xml
+++ b/x11-misc/xnots/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xnots</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest
index c4fa459f2863..5f025f688af6 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xpad-4.1-glib_includes.patch 444 SHA256 a32e54d9cd8e6a281b36b758c9c5482d6f199531ffbe6abe60e926ca470bddd0 SHA512 5ea77c49d8d43601bcf8048cec5df713dd81b579fa3970d7f9c4578c1e282249dc0a24ee08f6e254ff2c97538f7f45c7e80e65e66476a2290052fc4991d96965 WHIRLPOOL bba9c2212a913184cec4a596d3f3cda7250783d5817756991f8b7c8832db9b299c8e9f923f4f43ce6c60a690557952105339691f00051961729c22785c7af20b
 DIST xpad-4.2.tar.bz2 244275 SHA256 d51b0e5f813a790ca55c3a0390650cbe1c567407e0f224b8b23c6f49403ea813 SHA512 4d619c9198198f4380d37b29243b76069c0e036fd30d7c6e2aa9105e8b7b1e0520c0c35fbf71f6cbd58be4a8799ddb04602694971cb46f70789b732eaa4d59b7 WHIRLPOOL 69166df7b1dd9be00115a13e2b9dcdb17a2bc7926e285cf2a9aee1ade9e1bb0d3fd19fc98e4c131510aa4f66332394676fb083019e3c02a8a399b76919e499d5
 EBUILD xpad-4.2.ebuild 738 SHA256 089bd33f6c89ecd5740b994178020bf41b3ffff1d7c6328fae205e3c4829855a SHA512 3539f783d79367f3de2f56cbd6cf440185f66795c64641bbf0b36b013c6815d0dd14186a0871eaa0fc041f356b9843306e211f3f48692d05133cf2a7c665b6ba WHIRLPOOL f7ff9b7d17e5b2de292ae3ef76dc97e9f507ba9019edf0e783d4590779826f631133be5155bd2a3389009e097b80ad67a5b9a71479962ddc552ae9c4ffd9446a
 MISC ChangeLog 10477 SHA256 5f285b3f118370bf21188b14cb6a35c78b5a93d2790dba5e8f7c373837d8f5ac SHA512 9af26092b9e0292d2b2b4ab49b8df742a77283a149c0ed030457e8ff444b31f4f3f979933e8dec7ca9d1dbe57262a9a99a624759be44490522978c9c456a4315 WHIRLPOOL 508a10fed0e0c764bb9946bfa5934226c3d212d13760cd9d5297924bdea47b058ac0a0dbda0e32d0ecf5ee4cb304b8f14b5e9f6d2771ce4d03e5c3f6f537c19a
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 238 SHA256 40992ed8e541d856e8edcd1174ed4b913a9ff3c48c9e1943eca577f4e3cd961a SHA512 f73bebc684068a0b7882fec36f4b5d76bf4fee945ef71e108d1ba0985bf60b43258a4c2663c08eb70f544b7482e863ab5e30eeec339ac565df7bacae57c575e8 WHIRLPOOL 1554df9897cc83f009dd1840e98eb00825c8d04f088007ecf353d14ac1cd50fd63c3e4c63271e4102c284ca8dd103d31f9645f1838fb069a595add2311b4a291
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPl5zIACgkQVWmRsqeSphPD7QCfYpqKJXlw6Y6d9GWkBI+472+2
-xAUAn3wSWo1SvUZ5SQosGvGPpyl1Jyxu
-=hhkG
+iQJ8BAEBCgBmBQJVf8I0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiO5oP/1zkGFPNGd3cet9UfWgz43ZW
+fXeMcQp1AxJfuwFPn5SUtx/mk7rLl0iQcrkKM9iaFwGYj2m15GRiBi1SXzAn2Fy5
+SgWtq49ahFFnsosLmXDTU89ELkARnPAwzqn35ReTBfNQ5YJU3MxM/whnmDE/mv/a
+floUTRJlhtHN8nJmMRKccvo3zIzXvQQ9hMIZIkYH0XBbxgVIf5rkcmHdMPMuz6b1
+0HDQCwrIEIozrcGHTGQKmBYoz1xb+CbwgTSH5/NWdhKSA3sBn2kQOobB6ismxVtx
+WZ9ouk3WWKC1pi+3w4MGX2XWJ7nCIk+b/PuSYXjq7Ee4MniVvgvCI4yTEpg8GYzo
+Q/Z/iUe0dDbPLjx2Ow70aQsVi0dWIh9H84D1LiPgwIWSmZoZHQFPkoAlPi7G/lSX
++X0rOlx/Mpvh+tAsBYEq+oKuHBoXHxx8u5KhVE0hWcbXNx0/Z00QBVr3sZ+JOF7u
+FFDl5dKu8+aih80jJId1TsIqt6FdjcMRGBqKx0OoCDnFXa4lYnDJvlLBob8jYpfB
+No1AbPlIKMhaLUlW1hjrUVAz/8SHDy8/iPb95GT6VuxV1/2AepHyhDmNJdDl0Rfs
+vFQAKTT/GY1Qni3leWNU1/L16rpq3riekDU7xrPlZGlKNlVb8gp6D5ButGIyF077
+WqV+RRyZVpr3nqiMw0yO
+=+vog
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml
index 731225048652..f16af1d84223 100644
--- a/x11-misc/xpad/metadata.xml
+++ b/x11-misc/xpad/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="launchpad">xpad</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xplanet/Manifest b/x11-misc/xplanet/Manifest
index 5b2b6f95d185..f05867f5c0ae 100644
--- a/x11-misc/xplanet/Manifest
+++ b/x11-misc/xplanet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xplanet-1.3.0-giflib.patch 25824 SHA256 7ca8647cf9667008fe6453e1273b75ed7d636a05b35527c588d8dd4fca2f3a19 SHA512 6ed75916d46c26cc616901f2e4af3b4b9a62c6e4c571782abeee68650677d72d5d71a7969701332b77c646d04037b5b4dbf064edf29e9b9d272fad0e76135d28 WHIRLPOOL cca73455958bc3aa65ab8c2a2b972fa63d2ca709fe5f4a90368672d50c798d864a33363a57b012eb5b3860a2d1ed51cc9aa7993e3418b310431d2b33189bf9ce
 DIST xplanet-1.2.2.tar.gz 1217169 SHA256 6f8f8c59b4d5d1dd5018ed4b1367e55f6296f0253596b7705f714a9b3ccdd3ca SHA512 1a5dbad62b79adce28239615e3a2fd00300fca085f9400f2735c5dc015f06c63e182ed0d78399324bf6049374f2c034e6026a4054f26c34e11024b956695a53f WHIRLPOOL 155f436b339e345dadabbf618d79ee6ee39ea039d51c245523e7e2fdd3c50e5148c10f25c75c1b287558ada1baf2ddbbf5a3a67deec543dcaa6239d47a6b93c1
@@ -8,11 +8,23 @@ EBUILD xplanet-1.2.2.ebuild 1567 SHA256 9bbb608a8ffd8a77d26472b756826ab2fff4aadf
 EBUILD xplanet-1.3.0-r1.ebuild 1743 SHA256 55e20f74766afe77b3756980d81b08ea712486e3e332678db25a8b2d4ce0d560 SHA512 6edff4dc888651505695f4952af57cd0c0c54ee7b4d291ee836dfa3ad22bc452ca75a69003dbb8ddf5fc290233b33b9ab5ad053f44bd59e07d0321dd6e1fcb57 WHIRLPOOL b59c4cabbfbf1649afbf05deda50f8b8f72247fd00f77df11207576816c6a7ec0b3f156e206323a4037395094e4449ddfbbd49851c67b4e1f5e0d5e7d0acdcfb
 EBUILD xplanet-1.3.0.ebuild 1682 SHA256 8d29b7d9ec59d127f2bf08fdad651210e10a7bff3821907af3a7b3c175478849 SHA512 3761d2955a7163dfee3824c45ef66cdd66860b15a50aa49a3509898612ead1096d1e1f35bdae797d075117c350bd172224f0e683520881951badd46a19bc689d WHIRLPOOL d8a3294fa37f3dd7bae3128453910ebdd0f3e8e867e0b21d3d3d19f15ac713f657a2555768b37e19d4d3847cda786931308103ff6db024c1a945db6502f61315
 MISC ChangeLog 10628 SHA256 cf820defe0c3d8a97de73785163a4eef8fa1728c57fa06ccfb6ddbac1daa2b9d SHA512 1c26cc4cdad60ffa3980f7087bbddcd17da3a274a9ce5e55d3ca0bca853fe32ff326e48d7c1e51bb479fd569d1dd7bde4003952fd346dcb0a13908809e46c572 WHIRLPOOL 7090ab0d164fb8e1d07063466bcd7d12dc51abad17525d8d858e542f1978e4e4f3553bd6b2e4c018772617d3586a9ad76f74103e1acde4226929056ee66ae036
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 243 SHA256 ce083f05e47068c541a82fc8257e7e7464a3f5dd0db6399bb108ddc57a9265d6 SHA512 e93a1fc834a49603c49c7cf2385f2f63673de5339ad1d1f40b40634f3796b4d2d9b87811b72aedd70622829a7f0524704337c56e707a889ddeb02552b8029761 WHIRLPOOL 53d1725ea3f78b27baad167dd35802ae25c37136d76cab3be5fa610c4cc29b49bbb768a25fdc5a04fd3deb459455fd56d93cc13c2a2087c5f2d804adc6d6ca50
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlLiw4wACgkQVWmRsqeSphNfowCdE+3mFexAVcxcDkoebP61d8kx
-Nd0AmgLyUi2Rj9kjv6cLbkm0bRpHtWIU
-=Derv
+iQJ8BAEBCgBmBQJVf8JBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6AYQALuGyFbqiSwm8drf5ROCCHkP
+ix+bKRG9MSIu194tlrxPLuLVnMBnTjqPXpMdROZdebxcRvspNO1Jhocz20EPwX78
+fYbyOpvkwGFEEGoPvN7bu131UN5z1pq/LqiH+lGHQx5uhF9ZT7lJE+lfuXBW10Gq
+P0Y3qRH+Gf/Ia0HuMsLUFI6fgWWGAFutixWxM4ze/bUU/j354Iv7WIhlbhOdUULN
+PhIgbLJOtnnwgqE/uPrIXD8VT9SW1KT/LjJsvUWij41eMjWNzl0UEmQUHKuQedWn
+FaW+G/RnamuRZtzBo0rhshyTHl4Aq988xvItELvKzENfP1Qwr4SUKWixySK1c8lG
+Md7ogoFOvrRKeudguDLKqIu6l9+E8NzptgdbXPSDmNb+C7Y894SxjXzs37+ZGmxU
+3i/TdlHpfQXyfd9XHDnsuFTKydBu4Aa5HhbSXPnKx0Y9cFNOqTDeeVTCvzSv0bcl
+/BGzpcA2jnXThVTPXycSIsRIUQkMErtZ9oFlR/G9+IVBX0yH1kb8VesgXTSBzdeN
+gwMhJcQi0ivtqGbU9oBGas2FMThVKlPw8qdukrEIv1ixJsSeV3Lm1gUZkZfIC/y8
+MqVGHDtzWvGVz3HduWfyTvPZxYw57b+hfTfjpozk16IFVuo2tL5j+svzGlrqRxOg
+6xwSQGGVMsSVQlD0Kayc
+=eCdY
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
index 731225048652..a565416dca3c 100644
--- a/x11-misc/xplanet/metadata.xml
+++ b/x11-misc/xplanet/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xplanet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xrootconsole/Manifest b/x11-misc/xrootconsole/Manifest
index a0ab7cdfd2a3..6eed20a63c9a 100644
--- a/x11-misc/xrootconsole/Manifest
+++ b/x11-misc/xrootconsole/Manifest
@@ -1,20 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX xrootconsole-0.4.parse-color.patch 840 RMD160 87c1776701f22a9e6003c1432aed18952b13debe SHA1 f416cecc899405adce99d75246c1e29716579021 SHA256 3c65a902ef7ae2036045d35ac19310df8a57048566b486b4e7db5319e433e488
-AUX xrootconsole-0.6.makefile.patch 945 RMD160 45398811c5efbd4bc869993cb1e9f826e99117f7 SHA1 a9fcacfea4785718a40892f15e931f72bada4014 SHA256 7795c186c3aed75a2191d2c1df366ae433b2fb8943300b0aa8d321fa703c3f1c
-AUX xrootconsole-0.6.manpage.patch 1034 RMD160 35cdbf17a85911c2ae5372bc3cc9e94631696cb7 SHA1 42ccb182ea6fd0e6776cf27f6983922594109fc7 SHA256 e9bb10b38b5b84f04906309428b84ffb4f7bc26f613a2ec9baec60140d15c629
-AUX xrootconsole-0.6.noversion.patch 1776 RMD160 7937db54ad8d38773cafafbfae33e68a247c0c04 SHA1 68229cdeb434ea95bac67853296e0185e61209a2 SHA256 609d3952c207159bd701d0f637896d958c08c0e332527c940f00bf70c8a46042
-DIST xrootconsole-0.6.tar.gz 15951 RMD160 3dd6058316fd72f428fbef9fd5385e75c82a9683 SHA1 6c4bdbe979ce15d00c2e1efde672a6a99228ceb4 SHA256 8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
-EBUILD xrootconsole-0.6.ebuild 979 RMD160 7a9a454d9223842dd53e97f322490941ce02dcad SHA1 dcad27dc89bf12db7b2ed01395d5e2b318846996 SHA256 bff47ba6c510550d4795061355590956ab10cf3aec7eff4926a2414d36282390
-MISC ChangeLog 3496 RMD160 dfbd3dd2962d5e373a5e2e36d02fdecbff7f8d3f SHA1 3b068b55c777b71ee4cca048c9e693f1342cf57e SHA256 134e4b39794530536f619c3f481cea2da570c7ea28445ac387b99b688f4f185b
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+AUX xrootconsole-0.4.parse-color.patch 840 SHA256 3c65a902ef7ae2036045d35ac19310df8a57048566b486b4e7db5319e433e488 SHA512 5fa33b06673f1191c7d58a54d71b38937295611ea746b49d6ecbbe8059fc1127ad52072436a0ec2bd56e05cf0292cc559fd2b25dc989f434a120150f2d54a28d WHIRLPOOL 91114c5e66571be327589a9b90fa4d347c96fb56ecd441220bd98a8c385f087f8f1fea8eb628dbaab6594438f4b4fb5042e3707609353f2ca86a1a98c8814edb
+AUX xrootconsole-0.6.makefile.patch 945 SHA256 7795c186c3aed75a2191d2c1df366ae433b2fb8943300b0aa8d321fa703c3f1c SHA512 994e96fbdb4f03eace08532e6df1cdf15c94974b52caf7a765c4109de75094c1d8760add7647a44f331cd560bcad2416404b800ef06dfb7ec4c9e74be6f3d3c4 WHIRLPOOL 5f64e644340f8f4927743667a33283874f38ce8bf1d61182de8c50d7dd79d5d3a369d6fbb7b39bb929171b71b8e7d8815e5610082c1cf14a7e1593b274a320c3
+AUX xrootconsole-0.6.manpage.patch 1034 SHA256 e9bb10b38b5b84f04906309428b84ffb4f7bc26f613a2ec9baec60140d15c629 SHA512 b1f8b8292bb1a4439eefb202ed4445c211540127c4dc12fbcfe4bac3b8f048f53d7a1ed002ba15494c296c11929b841ac0afa22c5f79b69624e3b39d4a93221f WHIRLPOOL 8032d05feb7fd5a58ca3d9698a63262c6b1ad48a8c55b98091dd9069a4c2f14b5d3f83e335872ed990bd5d8685e483ca2b5c2ddef05dd67d5f37e551bd1136a0
+AUX xrootconsole-0.6.noversion.patch 1776 SHA256 609d3952c207159bd701d0f637896d958c08c0e332527c940f00bf70c8a46042 SHA512 d29a09455bb296005e26edce54dc06337063ff8f169cb0996188b75030bbee8304de3711e07abd887bb811e38470840bcaacc723bf1c0dc076c37f1dcdd0ebf5 WHIRLPOOL 0330ad5c5763ee27fdc966d7ae4fa1e137b153777db1ff518de69fa8efc603703fcba20fe19f276118f40f6445916a1656f7f84ed1bf39c53b4668028f6f1e00
+DIST xrootconsole-0.6.tar.gz 15951 SHA256 8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
+EBUILD xrootconsole-0.6.ebuild 979 SHA256 bff47ba6c510550d4795061355590956ab10cf3aec7eff4926a2414d36282390 SHA512 23a655c70bc0a2001ddc54233f0ac12eeaa0ed3c1ff07477c61dd2fda648125ab0dbee3892b89dec2ea4469b5e77c013eb3f61b75912e16ecfd8f3df5d15bf7e WHIRLPOOL 15b06f60dcc54e6b9b7f26e1153367e5bdf005ffc584cde80586b2bcff4c66f86e354f69398f326fd6e83938ab7c5ca6245b33c1c7699af40d3691ba64be4e08
+MISC ChangeLog 3496 SHA256 134e4b39794530536f619c3f481cea2da570c7ea28445ac387b99b688f4f185b SHA512 e64548d157163b1dc319ffad0d259f50ad920b57733417034dd7cfc7c27bb98e9f6a64ccb442b20e99a536c4b8ecbcb61ca8649733d21ab4c92979af9fcc7b18 WHIRLPOOL a4caeb78fc16a014bb4e79c8603ec1c55c87697753984e9ab0964a2ddf8dbcc15292208b083024cadd81eb0379dc0c874c34f8af917318806492c59f96c16ad5
+MISC metadata.xml 248 SHA256 ac18dc589d54bf202e10b06ddf2b74b87b00824386441adc34ff1587a818fc14 SHA512 ce1a15e2e4e7da9fa8bf037a7ad43f3962acf6d242ecd912d0bba0e38f98107fadd83de5a61ae11de03648f6cec04f949b5d4e7ca57853af9a4ae5247eddba52 WHIRLPOOL 7183ef28e1ef15a72fcb72ef5be7d8ab3fe4c428544e2b68e225d6858532954e8f76d724f1fe2ea180a21099247c05188cf703de25e03fad2600dac3066ae32d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk4f95kACgkQIiMqcbOVdxRyIQQAkXR5o3y9KgekIrhFpPTvf3IX
-n54QG8WU+utxDLfZkbqX4JydbIY+AdVuAB3OgLDprX0i5VEodmVraKfkrpftr15T
-WayhZarsp7MxUDQvWsem2fgpmsjU5OMWyRs4lJ/kixaB/DqGvS0+5l9d1Mj+Q27t
-PmlllOzsx56ZngWZUrw=
-=K5IS
+iQJ8BAEBCgBmBQJVf8JLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWgsP/AwKyH1W1Rj8sAzg5D+yoKFu
+lpxSSNt8UgWY0dB8mdjREm5K+iw641zgUKEJFbDrWtUXcj68ocm0gLPCLmVVdb7c
+Qt9vaIjLY8tqF4DZilGdy/vLSoXXZ3AFWse97P2i5qQld8OOrHEjVBu+nxTi74yw
+s3ZxMEn4HHzPvxdPeHV9kLw9A8I+P/FUPGjI8GCCK2c9NLiXxn4YtUzYtQCobRYa
+HAbWT/CU1uMnle50WrnMhbMGloAB78pAV8gA4qxT34CinLzDMUH3v+U7P0Es7UP+
+Sl1OIVyYi1Om7rTa6/J/xeqam2KChlAYswdknvS5xLkKB90B9md6MFBNWaYg4kCY
++VeXak982zyO/lX3KRpqpht6KgUjsocA+e9g+HZNWb3YMYJszHwGWrR6oaBVEWoy
+WHPWElFn4a5qe2b3tsG8zuk1aMT2XJ1lrNRh+RfQTfL6CgX3cRcCpCkMqRGLoXPP
+S9/j5jWoluUwdTrf7lKXrBkstzDHJ5CoEo7+Z2qmFUg49J8x9MuUJ2dvKMjvEj0i
+v9R1YKWIAz99LX4iSsFtyVWAN+417qpMNIgkC5da3UD8WmFpTjM8SA1tjYSvhypO
+q9pLD14x0gM1KquQwP+E1ASqtF3F57XuUkxl+sILESYsvlYPcLSoX42u/8lGH0bW
+jpMcTohysmpYF+R/NmWa
+=O61p
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xrootconsole/metadata.xml b/x11-misc/xrootconsole/metadata.xml
index 731225048652..b5be7343e366 100644
--- a/x11-misc/xrootconsole/metadata.xml
+++ b/x11-misc/xrootconsole/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xrootconsole</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xscreensaver-app/Manifest b/x11-misc/xscreensaver-app/Manifest
index 33deb7353dc7..882d6e88494d 100644
--- a/x11-misc/xscreensaver-app/Manifest
+++ b/x11-misc/xscreensaver-app/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xscreensaver-app-2.3-underlinking.patch 253 SHA256 3f95bb06bcddd6210fe1a073247a87f1b409e32c8f68617231ea949f92daa200 SHA512 02b73e67150661971105d062871b1d2f832c6c422689d5a1a53f68c6f77014aa19497d85aaf86d1c017a8302e36d567e73b0bd3f351133b6240c786c0ee6de97 WHIRLPOOL daf5e39dd221aa86c606a2b965ef80790bebe8110d6dd696cdc7785916f92693ebb60fb3ed10b3ff7e207a3bb90b708a9499a27f8e427d8e5e77d70380552cd1
 DIST XScreenSaver.App-2.3.tar.gz 47566 SHA256 f5ee06a00f57153f1f8e3dac480a6eb3ab93e74406c23ff6bf1dbc67d39138e1 SHA512 eb65cd14f70e6f152fced9f073dbc7737c855f27787472d0e7e9c4caaaf59026c0977c0f27ebd55b13391ab29491f4a96878236b78716b1f15dd9b772091f290 WHIRLPOOL 0dfdee9bcb57ec2deecd8889b1e74c88d95be1aa791fe16398b716b59fefde8f6ab0e6a2a5a4f3518d5881fda9c1ba153086c27dc26b2c5d8e24f1957c9c3fcb
 EBUILD xscreensaver-app-2.3-r2.ebuild 955 SHA256 379a5dbb4c76dca4344bc384e4ae8e0b0012f92625398017d2d30c6a95574bc8 SHA512 f1cc998b66e9508dbe8f0e5c7faf0e175f1f1032f8dfce8a25fa36be7f644c0ffd4ae9ba57be58e07c5ab326615c81ca9ab263762a19e79b4968cd7cb64dc909 WHIRLPOOL b4dcc35f683d4eb87d8d75cd115bb9b0b2a07a9dcecbb0db70e728c3b0ab0f0c227b08e77e92d50e13684a871cd7feb2ae4f5e28bbade755b73a00c32010e01f
 MISC ChangeLog 2271 SHA256 e8120dfd30239cd36555a6a9eae69acebb7a0da0e2710e51d786be0e321a6005 SHA512 9cddc73c91cc22be7af5d3ddc969b6f747febf556590257b35a2c110341b84bcc7ebb7663170709e863b97b850907cbfc133fc94c225065f23bd454edb01a3a2 WHIRLPOOL b3222033a0e19fa16faf2a85b2d05c6f52ee9f7d6d113e409df19c6729360ee2186b52cf2198fd161a9ec810ad96c1a14a4f6796bc5fb537081d10995fad2b64
-MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
+MISC metadata.xml 256 SHA256 de9fbcf98fd664407f9d3adb1945a9548bea1fb8fbbd110a4a828ad91bfbf769 SHA512 acd735aa5ff62c77647301d96950e6a0f2332a9f7a120497bde6e650e99b05504d10842be87f024e8af1b7b6c74bfdbbfd8bd9affc385270c0c2a7b2a44de006 WHIRLPOOL 9edb88ff4bbfd9726e677c2d6ccb999963f643a01bff104bc2024ed852cca740725be2d8d03c79a86dcef3e2ba5c71d17a3f3360222d684e498942588bf67a96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlTaL9UACgkQVWmRsqeSphPyCwCeKtUv8bbTbMjoSS+CHx1zonw7
-UakAn0AT+L9dh317hFqaAArtc9AsCK43
-=eSwc
+iQJ8BAEBCgBmBQJVf8JSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifZcQAIJb+cSMt0YBj7msiVJ//ygb
+zrDAlNEZkpiNVFsmA7InhaBa2b5AdUjp6oeb9PTp+/zYq50bLDj/4v8UXheJoB1N
+Xovi1nW8o2IFAY5vc+LGVWXD7/VyQPVHTEMgmJ34a+8Q5fS9G5QpMR4t7EeQWkI7
+5ZRA6K9OMulKT1VXSya+jTW+GDVOoWarL0CvYREXcUuUu1NIk+deHAGSzSt21xYq
+Y3J37UTs6bUOoGR48gkx9gKF8ID5HCqY/qhPkp0ADjFmdRGjlZGEMiCGuNaevHUV
+Wq7fVMnt9d+PjOQDBgvPAkymM3iDFm/JQBwNhy8/Pcs8DYVyGJsyn0vE5vQjBpea
+6XEFi6DDr5VmAZHhY/eNMHCW+OD4NQIhQ0GhfX2eSIMGF6A9uxNE+XP5icrojlvZ
+icSCxu+MKJIwWHcZ7JLFM7tX1/4yZUva3h/Q26AjdFBFYQ7xCzwPNPoDybWera+i
+CZGoFL2OlXku73X2Ee5fsxvY4eRaizuXPvlbigtmTHKaj39Q2TOvFbcz/E6woCY/
+JpfRwOxgV2I9dPSR9RmJyfUW67H67V7W9dpE6wGiDne8K5p5JFzS7h9pRxRIthj9
+KAMPnmRnXH0kxehdjmKsaP23tcapyFvRKH1i8nVikBgC6TYGmtjgmMPIzuClMUBa
+k7WBrMDSJRB6rZJsAM6I
+=t7bG
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml
index 2518313f5241..7d6c82b3f272 100644
--- a/x11-misc/xscreensaver-app/metadata.xml
+++ b/x11-misc/xscreensaver-app/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>desktop-misc</herd>
+  <herd>desktop-misc</herd>
+  <upstream>
+    <remote-id type="sourceforge">xscreensaverapp</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index 117a96d3a8ae..71ffc144eba4 100644
--- a/x11-misc/xstroke/Manifest
+++ b/x11-misc/xstroke/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX xstroke-0.6-sigsegv_sprintf.patch 438 SHA256 d0acd3dac33f2e4bfc03c3b8a73bd04fd5525bdc5a407d04e1ed180284a8c98a SHA512 6ac7fd2b4b64021926c9ec6999df6fd7142b7d42f31012a63ca31ffd6db9848c9687875af508b0f63e7c49dc1cd01057f2073c0bd99409998ec578c44d61f384 WHIRLPOOL 54ab922036df979a325ec3790c44e4255fba448c5c4933ae1dd6f96f9359315764d2c914a490afe104c1da1c7e02aa61f8090e4180a19c8e601e32eae29167f3
 AUX xstroke-0.6-underlinking.patch 443 SHA256 c4d81df637eb8409e3990970ea2bf4ea9c69bb9d7239eada050f4f84df6f2076 SHA512 ef219a2d56bf52df8187cbfee704d1e0dd91f7f742fc2b83c63dd469eb1f6f2297dc8cd09ab2444ad18f94aff5c95bfbff0055084202363426434f3185074c84 WHIRLPOOL 064b3edab9473a301556517dc409d568c4015c3359481af3fdf1e23a5208e949d9936a21b2b8dcb676250c63a3ba92c6c018979736f01e3abb5507241f0a37f7
 DIST xstroke-0.6.tar.bz2 140237 SHA256 814a38ec6dada26a7bda5439fe34995d5ac812bf2e8c008f8b297ab08b42fb5f SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a WHIRLPOOL 233caa7771c2dd62e3bebbcfcb54addbcc149d889289142ac024016593618e746f4f80e8173c1605d9142be09a752b0552d92ef829763777111715b62b0c5c61
 EBUILD xstroke-0.6-r1.ebuild 961 SHA256 e751f1b96d7d9d769542b6fc228490318d588b6f5a8e3218c3cc68697094ceca SHA512 75b26a5c058c9afabe7558f62c1c83396bc4816a47a8c6b234b7423b6872846d8cf14f46ec42f35e3cf9e43084ca0d683ace53ee58ab9dd8c29ddcdb5f381d08 WHIRLPOOL 2d7957ce5ab46fe30e88d8d50ddcc55d2193e306fe759dfc4892e662dc0568cc45772b058b7b8da19e7d17e56934cd40a49916c708a84553c5dd5b9fa8800a6b
 MISC ChangeLog 4130 SHA256 211804a20b5aac18ec0bf171376f47f509f71b74c9f486fec10fe405b021f8fd SHA512 fe476531b76e9afbbcfbbed95c15ecc410893ca41b1ceb24f98774087d162c9cfb50da36b3fd061859cbfafe3d125c0051e2e7bd56938e4764e848fdcb0b00c3 WHIRLPOOL 4fbf8c4c597dcf0c0aee187582733532c97140d713977778a7a8f75e0e08c735dde9760eff9a5b29e67e428afcb178c22abd1b90f93b466fc366c5fc4b78cfab
-MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+MISC metadata.xml 241 SHA256 88b4346cc0985e72daca9c1c57b24a94fbd8ef4246f4c92cff31a1da1fbdca22 SHA512 8ea41537c27853f2b9a3d638c549d6c0fc85961152b9ac0ffbd54899ea4b734ac6ca70c4dc374a75114d4ec60066648abe9f21828e886b50f110635004e3b992 WHIRLPOOL f562b528bafa74dee0518278d4a8b0cb7c85852aa5b551c6497d07fccd8268a68bdbc03f3b5f91a336f07148eb17f64628499716cf68001d47ad6f0f4a817e58
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlBP6qwACgkQVWmRsqeSphM46ACfUgX0WjQ0SH3joDaDMafU1Ekk
-430AnRf7ix/igcdKV6WgmAwQrrMuYtW6
-=XpUs
+iQJ8BAEBCgBmBQJVf8JdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHBMQAJJtJ0bQTbXC1xIyWy1LXVEH
+Lg0aQv9kh0J2ni/HDMs5OjGDPkEFom6e9cI/eAnDkmTYTTu1HkMEZFE4z+oc3rwT
+GRqOZlxH5TpvY+u85Qo2GKqNVIU+xKbhxO5Nh1WRkuIIfasoGkScxGFoF8pb2uSn
+xEAvewmu6J4sDIx3pzpCunFpsIJBnBfbKYlozGxKofow6aHR08+JKLZq2c+zleSI
+8NoeSoJw4Msq8X7SWoWVvXM8NPNnnFHS1uDS6NMpWQRrsU4g89SynoaKtpVs+ADl
+0upayq5Ffx6A79+Evbiq3hBiyx3Y+axz9nuCAPJUDoytBXYbJn0KEE3p6dBki6P6
+rtVM22KhqkfDs4I0iKRYzeXMRTGTvru4JezPtJANzK0qkTRQSgY5DsZ7kd+LebxZ
+45NZ8zBmdMIZT3iS++cmj1BF0BLnKF6sR4qd++GgJxf58/lT/Nwyq453wF1zcA01
+5YNpD3igUwaRz5Iyqhf61+WgVsVkjcM7VNHiTEi/IME7iIdxNQCizyFCLcvyQUBt
+BJ78tmtySq8IPOPWV9oec5nPrvSU3zTxxL3bp6fO7MzaeAM4c6ym/NqLSWTv1fni
+d0DncUYjvntcMa9zaDJRLyQ7W+4jKH5cgsAWyEdS/Io7EI3Att8a79Ljy6AB7kam
+YWFHT/oOEu10qf9VEReK
+=grdk
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
index 731225048652..6b3af6a2eb25 100644
--- a/x11-misc/xstroke/metadata.xml
+++ b/x11-misc/xstroke/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="freshmeat">xstroke</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 82cc81205935..450086b480d6 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX README 429 SHA256 02192bfe23789eef9ca0f1fefce5baddad7cc60f78f0aff4fe020a409422b9a5 SHA512 ff843f10e942e609f3334712cb0dd93cd5be94c61e103e2d46fa58b87cec573c757f45b13835fe2de09edd84dd311716ba77cee495f581e33874b6bd4da229e3 WHIRLPOOL 8974020b2041afbe39ed03361951890cc37ae34af610abd7902033af232f826acd771885c4846d9271faaf68cc7eca51b563f0a0e4033e4018b952d7ab814488
 AUX de15.xpm 395 SHA256 dedbfb3e9a3873d36fe205208530389f2e2a2df30eb032aae69781a917d36b95 SHA512 451756d2e242dd47fa3b4e4738de5e2eb4d57a96ef9d298ee09a1bf1e4be7580474750284920513ca7ce8d4bd549ef1a9a0ff757dab132fc0b4ea19e603b06ef WHIRLPOOL bbc0118dfc1639af5b407cec8834a2951867c172cefb9a4c067e56706d20ca6c9631186f727b16b9ae359b2520678300df4c4af9f29e7f124949378517237422
@@ -15,13 +15,23 @@ DIST xxkb-flags.tar.bz2 2541 SHA256 f777c676a58ecab97c242efd703c0e8056cc2a93bb5b
 EBUILD xxkb-1.11-r3.ebuild 1670 SHA256 659858da2cea380d17a70007cb0b1bb811aadbf5f9cc7a37c190a524b2baee9a SHA512 c91303c367c02f0a397a57f041aec17526e3acb8bc7746dcd59ad8e76d8362d4ff04906ea4d5afe5dbecd3ce925a27e1eea3dda3cc413d8230daea22a5637c7c WHIRLPOOL f25cf9ce1057a1de812a0c8bd4cbd37f5cd5e2b72c6e51c3504cc953544d5d5951df0b740459604412a6a301f061457b909088e2a5709eb903e578ff5d36553b
 EBUILD xxkb-1.11.1.ebuild 1648 SHA256 45483a3e81b5938a057baf361ace0567101781c05e143cec1164ae278de0d6bb SHA512 aeb360522c5ad4edb79c692d8993d239eda93ebfa5e6b6e5f546787b263a64ee06140d9592f7cf95c592da913ba86f2fbf0461fa579d4de25d8666b98074a713 WHIRLPOOL d426762b74537e740df8ca310877cc96e10c2f1d5645f0d43f746d9063ce8476f8c118183f628ba7216d0d3e228b182c5b9e6623ea93146524662922410282f5
 MISC ChangeLog 4339 SHA256 2860ae7a3f0b71f2921f44a50e2f8771dbaf601949e542c3aaf88f2b53a23aac SHA512 630ac4032cc860f0720b707a49b9da245203ac5f7b2eaf162f0859156117594b828237d8c315a19272971655997125fff72062e207471ba8bc524bab88a018db WHIRLPOOL a9c485177f154ebb02bc1956b3e0cf1a1a6adbb88d9d63bcd5f2131ea81c1380a05f08a58c900a5a36b90299687961f1d32d08a8b9fcce01d3ad97ff5a1a5804
-MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
+MISC metadata.xml 240 SHA256 eb108f78ab07e4860180df9a9c269dce078e0b98974b7842e39c13a44e7d73c4 SHA512 6338e696d7804092a1632cc1d17628b73e6797307710c80866a0f4dc4e3bce86414bc688e6ff350446d59e7c3f927a0cc0589d67e598ff9a74b89d6ce1ba3a5e WHIRLPOOL 02a506180a4019c0ada6d2426ca036a2b452d23be173412308d4f9227b629846d805153097c4552a2cf4a89c30002c121622644edcf12279f9317716cf8f19c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAlTm/3EACgkQG9wOWsQutdYJkQP/aPxC7jnKQWCfgIM1XuJVetAE
-6BtHv9A+wHi/NmwnnVnXygrlcD8NPc5bItTc9CBcmNay+l1c9lahxysenNb2p6wA
-tuWf1N5KMwQlZOasCfipyMHD5P6p/k22tKaR5vI/L38jVQaAeuKof33I9TlAOCz7
-mc7uJSnQpGYz1tSl8Ns=
-=etF1
+iQJ8BAEBCgBmBQJVf8JnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmif2AP/3CYTBSjIAFeEGdJ99z575MM
+mlTmsB4qe7s4Juz0gIFa4rhKnyr5N4I4sJDX8Kf7MRRWRfGyassgKPLCKz2mQp4Y
+uW3gfRCzNF5VMicSmeukTvbk9n5FRIQwft0u3kFmOU7W5adqvPE8iclSmwCOW5Al
+aggB0dMSUyizbALQXJ6ssnvMyVgJqzCUHen4t3AfV1UhuLr455rSgl0rXRdaHjHk
+p2NQidHjGCK1RLaKc693p6AIOCjwoX24moMXXPnQSxXhDA4lB7iXAAhivJT3/H4Y
+m59WtMpvp2PYRv0gIXIVHfvjEN/1Ar4vJybzxxIrDdS8QlTeg1LtRq7klzsCBfsK
+2FzKzQqDGP5NpcveI7lODfGe82ZF9Vaay6K+h1bkiKv77fHMAzVLxPDFBidO0urF
+PIcAJWnyi9XGVUcbz4dmf4xEXhMoWrm0KKvhnKSTKEGls9JVXIFMjnoBAXMm1W8e
+txqj/v5q94tu9H7LIVNR32QcH9XJG+X/X5iyzFDaKWw80a4MzslNV/gRFqJx/u2H
+3yFICX/GgbJLqAktYUk16udpTx6Xglwa7HEjqq3vSRi43JfkkVs/3iRmR0qzm7J0
+4Ei2ea/eebKCMLVU3TRsHVoscfFuKxy+x6sVKtkxiAwqztQI1se2cJangZIsd1FN
+U5+LGs1Ryud7xyS8Pg/p
+=X/RU
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml
index 40838bc36783..37b1d4e5f29c 100644
--- a/x11-misc/xxkb/metadata.xml
+++ b/x11-misc/xxkb/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>desktop-misc</herd>
+	<herd>desktop-misc</herd>
+	<upstream>
+		<remote-id type="sourceforge">xxkb</remote-id>
+	</upstream>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2015-06-16 06:29:59 +0000
committer	Justin Lecher <jlec@gentoo.org>	2015-06-16 06:29:59 +0000
commit	2b6fe7f5a1293891b288366d6fff488f33eee47c (patch)
tree	e19e596427c05c544e6518c26fd9a685016262f4 /x11-misc
parent	Updating remote-id in metadata.xml (diff)
download	historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.tar.gz historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.tar.bz2 historical-2b6fe7f5a1293891b288366d6fff488f33eee47c.zip