Updating remote-id in metadata.xml

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

34 files changed, 395 insertions, 200 deletions

diff --git a/x11-themes/elementary-xfce-icon-theme/Manifest b/x11-themes/elementary-xfce-icon-theme/Manifest
index 5824315a3478..1aaa3ae0d432 100644
--- a/x11-themes/elementary-xfce-icon-theme/Manifest
+++ b/x11-themes/elementary-xfce-icon-theme/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST elementary-xfce-icon-theme-0.4_p20150327.tar.gz 7468590 SHA256 da7831641bb7bcc2a9102d38db2d88a370d7e32def1a4e4d9b686c5bb6a31f08 SHA512 8c92bf720ec2a283233726463654f8dc7293b7906616738be0952316193d868f6c62cf9a959c6bcff8684588ba083cd3450b2181d1331d5fdde658bd7e875d14 WHIRLPOOL 332524fd25999d7037e65f8259d9ba0a96719e39a1225f9b01d122092523a45de4af2d42038101416ede1f80e913b5768f11b97916de774a1cbd4dff638c643b
 EBUILD elementary-xfce-icon-theme-0.4_p20150327.ebuild 1118 SHA256 bc4ce3239283e171627b3e2312eae7988546823ce2fea0144470a856108f052e SHA512 30e270007fd7b2be0837f2badd0961dff110835208a50b6b528ced22317dec983180b737358c731e49e9202eb1afdf7866167916b5b88bf839c36444ac19b0ab WHIRLPOOL 4fc102020f6b2e8aac65be9d2246c62bde8590bbb8d6c3fbaba717f43e9793d03316f6a65ecb40fda000bf409d9b515d529cd42d727a4b7403fa2eabf5f059c2
 MISC ChangeLog 442 SHA256 0f0152393dd71c4e8ebf1a59aeae9c2faf4815e53eb9e50a7ede3e4db05b05a8 SHA512 4e91f365cefc08cf82caf385d0dfd14ef3bdd7cd24c65537d7433ff602becfafd9167943f399103394b527e3680abb527d1d1c3a1be864bf70ceb8b797ee7022 WHIRLPOOL 772e5b4241ffd5c59e9140d8cf25dc42cf66af7d39a41f81e7447e006a3c35a63eeb85e28afea2289e4c5d2f6954b5fc0efd88a86d8f3a07bcb24c028a4b2488
-MISC metadata.xml 240 SHA256 aa3c8883b35b6d81c030fd9eebba39ef7cf9d6f5a9df710c9eb500cd47ba9976 SHA512 240762c00c1d233b5386c447b2fadffbae16aa818ad136bb9a9a7df96fedb2839fdfb6cc2cbe5368ee832fa5796fb9e6f21a4e0b040890b3f9a36574559253a5 WHIRLPOOL 5ceb0f296c6dbb4699a692d584f8392a3230815db54bc946ec287fd96b3e7d0fb7cc32cb391470a3c4db274a60d77431657d1eb9a312ee2cfde42dac50d62bae
+MISC metadata.xml 339 SHA256 1a27f10ad9bf625079dd772ddc2b3fec9fffc93719a36907d1466418c9ca3438 SHA512 61c6448e10fe73f5fefa313bbc375dd1341614a013244763d86ce27cfff5f5262f3645bc9b2ef0f0b80a43b0f941fab350efca0c888c3cbd7066b4ba33c0dcba WHIRLPOOL 9ea12e0da9adb03f8ed67dae2a4545b917ceb7ba1201c1ad1c7d16466b92664ecf407f71d34e065412eb3cf75a0d72401c154a8808c42716ce09dfba5aa3806c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8STXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOwoP/R15OL9/9A1p0oAHhwCLVFpO
+m1/SyPdUKp9TKX+qUh/+MAzJhamCsSiZ77U+f69s39L0v1in8U3bu4KmXXp9IkyT
+4azQgSbZF6NZUjxVstdquosDMyLLWS/zYo9U0qTRSuiSbKct63u9RgekXLl774Kp
+FlcqLqZIjAf/Ah3DJA2sA4eHrRme+ee+vC41OG6r6OH2oW9ZhINEqkv2bMgkMAhb
+Uvb4IVgdhextJnseObhe20EC299GWLEu7s1TNdELbyAGoLV3kGVoNMC5J/jKBZTK
+zX8DBeQxCZq8lXBCjG7Jy6+u/EQIFB73aUQYcsfH7YYQLYC6DqcHhlV5N1qWUyDw
+TlS9cUc23c/3TXmMfsG+eOkMwliepqBEoEccBSi1Nk7l8BQ0QeRjQ6DTCY2SxZel
+NMaZAmpv+GnKEhb7uZEIWZxo3/9ANcq8XqLEQ3GeyLqx0vPAEtVJAK1JPkE7srHm
+Vuvlj+36W0YTghdRs7Vsy8s3PE/5X9328xcnYVH1oE+/c8M1xO+8z1ketnFpKoCc
+JQj4buS13vq3lSAZWyFDKnIdzh0kXr7PNe60mOFDStyUgXsLgE98FWpgm21pxYcd
++I944XxMpXcnIp5+y6aHubu4YYKfghWusQEZy1AUBrED1wSgOdD2pv67IlQzYaVR
+ZZL0LC2XQimxhnEdZkLE
+=GWnq
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/elementary-xfce-icon-theme/metadata.xml b/x11-themes/elementary-xfce-icon-theme/metadata.xml
index 5b78d475c43f..373a79b60357 100644
--- a/x11-themes/elementary-xfce-icon-theme/metadata.xml
+++ b/x11-themes/elementary-xfce-icon-theme/metadata.xml
@@ -5,4 +5,7 @@
     <email>calchan@gentoo.org</email>
     <name>Denis Dupeyron</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">shimmerproject/elementary-xfce</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/ethemes/Manifest b/x11-themes/ethemes/Manifest
index 0087804263b0..0ad19d74eb70 100644
--- a/x11-themes/ethemes/Manifest
+++ b/x11-themes/ethemes/Manifest
@@ -1,20 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-DIST e16-themes-0.16.8.0.3.tar.gz 8203866 RMD160 02fe479c4dc0760ce0f9f52b3d269908aab2e105 SHA1 ac94ad389760081570fe62717270794e060678a1 SHA256 9936360d807678f2291d5551e8b39822a01a0e63ef3fe03eca1dab30011a09eb
-DIST e16-themes-1.0.0.tar.gz 8225413 RMD160 9ca02d11641d48384b70ed1da041b2df87721b0c SHA1 2fedae04c7563a6bc43497bec0f189e8d439c183 SHA256 832a6cf57371534e63a42dcf56fd2371545b00370e56c2804ba23cd64da5feaf
-DIST e16-themes-1.0.1.tar.gz 8249438 RMD160 19c59a679c05b78fbcff342596720e49657e3eea SHA1 ae34e2df1294198795736bf953bf695aba93b710 SHA256 33ce48c5d5651ae3a5d56743f68775ccb763ebad70306ebaf7e162587940c865
-EBUILD ethemes-0.16.8.0.3.ebuild 736 RMD160 8f19466100d70c4594e3b401da90e4366d93d9d9 SHA1 6752f216ca47c157b4fc0e4284933fa8780360e1 SHA256 b220474fbaca70067138646777ff12dec003f8044aad7cb56f960aa7669831c9
-EBUILD ethemes-1.0.0.ebuild 739 RMD160 25476ff50fee664df35936b9f4ddfa40b6a1f047 SHA1 9db019878a06e084f970e3d4c93ee5a029602f17 SHA256 27d390b1970abdf5fe471cbdf219713f4b7e46fadd6a214cb22cf1d6db29f9cd
-EBUILD ethemes-1.0.1.ebuild 739 RMD160 f6738bded82e24dca0be7f0170c6a2dcd988061f SHA1 c40dbcba02f1e58bf77d5dff734b70aceeebad97 SHA256 52bccf1234bde2d87187ee765530b90568eee810ee072e37d223b621e2d92446
-MISC ChangeLog 2160 RMD160 a915f95154bcad91b892e61e9467a1ebaeb3f3f5 SHA1 186a0631c21380831ead2c74b8d604d355721e58 SHA256 73510d1d706d1c2399725308ebf993823a102e9aec6d127fdc19f96968510ffb
-MISC metadata.xml 200 RMD160 e618972986cf2dd6c8d0cdf2248299f3a5bd2dc9 SHA1 289d5d94a8c473ae8e9d0c671becbbfbf336c55f SHA256 eb63f2affd0b8e3f5149df2f2f964910eb2127b650919a9e7892fae011e2b22b
+DIST e16-themes-0.16.8.0.3.tar.gz 8203866 SHA256 9936360d807678f2291d5551e8b39822a01a0e63ef3fe03eca1dab30011a09eb
+DIST e16-themes-1.0.0.tar.gz 8225413 SHA256 832a6cf57371534e63a42dcf56fd2371545b00370e56c2804ba23cd64da5feaf
+DIST e16-themes-1.0.1.tar.gz 8249438 SHA256 33ce48c5d5651ae3a5d56743f68775ccb763ebad70306ebaf7e162587940c865
+EBUILD ethemes-0.16.8.0.3.ebuild 736 SHA256 b220474fbaca70067138646777ff12dec003f8044aad7cb56f960aa7669831c9 SHA512 95b824f253f48b84e461dd7e620bc99666c3c05d8b001ec452af364325784a6b155732b53b61460fcc3505f8bc5b77759d75e609d3e7eed7217f9e08c8f292ae WHIRLPOOL dc3b3d393bcbe4aacc026da696d89b01d88ca0d49a193ad83b0a8b14d00faf2f0ac650a1b56d60e3cfad3fdd6e5cd7bed072d4f43cd54fc8a656794878656e6d
+EBUILD ethemes-1.0.0.ebuild 739 SHA256 27d390b1970abdf5fe471cbdf219713f4b7e46fadd6a214cb22cf1d6db29f9cd SHA512 7c184d63caf3e5b0e99d14bdca6434c139c2d4dd93b842b3799a75e2f1fca2c82342ec9cb8c54a8634d7420191a4490138bd362e42928a6ffe081fc6f0208ddd WHIRLPOOL 572d40650211f658c32a418152f6a24f30229677ac5a3881e22f70a5367156d6a2e0591e9d2183b5aa6ba8dcdf5cca110c41b0d0a3a890d7bffa59eba3ee0617
+EBUILD ethemes-1.0.1.ebuild 739 SHA256 52bccf1234bde2d87187ee765530b90568eee810ee072e37d223b621e2d92446 SHA512 6104a4bc5d02deda3d95c92b9dbf905bd89e05ab7cabeeb61b5c842c9973515713f8b3d009457648498e5bd0283f7a2850ea39556d7c53718366629bba759f31 WHIRLPOOL cd0d8f6bc409f20804ab5c6c4995bcc27de75cf617cc73f4460b5222a4dfab5a26b593b8b16b660cbed5bf508d01763334321fa13fd78631085404fdce4e5305
+MISC ChangeLog 2160 SHA256 73510d1d706d1c2399725308ebf993823a102e9aec6d127fdc19f96968510ffb SHA512 9f02cd84c66b289252b649057b0fd408d90e887897d973019e42c7b8d5d4408eab643e36791e6a16e2477871ae3f909c45f9f6d5877411382f6ab741b2b4c6ad WHIRLPOOL caa05d4101080f2b0fac0ce6d04d86441e85f2270e9af89598b61a0985635238befdbaaefa033dd97f4dac68b9e49d6af6798c33a3d8bed9df68e95fc1409693
+MISC metadata.xml 286 SHA256 da8e089c90b481129b3f0b86d8be094c39d309df619636c3adda1a67bc0b7498 SHA512 2e2f65fe33c269c637f5e006ac2ee6aae4011bd0b905f306b9ed23316f82ab4b09d7bfa534d7ba4202afc10b5f598f94f2ef4784f80b70764c0237ab39230d98 WHIRLPOOL 3e12eb139986aaacff485cd56433723434b07e64191ce1d11f92c1e2fbbc9ee0eb47fe4f5d270ba92e1c0f5ed3771ecf059061889a71f21a52d902eaf33dce1d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iJwEAQEIAAYFAk59u5kACgkQfXuS5UK5QB00UAP+MvwdBq1NXoOF6JrxgFbNXYAq
-rr7RYOqVKrc6N9tq8H4pMtybZyUrOrfq3e1HO8UHx2t3j5/q91mztRMuHdtr8D2U
-EeusbxxB/MxmJ18/pn/kER1jre2HVRQZKrYTENtdd+EKizw0LbfKAGE4PewKz24N
-hdsdQgEfbPmuqr8Isu8=
-=ivm6
+iQJ8BAEBCgBmBQJVf8ShXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmioA8P/2txdXFnawzYRdq0h3tYPbJe
++DJPZt1SAvw30LofXWwZsF+n5T2PEpVVVjsn0ZuciW9z6dL+06Qkmgbbk+sLpPiY
+dqQe3AdhgUxjb4Ba8Ykye8tsdJ4Ct1OCHpENeaUX03Ek8yjgNz04Yx95nuPDm+81
+5mmX9DxXtkZiIt4vVEmUcclADrzurO0fT4K/atDZ3SfX/ibVgHmhprgei7YBP15R
++nnwfkQ9PxYjT/DAhRhdRjaeZMrd6/UnZ5UswXlmxuw0PmAuBA2mCB6zVV2X0OH+
+A/cBVSoj7eo68pN+m/AfjD44gkK5ruBXXAmyWeTPEs6pMZpOMR2Fnaba2C//0iF1
+ExtqzmBFN3AK5Fk5j4uLo+n+f0uxvYCoWcfJbUAdoA6yiuG75Zue+uROj6fE76eu
+cISpUfF3NaumDuNevf9FzcCmdfYqtDTGNxTLyN8/pVX2VU1qACLXNODHMqeiR3BN
+iLVjnHSR5Md4sn5R3CCaf6W9fm/3bd++Fn/v+3YsLnsfs6KA1xgAOv3o24U0yzg4
+9gBG2d/qeOfcHXF1fiBwzjA6t8RPVPGou0EOoGanZV1dZwlU1Ghb6BDlZuTOR7oh
+7eA2YqAqE/VXPxhxyawmZ0M9XDb5EXJQJAZMhYFZmHolT/GRo3kz3WnVIpG3/M0U
+G5otfBVtv0kl5IqKQQMV
+=TevX
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index 7123fa8f9ece..a3f922b180c6 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
- <email>vapier@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">enlightenment</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 9b9edb34cbb7..cb8d1dc16425 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST fvwm-crystal-3.2.3.tar.gz 4388604 SHA256 f259fb40506b3bc5dd061f007d15a621f39c5c5bae7f320951f459ff43abb8cc SHA512 fa3d17b55562f773a50e00954aa66d22ce59fd62153ddf84a3df2ace1bc480abc2311bf379e2593f234330033f83ef3800378bfe3da593cdeb8b80b284d299bf WHIRLPOOL 85cec67e583fa2d9feb40d601f66f8beeb41141b3f0f3b9ca15b9f8dda0f7aa8277ce78a7908d8527e28ee8fc03e5df2420681db8a06220a00add74dc671739b
 DIST fvwm-crystal-3.2.5.tar.gz 4474561 SHA256 ecb21f419e3bfb27f1c0bd15c6a298f57f125d6b857e45c129f1988a3c0a244a SHA512 f3b494da1f0851d0e16dda8a8867314a1b089d5a6c9ab18eedea6cdfaa753dff26f0e49747b12ec251812a22dcd93f348d6f3b689c9289b95e28545a245fadb1 WHIRLPOOL ee44b0a56e09b4fd99981de704d3170f07fa567d19cc5da874c174ffe54e1b44a9187d4e6cac78301e9d1c20c5c30d419a0f03016d80a8c26469058efa1e5f11
 EBUILD fvwm-crystal-3.2.3.ebuild 1875 SHA256 0d7307410c8be77f8346da8810657ee48901bcafa544f6ac8c6524561f3879ad SHA512 624732399e86bec90c34f800e2bf6ace243de0c9c57fce9cd4cada843fc101ecbc1e618ce76930a3508f74ca78e33b2db8e37b4e966a5ff8dc788d45c0f0c60f WHIRLPOOL a98f25d3d4e921b062b00918ca5214485f6383f5ae3b0ca356e9340917d88540ee4d5a7b7c4c4b7ea0e8066621f5187e7b3b584e663c6bdca8e05582f705a7b2
 EBUILD fvwm-crystal-3.2.5.ebuild 1882 SHA256 11f21a9ae13eec6c4ee5c5591a18d54287166cc1489c48a0d283be48433ae522 SHA512 11f9717a237ed40cfd4ca0a729eb509f39cb6ef5fa9eb92139282928697782561a6101b2faed50c0a14db10d9bcdf417458979703d90b3c1808fecbc46390c46 WHIRLPOOL 1bca1d6aa71874fc986629ffa9071f59f4d85cf1af5e6be349169b9eb8e9799266ceeec1cbc9a26a6448f9418099f796fb2c5ac9d278697c5d5fbdc8341a5111
 MISC ChangeLog 12332 SHA256 f8cf50e4d8384a046fd5d4f6056946bc89756e1891cca6cc245c472ef530dcaf SHA512 1c463b4cea2a99a8f6e2b8241e330f12744b1878d42af7022e7ca461eb8a30548e4a97ad408d925f729ba07d581249bb74b8f3968f126e35e71a48440e2be137 WHIRLPOOL 92dc10c9d1bfef1ffbcca0ec184fe6c26844a0f1fa19a1e8b42540ff89bd9225aee5cf4e2ac40923fcf21be6e3f5a4947f9c872b52229016c2cea2a4ffc514ac
-MISC metadata.xml 935 SHA256 8338b01e9acf9f5812a28f5f5a42fe904458a82e5e4109c6831b45d1ce4cf994 SHA512 4566b9032de975a4afa8b2792f39cb8fafb4d231c7d673a311044c7c9815f209d79ba0a2cb07978c3819157505b301d7effdac0dbd75185362ba23e9bb4f801b WHIRLPOOL d08812076de47ac834207a5ed584395e99c1c6c88c5530359443044f57bf6980265842daf15d0aca53d968a0899b28e5d4eb7b1eabd763deb6b782c006462fc5
+MISC metadata.xml 1033 SHA256 0276776b10290aeb1e471b8780981ecf0141822f4c153370367b4fa7063d7fd2 SHA512 ff2a474f8e02bfcfead83963e1884615a5aa041f106f678cb66a2f3286762f952320c819cd8caba6600f97fe557583e29ea35d0da978099e8e50a69e87cc938c WHIRLPOOL e099fb347f2d24753f5101f739dca6ba5ebfe0460d8753f06ccaa40a696873dc75988a1a12538836b86fbaeab2c3b1e3711a78547edb466876848d5c241d2b08
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSvYfNAAoJECo/aRed9267+OUIAILFV+LAXMR9ylwCPJbVP/ee
-P2sc6jbCT5xihKkf4E2sTKCsIvE4Fu+zEjzhKAvbngjNibPyJsjgW+/Rj89WmOIg
-OI5ZWgUTvmMwzLbeF4MrBkF/Yg/RTkx7a1WMuckhGBX86oCX/O4Dv7xoitD6KWNt
-z/g8jZyqyMlzw3eHv3cl2DPDRsjilakvoGMLc4waUQiHaCLTfouB8KELGRtObcYb
-7xxPpuWb4uYPn76XSyENjU0l4Wg9HHmOPTvZY7KD4GoP8Er7pXk819Tu5KixtNWf
-7un96NZpyJ4Y12WgYBDX9092D8gOwqEQ6vFoY1g4fZNL5eNrskO9k338pLBwrSQ=
-=7L8k
+iQJ8BAEBCgBmBQJVf8SsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivLwP/i3fBlSBrk9b1YCk36rQySmc
+E9Fcyxy9EmPVz9ofDe3GCO65L7X6pp+1D/dLbnfqztaY3L4kBUeFyaX3vOJOkVmR
+5cXVVAfN/xYZyZMaz1CCpgvnYSS+xPVV2iwdYL7D6cyauuVJChnQpHWvnMxVY/IX
+IIKmWgbK7Dw+oBLHuKrW8qKI3HY69LBNirX9CJsqvOeIXJ/61IVNaRVzhCxQ/QEk
+Wj6M3c1DN7cbkzW9LEGOKVz84W7n07Fe2TbPI3WgmHLA6foX3TP5V3LOngfCT9e+
+FxJxgD7WM9YX+HXopsLw3JR+LASN4Rj/wvs2Qa9tzKEl5xA9IGzy+OzeuU7hITdT
+2pZQP7Op6UI1ia3cGRZdX8PnHsZ+4Yzm9LzZeD7m5O4f8IaNdgvd1mTLeV2pvN8R
+HnyELkNemlcTCYZ7SX39TDhJ3IWZdd0uiR115CHWjX6wTpsBrRO5ztCPEvnE2gcH
+l7RLT5gk5ryCTdY2QHGGpmXtPhsFLmsdyZFEEBBEP4SygB8sxuN4bvvVf3Ishp8u
+6hmW45BaVB+GzQiNM8H4TZs15mmNlEOJfYhfCiQLYtf2bEw/U/swxt4L0J5/ZBhy
+dUsYzqQfDYZA/3Ack0fTnx2WXGY0YInKTTCn7RZp3N//X+byR3foLoIUKySXNV+Y
+eZ9OY2uzqDuRZSXdmUy1
+=wvaK
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index 5f357c6bb08a..729da74629f0 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>dominique.michel@vtxnet.ch</email>
-  <name>Dominique Michel</name>
-</maintainer>
-<longdescription>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>dominique.michel@vtxnet.ch</email>
+    <name>Dominique Michel</name>
+  </maintainer>
+  <longdescription>
 FVWM-Crystal is a set of configuration files for FVWM window manager,
 with additional programs and scripts. Some of it's features are:
  * quick launching of a terminal with just one click on a desktop
@@ -18,4 +18,7 @@ with additional programs and scripts. Some of it's features are:
    desktop pages
  * transparent window titlebars, menus and panels on the desktop
 </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">fvwm-crystal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/fvwm-themes-extra/Manifest b/x11-themes/fvwm-themes-extra/Manifest
index 7f15fff04bdc..f14e2bb8c55a 100644
--- a/x11-themes/fvwm-themes-extra/Manifest
+++ b/x11-themes/fvwm-themes-extra/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-DIST fvwm-themes-extra-0.7.0.tar.bz2 1141727 RMD160 0887aa42886792148f341735c0347b32d3bcdf36 SHA1 3b3b99d78cc08b68e7f71074070b9442d7e22024 SHA256 e22d18597edebd9dbbedb6ec03aa5f327be38ae03cde1461308d7f556f5ee5e7
-EBUILD fvwm-themes-extra-0.7.0.ebuild 615 RMD160 1edd0d19ac7cb9f2a5d3da4e4550df9d7f990c2e SHA1 c8c4a2e612ad3a5341caa3de0bae11aa489e0f99 SHA256 290edf51c24d6520afa6ffbb1d039912e9bfb7022acd09dd49b350a4aa7e2989
-MISC ChangeLog 1536 RMD160 c6201a06430aba57a2bb0a6a9efcbb9e7137573a SHA1 b4e688ea3aaf75f6fca572b3a9dafde0f460f5e7 SHA256 a4ddf11f29c6ef07e0715ca9083e197d72c8229699a66ea47b739720fefb667f
-MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
+DIST fvwm-themes-extra-0.7.0.tar.bz2 1141727 SHA256 e22d18597edebd9dbbedb6ec03aa5f327be38ae03cde1461308d7f556f5ee5e7
+EBUILD fvwm-themes-extra-0.7.0.ebuild 615 SHA256 290edf51c24d6520afa6ffbb1d039912e9bfb7022acd09dd49b350a4aa7e2989 SHA512 3462ced92a9eafbcc3d885e193672e2c9af86229835ee989b9eaa67e41796518cc7c11a13a185828bb2ff3c67cb8f4c8d4c695dae3beb5c508adc77e75166b20 WHIRLPOOL ec399126aa5f8f38ef87c0291343b8228c81e7aa87f08a0be52e52c9605a9210f16d55058937917fb1694d530953416af54a8409689e0a9a3a0e4cb3627528a4
+MISC ChangeLog 1536 SHA256 a4ddf11f29c6ef07e0715ca9083e197d72c8229699a66ea47b739720fefb667f SHA512 76b43a1421ac864483e18f1648462b7cd656a708d91c462daf5c0f775d4dbd06de3367a39b2388f6107b9231bd5db645685614e6c6677041bcc2142b09f35cc8 WHIRLPOOL c51f330e94112a2227724aae0c6c864adaf31983d0767c6536aa05fb7175478f63aa20ac4ff2724d3a179d2eb2cf0a1d69873fc9ad6827960a76d5334c819d9a
+MISC metadata.xml 252 SHA256 bdd9f4499890f6af4e006fd23d2511ca5abdf7f190001c99127e93290f8fd509 SHA512 f1241a3703116538b57039d0e93b6cd6cdbdc90508ccc005d743cb8337ae3dd2344676cb19260d3ffa92c4a66f7935583683a3e6879bc4ce3c3620b92fd8bdbd WHIRLPOOL da41666fb9f5da7fa7b5cc9741700c5ab4b4e2fe7bdc9cdafd463fd1a27b5eda7b77f87e06a1755bd22c1ecc44fe56e60bd31658c03b235667e224c645ccbf7b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBAgAGBQJOvVjVAAoJEEdUh39IaPFNUfYIAJ/QE7o4QiQERzSHSmNZIot1
-Lko0dzE+qoEhvstKpCB2mTNEG0vqYtjiHlpDAiLWhL5WpOxj3Wu9Cb0q1zH5HMPJ
-9JH2SoGDCigGSP5KwHikUouOdYRCDcIRGjWamJbnb52aH2QFPbIxoZhoIrGO9iHf
-TV0ZPYXyARVEjWwHAGQm53TOc3X+coHd8DTDa21+Ab2hH4Zwj61G8cJdLDlWS5ok
-tKiWaWigVRkwkMuxH/pcbuHZBbFw46xfhVcZOvrfizLtkjmj21mXY4I4HyvD4A6N
-9b8rI5MR2ueE73rrmEq/2DWvyuZu81ZC8GCWYSzNN6KAl0+oIBsxVgdrI+j7JYg=
-=K9jJ
+iQJ8BAEBCgBmBQJVf8TFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihZ8P/37eD4RTkubBdnE/oLe1xOd5
+1JuCfEz9gDtd2d1s20gUlaxGSmmxCvK6ZuPx2mR49ehQAeQsF3Fk1FN/DGUUmsXF
+JcfsGtiZej+cjMfGgLTSQbKi1S78MPxYHkrcJYooGNz42HSUq7U/0QvdahRo1676
+KV/Tf7X771iuk1kbeR0amTtjjbvgRJQOnVqxXrxnRQAap2+Kp2VPI29ctElr35tD
+5kv84iEXka64uZ2eyHq9aZf0LZLJfgh1c8GOPPQmSx9wfkxf3EA6hqx+lhonY8ec
+TpMXtDjDCO057mCK8+5hBaFNhCs7UN94VtgXxPBL6eOZtqwyoFV/qq5YBNdr8kHA
+OwBB1dB18IIWgRTCK7JG9iQrFXkTQPBepN60Xg3WkPv9cq4C9BiHHUF9q4a/ot2x
+PhOXi0BKIpd+ZArLGvhEaatmQpX20p5y+utbwLo4/eIpGupl5wkaXD0MAVZZzSaF
+xI5+EEOzys5UvBQNIqW4pMtGtKIdPlsYeMlzfReY8EGoBElON3vuYVQhZU0+0pcY
+3mRr6dpPs1vS6hWOHjlhlxWQWatxVSYNitiFBak5Y0rgGUj100xvk0ozj3GIiUfm
+GaVqPs+x32pSE+2xdnqAa7YGovVaEJ5imN4lfLO0My8yM5441gBcentxqAVpNB1e
+22TRhF8uS1y0/Wqo0ks6
+=hmdv
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-themes-extra/metadata.xml b/x11-themes/fvwm-themes-extra/metadata.xml
index 540f810e069d..f6aac99fec22 100644
--- a/x11-themes/fvwm-themes-extra/metadata.xml
+++ b/x11-themes/fvwm-themes-extra/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">fvwm-themes</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/fvwm-themes/Manifest b/x11-themes/fvwm-themes/Manifest
index 0b729f66230a..7df8dfe8f640 100644
--- a/x11-themes/fvwm-themes/Manifest
+++ b/x11-themes/fvwm-themes/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX fvwm-themes-0.7.0-gentoo.patch 903 SHA256 d9e6facd31d9d84fc668a90dabd0c9801e3ca04f09e441f6090362857c41a9d9 SHA512 7483e79ee155c30d6fe35bb932005002d4866d0443a65138f05d41116d02f0e54decbacf6927a25b648b5fa5b90a056dff7326ad4962e0036fcee1f396239316 WHIRLPOOL 9b72bc5171055afada79b066c3f30875686799198362cd4a049e88c792811ddc9fa8bdda57b934cde96b30ff1760416a71eba36f576c62a0215626a4c06b250a
 AUX fvwm-themes-0.7.0-posix-sort.patch 388 SHA256 7b588615c1fb612f9e4b28068f4775515fa3b14bc4db3952ba1c992b13845f3e SHA512 ad2533581bc90b1cd54d1235f6b4f703d93f0ce7d703e1caefcd9c93d598db5bc2b722d5bbe856e2a381e0d0c43cecd0f491b8865342915c173048eb9f50724a WHIRLPOOL 2eeaf4b1586181bc417316555d6a172f0299a7735c5b59f0d7add1b32e4d2e4dd92bd48cdfb21a6f4c863de310a66fae1d8f635c1f83b84db5e0726b25e3bf16
 DIST fvwm-themes-0.7.0.tar.bz2 921517 SHA256 0854ab07c2d765a499e6bbb2fd0b2722bc824c5b4fe6d9f917d71042919b5848
 EBUILD fvwm-themes-0.7.0.ebuild 1100 SHA256 66ad224e735e85332c23bc5d5d6b53bb1390909908b5a91d450ae863b5d656bc SHA512 d06002246915ef2472e005963e93cb68e647861f037e3686f8f99e01d34532474e169d22b3e2b8bbc6a5acb37232d5722242d6c7c7c4048395cceed9f5ec2dc2 WHIRLPOOL d4cd1799455895a237afc11dbeaf6ff06b891db1ea2d4b5ba434017d637ca62bf3e000f43cf1e4d08ab53a30c9098bab5c74cc53c5a9a9191247aece168c3891
 MISC ChangeLog 2833 SHA256 0861f50b557677d48ae05a201e2ba96117168d103d0de47a7e85b848619f970c SHA512 8ac401bc29be17223a992817322e264cc21931a6367e29daee34b860981e56e40caf3677567c6911a8c1eb34fb4b4df062a39b79e134399c09852e8f399f7937 WHIRLPOOL d8af8821c3e84a1df97df186c2646f9f316e5b97429f453010164b9050a41cd16188cca03c29a384ec9ce54eab29fd1eeb16049c454c02b19061c39392e4a29c
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 295 SHA256 568b177f5bc0e23f1deb42137e23835727aeed4685a8595663525e7dcf475973 SHA512 11a7490eff16258c03c88075ce64b912e94bce9aae171dcfa843a59d6404a945fb17fe94bb79c86ec9154d73c6e4c0ae663ea5330b6b0cc7e15f348d931bb4dd WHIRLPOOL d694ba730df064ecba3636408ee39c1c10ec651f488b661cef71a059dd0163ba683b0a3b51d7c855828b76fa0a2da7d7983994325eb4f9ec944ca86c7512aee2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJiooIACgkQCaWpQKGI+9ReAACeN/KwOFmYNFifN23qM4SSfKOl
-wdAAn2D/vO0guiDjCKXODlAQpLWqJ4EI
-=V+Rn
+iQJ8BAEBCgBmBQJVf8S6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFMoP/2ceLqegI9UukkYubYd7JnhN
+vYX4dbs7Tn0VOcZqfumV5rcpkLNjKjhBiqWArjnWAJBSuF6D60hoH0IChZ9L+Q1Z
+pr1RuX2YC4hRpWrNq99Uzp/BH/McYhvMrmXIQvpMSKFM47QpqU143XgPwmlNklr5
+dpxfKM6o8PJHzcUlfKoLSW4jXL2JEDMvIvhF2O5kLBBHq/rITgz8k3ATLiM0XJpi
+DPLstZKez1T0gwIrgrPauVQegPpcVJb1sqBPqjJZgq0yHRU7uoi23NQI750xb17K
+QyzcWeOuNWUro8tzP/hyfkgakjNwsfUMOOtbPv5bklmgxlEcs6Y9dULG6Zyz/Pq0
+JFV/nO4lnr/UKHxOQfLMzHs6EpnGU2beg+mcslRxY9dCevWFRoJga83kqyoJrrNf
+p8yF95ZTaUBJCIZM+uUhuuSreVg7TrvZq1xkRoZD7GHrXK4ZOLLtnQe4B36V/xNq
+x5kaELXOahpASa9sfwVvSEXaOmConEyZstQkb+wpy7r3oWm0aKEgk/qSzq0xE8yV
+lmnCgzrbr/ru9ML+dLLE1fitxO2X9J5QKPVMxqY8gHCh2Jt182gpzYknJHOo6uka
+ERDqV7qw6l+L7glSQMP/mTRg7dDHqcJEUTcFCPE6v72vlzze+hRAjoA9lYaZgAG7
+9HiN7xZEypekvePO6IyG
+=jw94
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-themes/metadata.xml b/x11-themes/fvwm-themes/metadata.xml
index 4538a68724a6..6cdc4859cfde 100644
--- a/x11-themes/fvwm-themes/metadata.xml
+++ b/x11-themes/fvwm-themes/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">fvwm-themes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/geany-themes/Manifest b/x11-themes/geany-themes/Manifest
index fedb756a66c7..789f69bee8d0 100644
--- a/x11-themes/geany-themes/Manifest
+++ b/x11-themes/geany-themes/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST geany-themes-1.22.2.tar.bz2 14694 SHA256 3737f182bd770a2ecebe21fc093a3e4caa885569e0aef2078b29109ae020e007 SHA512 3759c687a06a7f933e40fde5c52dc10c36eebeb799a5c471c5ee31598f8c32496b1a3f326342494e33ae209bed66420147f85ebdbce771af2f27b0151dca9c84 WHIRLPOOL 5d23d40ac59122d54ec3a90390d5cbcbefddfd2025259e9885c42d0e04cb644b26aa37b5be34a2e3377cc8be9e8f3e92dc7e43997d75802e20e6c5fae729164f
 EBUILD geany-themes-1.22.2.ebuild 624 SHA256 f037aeb5161819335023ca715109b387330121eb6572964c561962d0e95b2582 SHA512 77ecdad900e8afe48270727a1275953c5ed6b53b24aa3b03266e7aa24c6c412c1dd32334bb9b617c237856989631f8309eb5352f33e1864ff0d0ab9d5c997da5 WHIRLPOOL e23d1d71870603224d980d90806e8b0d8a9927ab4e7118a65e232bd2a8f3520b1c4a2639b0518846ea8ae153ff5e3be19e247dc966040092e0b17991ef12326b
 MISC ChangeLog 1017 SHA256 d353a821743e1de59e3b894c252438b452c774278185d5fa4d73252876e6318d SHA512 7cf9ed9646ff72081faa0d228b30d4da36cf5a4818d1016adad6a0882a7feb17252313be1a3365e1454e2f3fb4bd710011bd71a93a47573a315c5ae3226c2c65 WHIRLPOOL 99ba5506b827685db5eb5d609552ee1cee81671415dd5fe3279e06e4329463952642ead1d9cf287306c693e7a0dc7cce1e81e7fbf6e9baa7993c11c26891aad7
-MISC metadata.xml 235 SHA256 11ffaf6c7e9d3f8dbb48fb60cd443d87b61015bc3197206ca230f5c2b0c1e013 SHA512 8ff2114c96567a53f83cd07149d1530286182f54b3d1286b9ceccea41e85734be19d0f60876c73880d76baac48e698de91114bfda459e2ee6ade9c3237847133 WHIRLPOOL bd4bb26791fe245f1c2407aa690887524eef3e76de87b4f2b7049f436661ee78a669e4fe4415e227aa50ee404bbfbaf1822fa648792919f93cb3674fa0f55858
+MISC metadata.xml 322 SHA256 caab4bb88f6cee8f8cf9ddd5e09117c895cf2ea3e0a2154526beecf164ea8c32 SHA512 bf0a5c98f33a984e6973f7c719039fc37f094bcb8acc4d8645073cfaeea97598247d195609e0cc3d076cbadbb9b23a3060a9e61c137f54b80cf87575a7cdff80 WHIRLPOOL 796f0466e372724cbafeedc6c3423b99fa0567f64013ea4c5b828caf99c8ba46d11337bdc103a991712e912f96620a2d7d8323e71924ae5410d523a1754ccc6c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJRjmqSAAoJEFpvPKfnPDWzxqQH/0NSi+c6xm7x3ougjVGkfb5L
-lA/Cm3LvsW8PeDrJl/5W6tSUPnVjS3u4GRMjhCYPvA00yr8hbnF4mS+Lu2QVlbue
-jYwetVMCMQGug9TcCRl8ixK9RIORlrUzzkgvWnu9UEedloSUPl2Ph8O440qVKv54
-HoXO6uDvwGbK7BUiZDacvac9GzXD/a0MUH9MGXhIlG4ot3k+au4GIta2xvGhm/ju
-Qt7o0NeIBiBtrQ+SaBUy0+Z2uCGpGhX33U9yAiUUYppvSDAwh0oWpURRXeP5StY5
-RLkhkDD2MEYbrpC+xD5TgKBBdBaYm3GVO0Mj7IOQYiFaDT87hPzs2MVJRc2yI2I=
-=h3px
+iQJ7BAEBCgBmBQJVf8TMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwmIP+PG5aTWB6CM/qA6QbfMfckzE
+fvvf3jS2HY2d6FcDxBeP6JFJDP6KWL+fYOEdAk61/yJdONvRkUzBwUiQu56ITt7v
+YsnO5V/yISYYt2+Dee9kzLtLPmlkyHNfBO/TuR7m97XktqBWoq3RJMh8aA3mRvRg
+TQuloANGe8iwnnR17G6K2WdMshSpnPqlKxGXurrL9qpC/jO7aqmEdnTTA1l3+CPy
+5m6Yf8ocpMrEjGB8OCr8czgvSpzFt6x51AURezNfPp78S/AN+ZHMFH3Hm9jJmUgO
+aT6sbUPkDIoc30ShitvUXYoTG4byiJdv+UhDto/boHk1agS4kz1ole8uY1XPy5yL
+K1yFmHDHo6IkwdRtWK8UZT1NlJtAkTLZz78axKQea++p6uYTDVWDuJo10LiJiXjZ
+j6yXpmW0ao0qof0oZCFXMKF6ZUq/5msSxUEzq1cR7xR3Xjmp22wRBon6fRVOJ7Sj
+1bVleIIW9QgIIoG4qJ6X/tPbAOCJySc8rIJZOB4v70inWMdOOs2hfi1z3A0SYbhG
+/6m1YvRnmUPgkZywkM0erFGfuyt+oIWFeEZyKS4lYbnSbhUKrs8oIdwlQrADx9DG
+NE5JAecM3mptGt7TheM/RSQoONWDxVaFGNVhgN4VhPCRWO4P0cbxFtMchGvlHwu8
+IlZtL5Y4wwSXxczD9sc=
+=indr
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/geany-themes/metadata.xml b/x11-themes/geany-themes/metadata.xml
index bfabcd0164b9..91e0528b9ed3 100644
--- a/x11-themes/geany-themes/metadata.xml
+++ b/x11-themes/geany-themes/metadata.xml
@@ -5,5 +5,7 @@
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">codebrainz/geany-themes</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-themes/greybird/Manifest b/x11-themes/greybird/Manifest
index 8f1280ff48e0..4d6c2c916073 100644
--- a/x11-themes/greybird/Manifest
+++ b/x11-themes/greybird/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST greybird-1.2.2.tar.gz 112022 SHA256 b54c73da705dc5607e439435b99262783be562882efe43957c6cf012394496a0 SHA512 0384647c51e6b473f104c10d5418f8d1e465190dcbfdaebc9946f47cab77e90d7c81555cf94c47298a053e150c6b92adfd0d5c84f20f2b5f2ebcc0e12cdb444e WHIRLPOOL 2b3dd85461408a539dba7881d73a088dfdcd4bbf1d74142e359e6429da8f837f9dd5292efedbd4b7c7a646e61bced0aae923bdbc29049714b5ad177a8bdd62ae
 DIST greybird-1.3.4.tar.gz 116901 SHA256 d4c3ea3445d191f639fd045feea43f7139375da94478c3789f0a319f24c3ff4a SHA512 78bb9372d9c05c7c83ae130a3559f7b1f413bb0519d5f626d477bef917ca35892c7b0235872a084720fdba5aa5b381401fb36f7fa11dea00bc0986c76670c286 WHIRLPOOL f40381dcbc9df3a15883df83f2d2480d4add48e45d0d77dddf9781fb4c4cc928011c845892b02e7be070badb6e3c89dc69b2f7701d4911b6678c3976fea92b8c
@@ -8,11 +8,23 @@ EBUILD greybird-1.2.2.ebuild 1003 SHA256 7731f56fc6a8147ea4b06076df796f95416c7e5
 EBUILD greybird-1.3.4.ebuild 1064 SHA256 82368ee4906074e9836b0b4a1daf81e8e462bab84b91833c7cd719a4289ce4d7 SHA512 1a5ad26346ad9516b6eee921346fac29beaa8baef48e5b465effd248d2670d5a32779a55061f2e465b97c8cd0314ecf300e66ccbbc91e83b802da4f7578c7a44 WHIRLPOOL 625f34a0804a85073258ce15a936e20d2df9f45b7c796926f45e7d3c9f931bc5e5e1b6a6298ab2eeff399b3221f9d47f7ba3f43ab7d96d0502b73af0fc921a40
 EBUILD greybird-1.5.3.ebuild 1060 SHA256 6a720f5edc5bedae122cf83abab9fd82c79831a0fd536d44ec8af1f39dcd6ed3 SHA512 af5f4305c46c8166eec3c9bfcc89459071e1bfaebe6d141c0c5cbccf0cfab3ef1e160ead2da1d6d174beaa6ddfa0278e185d226e47cb1a3bc008d5733d1ced45 WHIRLPOOL 86818b3264488cf5d7de31414a528e22f90d66386c6b0fd7299a4e8b4cfa50d7c9795c15c6d2bc5ff99cb836fbdd4b73527b2490a3ff83b751127d6723b81848
 MISC ChangeLog 4820 SHA256 87c24e59a0c251c55b48695aa7ee27846bd95ae4a3dbbc2534db3383ef5b9dcd SHA512 2a4e634436c959ba2ab78420925ece65e296c14e3c13da5b6d7d9bca66ef375dec78d7319249a52efa964f5d89d231edba59ca4146c8435e01cb2c28d9c6934c WHIRLPOOL bee73fd937704eb3397d6a57f0d6724eb749900751795f990d6ccb4538fdcaad33ef35934c3c29f748d94c7a659f419fa68778e533fa30e35a719ec006804ce4
-MISC metadata.xml 264 SHA256 2d668bdc068f81527ba0f7c72fe46d67a9a483de274c1d89b64b25ae667427db SHA512 98d19b3cc097034a563a1e91b027bed82b2a3d3cb26b1ee975a2bbef9e9369bea51ed5d555ba94d21518df0de9e1530297b3d11e9914cd46c25c61cc1211c5b9 WHIRLPOOL e61a583c7d0ad45d930184b448648e2ca0ef09065a1dde495dbcecd9c41b0c3466691627209f4fa0e649cb9cf12669f8a822f304ebc9e81c9ad3957f0c528464
+MISC metadata.xml 356 SHA256 19c6a2bbfc643bdccd04fe93022bec99ce1beaf2f3ab0c96bdae267e37a1cf76 SHA512 379bd7f02356261468f95b5e67c1e4e8c5fdd4ef6ff094ca2fb5a0881278b192858fcd3018b2a12a79b1b2f9b536cc47deeeb1a55e591998048d4bff8ebebee5 WHIRLPOOL 07ca2b1233fa2fb085748f844b1d2f381c76705e3fddefd45e5c39c07dc29f5a399980b4fe09e50579303cf2b21521dc321a66522b4720e95fc54a1be48d7ce7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU+xPgACgkQsAvGakAaFgCh5wCgoI/TB+dsjfeCUvw8ATr/XmeL
-JKgAoMwTJDRdDbY3wczVfOZKfXL2dyVw
-=G/nQ
+iQJ8BAEBCgBmBQJVf8TXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYl0QAIVkqHAXEwRLwHUhuaoNJETJ
+4MP4Bn+eHq+E8Nhg3OseIoGurO5vFaYEYzxTZYTd2H/h+fDNqylz3/LlaG5gZzrJ
+A38eDhvvP3FlEvEgqMuzjDAOkFkmqL++4u04Nz5TP5532i6pca7wdHBmV46XNUxb
+0lWFbEIQij4YKLf7mMx17QtNHRKJIXmxl8Dl5TIYG8TzpzH3KcxKfCWEbtpCdAyZ
+Md+NhX653acInu1yt6H+w4vm/4j5sMsillg1rHGY+aesUr0ZQalqmzgLIWHP/IzN
+n/sX/q4gihtg70wwiRx9PO8JySILBi83SMZKZ3QOqv2BUL2rehQvKe9Z7413Vwv2
+83hhymnq4+LQV6yGXkpwMtKn8M7spYRcsV+qHw9cTtnMbr3xPtV0TtAGAj/C9DzX
+E+mnQoYzLFgJwBz+9xgo3b8J4lZNkv8MFcYOuA17K0zIM7IFY5lrvy0hNSxlQF5u
+RdZqtgeMWIs2Gv0UIBUVe4yIMgD9Vsr2z+eJUQfeGCfcz54WSMDbQFTxiA5BQP54
+YldwQ1pdwJLG3sanNqFu6cyhmCAa2O1JQ1+aliSIxxNvtVEyXPm9y7z54+SGonBb
+8oR4mH98UqL6vyGlRbp5XrtcmZIbxjSTnLgSyidrGdhDj5wYpgDxAfv26NTI1bpd
+a4SnpvnIWlchaxytVKWF
+=tbnl
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 6effba26c611..324478bd5503 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -6,4 +6,7 @@
   <maintainer>
     <email>ayatana-bugs@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">shimmerproject/Greybird</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-candido/Manifest b/x11-themes/gtk-engines-candido/Manifest
index a72c2f6bfb45..f253f4482d7c 100644
--- a/x11-themes/gtk-engines-candido/Manifest
+++ b/x11-themes/gtk-engines-candido/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gtk-engines-candido-0.9.1-glib-2.31.patch 225 SHA256 51f649d78ac94d665d6f5def8bf65ed70b5364752dee0de46b9c85a3c2114521 SHA512 59e0f2c50784a3f350f1712eb904e420e5e0cb3a0aa0470cb88be4a369293ade986d7fd9c92af0fc5d7beea582c820fbafde21901c5d836d7b59d037fa2846ef WHIRLPOOL acb3a8b57ae40cf4382c56c6b19d184161fac2b34d4b56c545f6fe2f598c300d0651ebf444332063ec4e8731abd3feb16758c46e16deee4e8e7dfb5b1ba2041a
 DIST candido-engine-0.9.1.tar.bz2 319688 SHA256 68a988142b8d5155cbfe3958c5bb684a814a2d6b985d672789efce780ee7613d
 EBUILD gtk-engines-candido-0.9.1.ebuild 924 SHA256 abe811e1c7b87fe5840c6577e76b19ac124beef6cb40da84e8ad5885cec6ba04 SHA512 32650e3e3b9448c5cc256dd3173b07090ecb2d4e0f0e7c164b4fd9ce2e52bc0ebff3acd7557bcc7404f196d9c47354d9339042a0bf1c4d1d750e13f3992842d1 WHIRLPOOL e407a77a5262c9dee114d95496e1c1add51e3ce448847828eea922e097a48d144cc0c1ae09657ab000ba0b63d78025c1a5b595fc632df181d70e6a489125d987
 MISC ChangeLog 1605 SHA256 2b5c761de35e65b05fda3d597ecc76072cf8df26c981436e2f62bdbc5ebff833 SHA512 9676a7d5cc357626391adc78fc2bd18af6f9c11025f753915acb41fd0d63f4c3ba682dab892507a1405978100401ae4dddf90f55a4550a6c0b34fc984e1aaf58 WHIRLPOOL 9d08b5185749a27b72cb0f72b6f688d8757a28ab4a1f7523cc3368d8e208f88484574ebaded166f741e357e74cfb607835309438bd11908b19d61f2b3db5e2b3
-MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
+MISC metadata.xml 256 SHA256 5a3937d2852d6a098c87775d338dbc5a2a98bf21433d6b683373c3556031426a SHA512 03f9434f3ee4a409fb87b0bd6e81a390efb2b2642e2c30a1eca5e00405f472e4b833cf3433226c89f1fc98a702906c2fdf8952e8fb9793ed495904bfc50a2c7c WHIRLPOOL 9a03f42b24e76511ac70241c0bcb83c5e17263685fdf401a2f1fcec8b8643b55640a4266aca5d01bef6c6149ceea8a44560f3ea830fbf198caeeb87df7260d09
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU64mXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwpIQAM+8TN59jBfd+GvpvPgLNHn7
-9r7D0u9LRc5unwaF03TIjrDsrNPILzmsnHJtOa0aqcBtgTNKopRVsKQzPq2YCN93
-GtoyQHLZarmvVXfbU7YJCtwRTGy2AL3CHKm2Y3qFGu5h3LLiA5w3dvevW1UgUJTV
-BvoK1hCARIW027lPO8wsoa9qI5xD7vRpnB5E63Qz8C3rgzt5kc9e22KWPdBhFXnO
-BpXRsm11U4QrXNfD7sXO0X97W7jlDW8A4Wn00Jdz4zG4HSA5JtNTj3NtcThAyK63
-0FsTQ9zNpyjkPQONOSGosOiGhw2z0U7Lg4eTL0WUG3kXUC0NJ0I/RlXed8KVzLG7
-tOQz6VSFa2HGmCQOymxhKeC+8OMwHiIJOvoFo7M+kaOB1e2x5KSkyNe2DjMJv9Jf
-yfwdjmkXj+euyeBVs2RD16nwJfBTUp3ecYT2rt4RRdc52SJS4SJ+8W0SrLeWN+MN
-usLAi/+szcqkIl2Sxb2sY5NsoemCMRukfJw3AgCffGnAWwU8Wg+6ysZNZ6t2+k79
-90OtRqpJS9t48hMs23XuQogxXyJW31pT8ctmNDEmSPYB/YKbAKzjNjcmNNr+Ro51
-NP59vYCAZv/CA+d1p0GO2wD9Ib57e6z+SEAmni84nHIyjuNhoj7tu0CUa6EerAaA
-MhkngxFDKQhFzZg6jeke
-=ZQtU
+iQJ8BAEBCgBmBQJVf8TkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVjkP/10PrSjbMaNbl7sGvYUvVo2o
+LR8/r+EHj80zXpk0m6yTkTUaOF3yozPJj/DgSVWnU3vBEdrY1aeh9UqwL0cWbQGD
+Mtk2EgNqgmqf/NJiMKKZFelK6KEO4NCwM/9x120xDoR40VoXgOD7oYecj5ktOf4e
+PbAA71NUKeJl2Q+7/H/TyDX5ZyTEjqaIYSiitaF8ueONbjJfozSFzLDWL/Kdkjkg
+C+VrnmpZxKo++9dk0HCPxFS7LCKn5OsrIQbltATDdlsUFdKL+GkP5PsQLYfxHd8s
+8tF1GEW20z6NvBRNK63d0WKI1bRvIm4wBnym6CTZlozWL+zMOYusCgdRTDO4YBTw
+RMlrTGuE4rOmiZT6AdqK+KWXUB0c9hMTtmicNraFKJbQ4xF2a8OXjz9z+6cbqrcK
+eNjjkVbx6rRo7IMZuCrtZBqXqRTMP1d45vSqH6sbGoIuSWm3FzP3e0Gn1mVuHcFB
+jVa2Mh3R8BBYw+GOpMkE5crMqQcKbBlfdJ2XYH9bo5mzIGC2oL0gaVfYRkXdF1nV
+V0AN9grGbcue8dnlNLqEjsbPCraF1THHArCoOvy9bK1KZoTmeupVyRnGAD1kflxC
+HaWtyPOe7U9NZaa9CawZ9P/jphiqp7pjORfgLMBJudKiSdxar5NNA3X8B+NVRJlS
+A6QcB15UmWVe1TPWIa8q
+=Quat
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-candido/metadata.xml b/x11-themes/gtk-engines-candido/metadata.xml
index 540f810e069d..540c25023998 100644
--- a/x11-themes/gtk-engines-candido/metadata.xml
+++ b/x11-themes/gtk-engines-candido/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">candido.berlios</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/gtk-engines-unico/Manifest b/x11-themes/gtk-engines-unico/Manifest
index 96e79a936f93..c0511e0be84f 100644
--- a/x11-themes/gtk-engines-unico/Manifest
+++ b/x11-themes/gtk-engines-unico/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST unico-1.0.3_pre20121212.tar.bz2 276446 SHA256 0fc028dc01cded59d983608397316297a1be6cabf747b606caa55da62656993e SHA512 654a3ce9532a1f9537b45f0549b9cdd956232e6b0d933460ea58f85065fa6b82d1d82856b71c09a9227a47b237ebcc0c8f6759c34ff685c238dbe104529c1954 WHIRLPOOL f4f233f75221e50552ffd79e72e44d31c1ccf063acd8835fbeb4508dedf3978acb6323f42f953928bc5afe11ee6bb1b2e8620977b9029fb6438d497c3fccaa90
 DIST unico_1.0.3+14.04.20140109.orig.tar.gz 19416 SHA256 6f96674e17126ce6daadf186604bd2f46d68073fa8b1ade3ddf70384df085df7 SHA512 8112240d63ffca2cbbaecc6731ef446153d8dd8b2b100c2d258013faa20b683761ba4768e71e91bdc885d1174874341e68400d1d3ebf95dc92db47cca7221de5 WHIRLPOOL 33aaec39d14ce79fafeaed1cab5169293c2f482ee7c5939f2d7ee45387c36da04b56ad3c297c80c9d386a6f7ca2d7d8323cc9b491467b30ab5c42df5962ccfe0
 EBUILD gtk-engines-unico-1.0.3_pre20121212.ebuild 1068 SHA256 2b0e10b4a9531549e9bee5eb50f1e74ee2d22d3df56f6861d6734c2d38885d14 SHA512 7a5e0aa1ae6d3135460dbd6141ef6be21a83f5c39858aad4c7d6cd8f9e8fe9aef186a67e4c9aaa01194b2a7af20cc1e99f60df1bb3e17cd2693052019cb41341 WHIRLPOOL e8033634f298970c88f6affc302086374ed437e7e246d110acb095c2c67b3a3f83b8a91a1a61e6ff41f503bdc99a9e3e76733f6acea9830facdc6ec60226d046
 EBUILD gtk-engines-unico-1.0.3_pre20140109.ebuild 1142 SHA256 f10a4ec56bc5cb2db85adb6f70d2ba4ebc40a210cff0d01fac67800b1c418476 SHA512 c8e17d67de949e57245d5aa1d57c224d27831a79eceabb2e776573f2ef072974a7240d5e1efcbb6ae25e416a6c714eac12ec72cac07fa7845b1af3d0af7c2ace WHIRLPOOL dd7558ee8a10be875b18c2de16a61d1f302cc1d0bd66e51e425be9772d1a8a02d158f6e15e9768b5d76ee8883e6fa5572a93c614a4da4346d3b2b0f5f5881fd3
 MISC ChangeLog 2874 SHA256 d17ad122730e781d696db2f1d072a26aef48e79a4beacdd11590d1950b60c334 SHA512 fb2914025d0eb0fae773136f73ac607e647ccb2a6e4b1283d3dea1d6251c09e58ad422bbae7f15f7ccee402f0ee4f840d65bb186bf14263a2318f6fb7c84f168 WHIRLPOOL 154b2e48b52f6995577760b99f66a69b038c6926eedd47e103f60ef083d3ada95f0016b5d2707e639f18b2b2683faa45f96314220a685cbc008dab43a53326a9
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+MISC metadata.xml 233 SHA256 18950130df8692389d65995c152c20a6ef7610a5a8b7d18db270632044fcc31a SHA512 474e5f51ab3e1a272dd2c0d0dacb7175ceeced0f449f9f0de1054f5f452cfb4a89fa0f54161d159db35e1aded7d8651bea2e56141c233b2b9aafc2e55efe7b85 WHIRLPOOL 2af36e34f5e4422152600f0c71e7f73084ffbac2cd34119428eadfafeacbe0a9c3e09c57672d89fb5860c70047e15bc796c6225a7a63bcd71704da5de7511946
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVCYf7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN9VYQAJb0BRdA1Wt7e1875bEsF/Or
-eMPaqgdNH7jD7pV1sOBDr5bv35B3jwCn2+KDyeo/m2kCwb4E50+Gn132kzse1Yyw
-kTyIsaqCsQOOoyarIRzuUiyANGz93vuxx3svefD3vynwNaxkvyCuL2FwqnifW+u1
-m8JkehWzfoBUI+A/te01aR6r7STfYUKhjE0nnC9bqsNte53kF8kP4FiXVfxsRhxU
-WoaajEhmEeL5tQzhdfTNjm+OabMFH/30WSssRI9O4ieu172TiViiOosNV/atJYSA
-/rDjY5ssufJCu/VYQpA6P/bGD7kWMWGZZXpDq6ph1YY0tcl135eeqpt2oJkRaM9m
-havn4iRHqG1Ki+BNKtgVrApu9gVrfIIioP17wP0oAkYxYhtazeUagLc8+fRX1Z08
-hFQebzIoiOyCS3sOWPlpmFfA3V03nDxG7t7un567MoJnmIpvX2ps94Lz9MQU4ecr
-uywnZs3hnLNAW7+fJuulL753eZDXhc5YUT5PlGegF5Iz8iIKAp4kpoef/YPRAjNn
-7SHDb/RjNq2FQ7Wp5NwGDpFL18RpLiivxHwvPo62sBTlBKoaOJix1Hg5xaSxr2xB
-E0leSI4F1pfurI+UMW9kekPiVjkKdSKe9j87y6sV0owq7DMiHgJN5n8+BK2dlToK
-HIYLuwxzEqyEHRqeD4ul
-=LhDV
+iQJ8BAEBCgBmBQJVf8TvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNMMP/A6GsHBuRDCkYuFqvLKYhLSP
+vCqMM0tw4qIXkzIsyNn909h+mbVhSYFQsuAW8/wRs2CrENxgJb0N9B0isrKWPI+s
+i+8osTHuRNuELOl+fLCmRwVRZ4N4MzWAAlEZDDnu0cyIjV0P5le29g4LSEATDtau
+NhHMhM81ZQeNf0Sax3rakyKPQLzlgoa5Ajb05IjfYt4qLdmvb3xw0+/rNtZRIw+H
+RFOPzBhg1Gl6ADiZMiCgWNSikE3sqoA0+Zt68DKul/AI3e7v+VlAM9K4McX3Vxff
+cSbeV37i19mq7UTWgjSvXXnfT9u9fHDnK0RswP+Uc/P+dvw6FPOKQ1tvRXSOJ+3F
+TuB8koL5M2I1oc9hCLjzIinsu3ip8D2nkyYuM8LHwmHoFyqroAgvuVm0zFBoedd5
+9dWjiy/Ib9hfdzZ33RW3a2MysgrvdvRAz5XuN0v4FIFllG1LFHbAWOvBmIp/oaFQ
+Dt+uw1xEQVKqdrwJUiDFwhXBHoJxjbKercVnHOjesLwAHuML9m8CSXMQGxfWitGk
+iwrMYy2FBaIJgRGxDhThwk8BW/uQf7t5qP+/oaIRZObvEYV1pHLX4vNDCr8X8QpA
+UafdaJudxDTBZvWPnfFT43J0rEqs/JE1kwaMqlNegxGRruvMqy4xcn2khTSLFuZ1
+QEZeVs2KP5YB1ru4F6oE
+=qAXW
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/gtk-engines-unico/metadata.xml b/x11-themes/gtk-engines-unico/metadata.xml
index da6fd63d0085..9fd4d4fbe5c5 100644
--- a/x11-themes/gtk-engines-unico/metadata.xml
+++ b/x11-themes/gtk-engines-unico/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>gnome</herd>
+	<herd>gnome</herd>
+	<upstream>
+		<remote-id type="launchpad">ubuntu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/icewm-themes/Manifest b/x11-themes/icewm-themes/Manifest
index 181acdd7faeb..24c3830a13ce 100644
--- a/x11-themes/icewm-themes/Manifest
+++ b/x11-themes/icewm-themes/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST 1in1-xp-default-1.1.tar 337920 SHA256 a5065dcb15e952bfaddacf7a02abbaf34c05ca4c2499aa1ced55ac93298597aa
 DIST 1in1-xp-default.tar.gz 165614 SHA256 d4482b591412dafa1a4ce86058094f981383c483a441294a8f6a40a32e3e1201
@@ -24,21 +24,23 @@ DIST ufosightings-1.0.0.tar.gz 179925 SHA256 7ce894856b6471c60102f0e53510700d63a
 EBUILD icewm-themes-0.0.1-r1.ebuild 1832 SHA256 a27285dac98b4d5a919b25c6294de8abb5dd0aebe1dffcfaffacbce21852caca SHA512 ce9159326c6d6e8cc247ffb1e982858239b1c928f4e0f61925528e15228435df0c7fd96b60fc00e4a2123cd6f74f8a104c2c8e9abe2e95e4b30627e9b99f7ebf WHIRLPOOL 68b8a5bcdb9e3fa11a8fe13ddf5ac50cef399c110cc1ada56fa1d1e4b8fe84d1bfd3ebe0271c33ff314f0bbe6d6dc37c0868ca057ef73ace5e5bf8a83cee63ab
 EBUILD icewm-themes-0.0.2.ebuild 4285 SHA256 1ac87fe896dc0e24951697f04b587808ed2061970b797c19d9d83063f7606410 SHA512 611bf5284ddacdce3aba9515ee15b979e23f2b5de421d6369b11de525017196f56804e5067f50818cff3599ee890d4c491bc2007252f192f6426f557ab26f5b7 WHIRLPOOL 4261cd36a0e1c3a5cf50c602990abbec747dfe2afd87444e3fe40ecb0d539cb789a1b555b5d3b286351aae776b6fa783ba08723acfe547f9a8e6eea3f3b1d067
 MISC ChangeLog 3066 SHA256 d4c3b853d87dcc9b06b1810310de13edbd0beb09b1230a9ca706636f32d1db7e SHA512 28118970a00b8362012f8761f1ee0f00388863f0ea28591cd593f8e0623a840c400fa304b89a12c6cb6c042bada9251521e576e37997f5db2ecb2f3942653f29 WHIRLPOOL bf096890b50136eceea66633b4b47e5590c3fbf430f2873338ff7e85cd55887409eb4f6b7524015ef4381d7111e127b2eb6dc8370171a63e621e7c92555687d6
-MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
+MISC metadata.xml 320 SHA256 51a299e657823f6a2ae56cc7b32a4d4f74b2e9a338b825c2093986379c59930b SHA512 32fef771c9db740faf7c3dee5c61d58ed2e959bb96a22f667c4923d2ae2fc33145badc95afe7a0eca42a6da2d77ff500be68612d6d72e6198eba643f9156761d WHIRLPOOL e75dc53cb734f86a0809bae260660b400a43683dfc2994dcf6232be628baf834a86550a817948298f11bc9dd3b446065209576ffcbd0bd61f8fca7b1e3b2b083
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJSZseyAAoJEPiazRVxLXTFrhYP/ibXWSrm50ZmUrHraZcgvNZV
-p7/qPV8xI9OCFPRSpITG+yVfTZafiwaYLldcu2HDrZAuRD0beEQuGuAbV2UZxPRC
-5wqzTehSNF6XXl0MttvO7x90wOYemj8m8WUMTxQVCEGcAnMhsz6oxctbcY6a7xP0
-zy9u6g66cQ1UGYdNXOVeRUkLRucRTl2iV0Ru50e/WDQ3UE6MJ6F9FJ6e9EVzCxwD
-ewCh7naYpw4orik7YmmM3W4wCoUwhBIs/4GoF0oBg+u82Z3s8Rpn/oOX6wHlJv2+
-U3kKdkPDsk9T4bklKnRg0LC9FOITv0r4EcJEVkVaWjTDw0tA4h55ktlqk0QLmoIX
-HISMZ2YwHITy2vv5EnYYSrGUCmY1B7oHt5jfNlpV/5GcRvXBaONkM0emOEg0FudH
-dEwpw/XwE/04Dx516fkNKcI7syt/Es0QirQtMdrCAf8ZuocKVcZoS6fP9LkB185a
-GYvI5UG6HhhK/woUMj3V51cqs3ekf9D+shE86nXU69WLoKg1/lMDcwzP1aT+VtPP
-GOzGDeslLd9kB9CGZAdH8MOwBgD6m3ySkALAfkhwbr6M4/uM3XD2im78IDiMGSEh
-tGn/XU/44+8pCmNOEokDUOFn7LNOMb40LYD3R1Ifnb69zGhrBzvdRJ1+k8UHP50u
-Ibd+NAHVo9I57OD7VRGy
-=Z3SR
+iQJ8BAEBCgBmBQJVf8T6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmins4QAK7kowzdflfyTyG0+9ce0jdF
+6HMBbcwZFkKrz3ziNAM0l9gpK5CZZON5ztfCYG+aHqfbWFb41hwXHx0mXMEVBAh8
+5PvcsW6APIZIedctmRXakXaW5BxGBNX+u91xWbT7niN3QfuyVipclXwOK/vJo5qO
+HxltWZAalnAsXBpLjk8TM0Dxr3IhvDaUYeQQnuaPdxqRQDi2UFBdejrIsfWvpWdR
+jy5HaVfdwpbphbBUoohcK/re5c2s4OHJsus7NSu9j6Nmlmxn6atQfS2y9jZuja1N
+74G43xf/WaPMs8w83PYHNe9KGG8y/oOO9UKPIBPM8ZMnExf9OuN84vRgDpvieR2s
+zS8tPe+P8aMor17PE8BZMmBjHTOPVZKce+Wf8hJd7LvdEgswUjXpm5UbMDZeTyyT
+wm1FzfH+Scqgk0+Hft+VvqTQNYmf5T5wFFLCI8PoBTb5jfRR+rB42SnMm0SBDViV
+Svqm8yumbI4xStBVqvkIBvRcUn0oPj4v1p+5uC8yh7FwRjAuZjvqthbfjVMjwM8p
+4UMqnH6y2HAFYaJkJEi7b/JwYEoQ+EAo/Vjhpvekkf5jxp39B0ThnOjKBaD8Prp+
+rhNB3DVIZiKTb0NG/XPhRgJrfdwLz6pvb9aGbje9BSA3lsVUoMfR8oVELuL/+oG3
+uiXLo+UedBhhKK+2s3cf
+=DGcJ
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/icewm-themes/metadata.xml b/x11-themes/icewm-themes/metadata.xml
index c9169515bdf5..0ec35a04b727 100644
--- a/x11-themes/icewm-themes/metadata.xml
+++ b/x11-themes/icewm-themes/metadata.xml
@@ -5,4 +5,7 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">icewmsilverxp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/light-themes/Manifest b/x11-themes/light-themes/Manifest
index 36de84146d7d..d82fa04a6bc4 100644
--- a/x11-themes/light-themes/Manifest
+++ b/x11-themes/light-themes/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX light-themes-0.1.93-gtk3.8-1.patch 760 SHA256 34cdbcee6a2503ab250e3daf0322b3950cb50e01a88bbf4ae88422029e30df60 SHA512 3c72fdca8d314402a947aaeae7ec35a8fd667dfefe626b193989d791f3e7b3c7d92c2f14c9997e65b70cea1f45efd4fd00b3e524df1d01af04e5a9140c5545b4 WHIRLPOOL d42c792fbd2cd5ed0dce913a12e1b5d85dcdf988e945c2d5941f3308711ea907a0b53a7bdd132a02a8a618879bf673e2d2269e793b622c63e3e42863c2ead5ce
 AUX light-themes-0.1.93-gtk3.8-2.patch 812 SHA256 e55847ec659b797807e1fc5b370820913efa02ffa528b2b55803504c4a4dde44 SHA512 4f7a2c2c66a598946c7283826f211c3800d634b03e072af4482226efe54ef6ca4f49c068e34e7fffd72dfd6c99406fa075a51dc11636b670f71ecc0c8da8d1d1 WHIRLPOOL 728cd5f0dbe397f3874f8a3f04088f90d992e5940de9075fcceb84f1dcb5353080c92f1a23abd81d63b8a55c1d2d5ce39b05425f3bb987d7eb452fd4f84fbf66
@@ -10,11 +10,23 @@ DIST ubuntu-themes_14.04+15.04.20150410.orig.tar.gz 31996792 SHA256 a17c010fd92a
 EBUILD light-themes-0.1.93-r4.ebuild 2180 SHA256 8d75db7c4c9bd987157fa27cabbe6da8d3ce51ef0f5f49817a5deca0082996c7 SHA512 a055b9322f2b2e0c88069af6868084e5546418cc3f4bd40ff88d290e5b7b169f8ce9090b1743b22e681334cfabb98eae694168e297846a66035b5076faf7af3b WHIRLPOOL ea8551bb0ab8f5eb6bb0018c62288d1d515c5e1e699f9765d0139c6ab664b16c9e473eba12e17d0d3eeb06feff1485dee2b668d14d71c49d4165fe15dd1a3ce3
 EBUILD light-themes-15.04_p20150410.ebuild 2062 SHA256 268131ebe0f7a02199465a538e925c04c2729e6eae42d8d4f8047f07c130ccfa SHA512 c604a48c690b4ce9e53ac3981ac20cfb2410dc6338e0e7c1895eb8ac0ece3cc4c65abf6fcd0e18a51582a245de2eadd70cc3eb820c02c19636694a6b715bb473 WHIRLPOOL 534e592e23f5aeb2fc037c3f1e0999fb1911d45ae639dcbffa94b063b62de0b65d0ea491cf1a85e01acd86c5f40e0b2d08691af68d3f7d40a8f6c0ea92f918dd
 MISC ChangeLog 5245 SHA256 7c1152f5f70a068b8a5004ccbf30c21591f45c75505d2bed7a7aaa99634f9522 SHA512 1392a90fabfbaeaaf83807e4878d703942cc12a72f0ba9a13b33d122a932a0f4b4e3c0d9c9ec7ddeba00b4f759e7fbc52bd6c2e0197523a9f7d45d1ab4d5d862 WHIRLPOOL 71c59d45fcee5f76ac28df19a5961cd36562af79ad3ef6e10809d5daeb87207181fb3679a05eac22a90059fcaa9b4f344f17f703405c4722fe30c849f22e831e
-MISC metadata.xml 408 SHA256 c0608720bca0d41e83b56740214f8a3f49a139771c3b4aa84c26a90fe8b3fa6e SHA512 778ac92591362816d472e03b41d89ed75e4a58f54552429bad7159b3d8af8380bf89fb798ed23d1b67a3ae10dfb6ee8231dd2da04b67230fdeef05cd2f46a777 WHIRLPOOL ff28cb6b5a3d1b7a1931c0b712b2ab81b0f23f202fc87f00579f5988bcfe8017e9a7f9206d93a4b055c5526b699075ac8c6ff1d6674fe762298f180fe9aa7162
+MISC metadata.xml 488 SHA256 2ae04de911e986d2b1c93458b5dd3fe788ef798e8683e0e4c07e4f5825108ee3 SHA512 4e392ae5037a6943cc7928eafe4bc0ef7659627951af71f2eef0f8a3d98d2534403d9bdb7b7c065733f2e2b1cf112b246a507ebd2fac2f79bd1357ea0912914e WHIRLPOOL b50201dfa6336603f43addf853749a45e9e377e9b5591c86c9e3026c2240c6764652a8aeda34fdbe88b7b7d8e4b49f5add8c63e5431bf000007c103f56bade7c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU+rD4ACgkQsAvGakAaFgDsEQCfWHZ3JMMAydUqAyTJiFGSvmn0
-fi4An0wzX62OhpU26+pN/jmHdMdhipVW
-=o12W
+iQJ8BAEBCgBmBQJVf8UBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiixUQALoS6qOyP+c65PIG2+8oRq8m
+jUlKl7E7mb9EtlH2mWwds+Y8U7fJSXRjk2LbHeqhOKWHB2pfd6qkc06gmy0Awmya
+m+Zmajvqiz1gbTSEnhk3DJ64HSWU24MqneWohtzvjdrje/K3sE7LrzULuOWdBqrC
+jVoUM8xR0aAGdBEuLvkSl1nKWsOrprP4nn0TBMMRxXI2yVC34RlYD/Q98FjSagkl
+9ZbSx5xQlARyWUnGwpZj7jvjWO7YiqpnZs6abpJeSPgUIS33xnrQJwFM197MmP9/
+ggMwGn4fxCEjlJeUFkBBDCdOp3n1pL7MYCuiPXFeorYJ1l+Tm3UwjrPZ+70Y8TcG
+jWYBc9XzMSSlZdqv1WGcU/MniW49QqLz/NEl5O45R8lr6pST5tUVMcF+qNk2BvUS
+JNgnVr6WvKw+tA4r5WQSaukkwJegv/c7Bjku5ZlcKPpJe6eVqbOTcnDSR+9IMGwv
+8jocU7T+prF6Tc7oxDX1EIQKh/HeLilN4qfO0S8OhPtyQLIO1Nlho2G0SYzSiAep
+Y9XBlmA57BbYBQg2GPEY1hi1cFS02xdH46G63w7faDo4NsdiRxOkryedM1MDv2D8
+IpaSROaD41uVrAvmEZiSq0WWxA7vMpXY4ab9LrNJGDaUynA9QC/9lVgE07vCbXsz
+ESoDljsWx/uNA5wbHRa8
+=rjO7
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/light-themes/metadata.xml b/x11-themes/light-themes/metadata.xml
index a4dc593ff31c..44bb88559d2b 100644
--- a/x11-themes/light-themes/metadata.xml
+++ b/x11-themes/light-themes/metadata.xml
@@ -13,4 +13,7 @@
 	<use>
 		<flag name="gtk3">Support GTK 3.x, too</flag>
 	</use>
+	<upstream>
+		<remote-id type="launchpad">light-themes</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/notify-osd-icons/Manifest b/x11-themes/notify-osd-icons/Manifest
index a9b88b9d4ab6..e538884dd0aa 100644
--- a/x11-themes/notify-osd-icons/Manifest
+++ b/x11-themes/notify-osd-icons/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST notify-osd-icons_0.7.tar.gz 518154 SHA256 aba4ee6d1338ae064bff80ca986ea385010d50a4598bffd3457c9fba744a6a28
 EBUILD notify-osd-icons-0.7.ebuild 876 SHA256 0e11f38e9b8b7ba494fd83a7ea1dc6bb839b378b3edf2d0002321e7f1a62eab3 SHA512 e24fd264ff2d026ba946f68ecf42d4c09129ffb3e55184ae6eed4e3163ab6a1e150ebb618c1e070570fb3c042ac4e0d995d7d6af516fa1647bf053ace92c8f48 WHIRLPOOL 337dada8d0680d49fd3fc2a087087082a8677a46b65e367de3b82a304bd5fc2248ec3cbecdb48b70cdf01cb31b19aa0d40ca206e2a6c620ecf0f3baea3c04156
 MISC ChangeLog 587 SHA256 ef631bb4658591686b0581f36a07ea415d4cf2c7b311fabfbaa57517ad391fc0 SHA512 9629f8788db4552113afc7ef2b39b5e4d98e2e451820c5e42e654ca6e127a6fac0b4e2157f4c6fec72f041e32c3ccb061f9cc2ea6a4663e31e783932a2bb184c WHIRLPOOL bf78f870152d46268615eb8acb3c585c15c234e76a5dfee809a4bc699b1a6a281dbdbf70facfdbd9d2dfdf2ee1c5d900482767ee72515b38a6d6dd4d97f541bf
-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
 
-iQIcBAEBCAAGBQJRFDOLAAoJEDxpGckxwJCBT1MP+wXQLhan7NdMsZhXjVjFD1Nk
-XItHn/Lnm0XA3PedAOBXCwYc02K5+/mJG/lh3l1GxAsWKBRwanlp/pMc4B3ijmXi
-yRBkchyzLhuh8h05iIAtrZ+XoeZ7sKXn84Uj50OmXIft+A6T6eojyIq3I6WsSxBP
-PRad2sqe+kPO5dBuEkN+wRwKPgyX/uR4Ae6YvJomlVFm/t6b2yT1REOuDUkAxFCW
-m+XSFlURKemg8envMeNzeMxWSuLN+ptkQ0a9OtdNhsSbR13wzRDLj/67TVQmIrS4
-cbkm+aov7HUaIYeaYi3dsFigQwUJIjO3kEhZbe3UvUipCaAave4IDMcB73b6mJR0
-uAjdM2jm9w76lFN4eqxKaCtb5gql2vjOfNEoDZ2FaHBC/QSLK4dknDVSjpQmmC/1
-LXY5XU4UPo9Bi2IDWQLoX10zhqRpJxoIDvQijPE3Q9HFX7QEySgxcjglhJx9MWB+
-34aNKBWkbeSALJGfqxuq4aSR99zZ3Or4q2yCCINVYcV7wOOwHt+AD4kTFWD1jsYL
-JDzPUBETxNF2m/f6wvY0a5PC8VCZGSEh5hZALUyjft7brxDCcy8r4OS0dCGXRaED
-9UBZBqP16kdO4WFLTuvBEf0QlinLX4Dt9bFU4aa2evz8TnBIX/pBzKdK3f4HeuMd
-BUt8Jj+t2ufIyO05GmYs
-=gheq
+iQJ8BAEBCgBmBQJVf8UJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmip9EP/R1CbtjuC8CL255qFG4NDNWc
+FOgOQESNo/xCoKDClgjzPUTAN48Cd6BOU8WRxm6agES1bSaztPT6sRDrGLYvXEwi
+zfk0HGQ3VSCDWiVpfRWm3eTrM7+jQn+EjgACtlune99j+JgJRfjesEEmHiJRI+Jy
+xa1PsNuIwNJmKC/QGani2yWIcMiiCXcU5tJ+yyKE+Tv7gSOZnRHDAyXj80gDNKwi
+zo+9dBeif/jWluB3GhRiU6sJmU0Z6iBXOTurA9Op072bNFqwvrgn/YApAf3dfyZs
+mjPhGDbK0P4ZqtQBppeDgeGdAbZ6JtD56xdMKl+pEax32xzKjiFZx22xMLWY4LCD
+ClMODHAp1VCrGDzdgbimROCmQcwcgiBnwNN5XGJqq+/3FsYY8qp4HBio5DiYwVI9
+GFU9115oMzvyxxCKVdRPahcK7V7nHudnLjYbRzA84L/YoR6EdcHPrzegZ0ljINvV
+rg9B7GYbAaYt3wElj1KJf04upiSZ4ZcVNQ4vH56ZdZFGDI5jpipn19xR4U682IHC
+8RtogkBPElbyVpqd49upA4NrEDuKy4UdHrlr8QHNM4g3GC7yjrGwmYA0sOdbsPr6
+kLYJEbI1Hvu3zOO5huQfo6h00vWC/FjrJ36QsnHZEkxEvHiEPSv9iRlbvwj526Tw
+mmMIWnoDrGH+0fBeF2g8
+=3MHX
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/notify-osd-icons/metadata.xml b/x11-themes/notify-osd-icons/metadata.xml
index 99dbb45dc755..650c2a2edb1f 100644
--- a/x11-themes/notify-osd-icons/metadata.xml
+++ b/x11-themes/notify-osd-icons/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-themes/qtcurve/Manifest b/x11-themes/qtcurve/Manifest
index dc8fec9c4465..c615a7f2b125 100644
--- a/x11-themes/qtcurve/Manifest
+++ b/x11-themes/qtcurve/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qtcurve-1.8.18-remove_qt_filedialog_api.patch 1908 SHA256 92137e54e5f92b6dc0a1c6011d3f68e2f0464ebede37d36d383a42b96dd51f87 SHA512 688d4e3525182804c94754ff2b0c53a94d531584c3335370b17e4f3e597f2ce23284a96cebbfb92525bbaa6bee4d4aea403ba7e4d58ceadaaa7c9bbf58b207ce WHIRLPOOL 4a359f29ef4244f977e70c794bf56db4b978fff6b7a23fa7e6b57b976205991fd4cd23b9747fe5c49c919618e5e675ad36db8552e0cde7401c348631c3337cbc
 DIST qtcurve-1.8.17-old_config_file.patch 1000 SHA256 fc744d2bc69b8e9008408df0b83d358c4036ea944aaf4ad46ff02905e0d8c87d SHA512 53de2692ba3a231d5a209f518291da035ac72ddb421073dfcdebacaef130f5249a1af7d05992a26be640641f50194f12ab5f710ea9651e749b839657411f4426 WHIRLPOOL 8afa96f0f32481387622e60ff538cd382f7c1f18d6ec8d9bfdbe600edf8060c18129206a8d792174b8844d0aea60b66a72e2caea196d2c47e3af139b0b146365
@@ -9,21 +9,23 @@ DIST qtcurve-1.8.18.tar.gz 991195 SHA256 85997c9fa4a948945d719342f5993486aecf189
 EBUILD qtcurve-1.8.17-r1.ebuild 1990 SHA256 b1cc88cc9725a4b2246223f776a2b324b73f7d78faf5e8e9a73ed2d7103e2db6 SHA512 d22f5de3a222383ee074cc3ddda6c4cc7748edd9ad7258e62b3e6ec13440fd487b55b8bf4efc3fc7481eda163141c82ad2049dd362073886cae697a4e13730a4 WHIRLPOOL 3df15d908a1f476cf892ed53aeb5ae454d4e62b9710a7cf8be530cee6812c9d1a7ae6fddee649bcfa4f280ce48e2c4c64a8d9ee162bd4e4074a427e9547c7dd6
 EBUILD qtcurve-1.8.18.ebuild 2063 SHA256 210b1003095a2447a97103371a89e2756aefb0914d4e32448299013e4475051e SHA512 d134d9de04177255daed5233995b2b9edf18455cff9755a4eb1b6bf1151e0d767f69771147fd544dff844ddecbaaacbab6ead03c32290d859bf2d6ab2271c71b WHIRLPOOL 16fd7addc5b4a8159def21b9937cd5572214c2ed93079872d81bbbbba132347e4868f351dee41855fea3bdb9194e15473aadaf42072339c664c1497740b1d557
 MISC ChangeLog 2766 SHA256 751e775890ec08262b1cc4653d4f5704bed3c6363053a42484dfbffdb883c16c SHA512 aef38b7ad16b157bf1a35d02840104ca64e3adb335670c181998e9d2020008c58a68edb7d3c02522937407822339e2b805b8c7e6831f140b8ed365664a01e46e WHIRLPOOL 87de986edbaeee984e66e1a0731ac23042a4b1160c9f832d0b127e459db682d98e565bbc0dc5e8cfac5db4e553d1e9f6195d84b7afde358557dec779e2f78636
-MISC metadata.xml 464 SHA256 c42f1a02728c330d5eface146f5bb2fcf4b8396f408aa58b80e4067b56a9c1a8 SHA512 327d4c6e7e5bccebb80dc4d5edbd5ad8727f1ba07aae83df71e539c8e115df59726b7004cef57af5b5107bed97e02c4d63fdad21054511ede8ff3e472636fedd WHIRLPOOL f257a43ddb399a1509a509cb537b7b651e18521d11f14e8ef93c22cde69628cd9fcd38c85ba7f8584aa22a263a0addc38127872760f90f294476f7c5c8851a0f
+MISC metadata.xml 548 SHA256 975b4fdf4aa35f0b25318bb9763510795402e485ac6041b65eb2cdf9a24b9b36 SHA512 9676a81171ca40609ae8b3a880a90e22aad3d2f83a5772310fd2976572367e5d3819a45cf8dea627d49f036c536ccd02c9328ad4982eea49c2411b9a86ea146c WHIRLPOOL 1188ec66fdfb659149db76f4020d90bb58600bc97eeea93d6db2b7998b258c4f28217062617d6eb91cadd9cff1f38ce83b5cbdd8075ecd68a8b576dc69308f1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT+6HzAAoJEPiazRVxLXTF5+IP/1VddeXxobW+9gbxQjJOjoDp
-CpCBu00kgyCGp4vR8+uxeipu3KNJsDUdrdNM5MS85XFI1JGwAHE9WBU8/e7eNsTi
-hNXVpv9h28EISjJbxD0VO64gBMT4ahr1l5JXJhLRytIuZ4NAtV/iVZw9F2hXrKMp
-5bCT7XWez6pauoOaJ/so/U6foQt1cZXqXw6EBfCiyBoVda0h093CTvv3GCJ9z13z
-Jrq1v8Vop2MQVXQY/JgUhjgc4RVZIZQKeovFulQEHbHxxsb4yZxC6b5mmsxTF5cm
-wctzMyh4MSPh6/Ko0eVmOtCXXw3uPn2OfvT4VFmXDJqwTkjK9kE9vVGyiNULFMqv
-XWODG6h2BR5a4hGd6LxY8tvukUT9E5PNOU+gFJsQ5q2cmYzf2Z3dED9s0/X18a9Z
-8MhXe/EyOiD/n0CZG1LKGI+Icywo4Uh6NAi/zbGs3Sm9GBVGTDOitLpzSb+kxsPU
-gPIDBczEfQoCguGc5PTGbHpDyxQLfihm/om9V5nT15l8ts7T/kAyvxFx1Tyo807N
-PWTP1xS8wiB5mwjFwVNEZB+aJx2fH4AyZ2y3Ho/CZjXQq4S42QqZ2Ntaon4RFDXg
-qZvhcF6AokZMM1icJkfii2wGOXc/9gRcZgD4Rc8c7AF3qcgHj2qhZkwstXOOTHj5
-NHHvOV2XgIXoInXRw/mC
-=9vzi
+iQJ8BAEBCgBmBQJVf8UZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAswP/AvZcqhbeYpV9HTRHOdY4thK
+jJK+yUjNyl0SM2PLOgqneNn9z98obNMlhpB6fOdzqAHWsRaaNJ/zjs5vheW2WY5j
+ILHOGVZa/6o1CeIfrWklKOrubqqiNkjYuYCEdG+joo+gNW8tCylIDcSdtdGRvfew
+USajVnbH909Vtz1OAACIsfBEAu5Muyn2MJmc7bFQsQnQrLBjmqonCxIc4Pq+ycbL
+uIII12ronEVAkTX9OSqBlnnoCPlBro+2kY3sKGcQBHQqzXvpjpJXm0uwzJspYcJR
+JziqYt8P0OuURL/ln1YVC9Sg69wiWeu7qAny1rCFWJvG0BzdGUOxbJYN//o5/TjJ
+Q935DAApA4B4Cg0zP2VtL151Cl+5Mtv7Vo686aYwdwwsME/f8os3PL9tlJgpdGot
+CEotoHS7pYYl6nT6nZSHm78JeqnRMgTqQxPr17Wx8amQ7AoTF87krU8bWGztjnLo
+o1KCxZjPC4me99iUr5xXmr0obhMNROoJix2kbpxyz0g0W0QFac5tuAt7bSNaft2t
+Qx1azk3KxhOJyO9pCZHm4ywRtdtLxZTDdict2s4nZR/pvRTzRT2Pm0q/rDZfINCE
+p0cMTEfZAlXKP5R2y0GSoGfmv2aoOBa6M1kSDlxl6xB5Xwwuex/ehIy2vhNEdUCg
+0+Unp7KA/4Gjz/+XFrYD
+=Fjzo
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml
index 630fd27382d5..2812a23f14cb 100644
--- a/x11-themes/qtcurve/metadata.xml
+++ b/x11-themes/qtcurve/metadata.xml
@@ -11,4 +11,7 @@
       module to KDE's SystemSettings</flag>
     <flag name="windeco">Enable window decoration for KWin</flag>
   </use>
+  <upstream>
+    <remote-id type="github">QtCurve/qtcurve</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-themes/slim-themes/Manifest b/x11-themes/slim-themes/Manifest
index 3bab9b4689bf..329ec15cde0e 100644
--- a/x11-themes/slim-themes/Manifest
+++ b/x11-themes/slim-themes/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX slim-theme-flat.diff 952 SHA256 acd220df586fd1e53ac07d9a2a95437ea287aab91453bca7efcbc4569a5660bd SHA512 250541ba316d09445ef146301105e75c56926ef32167ef073b49e766ec27af00a1c73fab37195a8cc8e19b3d21d4500cffe2a59628ae8bd621ded3b977f53ed0 WHIRLPOOL a7b2d400ea5ef82ed8acd9010a8afc5cd063cf57884611dca98f402c67f53bb657fb43c83f8662dfb60afca3fdc12df26d7304d8785d6638c1f13e2406acf6df
 DIST 48605-xfce-g-box-slim-0.1.tar.gz 477441 SHA256 39e86a21d041778e955302d73f3631559e184384e666a6fe52540780a82b7c42 SHA512 03f6ccd65cd321dcd94f69d8bc057fe64c7f0fae9807035283fbf1824f67bd5ee5d78275da53e6015c98d10fa021a3136a780dffd58072b389f9f8831eed7e68 WHIRLPOOL 24dba34e3a84a25537b9feafa3a05fd1b473b1af07924020989bed66eb9f72d31f01c9fe6b930b92eec82fe45f64394de655d3d1acd5d3577a5f70fcb1bfe019
@@ -25,11 +25,23 @@ DIST slim-wave.tar.gz 277774 SHA256 be75676da5bf8670daa48379bb9cc1be0b9a5faa09ad
 DIST slim-zenwalk.tar.gz 337070 SHA256 f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57 SHA512 8f0cdc4fe3830d3dc25d91781853af102d0c3f8f6a24ee917c1d5107c2ae353c590c257ff329fe549b981928d387340cacd9d87c17d7b6c9dd39f2a950ac491e WHIRLPOOL 8843b7c944e6bc55248dbb817716c0184613f957247c211a0dd1738f2727b9373a1fa26205bb6aaf3bdc9f4edb429b2d80fddd2f5b76b97b09e56458f8b57413
 EBUILD slim-themes-1.2.3a-r6.ebuild 2561 SHA256 1fb17125d56acf0ba06ffee2993e6df02b5247df98bfe12344e8556ad4aee102 SHA512 fcbff037882225185be8f55471d22b763f46a829097ea1029495bf41cae41a74254b9911bd9becfdad42de99dddda180380322784828c370fa7f3c9e26617f2b WHIRLPOOL 244e7a6f6b0b8e42a401e772cdf07eb1fea122ab787900f226d9bd5ff6d6f1b95246812bc86c8a896bed0d18e5a8080316fb3036846917fcff726decaec50a85
 MISC ChangeLog 5060 SHA256 728db8d79577e771a7534ac06b8ae26848b8a9e0b4232bcdecb751820fdf3880 SHA512 73e6dfe7b3641ac2c4ea298e6de60eee74cd137daea2894ca82b84e4889c6a577bb4c6546cfab2b84bfa2dd05d8314e398699e81b16818a1929608e887137ed1 WHIRLPOOL 107cebc80324993aa9652b979a5f03d84f96ccf12556e50b1f174c86e2f25cbfdaa693a4715179abacab007de24d17e495a4572df59598076022c0d5c0629940
-MISC metadata.xml 228 SHA256 2b1be332072fedf37b33a90282246af7cb897c6254ead0c7537fd4fd4e8f8aa4 SHA512 a0a39217af0cd1eeb5a8d48428ea2b2cf3991e6fb067ba7a7f0ac8555e3b66893e42d131d04051be0992cf39b1413bbb5da377b153187ff0b37ba9611994e600 WHIRLPOOL 55210c0d2f25df4d058240258f37134925e23c9a4ec0fb9528e491631b90de4f46278231fa6bf61c92a7a69653ab9f984abc59a67484c4cd105960e0733b8b25
+MISC metadata.xml 309 SHA256 bf0b6ef7aae28c1e0b9a15dd3ea0f40f5fd20a57b6a318094be4f8d8e38e8dc6 SHA512 5e4d6783ee42eefeda6da906760fcf318f1b3ac0a44aa6862683fec0f8f583eee124da895380eb9cb734d43abfd32b697119bc0a5a746f3419e86990219a2233 WHIRLPOOL 473df9d4d98e3c7b6574b6d0da2cbeaee1b0be04a7d59266efb63f2ccc5a63a896025433e8712aa689637ee1ab8fc90cd8aba42fb7f7e6c020e4ac16d18a77ff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlT0ueAACgkQ2ugaI38ACPBPFAD8D+iQtB9YJ4+iJmjloKjlWY9g
-0PEjoP2tisp1NjhOI+8A/RqQQ5YlQdNBIIRPKUGLEuZMm1AqRkUti/3jgVIXcnER
-=BWA4
+iQJ8BAEBCgBmBQJVf8UlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0DQP/j9dORsuDlHGziRy/SA+mjBg
+JPkFUl7Cyjsfhcm+siPMfJZsOEcg8VBTeTTT37kKWP6vTHeppLlKZRVqUn17D3kF
+Tofr9lhcwULcecwaqOdkT3cXDYawYD6Qdqdp2LaQ8b3i6OhGFvWewRenqFyye1hn
+hpiBSWX72NwEPk78Mcyy6LPLvCkmiJ6mBH8O2e+M/4Fp3F6Aj+7dHXey+fayvsLM
+8fbdBRuyigbYfFNK4omNaAWy+JRwLpCxPy/nsT9N1E8M84jdEQgBNcSNZAwmVrOG
+eLOv6KjL1PmAyT+1do4K7WlNopTaYuodytbkZwr7tw5042BUhVNqNObNFcINJt2S
+z1Al6VP+NkBojwO1xd7MawegzxT62u9MFDvv51jeBVHvWSVT2nnuVDwzaZqgK7io
+r6HV5erEUlTyRckEWlWl5gcvu8/K9pYldxhXMWkrw7ZI1Tw537Hv1P3xIbX8wArp
+iFWv/w8/i1o1rnGgnpwKrkktc5hwuI66B14d1lRa94X1XjLGoBM0IYzuupRZWb5o
+NZn74glOfjyxA+jUs+WdMJhEoCdpgcv9D+1A1BxNyNtE3gPYVIbSlDU74C22NZRe
+5n3sWQfc5kfLUUZ8Jfho2BFPIaI7FJkRTiz9dJ/kWqGqV0k8C31RmZKs7ATH0XJC
+iDzSKTi5PDWjx5wIpfv2
+=moce
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/slim-themes/metadata.xml b/x11-themes/slim-themes/metadata.xml
index c805ac6fd3dc..624896ee5a66 100644
--- a/x11-themes/slim-themes/metadata.xml
+++ b/x11-themes/slim-themes/metadata.xml
@@ -5,5 +5,7 @@
 	<maintainer>
 		<email>axs@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">slim.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/x11-themes/smplayer-skins/Manifest b/x11-themes/smplayer-skins/Manifest
index d2528c0d22cf..752bf97bfef6 100644
--- a/x11-themes/smplayer-skins/Manifest
+++ b/x11-themes/smplayer-skins/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST smplayer-skins-14.9.0.tar.bz2 382195 SHA256 88889dbbeb90215ef5c16f29627437cdf7df0759a7d1868b2e19ffdfe2b6ad53 SHA512 887a9b0ea44f0a1820f6c9fdc922d20e9cc466903e4dc71ace17063d826c4fc01eb004dae2da95147ac707d2bed5da8783f975f69fa6e3a28ceb6ad081141323 WHIRLPOOL 22f4f9e4ca10026f97fd5c619bb7785d119a95fdaf7e9a56a74bd7ae1810b35a8e6cdae026c8833aaf08bd29a359855c29f027e7dd0a8d333c1f4559a8977b8f
 DIST smplayer-skins-15.2.0.tar.bz2 382879 SHA256 a73fe16f8b8802780bbac4485767f309ea8064a48e98f0b37523dc2fb7245197 SHA512 58d1dcc9caf5d93b7f0692ffa7ff4875eb8dd83db78293aee25a713a1f6007c83af556215cd1f7666dec98bc323b074c6b1fdb66eb9560176db842669c206a83 WHIRLPOOL 1a380e2bf4cfc6424c9ead4558fd93b740c52091a5c9e09facc1a4dcc44abe2510ced427243f56027bf94537151cb1e8fc0405948258fb94a1a1a8e9f72c6a08
 EBUILD smplayer-skins-14.9.0.ebuild 658 SHA256 ac6e837f8acc7f4ff3890f582df31ea95dc4c89783587c0c749f683f31dddbb1 SHA512 c95ec89b367eb024baed2786824cbd5e300b237275811f083a573e1eb579a4b2e0c6c032551ce74c6bc3345eae3a43075cd434dc82e49fd38d16c5818b64dc75 WHIRLPOOL 9c1e1a5e31f1dde78a9c45b789a1bb547c38f7a966267e8bf4334e0cb5bafb4839d1069d7c2babafe2f974bef801ac76c104894719190455bcbc38054eddf13a
 EBUILD smplayer-skins-15.2.0.ebuild 658 SHA256 0c7ae3860836a252eb92a2b0f19d7f074914c929b303855d52c5c5df48e12e6f SHA512 02c6c027f76f7bf3edffc6a1000eea89b4891836ab808ff92554619791d432434f24d6001ecfcdd0912c84bab835d646d3f3e45210103652456329c2da98819a WHIRLPOOL b2e1d5a202a0eac3e297c15f514096a3d2bee9e9ef1cc0210a4a7582c12b6e80837fe53ccf6cbed854112eba6aca2c7a7d186fa0f6425f0d58d0dc0d6cc90e45
 MISC ChangeLog 1077 SHA256 5809009c590c4dfef7b892f6cff818b20555b5b22508df075e3802cff405843e SHA512 69bf8990c0d875dc42e9b4ab885c9ca3a12247d4339cf155ffa6ef747e5f795a7c5f88bba4dadf560fc2416f8fceff0d5204758d649051bf29eeb9d82df5f766 WHIRLPOOL d115895ce0b840bc9d440fd80df82f673bc7fcdd07ba053e781c42b7015136319aa2035e2b39b94be615ec82b5c7249610f6cdeeb65082ab5a1888f7eac537e2
-MISC metadata.xml 174 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa SHA512 bc396506ea847d6a36e400a86b8a575a46d075da58b57a4b085e12ac242e210a7a55c4e8b3da567b97c0e5a8bfc682bb5546b3b657c2f92f6fa00da674bb7062 WHIRLPOOL 0e82e9ab352222683df9da1682d9cc03d2123786218c74f31ac487417100408cd5737aac3355e96f68388ddba76b3a1ea2f4bcf50fd4ec55c87fb6bfd20a5fee
+MISC metadata.xml 254 SHA256 aee91cb3792318f7f6f392bff95f78086a616e7298006e6eb572d83b6bfa325a SHA512 ecba199aef7b98e2c3b22c7e23f321a6452afb1c70ad429d901db003c43649de676786a0f01ab9fe97be665c78b5d4b51638c942aee694220506bd3aee905d52 WHIRLPOOL 208c12ff261911b1b1b2f828d4017da11ac8fb5d3d55378dd3cbde65bfc9f215561f2050c30447bfac0110b8cc4140ffee9f302ee83bd2eca169916b6c3a1646
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8UwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFAoP/29b5jmOEuwCkE9LPL9I8i6n
+VNeiS1jAjW1m1Dbak4fySb6l3uwH0Oh8EbnMaMSL+WS8SLUy0m59xrgDh71llATv
+jeLDYRR31Cvker0BC/0Qm9igIBvSKx1ko4Eenbz7+6+CcqpgbCsldDU8rYUq3QFd
+g7vPy2ikJyVYguIfyHbX/TU2rDiwJrkNqVSMo8ze19LHcObPYY6UFHXd8KQdCuNI
+UywtCg/1ZmnjngUzsFNdEmk3HxkR0GHwqEtRXOUCB2kycoWfigbu6liCfcImiMxZ
+Q9yAxAKwoiOqU6Szjdig5mr3K6KlC8/WCfuoOBF+E+RIWJd3BofuOWYXxixJVOrZ
+LNH/wJdBXNlqH/FtekYaQ3O4vU6AzcLdyJhW2xhwO1JBca+UxMEXxBjfAqJve+cy
+dTNAXsAwwNNmW4XmejOAMxekXidI7RKU0oVcVxjFhLCx0xNsLIb8bSMaj3DQqnLk
+lnTOEaYn/MoBKhaNR6Uir+z6Jx0sRUIlROE/Ji0doz+Ub1wX8jXrAeU52Wid5xVT
+UxhJDRPIgGEs90KYyoQscv6ylR5RqQtKzSkr5FdM4SNbFDuDd/iGi6K5uOFSZCEQ
+FqjOdSIZscdBpBA+aTXQZhrFBvyeuk6wdcLaJFkY4mjOjSLPhR+co5tg6AxbZBpB
+7OaqTlJT1OUZpwu8xMo+
+=d34S
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/smplayer-skins/metadata.xml b/x11-themes/smplayer-skins/metadata.xml
index 8267a2639d2d..862485291aec 100644
--- a/x11-themes/smplayer-skins/metadata.xml
+++ b/x11-themes/smplayer-skins/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<herd>video</herd>
+	<herd>qt</herd>
+	<herd>video</herd>
+	<upstream>
+		<remote-id type="sourceforge">smplayer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/smplayer-themes/Manifest b/x11-themes/smplayer-themes/Manifest
index 24a6748fa52d..728ac24f8875 100644
--- a/x11-themes/smplayer-themes/Manifest
+++ b/x11-themes/smplayer-themes/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST smplayer-themes-14.12.0.tar.bz2 2660621 SHA256 2c520a678bfcfa8c9a6881d4612ce8fb5216abdf072d27fb3da362af316ae333 SHA512 b97c097c7bbbcc60878e9cf4306c08fb87b83da67763a965e9e21517fb02568e902cbc1c8739be3f54b7a5b398c49dc8ab81964b97140a64f34bcf8af9c39765 WHIRLPOOL bab1009ab6dfe693177a905a583454fd5614830c90c09f1a93832129342583efd8f6c4bce6c355e340e43062b06119fde1c5532136dd38cdadc72fe280603312
 DIST smplayer-themes-14.9.0.tar.bz2 2094596 SHA256 66164c0edc8698e174844ebbb7047a2444f249c569029cdc3c04833bbfb73238 SHA512 2c6b96c2fc5029ee3d4d6cd1204788c89c712d69ca230ba335f7a988fab181df9b700d8ceee446a7ccb852bdfdc82106fdcbf38ca199fb881088f9efc1ae1d7c WHIRLPOOL f68a511793a4f6fd270ce2708e4bfe5a25ef26493f18e9b18f49d5c19cb80fcab2a37c8494c9e9eac263a978ebce64e4bdfc4c0af32c6551a9f5dc7b4b2584d5
 EBUILD smplayer-themes-14.12.0.ebuild 667 SHA256 a6a20b427df3646e619f8fb969f0e60748e39a267ddf70f98608603c728d9173 SHA512 b707b90595f17a704557204ab4efaf67848c2624dd27b660cd9a1cd1016e483ca42ae5ebe38cbcc93759c2f0e70125cfa8507f430bacac42e0965f072ba9ad84 WHIRLPOOL ffdfd09d0490cce61f0f88aee4d8818dff55709e35c6fc6cd67e8a3531d3d50876d61f50a8cabeac00266aba6e491ad97c37c1687a074e667f1df129e3bffb02
 EBUILD smplayer-themes-14.9.0.ebuild 660 SHA256 f07145e5c2954470bef1f4bfcb1236cc4154d6c6ea159c07dba67d3ab5a50869 SHA512 a796a1038f23dc5ad7f139dd24b50264e43f38924328c99a8518e4c25cc1a734545732d74886ba8fd5146119897fbdc4c8e0af1d7efbbab4568014fd3522c90d WHIRLPOOL fb966d135cda2931c84ede1c6e8debd9dd52556c354d4b5a4525d0fd289d0e4f00d5e962d058c115b640d58c68e8b5640546ae83c0e0e61523c8b3dbef441c59
 MISC ChangeLog 5674 SHA256 989d7ecea6d09d4b94498aa86930fcefafa98c012291473693cff26cfbba91a9 SHA512 b4bc0a8dced7072cbabde7ee733821198be70b868294bfeee44569a409735978683db5eba66f3d32280216b4cc1c25f53745748a9976f9a9ab113a54966e9e13 WHIRLPOOL 7cd303de94549adfbb4d0c347ff96e59418a5bbdade8a0adc8eecfa95c87a2235fabd85ed86f003740accd7e97e38e33fb269b3f4757a24df023ac0caa893563
-MISC metadata.xml 174 SHA256 89d4f3510de4db0434e0b3794ed9bef3e603217ca0cb195d3e817c208239f6fa SHA512 bc396506ea847d6a36e400a86b8a575a46d075da58b57a4b085e12ac242e210a7a55c4e8b3da567b97c0e5a8bfc682bb5546b3b657c2f92f6fa00da674bb7062 WHIRLPOOL 0e82e9ab352222683df9da1682d9cc03d2123786218c74f31ac487417100408cd5737aac3355e96f68388ddba76b3a1ea2f4bcf50fd4ec55c87fb6bfd20a5fee
+MISC metadata.xml 254 SHA256 aee91cb3792318f7f6f392bff95f78086a616e7298006e6eb572d83b6bfa325a SHA512 ecba199aef7b98e2c3b22c7e23f321a6452afb1c70ad429d901db003c43649de676786a0f01ab9fe97be665c78b5d4b51638c942aee694220506bd3aee905d52 WHIRLPOOL 208c12ff261911b1b1b2f828d4017da11ac8fb5d3d55378dd3cbde65bfc9f215561f2050c30447bfac0110b8cc4140ffee9f302ee83bd2eca169916b6c3a1646
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVDkwFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO3nAQAIv9bO9BCjq5ouQFDgOFDc8K
-G8Avp5KVmvhiRQI7uQy3RqRnQKgooLU8gzOxEHrEYKwW2EZh9lpMDKFkn0odZDE3
-mTg2CpsdwvMcdnacP0NXA5Ct6ymKp4l1mXJf08yfqRbDp6QcF29H2u30vLCR3KuT
-Wp6xJ1OgCFbLujtT0EK7HwSaF967vNxlDsDItLvIUJXgEB5l0w/yel/GhDjh12by
-V6jhCp42IZAvMTZjQRqfH+s8guC7GVvmZUOz5yzS5I8iZfeG7T0LMyeobop99//T
-pd7PSPqNlKeDgreDgdgOrzV7l+Eb3sFA+a+BSn6D74M0ktkNvA0SjS0/SctZYMg4
-AXZslO7bZlgA1JXAT+Ef8kPBxOaiYJLGs32v9d9zNJ4/EtdsxeH0FfPw3hAycCmJ
-6nH1Cwc78fNkvw7+TMMrBAFMj/POp/YPl4gY5/g5xEqz7B6EGIyQhkjrWS9tz6ZA
-A/dX4VnqcYTKpigtHFBJ71fAslDVl81e1QyidXzKfnaB9iN2Mh+4blcHAIfEsLtj
-3Ip+2PZ0OyrTOOJv3+3pkQ/fX+L3XTIGnlGcrgBVCJ46lDt66OttPUErj172XYK5
-k3YVMU01coQQ5GZNqlmF4JXsjOpDX2K4zwdUwUb65UpHtNx7l9m2I9Qk/EJ6xmla
-ZOVXu0q2DM98o/OUF1gA
-=wd5R
+iQJ8BAEBCgBmBQJVf8U7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi9MgQAL6KvlofJLxNFWSP8weM++sn
+IaCENkythPh3m7UiSo92J8SyhvQ0r1HEgDkNCKQnUhS895EX3RvKgot8+qaGUBO/
+D3HBKL8bdVVvFvcaLl3g/yWhSco6wEW2hiiQEXIPJn0w0OqFvaFw3ljjduRidl5F
+uuCYGFUzH3+AHjvuSPrsDuwFlMTp/A18DZlpgCkFe5vkkmLvaYBKLpLbk/j8PqjB
+gvWbAdFASgBFI/TlxYc+6wyIr3mn6KUrqMWhE2UiI7uQ/12gCeO+K968/c3Fjchr
+VX1j3FiPbdOr+qyNCSv4R+O7A/2lhHlz5eiyXOhoGOWrXjpjsys8f4Ho5M7Rsm8r
+JCsaIYKe5C8tutZLkIexKvRPYoLGafgzOfPpFjY9xjRwUdg3M2T3eVbUsREqdMFJ
+3BYwynW/9xJDRDrIldPqOZMJdpzzg44Q0B/p60vTWCKcyl4J4FiRVmYUceI0bjyr
+ISKrOk4udHsDN5eQArzc3XfwqjPHNNiNukDov9D/MiD9VxGPwR7cwgkyAlUby7cG
+XwXf2Y25bkfQ907bQX9zRAGtBu5cgkWJyknx4zektc83xHpwunrHIj/UYJ2DkPjd
+wZkQjb13OhVq+ijf5f8EoR+p37HIfe6kc24Oq9VWPgueDl1fmKojff08n0uaQYO8
+fJWtAedwGY++Ew3f/c6b
+=5JYj
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/smplayer-themes/metadata.xml b/x11-themes/smplayer-themes/metadata.xml
index 8267a2639d2d..862485291aec 100644
--- a/x11-themes/smplayer-themes/metadata.xml
+++ b/x11-themes/smplayer-themes/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<herd>video</herd>
+	<herd>qt</herd>
+	<herd>video</herd>
+	<upstream>
+		<remote-id type="sourceforge">smplayer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-themes/ubuntu-wallpapers/Manifest b/x11-themes/ubuntu-wallpapers/Manifest
index 0ca28939ec13..da3355a39e49 100644
--- a/x11-themes/ubuntu-wallpapers/Manifest
+++ b/x11-themes/ubuntu-wallpapers/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ubuntu-wallpapers_15.04.1.orig.tar.gz 68085955 SHA256 cc790a3c8193a5234570c75d3ac9cb7e3c0f51617d7aeb2e0700057885f66d12 SHA512 0e878a823ff6b758294b8e4522b076e0f18d62c820fc6cbe3a96624a4b60fe23da2a918ad278afbad83380bc14457dc30fbeb2837a563f473ea5e5b382894c7d WHIRLPOOL 80f6a025ea34fc4873ae9a24d9c88f14369cf1c7467583378f4416a93473f69a569759d3eb71cea7776c6d2f9df6271e37c804f8d418c7b8fd563c43aac291d2
 EBUILD ubuntu-wallpapers-15.04.1.ebuild 837 SHA256 1899bc71299526852413567d52c72000cf75f6b8f1453438945e30faafbbe9a3 SHA512 ba5056f195f7b7559d09389ba59c0c19a94064ac7a870cd7adb88e949488765a26cb99903a08aa982af0bd1991027e5a3b157b4106dc72261e769131d341568c WHIRLPOOL 26ad72420d583f7b307dc9de3da546a5631ec0854489b19613f6dd7f497c84b3d0b7681e6b20b24815c54fd7dd2c3a993912d3eb0e6d7350672d4bd5525e7957
 MISC ChangeLog 3015 SHA256 3e21c619cb877f67af0fdcd5b10de9a5e5b8c22a8b3ba388358809bcf469ffe5 SHA512 6683a3c7c9ef17e4f296fc1f10b613d74a6f87ce19f9862f5a4bc1d33783981f3607c4ac0a5f44ddf9934def3c8c7c84337f890e171f0249dcce40f805353d56 WHIRLPOOL 837b48de7302272802b82e1b1c3fbf34cc47a2cd7ded20777f4b6cad88a68cd1eb74c73f06190e9bc80c999f03f8018cdb74d1c4e2bae460d323c33a74a888ce
-MISC metadata.xml 199 SHA256 73248296e758e42e405cc27231cb6646d8bc4745a4c961976f1885dfea19ab8b SHA512 e0b37d27b4c38daba403821ee2055755c2aabd46ef5159381f2d445847d6182733e23624b9d3a04533d49efdf69cfa292b9c24b0dab7f53e14221b17028029ac WHIRLPOOL 91e565f46f0bd583607a8315e59ec9f5b69e36bc559bb9bb013d4755cb2b8cc084e1bc456b877ebf3526ac173e037f76fa4455fbe268196093f032a9ae25bbfc
+MISC metadata.xml 302 SHA256 1e8588e4bbbcbecdc46fa883d42c2970607116e5fbd1fb2dc126b100a60800e8 SHA512 1c5c71a8173e994cab6ac17495858a9074bdcafe9fd9072fc50e442b8a0944ae46d10e8eb523eaafed969d504f60d15ab480e2734b3f96da0211e266d246987a WHIRLPOOL 6bd201d7c0cfcd838feb8a5ab4723156190a9cdb9550fccf9a51da5bb42cd9d69953ce546ccb9107b2c30892b5449632297dcee5fec701436ac7277e5165833c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlU/+VMACgkQCaWpQKGI+9RH7QCfQX3fqqVdMLkjUsFB0uILKb7B
-gesAn3i2Q+v6PNgl+yNESwEfvQhyDV5W
-=5bA5
+iQJ8BAEBCgBmBQJVf8VCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6TQP/2MooTAnMu7EuEh8qgkiJXC3
+sEHm61pHWaaxE4X/ezCuliiP4LNadBBFQpraTY84skdwW8W1O+k1V5cPl2ROo+SG
+qtZQbUEwZRNjFEjgn8MngCK61Jd+aLF8EEsRtbOl0Jm53jvABiJvqrXbk59AmDou
+XWZ5h5aOWLRDK0gahWJOTX4XxaI+7JuCF8V0S0ZzT9U5AyCBhAb1mQPHEpMooUE9
+wcKqi80pAFnlZgaUFLEEdVyHfkXR7vgOtEBZ/PYN5sn2OMjGM5kc67/A2qsNRFHm
+4hZK3JGwBnk/tnSVxb116e6mjt6bV1JezL+/mhGAqR8g47pQAZhBrTySBdLv5+Ru
+Y8wv9Leu3Y1C9VxidSsrPCJlGqXtObexXxWPL4h3EHjrHCwNTfNxSUfBQa/heHBP
+Qh0rXNws2T9wPzFBd/wpRU8DKAUugQJsqkiCS3DRjDC0M/pG1XD8ByLV5Q9EVdcP
+jO+a5FFlbrk8V4/zdW/kzXdgzqLCOJUJa2m9CipPfAoBUPI/XaNmVsjvtyPtPhvO
+AioGjq/uOt1Gaao0US3SicvOj+Und4CEBqstokOHSazilU71YBjsHtfUkN37A6g8
+wWHej4Y4rqaaBcek6in9P39j333lmss10aQOjHvl/tJHk0rnZ1cyxXPvd3L6og5p
+uUqYwCPBYX6iKcjBuWb2
+=KJL+
 -----END PGP SIGNATURE-----
diff --git a/x11-themes/ubuntu-wallpapers/metadata.xml b/x11-themes/ubuntu-wallpapers/metadata.xml
index f723cfe4ae14..5797cbb3a736 100644
--- a/x11-themes/ubuntu-wallpapers/metadata.xml
+++ b/x11-themes/ubuntu-wallpapers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>pacho@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">ubuntu/+source/ubuntu-wallpapers</remote-id>
+	</upstream>
 </pkgmetadata>