Updating remote-id in metadata.xml

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

24 files changed, 343 insertions, 199 deletions

diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index 4643be57bc2c..d58d8f120856 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX aewm++-1.1.5-gcc43.patch 1011 SHA256 caa673ac0421cdc33d759a4e824fef101783f876990e5834b7e3115fe022046a SHA512 aa95ca31f68ac57ee4d92377b39839594b8673cf9f54834c15026ab385c17dace0f0e7673feb9b92bbab5aaa528dbd4a861e7df5e3b257052cb253bdffeda3bd WHIRLPOOL 9eec01c57f8f127efc992071877d49515f38dfc1d6bcb402a5b3916e697f4315c065417e94bf10ee522fec8a6d2a14c019dfb33a0a9167c18111157e33290d1b
 AUX aewm++-1.1.5-makefile.patch 853 SHA256 9fcb952cd84ff34486ecc6bec65039fd344230f844840ce8184115d751e63d1c SHA512 f4d3ddec499e18598c6a2d99aed0f709226bbc43b6183c7bb5832e26d2fbe99c3292fe9c249613f62c962e10ddace5b10b6ee3d484f3030d1d233ce0b2269adc WHIRLPOOL 486ee72c23e90bba51cdd19e127ef58445b5a190d34c7d21aa13eadb8046376772d9ca1223b12b19e01de4a391c8ffad3595729799644a69f7ff63755ee1f299
 DIST aewm++-1.1.5.tar.gz 24553 SHA256 10603da6e6ef1e2c8377dce03117fed3270a7fe87accbfe54461b80e5371ea36
 EBUILD aewm++-1.1.5-r1.ebuild 849 SHA256 e1bf7871031dcb69f77353e08243f392e9ec05d8e020e658717ba0fc7c01a0af SHA512 c34ec70e687c55fc60dcb2b2c82ac1c3557791f575f4c72469ef9c3715172695994d3edbfd25c80efc4431d5d6de823bdb42d82268773f582ddbe01fee0c31db WHIRLPOOL 1d599935462f2f7e0768aa252d5e6642da4ea6ece5d0c11261d83eb6d56859b3f51d1dea76e7ef747e031ab9f1cd1137eabf1a060d93d05f33a27f9b73ee1ab5
 MISC ChangeLog 3023 SHA256 320bde243140f83680e29d5d3934dffe74924334b2c9fb5a84c53910e2f9c5eb SHA512 ecf63ab10765266dfe823d5ea160718b4ac2f7d0caffcf451b98269aded51103866fb0766a236cc47b0deacdfc1deaa58b38e4f4b69cfb2ece2c72a64d4e2b13 WHIRLPOOL 483e7a2f5a612b27bd8009850bd94e6c140ed29dc6973e7f38458ef820d4eba87c497401ece18d289fc02a6df61ceafb5368a76037cad860513e597a03e580a6
-MISC metadata.xml 422 SHA256 bbecff1bfbab538d58215f88f816a22f0e9bc223a26ad22ec7316e318c93c243 SHA512 19ba32b5f75e56561bc43180b46b39fd2b98dfddbfed1dfcce8c8a3b96fdf9042b48fc1c4e01ecfa847b771a7a36f6db1f597f702f4ee9957b0ad92ed7fec764 WHIRLPOOL b2a5126f0a9ea3118c468ee33647210614b45093a71ef9158edf83db4f37c256e147ef999fdc4e28a4ffe9c36fd975aed5dc6c613192851b9059097fa6bca4d5
+MISC metadata.xml 508 SHA256 d2b5d660a58d3fd8deff08df535aea2eaa162e54efb5d726b5ec922dcde5b807 SHA512 42cc29f8fd0ffcd935641a5cc24593f894bdf43e5e99ad01679efcc836c4260bef53def87e761790f38a56cf0901b87e9aa674dc3df4bc251141124deefaffcb WHIRLPOOL f7daaa7f46a255d9e04b4f79a42167a9b80da7c6caa84fceb3384526bb7538eec4ea0e5e283c0a4149f4fb48d8ae0b4dbfcfefb8a98ef4e88e2478be971adf81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVf8VLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiTS0P/2pReNZwSIuxHUzcpmK5seH/
++HsUw0ZY0e4cRLnHUk0Ku3VoRA7RexlL3Gjf7wrhJLF9SE9KrVEmMBY1xWz//UN7
+jiXNBadTfg9rL+cZBbUfiuLBYRFqsIvDr4t3FhnsHSI0HVkQbo8IRLn2AfTaN39W
+wicsOwTat69cJTjP4srX/+pFZpCi4VDtzMrRcG9nd5RZnB/khZpO/ormDVIn0SNR
+3rDsDhiAoKGS/ii13ntlkOsVXuyT0ZgaWxmZaq85rVFBfdAgwalWMr8drVL9ggK9
+7KkY4+RbZsIssxT46xY36b5oJXELOmKwqrm2EkatSPFEEkWfsmcy88xHmatF4h/J
+3leYuCirzzKVEsLrdtdVeAXVBl2KH07YYhnRfqlJOLPLN54z+q/FRtHoU1fZ+h6P
+ZzAxA4uY/aPETyIE01MFDyUNRohDBnwFt4U3FtUNHIRdd/jVA03TrlqKeni6YQEF
+40YkBtIk8HNGZv2/D1r7ZfMpaY7J4NoETXiBrsH7lYoeG32UFknNjodmyY37+InN
+PXZmJKTkkxTufFWrINsBEn2d+ghMiLP3K45Tknhv3GLnu2EsZqI4oAC1hKIqoNOG
+38ePXLIB5JGUazDNTtNqsyKy+Lb+TwjzM8eAPSzfdsJhuXsWL10NbVCjhmVIkLyK
+6Ja83bv9g5yVvLod5/cu
+=6Xm8
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/aewm++/metadata.xml b/x11-wm/aewm++/metadata.xml
index 3807ea66bc49..dda5ad35c2df 100644
--- a/x11-wm/aewm++/metadata.xml
+++ b/x11-wm/aewm++/metadata.xml
@@ -1,10 +1,15 @@
 <?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>
 	<longdescription>
 	The aewm++ window manager is a fork of the popular minimal window manager 
 	aewm for the X Windows System. What makes it different is its codebase, 
 	feature set and focus.
-	</longdescription>	
+	</longdescription>
+	<upstream>
+		<remote-id type="github">frankhale/aewmpp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index b8128267623c..b4799a70d908 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -9,23 +9,23 @@ DIST blackbox-0.70.1.tar.bz2 492399 SHA256 92c2be347253f29b10063d579b4267a21516c
 EBUILD blackbox-0.70.1-r1.ebuild 1466 SHA256 4353f377781717c4e8cb03680b18d4bf5cc866a78c9c992114968b76bee76cae SHA512 745acdd229f46c5df9052db708cde71342efa050203ec6bb1d4a3763e1fa949fd2822cdab932559ee9e50f8520228062a1afd7a20f77d4d4bc982f5947c55e1f WHIRLPOOL b2fcacdb3d6a130f0a54893ccf2be9a61a53257273b956324946a509873a42b217bdfc5965f6d7574fc4ce10da5797670ed46d78aaaae612c8b889d90bdcfb4d
 EBUILD blackbox-0.70.1.ebuild 1516 SHA256 d6d135024210725f9c8ce3d2dafafae6e46a6d35c228d0891d56a2ae92b1abdc SHA512 cb3de87fe118e768b1e3e16e367a8712fc075c7252130bf1c7b827f4f5a631dbef7f2ee50c35a36c920a900664269ddb971b6f68958f2808aea724a308d48784 WHIRLPOOL 28948f49b77c99b12099675747dc837e6f313235adb63265c0cbe7a7145f17c81421f42ad28bed25200f53795922cb58bf47fb1057237c23ec9e7242fc546e3c
 MISC ChangeLog 10129 SHA256 b670b492e5e63c93d98d2fb4532e0a5dd871e2a83d6ca106ccbf7a0ee7243760 SHA512 726afedd1e76cc5eac7ecd6e7479f51c29cd464fa03c542d7c0b3136b745dc91b93355626a15f87b5653b01f60fbe7951b87b297484dc4a904d7990c25da1309 WHIRLPOOL 2f11590a7d1dbe684969d5ca7272805230d8f00c7d6139a7b83deff676afaaa2f1103c70bd4b9e39d5b4003c0508b7c587c6a3c0da3a90b8c774b9d221278575
-MISC metadata.xml 454 SHA256 dff68573006bb01b0ecc6856f7101d2a609cd520a69dfa60330722b975b71039 SHA512 4f18d9b90ea41fa4925cb57243f246bb24e1986af47005736c7788b38ede1cf572f8a1239474b7ac1a975df24ef7613bfcfa64e304b4354df1e9e17b1ec3ddf6 WHIRLPOOL 7202e0a61eb253b13297d21a80d2a1a6e76663a3f89b9b2fbd01d61c8b6aab544f690402311c5bd880fc684654f52d5632c00787d5fce3959f71de6fca146a3a
+MISC metadata.xml 540 SHA256 58d2c3763e988c270a9d7f1a5255c9dc67cdd3d8a4869db6339cf09c54e41552 SHA512 02311d16096dc85b9dd9be0aebf55cbd2e26c54a9dd46e33d4fe3f1a73170b0842c8cb49bc0ad2f2e4115b7ca05a5dd10a3c9dbdf2f8c2b42457f3ad57bfe59d WHIRLPOOL 63b4247a95fe9d1343e9990f989b5175388552696ec9b2d13b42f17f7aa669c2a24c2528c361fc7eb85f602c940efd57be4fc4cb37ee038202cac871d0a4dce0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVC+GSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirlxwQAJ6kv0BRfXqm4k16gIEwer/F
-vWAFwzGhNo4zLj9MsrsscIk2wJwaSdMslPE4Dcos4+2XoGdFW6pNy/79Rfbq9GIU
-1rqQf6XUHdqx5nX2hkK5aMbKXzjoZ4e5M8tAErae7p+iNfsgSAUVgp1KXMj8MbEV
-l65SCt+tWwzYgb716Z7rejJ69Uj6Wudpzn6g6TvU1CID4XN4xeKjOeFx5IZirvpF
-xKgRlXnK9swJvlDONul+jG/Y8yv7MqdNIZXZfPKz0TZ9xt5r3W5e9gPkJ3mprAkS
-MU0degCh+N6I51Ef9LPUYgCcxrD8DoCBVeoz93qAqW4cUGeKi6Ur5sBOIuUwoNAn
-xSSzjjm3oaK6b3utu+wpzusdgez8ZuwjfiHttR97g4Ce9n2P3wF9ffbP8BTaFGrc
-GGKym52avGnR8w1tF/aF2dpisdIJdgTPIXlutnxKB7WQONhAXI0f6qbZkuXliTIo
-fss/8wPhQ7TPiVp46yV+i8nt1HjtKHvtIT/i8JtJwwBXPCqx7SQBpK9ASCIJdiTp
-apSO6tVgV8b1iY9Q/s6tl7/KoOd8yFYk3LYLu2jlUzz88PT3Tsm/ENBF6fisDwYm
-nfNhCx0GymtDOBM/t9hVBuEWeLXic7cNDHTwO2uOWO3pOwW8vpMv/5oCRor/zjEI
-TXac3DB/mnIAQmn3ojCO
-=ziyV
+iQJ8BAEBCgBmBQJVf8VbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiw3cP/1Bo3iLXhGCKz8RYb6L9icPU
+3MzKjbho/YnNwcDo5LQCCgXGhkw4JnBNlnuo7NP6/I45te4HPTRrRU+ylvKb67CP
+kYE0leYY5XGaSt9xdGf4fAL3NJxSAQ0lPkJZVZ/1wtaUV9mSwToa05rtmSvtvA5T
+6rR8qqFSBz69ccoyk5yp34npAcr6UMAipOtlgz4XPTa0Qea5kXc1qTusZobZUnK/
+ZBc4d+pBcKTRxS/ISlnXnQ29aYUAd1NFko4d9/BN2aF59nPuan3XdHrcMGj9xBbE
+zJLIrD4iU8kfY+RLLlvrc4h0LprncrJUZEW24HlmoyDXGwYU/4L/6mSCNHHQ7Sig
+SFWayHL3f3MSBIDmo2+K8/85+3j1JurjKbbY2QW6ll1kmzYSkrTRJZJTQPFSEyqM
+lDCwpUh4ffFZxz62siaSorJ/AA6mVb0ns7kBlUmUjbEJeNjkktQuUvTqy7Js7pvC
+drR+UrziWZkh0G4JhFZfhxlOJybo/IfY6aM0gMZqKAi2PMuol2b0sI/HrG8L33Ma
+QbALAYKjTtfdvHwH9Jy/xqhFyExQdjxvc9b8b8MT4RjMYwDIpeQ5lmVyFhFHtfDv
+Yhp0aVL5WzNoxoCuK69OXMqP7g70QWzKj9D0pX60DHmcJ6mI/VUrs72naDgKWx9v
++ZG09vwPYCwopfk6xEzH
+=x6Cz
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index 0a93d6a7baca..0deb53ae1fa4 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -1,10 +1,15 @@
 <?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>
 	<longdescription>
 	 Blackbox is that fast, light window manager you have been looking for 
 	 without all those annoying library dependencies. If you have a C++ 
 	 compiler and the X Window System you can compile and use it.
 	 </longdescription>
+	<upstream>
+		<remote-id type="sourceforge">blackboxwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index 7123123c5505..820f94a8e404 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX bspwm-0.8.8-desktop.patch 242 SHA256 63a7f038e7786a96bfe0abe22f1c7455869da13e1edf18e3f846507ec9ed0387 SHA512 925325181191c92bece249dd68788ada1e4449e0c259497a94fb0240ed7bdb5e0bded78500e0a7315b102427526afdebc7d256fc95de58cb4175d63f0bcfd9b8 WHIRLPOOL 13941d84c7e5bff6417e0d78079f9097363a634806c70b2e66571e034c259b9757203e778ffb18e3c0c510b6c4c97baece57b25df8ebbd946cb54d2057c253c6
 AUX bspwm-0.8.8-flags.patch 283 SHA256 1e5540739f889cad855e88ee5f6803a9fbb48e9916d892d1649cd5f7f27763b5 SHA512 735bd3a5bb5789dfb81e35c273e565c192c99b7661355055b86a9af64da42018c74052c89c77d51889bcc52438afedc3202bfae79b124e9ffb4dc358b7e70c59 WHIRLPOOL 0dc4318ff96da169523a588835e69d5d4354c41442e5ae2641fe9df15e9c27adaeaf5a4c4f11c520f3ccf917e7f152be845a48e43abd40db513631900c070a0c
@@ -9,15 +9,23 @@ DIST bspwm-0.8.9.tar.gz 65604 SHA256 750c76132914661d8d5edf7809e9b601977215d31e7
 EBUILD bspwm-0.8.8-r1.ebuild 1151 SHA256 d93f96ea6b3864f4952ee367ff91b0698fc0494fc3e0db4f91360fdbb0667a0e SHA512 e9e7c1af1ca0635e498a54c0859f0f4eea6fe220f0280879fff0661bcbcebbdaf7e7cbe5ae61d73b373e3a7405180f00c339e584f392d6fc142e7661906154df WHIRLPOOL 743344f949cecbd2306dacff463ea94ccbdcb9fb23eae497324b4b9eac30f2086064203f79c5f4a89ca1b12108ff911bd97ba87f05310348665c9154cdfa4e04
 EBUILD bspwm-0.8.9.ebuild 1162 SHA256 9ed46a7fc3eb32a49472f50e6f9242b39148b14e0eecfca7e1a69c077374de6a SHA512 531841384cfd9616b70bc1d13f0729b1ca7982f7c152585a8bab20a7b3f26aa4fef7b44a25097b11c06b304d070e4c325b635a36f9c0ae5907e4e4e89d4fb4ad WHIRLPOOL d75fac2fb4bddedc7021a7d0f20e0da83688b1c94d65de8dcdc268b9d9e721227b17adfcd41a294dde2ca2f516c057c188ec12633463f4a728f8736fbd729c97
 MISC ChangeLog 791 SHA256 1d54831bb41fea56757d28c3ba66a5305bbb4435d88ab647d76ae0da1df42820 SHA512 6cad6b608ba9b63c225144a25da7b7cb0f868c4b937fa2b03b67be7554f42d95cc3d8801d5c0f620bce4372913cfecbff84d0cc28c3be6b6597ec7177509a245 WHIRLPOOL 39d411e5b09b1cafefe412e94f34a7a21f935f4d9883ebfaf8d2baf12f06c5276a8b9a751c8e7cf0f93fcb6d75dfff51627a99d6d11e632864a1996d66ad54ad
-MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
+MISC metadata.xml 314 SHA256 9f5e7de1fa805ddb2a782b657413d6327daa7f3c7625d350be5802cd8be048d3 SHA512 09b6dee58cc45099d5d20e75027319c3b4598a399d92e10fdc2bc75dc62ca4d7ea8200c7ca881c58c3eabd6865b074326092eed51b53896759ab3dc36e24d05d WHIRLPOOL a9262ec6927da073238de1f1e415c92b1e79dafe011653ecae1fff72ac1d699fdb84506ec6e3d135e837f96521c3523b7a8f44ca5c051dc18f19adc26f19f033
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTqmGlAAoJEEqz6FtPBkyjkukH/3VfZzZqvsZHiTo3Bx+JqE8d
-Q1NlNd+bUC7fekefZVM0i9mn97ZrmFtwUowoUtM21ODRhqer0meHz17G4kG+bOIx
-2lDU/q0mDNrGtZva5rUPnRbv7CCDBD1j6h7iCQMPTbX0GLoZ4qimOK4k3B2bDl0T
-fp+payaoNWzUOLI/rtbZ7P7YwS3RQiDSFO69p8nveuVHsGxkLKF5inlZt8JMHirl
-yjvBsFnJfIL8fhwVjHh9L69+7r4ojnp9RqC2DhGwuXxAFyvW/amZ8e4EQfSe6jCd
-Mr32oDi/7sBXhCU4WXjZyJ1Iosc+hEf3dBd6io3bZ1f+IdK6YxqsjF2i7AvuLHo=
-=lSyo
+iQJ8BAEBCgBmBQJVf8ViXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOhsQAIDWObmYmUQ6v1m9306e7dde
+a+++zSwE7F+0EBDikiRJnqkJKx9Uxy6+T+zHZUB2oOQGgl+sYBCnbKesS2arGu+U
+6+Xvso7UCKH5RcU6n66uRqVjum/Kxk/rXSUFLHPfZzIPtDBQ22y1MxpWS+6sL4E5
+8H1QevNHq5zF/3VNLiEkkpBKZrkucNnKh5L3tS1lAvBVyIp0lR5qwgK7PK8vEoGy
+peWmw0l+LW2Ncut6IIK33TaDRIyRb44jncyxtuCFSdBRK1gwiuLRFk4m4H1hDBjZ
+EO3A89U0rUPRM6EpXwn+6aw2HFaoEeCLVj4k7XnhAZ97gGw4cJxQb6p4TE6jzWV0
+u/KKRS9Jo1/f2xUy/zdZO+Xv6czss4LtUN1Pvi99KWnw9Hr158DjxcGybxVOd7qW
+dwIr8m2rkxWtza4Ta6tAOL3zw5doy9u7KkZLdS3N6QpvclXvGm0pyazKD8yVorBl
+HummO8tKPz0fSa6dYAd9umH9S355zfxy8LThQ5H2t9HyQhQL7rkZ8rv7GeWW3l0y
+J89zNYKYTOmG917qy/wGRWIXxoldgOlBDlrnJblaELHIZyqMN/uvYEHn054Uaw1l
+H8wec/vcsbSj9KPIs1DT5SwPmHuT6LFDC8ew+OD3BD/2m5y5pZt8hWoW1wgSS0uN
+UWR1v39+81Pb8D/VtcCr
+=Od/O
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/bspwm/metadata.xml b/x11-wm/bspwm/metadata.xml
index efa5eb0078f3..5d305a00684c 100644
--- a/x11-wm/bspwm/metadata.xml
+++ b/x11-wm/bspwm/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/bspwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 566a09f12ef8..a05a5e17ec56 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX cwm-4.2_p20111229-Makefile.patch 259 SHA256 b9259040e6475363bc9f701ccebde1db330e424bb49089170f01d8145ab0308d SHA512 d943debea5c55430b4304809bd9e0ae15d754dc6abd2a9b895f23186faaad12181f4752bf2c663f73aa99d605050c551e483556a6065e60571dc4b3a269bb610 WHIRLPOOL df8153c37b5c588385c48b4ef5131f41ccf7fe2a9022a5d5242040b3568324f9ae37b33f997c30944c674bc17845f43ba7b238f32b27b19d16e15f6aa0a3a529
 DIST cwm-5.1.tar.gz 44095 SHA256 ea72081e6eafaccf6dd282524f5ce9ed2f4e6f8edc34d5aa88c941e8f398c571 SHA512 6bacd3b76aac4773c77e7216714d64f64f5b810904fb68ea62528e13a7326689ce0320b876086c044eac1cd0e24b71c541843c4c679af1184b93d9a9fe041eda WHIRLPOOL 0cb43dadc0aea17fa42168aae7b0a5bd28bab9d1587c2681a95a30ecff472627bc5d2a96a6fe7201e89c79a70b9ef729578dfbef394afcb69441bfa38d4d65df
@@ -15,11 +15,23 @@ EBUILD cwm-5.5.ebuild 1105 SHA256 ee3dc2dddf239f9306672d27dec3fa353315b845912e34
 EBUILD cwm-5.6.ebuild 1105 SHA256 7e69ad2a5a40d4c11f3c7ed1af18dd1a0a745754b49ce5750022ca7f1266f32d SHA512 821604aa23de9ed1e0f4c5296346c6a0c7651de95d76cdac7626798343575f8ecfda664d09ce7ba5f2b33f9ce7e0958280164e8c394138fbcb267860b8612b0d WHIRLPOOL c256f39beeed02f79be47bf09353fac362fb66e89c37bb19281b6ed42a049d9a7bad75521cbb669d1dc56c51ac658b708acf425d2d4e54935038c4c376c2172e
 EBUILD cwm-9999.ebuild 968 SHA256 b8e8a1c3cfb6c61e136077e8588652af83d46acb49c7e70bf894dd1352614bb2 SHA512 a0768ea8e8bbb5b5cb209529cb3b92f76aa70716e5cac07a4c866faee40282ee07213ed4c62cde026008f2038cc528cf9c1f7ff3d1fce3e69a17c508605eae50 WHIRLPOOL e032936e4bec27b2db2c170e1a674384bd0de7ad5c987aa75b944b7487ae58670c3eb4b1fa9cd21e8451a2d4a8cefbbe76c36227d1c7877d0f30aead4fe343d3
 MISC ChangeLog 6874 SHA256 80a91c7ce15fb6377316eef89790c8a939cc701fecf4ae67a1a953e98b0cfeda SHA512 89f661d2e33dfd8abc8220fcaf5e966d8cd8a963c33378d4832dab35f562fb4b04f28a2c155f5a3744018fad2b2e8bd2f84aa23ae5d3f39ee880a34fdbe84197 WHIRLPOOL e941dd406621c79094815155e01d0b84317112deee1c9bd5924cf62f487f4398730100ff5b13a4b415bc7a2b6aec9525aa0a5cb0379cfbd61a99ac599382bec0
-MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+MISC metadata.xml 310 SHA256 e01c218023e8221b4f1b56450fc15cafdc83ace991d64b3c31a73345daed05a3 SHA512 e22767cd04692cae8c72616adb28587b837deeb7115ad4178cea7635b3f7c83014ec9dbf27c4abf10143b126e46d1d05c3129b5ffd91316cbfce1629ddcbfdea WHIRLPOOL 528266d06c696d462b7e951b99d33a5d01af9488b55ad5fd0bc5da7f945d240ef76ca4bb72424305736ef7a6958c1c388cc7e8f4321d2ad60af9606b8dcfa964
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlTvRZYACgkQknrdDGLu8JAJlAD6AtYEEM888xTpol70QzmFb6u1
-kr7y64/4Hp0nUjbZ/fYBAJIatCXVIcz+tbLcrV+/Z2LJfQTvsgIk5PNvPsQVOO6M
-=qDYu
+iQJ8BAEBCgBmBQJVf8VqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVaUP/iYGmvRPRQ8+3dCuiWxRWkfc
+ua8tNcmwp8B+FJhR7WR8/4RBedw30/+HSUG8ju8gBObx0KE/jNHDbYAojj8Dj+GO
+5P4UQ4TTQIhPzTx+93Ux4uz0FCThLlXaCOrolPzDTvi8sGJjpX3pTcDl9WX/fDeb
+y8JFxCDsicbwaUjEunKE9HmHSNKUfRtwvHPLVtY4rBVRw7XPklbY21gpAqHeli7+
++grty8WhwbeH0OfZucjUk8C5+Lp4RiMMOPA6e5ET7jVV5Y5ZRpZKeSuRWWV68fkw
+bA14zvm1leLWQ0KBPU0n5BhC0Fc0Us/5vC9fSBmSnc9cdqGuaD9CdC1g8kv3bcYB
+wXN+3xLQwWiuriTBNCb03PjNZDpWOwFEtprAf0qqE1BgAZmraVgP5KzcHRWu0F2i
+jaxJtzyotLn01Ol6jHjfWbzVvFoPegdeHa4RsAKQdv/2rKObE0F5dVVZed3CTkKn
+16cUdPHROWU4gM7hc3uDNPrvpfayo4a4HNPK2anIT50YXzpwYAt6YhxVN/7rMkB4
+W46Quf1iOTwq6jXjbeCF2l0Z+EWOl2+i4RfEjZIp+qDkG+L6MwM4knQ/DdE+r446
+jJ6YMHxLFQiLf6oLmgfTvjGilY36ulEi9vo0LsOyLZWmVGgzkCXRo4o19bFVuYAt
+VqjREmJHAfv2+HZ0KuyZ
+=WYad
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index 5b80fb94c393..77896dc9461b 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/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>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">chneukirchen/cwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index a0a32e682c03..c5b70097181a 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gentoo-sysactions.conf 3056 SHA256 5939973a9fbaaba81751e936fb541d6aebd7ec1c599174ea568f5a579356939f SHA512 688f02cbff0d50a847eb08ca7832699b836adca9b22e15a780943a8e5a8213aac04b335cfdf3cb96adbff238f681ae8954a720153e8e35b2afaba3225d53206a WHIRLPOOL 0c05e0d295ede8b2f436a87c4b98876fed64d5cc780f13bb6bde1a74a3c87847f2f90ab482a61c2b39f20894572329f5497e5da22537261eef2f0a9fb33ce56d
 AUX quickstart.diff 474 SHA256 9201674d2f8707f216e18c471f0a4a5a7366b3dd32cb8ec131ca1795a10bb3e6 SHA512 b8df654dd1246ea6391017fe9856e38d209b250625f8343aa4943a4eeed980447eb52c6a15fe170bcab90b76e5670ee9c7f98358bb87990877e312cc4cea8f6c WHIRLPOOL 7ea473b01d46ab1ae10ed50d9991de652e3c2945390a71dfa3cba4bf7c6d8ae526dbd18a275db7bd714be7e48414b90ea470c46d2460c68512ede070025b9c49
@@ -36,11 +36,23 @@ EBUILD enlightenment-1.0.7.ebuild 2090 SHA256 5cfbf86f9aaa1a003619c6f1b92a16794c
 EBUILD enlightenment-1.0.8.ebuild 2080 SHA256 4b868dc821bcedce6fbf659c1b970e8fb8787b19ed6afc29702eb3b5c038b6b7 SHA512 07e48fe099e1f9d41a318afb28e6aed9e33d6842f7129e9cfb7fd79c278f9b957c0d6f53364252fa549628adec5b0cf72b815f8e0fb4e02eb1ab0db31da04ee0 WHIRLPOOL b4776d891efb53abe366d2eaf31d51aa24607eb25efdc0f956bf097fcd63530186a7bbb7f006eee9f4f1b426f36478de6657c5351fff1a32ab5167446ec72828
 EBUILD enlightenment-1.0.9.ebuild 2090 SHA256 0326237b0c3630a139c778c726f4133cf97e20c652d6200c79a417d3db07c242 SHA512 d47b2da524cfb7d5903fa493ee4b2fc1a65bc4d4babeb3add467dba836b7ef3f5c6f30eb9d9d1fbcb6d95490374d35f274d6971017bdc8035ebda8fcbd12053b WHIRLPOOL 9eeec036ea494b69cbedaa49936ce19450e413cc017e92ac45185caf592df0ab8a5a166b35795fb4e2a85b0d32ab7f328fe7332728e1fbbc644807115d7dc89d
 MISC ChangeLog 29701 SHA256 237384c0d0e9ed556a068b942817909ed97269ccaf4c9f9da0ee340a747a67df SHA512 5e8324fdce45f20243e7fd983f0b64ba558192d875f658c585b66ee7e6eb67d7615a285c1c0ff1d3786a8f336cd17c806d65d65e03264b6606726575ccca35f6 WHIRLPOOL 1acf556a0ba8617b850ac3cb87d8a6415f2c5f55cfff3e7f00f8de7340e3969d6df95415e5fa944cfa0c7574480daa7dc97f6bfb3b6be00b3d959cef72e678bf
-MISC metadata.xml 7255 SHA256 919acf28654e386fd0fef6cc3457ba595cb877c6748d613724958f801cde097a SHA512 d0181b277e62ca84cca77bb105a9fba776e457a37e9ab47740056ccc7248ecb7a226d1ad38a675f510d0633aef39a344370ae91c6437785934fc080b389e8c92 WHIRLPOOL 550a420c45918a91449231fe5ef3f5185c011154a2e11ebb05880ca947e3de0533cf67b11e874fb733d042c9757f67c78fbe2095e84e16d0c4b68a2ab6695a1d
+MISC metadata.xml 7510 SHA256 b41dd52b881affe9bd31161a14d95a91e0af441d51be8b9f19cb7a19354b0dac SHA512 36afad9070f8f5df6ca3e1a747c54986713abe1af99f3a86238432b3ad65785ac5513e88382976e76d9b54ea377110d9b5708d81b5b562af32d968de7a11e3a5 WHIRLPOOL 4a4a1a09cacafb04ff088c0361053e7f8196d03fb729b5ac8cc74652292e2b640a750dc82f39935395b00ec829bdd1c70f859bb6d2ea4f7ae1f185e1c735f9c2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUzeaMACgkQCaWpQKGI+9QqKwCfZW5OqGFZmO6lyYdpdxB0m9Cx
-sUwAoIcSOIw6izMSWPJdEhVCz+6/AaPI
-=Y1GK
+iQJ8BAEBCgBmBQJVf8V9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEcwQAKDFiJRwK8WerOTGbOtnAzez
+tP3DsZ9vqzmuGwFxK/Va1F/2ntCFtIDTmymSuBGlsv9Wv2tKL5OKCCdf0xPhupxj
+ouM2bWQSK9eXh82Mr8MCfMr3/7K+ihtrtys8MBy+ta2K4DLoRWGV2xsMYZq4F4Aq
+sSFESQTJe25GUzZj9hI0LDjKyYj3J94BYYKULZGRoOuuuBh/IV4piXPf9G4OvCRd
+MtwqFOsv3jgzmZLrQSEP4xyIfgq00DsNkC/JgAEnx6ArHnYzS3cE1TDROotqNE25
+HFjLztBK37zlJp1Jt/E48BHu6rn/ZRQC0KumHi4+dQIgor6Enmrue7bTfAIxGnCd
+pDb/wXtvX+8CNtTS8m/4U2PB3yaG+MmPVKwqQpuA6gW7OvQXK7dWunDiHFU03YQ+
+YLIQc3gUqWZuokoSrDNpC2J3nSL0wPie1Ysb6DyPeAuiS71LrOonqbyIwErVz9ey
+3nTk3HAduD6iOunxgG9Vp9qNqFoQ1VWCTaJpg6s8oteluGWf2OUJ+ob+ei/TUM4Y
+buXYvRRt3qzMIN7pU+NX9T9ujAxUruYgRLkLIzi7DRpz/dSFh8/Omd0QpeaXFgzj
+KbmK4yFLcNcvl4LaMlG2+REWZs6jS1rPXPdas12iQC3zrT+zeiZtNkkOCeWIdEJw
+yn61Um37zE1STMpGFsqc
+=fiiv
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 30ab00a13b2f..cc4abd49cba0 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -53,61 +53,64 @@ Enlightenment Features:
   <use>
     <flag name="pango">Enable pango font rendering</flag>
     <flag name="xrandr">Enable support for the X xrandr extension</flag>
-	<flag name='udev'>Use sys-fs/udev to determine available devices</flag>
-	<flag name='ukit'>Use upower/udisks to automount devices</flag>
-	<flag name="enlightenment_modules_access">Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
-	<flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
-	<flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
-	<flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
-	<flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
-	<flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
-	<flag name="enlightenment_modules_comp">Enlightenment Composite Manager</flag>
-	<flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
-	<flag name="enlightenment_modules_contact">Enable the contact module</flag>
-	<flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
-	<flag name="enlightenment_modules_dropshadow">Module to add a dropshadow to windows</flag>
-	<flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
-	<flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
-	<flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
-	<flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
-	<flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
-	<flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
-	<flag name="enlightenment_modules_illume2">Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
-	<flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
-	<flag name="enlightenment_modules_msgbus">DBus Extension</flag>
-	<flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
-	<flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
-	<flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
-	<flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
-	<flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
-	<flag name="enlightenment_modules_start">Enlightenment's "Start" button equivalent</flag>
-	<flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
-	<flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
-	<flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
-	<flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
-	<flag name="enlightenment_modules_temperature">Temperature monitor</flag>
-	<flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
-	<flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
-	<flag name="enlightenment_modules_wizard">First Run Wizard</flag>
-	<flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
-	<flag name="enlightenment_modules_wl-screenshot">Enlightenment Wayland Screenshot module</flag>
-	<flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
-	<flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
-	<flag name="enlightenment_modules_conf-comp">Configure default dialog properties</flag>
-	<flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
-	<flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
-	<flag name="enlightenment_modules_conf-edgebindings">Configure your edge bindings here</flag>
-	<flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
-	<flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
-	<flag name="enlightenment_modules_conf-keybindings">Key, Mouse and Button control settings</flag>
-	<flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
-	<flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
-	<flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
-	<flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
-	<flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
-	<flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
-	<flag name="enlightenment_modules_conf-wallpaper2">Used to configure your theme preferences</flag>
-	<flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
-	<flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
+    <flag name="udev">Use sys-fs/udev to determine available devices</flag>
+    <flag name="ukit">Use upower/udisks to automount devices</flag>
+    <flag name="enlightenment_modules_access">Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
+    <flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
+    <flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
+    <flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
+    <flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
+    <flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
+    <flag name="enlightenment_modules_comp">Enlightenment Composite Manager</flag>
+    <flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
+    <flag name="enlightenment_modules_contact">Enable the contact module</flag>
+    <flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
+    <flag name="enlightenment_modules_dropshadow">Module to add a dropshadow to windows</flag>
+    <flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
+    <flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
+    <flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
+    <flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
+    <flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
+    <flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
+    <flag name="enlightenment_modules_illume2">Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
+    <flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
+    <flag name="enlightenment_modules_msgbus">DBus Extension</flag>
+    <flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
+    <flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
+    <flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
+    <flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
+    <flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
+    <flag name="enlightenment_modules_start">Enlightenment's "Start" button equivalent</flag>
+    <flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
+    <flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
+    <flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
+    <flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
+    <flag name="enlightenment_modules_temperature">Temperature monitor</flag>
+    <flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
+    <flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
+    <flag name="enlightenment_modules_wizard">First Run Wizard</flag>
+    <flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
+    <flag name="enlightenment_modules_wl-screenshot">Enlightenment Wayland Screenshot module</flag>
+    <flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
+    <flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
+    <flag name="enlightenment_modules_conf-comp">Configure default dialog properties</flag>
+    <flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
+    <flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
+    <flag name="enlightenment_modules_conf-edgebindings">Configure your edge bindings here</flag>
+    <flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
+    <flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
+    <flag name="enlightenment_modules_conf-keybindings">Key, Mouse and Button control settings</flag>
+    <flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
+    <flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
+    <flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
+    <flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
+    <flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
+    <flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
+    <flag name="enlightenment_modules_conf-wallpaper2">Used to configure your theme preferences</flag>
+    <flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
+    <flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
   </use>
+  <upstream>
+    <remote-id type="sourceforge">enlightenment</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 914feb43d5b5..cd458251759e 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX IceWM.desktop 185 SHA256 925914dcf680538c11a8d6468d30a21c5eac8408c58d665f914a7f7faf1e835a SHA512 9e44391fa20f02f8aa0495c0d77ec10799e7b7097fff495dbabed457a88c17e00fd53a295b0e0293e8aae275b424928f83cac4e2313afa1cb2b8a1e7ac24c711 WHIRLPOOL 958ae99e9c1b2abaf5f642c6e67bcc86c4d72d06edb88e488eabed73ede6536f8d1adda3e8ff3daf0fe9356d2d7d54e8ab18a933abc5bf9c2c4ca5a38e54d3e4
 AUX icewm 33 SHA256 9c227d5676372166707902073337c0610ea0e1e0bb1c5d8881bd4e3b44919df1 SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0 WHIRLPOOL 7248377faae7454d1695d0c094829c47edad23b6bec84197bfeeda6500eb418dc9b627f3d4fe811ebffce2f91c508af66478d7177bfaa0013371f1cc0a4f391b
@@ -24,23 +24,23 @@ DIST icewm-1.3.9.tar.gz 890170 SHA256 2d47f8cda48a91ac14fb20890c2df0f304cf8278ad
 EBUILD icewm-1.3.8.ebuild 3427 SHA256 8fa79b067efa07da27a0bec70fed10b21b1b2c08bbfda51a14e005c02bf082e4 SHA512 cc432a096d4e8d36c143b1cd2dd4161a754bfd4c51a35baa668b69e10c4c3d97071981587bc6ae9f399ec3349aa40454f34e8a9ff4a3708f35f4406c887057c4 WHIRLPOOL faf7e66bc5c33c830a0a84c2a1c8136ef097bd9e12e639f441192205aabd713d0d23da33828c791878ef0077a7ed1948e61c22c32b04ef4ef94615b02c3ae62a
 EBUILD icewm-1.3.9.ebuild 3284 SHA256 e49d090ae896eb9309f49381f307e0f49c4fa58ee46523b112ef5760728e79a5 SHA512 88ee0d2b0e86b085db6e2fe234cce3caa808bb0b3ca9fe2339f8366ff1a4550d17e37b20f01fb583505802a71739a2f645bbe1f3df47b8068a6abfb304dad4f3 WHIRLPOOL 6976804ba7d46e8d93368fc5f53d4969ce9632f5d003876f4d9b19ffcb65caf6f6fa1eac2219c3ffd715e8b7ab29c34be97237077e9221ce1057adbc790726d1
 MISC ChangeLog 26854 SHA256 5ce304d65f348c115b77352e303780c9b2a274b8fd491bb1cc4d685a7ae4beae SHA512 c77bf43287108abf34ddd11733b54f50631f3762b6c17ab8da33aada7196162edaabfdc0ea9da936e3b22e6e9ac569b3421b3f19dde9605d7955a2d6382777b8 WHIRLPOOL ad32e84402ef95d7ce2541364ec394d572aecdca3d0a89c49f6d937ad9af369d1f604fb880a42312312ca80e59fce4d8fd3bfeee02c9057dc71182c56c4141f8
-MISC metadata.xml 475 SHA256 ab567633101459c7952b19014cc0cca71f5cf90e5ff7bc322ef8e39755e24826 SHA512 fab94ce62073fb76d3e8413444e3f43b243b5f484f5afab7c4ef2e47d020f5f013fd610109c248b247b0c78af978779da237c822bf103d2ffff7cb43dba276ad WHIRLPOOL d817f0e0c27ed472d7ebef46fd2d11c4e71e5b092ee46ccb6a60caf3a11d54051d20e03074b7167d585e225bf27302cbf27b48bc0ddb5f036ada359fde03f2a8
+MISC metadata.xml 555 SHA256 63d3fa868a6f6d2323d5c5415c80f86bd2740382fcacb3c6e460f927f5d0f3a6 SHA512 7799aa6a2c87a4c58270df67623a10f3f8b511860d3e18e9fdc6a22dbb94dea352eb95502202ed5fcf1bba9cc35a47fe0e337605f79beab42b172fc094ce8753 WHIRLPOOL d1706c26cf34cc86c54be61045127f27f4511d558e6f73b48f3092d32d077c7c397a917f271d94620822b0ff8a59ef7edce350b0e7faa22f9b19083665ab4fcf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWV0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZObxoP/0UYg7bZIalzEsMTiJt6+DpN
-Pr47Ce1ftwIDr6qvML/Glq/DdaF/QLcRmSbzTXJEe/0GHAmT1lp8v4b/Lu/tV3iR
-cAvmwSDPqQwkQWa6mcqrzP8HRqIJnbex4AzqXhH7KoJTOcBMUgeaS1RkD3zLodEz
-Zl0dd+ggjecQ5hnujnYDQ5aq7O9mtfklrk+MVd8o+BdPpNJ0OTw2pyneW7St4QLd
-/dxhL2Fq+6zMGjhEutYQapUwwMG5Rgswf0xx2r9XzsCzDv82kwOJW6bE8w3lgWD/
-k9a2PSNNveVvuvo8C5OUFeQt9sZPxfW1a15YG+BB41L4VaObs/WO85PmVvJc8mn2
-W0KvGzvxWP5d1g/680t8poywkuujqLLCySr0QsbUFhZWz3B3LTzqSrfAT3758cQG
-kCzppKYVDSkXbZVlcCA7nc3QUcbQOr68l43T9/FSvPzMWUSNCH7P3hAWUc3RGX1K
-wrONEvWMeLEOpOuN6rIFtInNylnXll0shw7o7p9BHtmVGY2bkDnk6dEOy5Dmyrcy
-OAw6I6tbVWngCGJdh4OgoSPI9bechDgJ2Q6qiDwBY+isQCy2L2snnMYPVO3bt2pB
-SE1KV9+Y+JggUG/M4T2vi6sAzevb/aZRmH3VlrX6l9x3wAUFW1HxuQMVxX08TLRq
-zfNprGzoVZ2GY7GqguRV
-=woOH
+iQJ8BAEBCgBmBQJVf8WLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5oAQALBtDIRFlBTkEys8XURgB/KV
+pgPCnuxwNMxK6uGhS+K+CGgVjCWjH4NWO542wlMl8mdkxxRAOVmsdIE+M0ekMWy/
+ieVodksxwxIzrkp++IsufIzGwqfOb++BcUn2AqZCNPKOGsQuVJ3ndRM/Hp4K2mtH
+cb4hJhmnhg53Nb2/Y/A9ebx5E0UBrHaijaq4sWowfrJ9901dwNRHMUBPThD91lm+
+FvGmxp12femww9/k1wjpGm8QNNs4ngofM8ULrzQCgSiHuNf9c38Iy0hqLTchcQlF
+dF4IiZCtpTfCI2Zrh3TtKybkHHNjWqNznhZgAvW+3WnikjgUAfe670snBKS2j9HJ
+oZAmIeBL8o3W56uHUtxozVCAFeKc7NOQhOiGTfdBlyRewTj+IOr6hap37aebpBYo
+GyjnwuFs0u8XsFARHKt6gS1nbxdEBFQniWU3Dcd71pTUhdGOuS/vyoU0P+HqgVg0
+1x3+OoXfBQNuVoz6mlRwz8PgeJlih2VqxLpXsS44GpFB/HLMfjuXQ1LFWxB7XMv7
+yUSiFJ2Uew2Dun9a07bQj6DOTGjZPMFV2OMtG5HV09t6kQfqMLAQoUleTO28EHsf
+oDYvBnc19AgvdR4pKuaU/TOGdG7ZanUvadjWTflCYQDeWybAOv0rma4PD93IoFMq
+/jQPaU+WW8S/mOzwhZpK
+=GL8t
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index 6835f18f6289..175a10c99c1b 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -10,4 +10,7 @@
 		It is able to emulate the looks of Motif, OS/2, and Windows, and allows you
 		to have a customizable look using pixmaps.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">bbidulock/icewm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index b4f233dd183a..c34c5aadbfd7 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST muffin-2.4.4.tar.gz 2706446 SHA256 027641f3bc12a5770f063ffbf9ff0a4797768d256449941ae0be779700b90805 SHA512 57321f73af81dd9e03ec81b56fec83a5a154f06fcfe113a8129aaa279f0e11bed446efe98693aa52f7d490b4ddc73ba76db237d75dfff7b670427b3c8fc8abff WHIRLPOOL 7c9ae74c3053b2d2eed876d63e509d02ff693fdd88aedf4ab835a7bf5105a098c1ca99ec36e35d2d24ae352a7caeaa661693e1532a30e14cb4044c2b6821dd58
 DIST muffin-2.4.5.tar.gz 2706742 SHA256 b38d62cb0d4ec9e213cc41501bda0d4712eebab7cd4fbc5ca0bdf8b5e74f83f7 SHA512 f8a791d88823197f8b727e00cd67e22adabbdf6fbad3a1ebd1a75087a48e09ad4c39b9b5550303db661c54937f5f42e25c2ac47ccdd98d281b4ff9aad5f5d71f WHIRLPOOL 6d9ff8ee2a09040baa8930006a4e48a6ab6ee7082a56a30826b1f57e6a317aa942a3dc1d4aafe993ce54209fb8e20bf0cb759a9fe2a4547afaa3d870ce0da72f
@@ -8,23 +8,23 @@ EBUILD muffin-2.4.4.ebuild 2156 SHA256 096a60e176d3a859ae7568a0819e5974af8f5c3be
 EBUILD muffin-2.4.5.ebuild 2166 SHA256 8fcd3efa5fcd0b25dba2b67638dc8dd18d3bdf2dcdbbfe0a2862db820470520d SHA512 49e8ef8574a6091788d94dbb076a9481d22afc1b7f86113e935fe2e614a97fb30830af05503b1177c35c6ef2dca49f172322ebd4bf6a0022feb246f89acb217f WHIRLPOOL a03479d073cc98f2f12f21722cc5125a6100518e92244ed81dcfd7748c1d6b555b2476a99d5264668caef3f192546c6b227352bd84724e382b9b2da7d1d837cc
 EBUILD muffin-2.6.1.ebuild 2258 SHA256 b7fbad684cf36b83707790f14ad28673ad7d811ec5bbb7a48402e9a8a31ed0c0 SHA512 6e4221e2c48d201a1fc939dd206ee37266ae3de2347eefa11018957c3932b3b125fa4eee31f28b91cc9dfc3aefce40645b7f34450b3430998dee3c3a27239adc WHIRLPOOL 931f747c95dd10c45362533ae64ef7f12a2dade47351890279a9940b5c1db838a46161757af1941f8a32486faa02c866e5806ce7bc0442b080a806a77a7fd898
 MISC ChangeLog 5019 SHA256 e326e78b2854870713b3e431a0c723c8d3db554e4bca3c0f76eabfb605f395a7 SHA512 1b3362f0d563cdbaf2ec8423c29936a90b1f77bbd14ddcbef70bbcba211f2cbdfdefd6931a7a752182401a7fa2feddfa3327dc9485463ea5fb0769bd3c519f16 WHIRLPOOL 418fe23517adea5f4070a4f5dc0534de7725329f6f51508b6d30b9db37c75157fd1f594282e0f4e6b4f87568528b9c1ed138a12ff201a52840db2c8f827e2664
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+MISC metadata.xml 240 SHA256 37ff4c9055ba2b6134623915033a625119ee896ac58a0228dcff2c6006bc44e8 SHA512 a0e35408d97511da3de966954fa74fdb9ebb7890a477df0b21f26389d79954d5795d6c3c28e0e817014b7984b597e432b611580567190722536a38192d65c02e WHIRLPOOL fabec3cd83951c728e4ef39857ee9ef76a6746e9910ae4069db9a05ca565a001456d28c5cef20574a7a56631d800dc96aa8db6d2ae7b31310f61e4d947710e65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVfN/yXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN68kP/3Y8GjGATj43bDbwKA/X+kUy
-Ki+8cIutMYsmOevJL7pgIEhbhJjV19RXvCGoHbtdRr9rhGvLoQoQOkDrwDjfVuAu
-q/R3D90Fjp4u5XDiYB4N0cxr6WjEJwYRsk1CKDDyZ/Fic10AHCh79StPKreXFiit
-eMVKbtOiC8dSg7JN72NQ1FIYFVNEsAu23x/K+g+ImupGwlzlIOtd+NK9k02xUqA3
-CxNqM4jROnFhyRhePL5OTEw7DBaxfWfzQFZnHSHNG/qtXOx/sSTZT55Wa8v0rPIw
-f6mqtLlLUCrZZhMI5oM917yfOcpfKbeE/6S/Cv0jI0zLMPv5geed+8+CDBbHVX1F
-MK7sNLZVxL/7d83DFFVag7TdhREk0HyMLy1+qPoBIGYXpbMkT5NPzk5TqCsloKvB
-I4mOqM/tr/NIHzO7lqtVjmYsyrP/WrWY+bCWVzoSXj6cCFfYW2qGWrexmSB0nJiG
-EQ3nX02naEo316givHxqasxALUSZq4VGy8rz9V7iJceRONGoZEQGo2WH+Yn4eSK1
-H5kwJlYIddz8g38auLRGFxxVOs6nzcDqH6O/8D7M22LSnz5M7x98HTZBzNw3f5Bd
-EUdMf457yx5uKZGsW9I1xak7B5IGoHwq1GPZWdTLEBmulGh7cByBNb0OlSO39UL0
-IaOTOVk0YRecAD9kBnDJ
-=yXsV
+iQJ8BAEBCgBmBQJVf8WUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiVj4P/0ZXhwNBDi85gFSigcslArV/
+CaRuDWPd4iXog6DsfbtTLZmZx+9BgaOQ02pgZBZ35qU/0wgkaPoYcuruP3w06VlW
+DAPRWAOltM0ZT3vTFmPUNBXSbVvAkmBgAsghm/0LAFdriEws+aRHN+nBvrETaaKx
+BCXX10pTuGxhtd1HOSPWwFBX0iewRRz5lwIDKtPd6rPkD5Y3BVi9iKY5nOvonc+p
+/QwcMrbbxFXN1C4V7pevCu2/NPcRixmX4kZ3+sKu5TkdJU2udplIHo7nDV+JQlYd
+AWMbusi6N8gZpsNRDkkgkR5nbWYmZMPvDs6J3D20AsvqfH7Ubia6vE80Htr5joBJ
+Z0Fguns80fmnNzOSalHqbxe6Vgs/3KJQenjxbnIOPmIb+4H3+2HdGmnufwUOwHU3
+NvwRC+RJ8dAXMqgw6QmW/FohBfrZkXt38Koe0PUmUxZ0/elx4r5mLMKygFp9wCen
+GPn8SqW5OLueL6VSwXIed/3YpTtPAs5Yq77KQUY1MSsAg8jwPE4LkART8Yrz/EOQ
+eDe3VAKgBR6HvSFui9eBUhvfbP9MY5yFLGPOuJmUhl0/WkdHCSbkk+OKYg3Z+StR
+tdf+g92ZMF80JikGpyuVJi6ZD7npiEcdgXR+ndgwT0FNDyrtm8xOlkFeC1L5ekpD
+R4MmwmFbaQQUfNq0snBG
+=LjMM
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index da6fd63d0085..fc4050a85c75 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/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="github">linuxmint/muffin</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/musca/Manifest b/x11-wm/musca/Manifest
index 22a17da6c063..b369f0597d92 100644
--- a/x11-wm/musca/Manifest
+++ b/x11-wm/musca/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX musca-0.9.24-make.patch 711 SHA256 114b44eb6cc3584fb079faadc85d3ebf170d6c1f790a6f55c78ce7f95583cadb SHA512 e31f4eb6b79e4137e366943c804aeaf7d571f005cf81332611126b94a82a3dd93651631670f7d0b6620e8f41047250c0c2c1955e86d9d48193ba3acd99e1c54c WHIRLPOOL 5f66c25a6a0309bf002223bf79097de6bc2b545b853cbee0a66f3a62d394a43e8a8002179245b56d3d51e22dbd283dc702ba64e3fe4e05ef14569bec61f200d9
 AUX musca-0.9.24_p20100226-dmenu-4.4.patch 1421 SHA256 d88c845edaa58a73bc4d2c331bfbd15cbbb0db50df6ab74e351eb35d92e77e6d SHA512 9aee1756cd0ff7094a26aa3ab0e2440728b973a72234c3532f733afc57763678cfcfb6a07ec2ae386f2b70d2313d62437cf889d561bbf321f96fe979181541b3 WHIRLPOOL 00682b04df0db076ac022dc2f18fb1d7dd9f7af6abfc195642815c3b298459de4c386e7442d56b9c056b0dc8359a0e208cb4aa359bccc1402245d71bddf4da42
@@ -11,11 +11,23 @@ DIST musca-0.9.24_p20100226.tgz 81490 SHA256 63167c76fa5ea9381685d209e12b795001d
 EBUILD musca-0.9.24_p20100226-r3.ebuild 1303 SHA256 c8ae718788f89f4adef3153c7508def81147efcee2a809388c5c38444d13bbc4 SHA512 2c9008d43c951557afc2ce5a5dc3fea294e7ccae692ec8cc76cad33356b27f80c1f738030f50d35e8831a71f64bc4ade37b213f8d91496c78c4dd782af9d434f WHIRLPOOL 946a741b5881f59adad48c5ead34a3419e3a69cfa23f1a08e14f05fb526ec44a5d4c09a73065dde84b1ed004154992b0e0dd073491ad769ff529615bcd7c8a1d
 EBUILD musca-0.9.24_p20100226-r4.ebuild 1414 SHA256 258d9558bb39c33b2cb1a102b5c858263f745560de661d7a1466f28c5ac8f2f8 SHA512 165f42895b300973d6f9b3aa2784020b183595e9450a87d6161791b793482dbdcb7fd93e2ecb283d2327f7cf57a1f9d308a80e6e9a654f9682471719a5d41348 WHIRLPOOL 7a6146b3a37935f0a78e622006f951a6a063173338b217d7e233a19cae232fe45435e4adecf92a4cd2ae8e6480071101bac1e73104db86060861d606218e5cc8
 MISC ChangeLog 3990 SHA256 e65b0be323d410dc7180e3621cf6b0765198c72f53589e5fcf856b77a9e21f0a SHA512 dda1a444b67ce5377ea9255cde01a62f8df712f49c76faa03e014ff36ec3100d867a084444e23775c9c8737a979383dff1654e61c83bdc73e490163970e9396e WHIRLPOOL 5385627721ed374c066420c9b3b29704dd807169d3d3a07cd0108a5de33134c73eec4223e4f0888a7165c395c0da78602c970d705d2293e7262ac617b912a7e0
-MISC metadata.xml 393 SHA256 dd8215a2bee91775b10d55416da1e78dfcc5ede014c6c07990409386fd21a076 SHA512 ab2173fddfe75a5167c9a6c149fed0162b3bbaf078998ffb988b27fe9e25dc7ead2e1d9aa91606bbcb99a1e998174a08893dddda47ec98f39574dc43ac168d54 WHIRLPOOL afddbde28102a3d328759b905854d062fabb3872f770ec24389263a5fcfab79de5c5e7e3fc2ab6e296e091a4bf25e97f9dfb6b5706ef1d651180a337f7b17e61
+MISC metadata.xml 472 SHA256 9a0c618c36a4fb10f742ba7885a2783e7f81c3409a8eb27377d81d23c829a674 SHA512 df6b6363e8f40e615da5dd6b9fcf7f156bade6d4edc46326630967bb74be6a3e49f5f176dc32a3bba50c5e41f41c2c9a301be56973a4897d15870b076cf87e79 WHIRLPOOL 065f2a83bfa291ba437139e2c958c9c412c1b783d86332bb142ec601c4da26c657a30fa3854d05bd7bc78db9a113aae0586ca0dc7d577a4c5503d43b0a7c7e1c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV14W0ACgkQVWmRsqeSphN6PACfavY5955OKJCYM3Lvl6U7+NWt
-1nQAnRYaRGx6RThAplv0L4f6qgl65lp0
-=2I4Z
+iQJ8BAEBCgBmBQJVf8WbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiW/MQAIhl4nzYhl8fLA0LLfN9lIp9
+yRumlkLWE/1rSxz5m7pfsJbNrulxAbP/FxamC1g246c2pfFjvk3gybtbe3f27wFR
+jUzf+P06i22hPqMHICBU+HUIwf/NtVpRDIjw/nZM4DqFOSBvhd7TPjFXj36B3elk
+V2H83vdAhZcIsT29TPsvFbAGS65j/oeLMlv+lXObIiXDyqRec3qyK0vm3KsU0URM
+JhrZHoxqI+w2b3W++yy4wQxlEX0rGpr2ZfdnEAVKdZRSwb1YsayCVfSPUtpEDrsa
+qc2nP+T9LMrGD5baB1FTcpf8x+MTgo8WsiH1vNcv0htZzU33V/qBCagN1u9864VT
+PZMqt0fEecbdZQlQdFxI7lw1qq0gAAktyKriSagcSGaUr5/WFnFGJd7O293MzRGS
+bK2rGJDhkqpc4UnfuXgSSGRVgMbZCIYTZuDOOAnXe4TyrbSHiHPPPruGRUmj4rHs
+oHHoRB5aUMumDZhrZdsOtZCMsfq7+aNFME04iYYartJ74n8yuaYOJI5gdI88ULME
+Hxj8Z/2Ayxx4GL66wyb+xDywj+4Vvf6H9hsnD8ALMV50XOLYMQBpg/3PVRNwKrhI
+jVHEiW4sOp0q1ofG5QTLv7M89rh54QJvKp6yVZG8UIZIZ4R045pGsdGVjtCshDlL
+YeaJJmBpUhU7KegiKLwB
+=N+pw
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/musca/metadata.xml b/x11-wm/musca/metadata.xml
index e691175ae22b..70dc935b8077 100644
--- a/x11-wm/musca/metadata.xml
+++ b/x11-wm/musca/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
-<use>
-	<flag name="apis">Optionally install the experimental `apis' window manager</flag> 
-	<flag name="xlisten">Optionally install the xlisten utility</flag> 
-</use>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<use>
+		<flag name="apis">Optionally install the experimental `apis' window manager</flag>
+		<flag name="xlisten">Optionally install the xlisten utility</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">musca</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index d91dc39d8339..2aad9eb6ea40 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX plwm-2.5-destdir.patch 1365 SHA256 dad1e7295ec52f8cfb0756929d1a627d74e78d0f1adf16c84f0ddbbb4df4e3b7 SHA512 e52c7f261b48c17aa2525d9a8aaa7cbc9e32f03183e480e3f76d9286ad839908571ac140bad97c91627d0d530c0ef0c00666e99f48972a0237391b6b72f5344a WHIRLPOOL 1a494098366d7ecdb85666b09aefa89f74c4ab812afdb9238035e68b3e6cf6e363f49311f4ab4581c45a5e299c487979c36b9874d53cf4896d83a2f28226f579
 AUX plwm-2.5-pep0263.patch 346 SHA256 dd8af03c90f3f039eef48654e3704a3185147061119d48f6fd0bd244ac26f6f9 SHA512 1227e025af4e129aa3186b6558bac3b9e6c24e1dd4eb6f41da7da0bef5d4a3a187ed3c6068fc81c2ad914b6c9bfeabf24244929bec0a8047dad69406984fad23 WHIRLPOOL 8de64553bd492ea7feba8dfd70bf7af0035624d4f727f49fdeaaf0bbcbd26fcab46ae10f6ad012d38872cc5d51a067ce7f28a566ed9b52e3b865d224b11bcf8f
@@ -13,11 +13,23 @@ DIST plwm-2.5.tar.gz 127248 SHA256 c1fc72f3dd7959743655c2fb2025faf598d1c5b0d7581
 EBUILD plwm-2.5-r1.ebuild 1133 SHA256 ca1b18449adba28da779322cac207f7566ef383f6ba2a85c0df005d2308af622 SHA512 41722d14848450aa24e034e437618b861567508611ffc7a3e3d3552b663d265f791ff58e2a2c70794bb6422890ee11b419907c8d1b3e828718c0cc59188f9a88 WHIRLPOOL b4b83fe9c741e83693f33bc9dc656953cce337ba039a8cfdf948f10098903025ecca78ab911410e1fd813dc5ad7a50d0460835f7d7dd5e0529f93e853423503d
 EBUILD plwm-2.7_rc1.ebuild 1108 SHA256 d6486880419ce6596b7b283c6a9e126d9fd8d2dd90d183ba60d6089639b6dcb1 SHA512 8414fae3115c8d0cff5b453d2b82897e662d115951cd9981f4860fbc91fa96b092d021293e744dfc5e5039c0123ff10a949ae6f736cdb9fcb5657c91256a902d WHIRLPOOL b1aceacd50bd7b3042967a835c2d52b132bb6daeb741023328be9553f19f89ac8bc970fedf953fb6732814f2ed5c9670d05aed792e3883941dac783459e269db
 MISC ChangeLog 2813 SHA256 875f6d6473a8ae6130cee4b255bf422c0eb81aa23da11e3018d0675801b8fd20 SHA512 6b24cb4ab549df43f4d5df984603650e027041c2cd42ba5c2f194d65e23fde3ab17ea278e1ca2969587ef2a8cab98f19d5e5e5ae18d98e886e60720c69dce1b5 WHIRLPOOL 338dc8e4e9c8e83e4df7d48e7b7bae621a82895084f7350845e8b4a0653a4205a669fb1d27cf505a942de301595f4f77353cacdbb9ad9ae0b5594a0bf70189d2
-MISC metadata.xml 403 SHA256 1afc76e8043a9e095f271e9375aeecc47a400a62e3f458b89ea8bc1f42cdf93b SHA512 e82e016ae6c2b2496df0ed521bc5b3e978027aded37788de3ebe5504155c2799bb043c250669df9923eaa37476667065b1cebb29cc48563c5e527cd1fdd04a1f WHIRLPOOL 49cdd5df21c8301e4d75ddb9cb970f3e0b0c3cbedbd43e34db54b878cab7d3d564599f74a14daf38f4e0b7a3044ec994711ffde7de0941438bfc7c3feb00ed34
+MISC metadata.xml 482 SHA256 d8fc894e49c7b00325fa6817f5c1d8a0cacddd2152d4b6777e04c9b0e673990e SHA512 074a023f4ba3bc542181538a90b878b392172601905dbea7935417215db4e392238f24476871a2b63b6279265e4d71eda9790db021320aee76e8d9eea283a6f0 WHIRLPOOL 09cbcc4f63158ecc287cfc1d9891595cf49182c7b49fe87e67d0c5c25043870c9ea7dce16c362f56993b59b54a45da76e8e6afcb36e43d8ccde7a99843de5eda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPnzzQACgkQcaHudmEf86oBBwCggGESCja7IJZ4b/7NHmtpm8Je
-swIAnRLwv6mH6wL5oleQ+mZk8auCBHH7
-=1NPs
+iQJ8BAEBCgBmBQJVf8WmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiPvUQALKxsrnDe8KevLXTZftFoADt
+8QCBG9njt+Zh7y4lp1CkNqJKFde8qz1OH8RIoHQ45pu4XiWADS6z15t7NPSYyC4W
+JiPbKkizpSZYCRIDNBGHKeafscSe7HZtnK0PiH5xepHfKl/CWhXI70GwYuOmn7pw
+0Jt+ZYP4i06dkaQfO+C6k78AHgc6xClyInL2BNJg5piBVHtsOhdtj74OPiHfY5vW
+f7APU6bzj9xYxA3G8FIQ4d5O2vp4cLqkAYBsMqTByZ38DK3bnBiX2jmWLSQHWcVX
+XVwZesw2EilTDrDnur1Y/tkuRPoD3lEdBNwVTwTb3sRhqLzobr5NgzaKKu/xHsy7
+PPmfDl+IfhFzREt+in2Lx/gEq1ymugFgVwU+UrNi+WtXUCUmjCL3I7x2gmxacsn5
+tuO+LBV0hxwOum+FK2/rXavDEu2Nt3lE/Rx/5MzgmTY1amtWZni6XNvCcsV9Wrlp
+iL4YE+stXA89FYVc7goJ1Kl0NUw42nZu9Ud0Cz6bRr89ugOtPMNMl0ThkGANGr7a
+Z27GpxXwPeTzGDmihiFobJf2VP83bFx4mESUXKGuLICtAN8CJLwgfVxqTEFEK0b5
+87d8K2zBfabvmuDBh//bbIxp0MMCU5VbRBGR3rLQyWN0RkckIpmV4qoH211wt/7/
+R8+WvirWtJgDmcnuJsPF
+=3BmW
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/plwm/metadata.xml b/x11-wm/plwm/metadata.xml
index ed2d69df6670..b260579473a5 100644
--- a/x11-wm/plwm/metadata.xml
+++ b/x11-wm/plwm/metadata.xml
@@ -1,10 +1,15 @@
 <?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>
 	<longdescription>
 		 PLWM is a Python package, containing classes suitable for 
 		 implementing a window manager. PLWM is also a window manager, 
 		 using the PLWM package.
-	</longdescription>	
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">plwm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index cf9980fa4586..86a10b57ccfa 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qtile-session 1854 SHA256 848ebde7357aa27e94c7b2e6d4f0eb670ce9ddf0528b58e8019944cada4f7131 SHA512 4d7418316f6baeaa28b254f341c74641004bd58444c425f626c92e44bff046ec108d128a9e91c10daae75b222c5758e8f0e8a5e3b778b2af36409f4d4b778cbe WHIRLPOOL fc591eb8c5ef8f3457f847e7577f915c8dbee381607760a556204114c6ea88ab0071624070d7dafd849b3888d7a930a77ff55bac1fcb267e9bab74d0fe5961bf
 DIST qtile-0.5.tar.gz 317041 SHA256 f80cd73d6655ab53baa6ae11afb9561f724515052e4ba570e6e978abc78c1167 SHA512 2af8a13dcc355b4f556e77a7c78235eb39e9112631750d6680cc1d96c7895ffd3c8ac937ec8b796f4e3f841d39b10aafb930b440addfd8e2fc951e2010e3dc98 WHIRLPOOL d88f70906de570d129aae38ff9ca7a829aa1d9b6d61a179a0cf4ad798d9314c9364a905739168a60b9c37384c13034172920c76cef0981a26df04544e94fe472
@@ -14,23 +14,23 @@ EBUILD qtile-0.8.0.ebuild 1479 SHA256 431f4f279e71bc58d071466d7b451d28fbb8c3f425
 EBUILD qtile-0.9.1-r1.ebuild 1440 SHA256 8500d0ace907a47533cd9e74429d3447638e4fffe81c4677546a130e63aed640 SHA512 b935c786d7e0e1af541001039059c6024eee01bc61223d7c2c307ee49b49d2dece3cd6d7d4dbb8161dc9dda9ca33883e63d1a4288256d06373f50c6909582063 WHIRLPOOL e2e3f5aa57c5e512c04ce3cad8de63caf25b8a1bd936ba4f0b9a40d23e0e29c04be8161cf68c222040fde22b63ae565921c9521c549649dd644077e707f756e0
 EBUILD qtile-9999.ebuild 1437 SHA256 c165a9bd8fa8a3f1ba8ad03ccd15396f9bfa904603eec22f7f6154814d707414 SHA512 6f3bde5135f4cdb451a4104544c04a8c7917a814d4eeef1d45467227d73537a6a3dcfa89bd4740ed47f14b848be2ca92763fc7e9aaf1029aa225004901c2318d WHIRLPOOL b5d18992287e371c2badd7be9716aa47a8330843bee84a5700e65e446680489113c98a1dad8c7b5dd0300af984c4cca1f1e945bc218db01f8149847a7c15a9ad
 MISC ChangeLog 2608 SHA256 c844aa7a077fdefca68d3e7915791e9f1ba5e372b714b43661bbc0074a170367 SHA512 5b165d9a8bc21cee54e4dfd3f4cd64c8e2638a21c91af75bdbadb8e73b02302bafed7e032b1548eec7193f4435a20e5268fa1803a60437eeb0dea6fa667d7bbd WHIRLPOOL 84319e61c6139076285b18ccf187ca4985d674a6730df3554985b3285b6fe071dd138dec6388d7911d1b85b2632af35a7740f81fc654ba910367b88bebcc490a
-MISC metadata.xml 232 SHA256 a778e40f66cb2fa35529e4f45cb8356c8b1b109163cd939396f02e8ea6aa5f1a SHA512 6952f63da1c92a4ed7ddb87b5eb4003d123f0b7af6ffdbc9118159c97ddf18917e8ac7727285a42c07c64e52a40335bc2ef9f17261557617beb8c2226a391873 WHIRLPOOL 0a4441f075f8af01588da2aac3e03732f93463b8bea5e46749d37e1468452735d15f45243b930b3346c93734f8aa235a492030445fee471a95d2c5998f08e7de
+MISC metadata.xml 308 SHA256 36c856dce4e09312b7c605928480fda443c5147f028001c4a21485a926fe3a44 SHA512 017b7e65a5662ee1cc0ff5de0863813eea1647324c8d4cfc2101dec5b6d60e5bda22bbcd39b42d07e4803439e533675d586119dac932b55cc21db0291473e320 WHIRLPOOL 0ba5f5cc107daec98360fa19b0a83d08bac3e24d2370889bad103c2721e1a277f8f3199e56482eb7b5c37c945ec78dc894355587e62f995cc0ad6224b5ddd505
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWV1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+BEQAKlxQ4EyNZyUFcJEEZBrJTVa
-MiDz3mqT4DiwGiGucK4i2Va003v9hIGLShAT2CBjezeU9MnpdvPuzzxXf8W/jBtR
-UtJR8gf+un1s8gAYJsvj4JPw8hT1owr3v7p9/PbCAc7OAWf06CvcoAZr6+n0yG7+
-Ms1/Mk9KSw3PT41E84jXBHatIVG6anp0EPH1zzb783jU4xNaxTk85t08zlb9yzVl
-Mu8zNINQEAUepoV63gUo6Um0oX7opvkB+3Buj85R/IrBxxvpRpqoEdFJRZ1t9Ejg
-2Td7z6l6O2LwsLXnYwaHroqFb3ASV5Y1A+4lwbYENoaM3yo1+ZGotTeTVg04PfXH
-i7QiYkIGA9m6wd9daGW2tGefvtVZ7yJAOKirbqYc1T1SvxPv9zD9g8Bl69FNhqSg
-ruOofe2J0xGrCQ/24aimzPeoN173eH9seS3VOfCX5mgs9gnvTsJys6HbybnJj+fe
-V9StwXlAvrQzagGhGRE8a/Jrux4Iw/dtKmWbacqmR3LGjsAXPU6C2P55hTFgmo+U
-wWzNa0GFKD+hrOkXKy2kuhRyzurZ1bIneI4TXRHzkYM9d+td+kdPxUUKr1ZhAvvJ
-WzCBbXnANlVqKAVAsV8v/ukZvMW+7uNY7PSL5u5a/qLjzUo19i9nRzoCrMtYuR3l
-Ud77KuM2HyWalGjkoQlq
-=na0U
+iQJ8BAEBCgBmBQJVf8WvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiS5sP/1HKNyKUS2BQ1JxSDLB/nom9
+8PFvyVN++PZ/OUZ5ON4HeYXMwIDxN5iiCtjM3nRSJ/LYuI+E0jUbXh5f/CCjZB30
+n2awgkc6LpeY+uPE34FOBRSC+6+x7a0WUZcspkkb8oa+5SJxnC0B82h4Ym+IPd6g
+quiRsoZpEkfE67achSK+gC8jO37mQfKZFXoMmwhb8JZGzMSkur8/RSEDPjsENfVU
+qBo5x8dLEuG1bnoPt4pdcS+p5GhlI6Ll2GpUGPgiRoV3VdYPLQoia8bKfUvSYPzl
+eiM2bPljaxDHGuwk1IfYHdsc/ehR5qKh+zaSWAzTyuIJEVSno/pPbxlx+kpeMvuk
+aOspKscm9rJvVQbrgVw8MObAou+K53PSYrf5pzjFeosUbYOjQlkxBtUlqSYncCh1
+LhfjnGBaSMhYofi1OsFxMFXWg6Swzyzbkyh1myO060tmIMeIEINYZISlo5xuYxYN
+JarE9hAG5TlofKaosTpd6uQgx6klVi5tmhqGmSq1Rr6FthhrK1+Q60FmNjwSvIL4
+leioXDF0xt3TxaJXRgjLD+QOIkwLNptKAAh43gq9sB9a3Rj81j2CNS6bTXtkeDAZ
+JYRdB8VJCfLRRz1EwEscSIGCw1+m7EoyStbXG/CCGb4WEbFVprSCqMf/qoU6IH0y
+uAjaBcZ4cZFrRXTnSiCA
+=5sth
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/qtile/metadata.xml b/x11-wm/qtile/metadata.xml
index 157326a7e891..8315743304c3 100644
--- a/x11-wm/qtile/metadata.xml
+++ b/x11-wm/qtile/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">qtile/qtile</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index ab3325f19ab4..41e04f936052 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX treewm-0.4.5-gcc43.patch 614 SHA256 6d1a2904ba1b00a8e594dd38ca85bd32e5164c4c0652f1858f215b7ffbd88016 SHA512 2e2e965c8592083e411da78eb3abdf2112e0b37b5759dd98ea62ad8c19859a59b72de1d0b9630962d8651921f220ad8e670e9e963a062dd3435a9e7d9e517e94 WHIRLPOOL d26d7dcf31878c824d11cf628ef19a4a9e6ee6e9e93b3c69cd16d99724588f0b27fb705d2b88391b50a1f5ef7907e50931e122d63c1cc050374b4cfd73169721
 DIST treewm-0.4.5.tar.bz2 87098 SHA256 3daea1c8d5dfe44bfe4e038e112f7ae5044c7978b196acd0258ac6f51e2f8c13
 EBUILD treewm-0.4.5-r1.ebuild 1714 SHA256 931fa0140b7b0f30512998f0588be67d8eb5955d31ef1ed5cf4170d371e79837 SHA512 5f74550d42da0669e2414a9be098f098eff1b2db0951a1639122e0547475056ffc417711789fb5cefbc2e945eaef717bed751bb4cb7823d52de7a7b1565bb446 WHIRLPOOL a7f6731434e683bf5becada63ff2734f5103d2b55a6933b64b1e415c7417d5e3ef4b183dd899fd5caca071e0a2c78ee5c9d12e4eb4a5e621aa81abf9e71e02a2
 EBUILD treewm-0.4.5.ebuild 1035 SHA256 ba8a0b094e7da4708434432b7ce917ba33203f5c4833dde931222ee450280c51 SHA512 fe2bf1caa580bb059a2c75f15873a700da4480a51200e1fd44abc4dc6ff8e76704bd6edbe3392d8d96e91e238d3f98f7ce088812f5bc2ad2d9adf1eb540bdb21 WHIRLPOOL b16500fc3a40e1fa1bf8d4c66a21537b3d6cafee9c17206ea3c4cf6b2a4ef6c042f0a3aa4602545729b6214e743766b42b80704393f2645aa9bba1c121e8faa1
 MISC ChangeLog 3007 SHA256 f944cb53a637ca01071fda24b0e8d3d655cc88745041a17103a1209f20ad2879 SHA512 529fe8dae6debab0810a02afc1a489b098123fbc256ee5d3ab7c4953dfd35a60bc2a393ef16165d0ece6c2a354a9bc90a2ba00994cdbd0f9a29cf4e2f5b87e61 WHIRLPOOL c09bd52081752c86be81d10b9ab857e62d81d563d944c02c4282ed3027ca943aff5e4842b81e366d9d47808024ec0fb5e4c35e09444e6f6a690fec0a6998c916
-MISC metadata.xml 334 SHA256 f5a7b33e23232872df2e4192470d6349af413973e85ae53c60d9cc3a4e113982 SHA512 f3519a8d5296ea34538c0f0a306352cac121021ebe805801cd24dc4d235f5bdf80300643bb88d917839507bf528f15a2e043a295d58c4c6f56e60ab634de69a3 WHIRLPOOL da1156cb5c6947ffc72992722d5bd63a39ed54080f37935d3009217dceb06022b997e9d7b7a6e1a7c390a0fd7195b528dbd45a1198ca6f40428f5cd051330150
+MISC metadata.xml 422 SHA256 86dc26ba6546bd8efdacce7660c023d6618204da1215930897b75c82a1408e65 SHA512 9bab514c3a7a5f1efb27f4d1b89a867f9f5b07b91e132a7ac8bade615c7b1e335270ace41ad371b5aed754c11114c656883d45811bb808972c2b3d167a23ef11 WHIRLPOOL 6a219f9cec8436e16316fb4441e966b68ea5444187906177efa1e9d383af6a7302c889921228ab079546de247cc2616981e7e26c72d4c6e11676b62f1547ca2c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJipbYACgkQCaWpQKGI+9SgcQCdG0xE1XbSEzUUzcdLb1an7t/S
-TPkAoIBfN+eRnlzSmH+pD9KhAzuOlFd5
-=tB+L
+iQJ8BAEBCgBmBQJVf8W4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmik6YP/iBuEkylejiVN8XSiWXhUirr
+tJe5GkFNJxSuQ2PFsZyLc/NoH95SKLttSaQclQErzZLEorXBbKfmV3el5aaaqFM+
+GwWcpdtL/sA6mKuNd09Ff2+LlWAac+1Mo37i9I7wFcvOur4+zrz0pLOvLmUJVMmq
+IazW2L067Eccc1N+A9jeqGXirEc9kRBcB6k403By7l+xvfD0F2yynVrOPbOxbCr4
+W6YuZwm228CtStKCEkyoJgWawkmCaBy6F5TMiLY5ZrYsfldWaBpfE/XcAMkFoglX
+IotuWTkE0jhaV/E+VGf9yEv2ehm1CBaK5nyFKa6n2p5WLzSh97f2aRKRlCSDDXXY
+Ql9eRgsYF6ZoL4pEXH7bC6Qn3mtgUAuiInCcakq0m/NezRUPdwzsTRA04N6XCJQo
+CFbnN03w8UttaCWTINim21Puky+6JERQI2ktnx423lSN4MONsxPejYuFsKkSoWHw
+JVPsDYJ3e6NxVqh1/lWts1C7r7XyWcQWn3KTOBtsl/k+pm6T2h8q1cKfjT7j3+ev
+niPgluj36/sg1MEymI/fUhSAi8cF8QouzV4ZCYrbtG7loVmUohU8rTpBBtScG+CM
+LhE6Iyb0V+EH3FT4Q3r71yuDqsvV2cacDsoLMxZ33QhZ2tzSGBfDP7FLBqZJt2J5
+3YM425iaVjdoKh/BaF6M
+=hR/c
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/treewm/metadata.xml b/x11-wm/treewm/metadata.xml
index ae29be8ea634..775c9627a346 100644
--- a/x11-wm/treewm/metadata.xml
+++ b/x11-wm/treewm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>lordvan@gentoo.org</email>
-  <name>Thomas Raschbacher</name> 
-</maintainer>
- <longdescription>WindowManager that arranges the windows in a tree not a list</longdescription>
+  <maintainer>
+    <email>lordvan@gentoo.org</email>
+    <name>Thomas Raschbacher</name>
+  </maintainer>
+  <longdescription>WindowManager that arranges the windows in a tree not a list</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">treewm</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest
index 1473d4b0cc18..c3fd137edb18 100644
--- a/x11-wm/wmfs/Manifest
+++ b/x11-wm/wmfs/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wmfs-201003-desktop.patch 167 SHA256 6db157734f97877ed2fd749cb8742d3a1dee8367aa2318b90cb0efe8aaab95d1 SHA512 20d885f3496d039794f5f94df73936aeafd93e658fff8843af63b433773ec05dde369bdfae43329302614233f1e6a6b453929bcca2660c451d4b33b3a8451717 WHIRLPOOL 4bb252fd1025b67fc70d32ec992db6a625d02ce5c22f7fbc35032cd771a573754d1db0c44fa26f83351def2d8f1d3cc6c4e0ffd7d07e0dc268e0afbcbc587209
 AUX wmfs-201003-pthread.patch 191 SHA256 881c03c45b064ff556eb65fe2a2f6bd600acdf20da50cad68a7dfe90678bcbde SHA512 871a6558fc3201c2652e1a84d221d7d2bd90150f4e1afb8b4a7e6862797e47d012f832ecf0b1c205ad07942aa9b0cd3807a9c839cc6304ce3fae3746065493fc WHIRLPOOL 83b617e82f64ec6dd6c9a579615902380015115dd409b79ad7ffae2498fb5bf62d5fa4c62e730958cfdc34a0a99bf47d6ae06945fbb78fa8e73c3f87403c0e92
 DIST wmfs-201003.tar.gz 59593 SHA256 d341c15a62998e0c9062168887232e1b5adcdc2092b74a7b825d416660777c4d SHA512 117a238d6a8d8d147291ec9fb4e0aaf2bf8bab8ea794cf00deeaeaac1df15f0122bc705cb1bff54abe80d7228a19e67a79e4b3e0de0ced82abaf98fab3778a90 WHIRLPOOL 908d96994501894099a16996260e77223a7c701ea5bd165046a79144c6db2fdce3d7e0ecbad21e55017c30857588e90e077d64d1a481c7ee37b2ba04ce0a1efb
 EBUILD wmfs-201003.ebuild 935 SHA256 c39d47f517b52fe8e88a271a822c36cbe1a3aeffb0ab4fa441b102fb8d429f58 SHA512 d3504811429c9961d3070a31b2c1d174b7e513733dc14a4dff85dd76a714f46e968a3bb388d0270826d2e2c2bff9fb5083102a1e22f09177a59b25ac21122962 WHIRLPOOL 0720a4449dbc41e8ba2be5a00a54c022200715e6224faaefc8091a8804fb3b22f109ac9aacd638e835532927066b2ebf3d987ba3581c9954ba48b296e332d709
 MISC ChangeLog 534 SHA256 821a202aec94426603c08baa2240f448b5bf7adf9dd0516c7f02709e130a821c SHA512 6922b2e66ff9f79f27e8c32a4e27bdafc3911ae15b390d4519833a405267993d45e727b05cd1dbe4dadfb355fa7392822671317c553c952f7ad05757be6bc096 WHIRLPOOL 97b3c53c0d7e31eb06656ca133b5f76195c93ef92217c95d27d4650e769f367c8694e6a5a90cf047473d997ddc56b8c3335bf7d002595db71f72b5b4d57254f5
-MISC metadata.xml 196 SHA256 599d489eaeda79157559bc9f7ecdabec345da752748886b14ef461d4fd95bf4b SHA512 d09d812ff37949ddbd49ad24e7c10444c4205e4e8466bba88fb04a973065632160988df92dc5b1f4514b3800581c1afee799ce01533eb0dd09902aa592ffe1cb WHIRLPOOL c67c7b4c7b29362abb1195603ede1ffb02875eb10b33670cf48b94f5a8a84fb76865886f0a487496b8765ed5d340d01ea94095617179bb20bd3fb029262b9355
+MISC metadata.xml 276 SHA256 4094e9dd1b11ab32680a4722b9c723700ba3c1c487132c65335e1209c7856c39 SHA512 db095ae072853a8c89c6df770c95219177360e599d8893e77c1dfc288609148ae505d0f9d837e571dc7994cfeb10d398433c9696d4ad887b899cbb8aadf4e6b7 WHIRLPOOL 38f72d952c3d7261231fc4cfa8f60dda7be85b7dd2b51a956077facdb1f59a2f0b5ea751b61d28d3328ea0f298c9a4f66f4fac108b5277fcaab8ae2e73e154c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV13aQACgkQVWmRsqeSphP40gCeLpIZxafaKFehA4wRht5Dqd9c
-vusAn1qzEOQeZc20pIQdpkhCikMHVC62
-=K0qv
+iQJ8BAEBCgBmBQJVf8W+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifIYP/0TyJF8TpU/i+pAXsOHiW4yB
+Vh8anSKSjjMo07XBbweQYKN05A2U2vdU8q68llVZica1PmDyR04FwwGHuQh/My/l
+a1Y2WJV+nQn374z0HT513XFYVsBvuJ+SrJLwU1fOzFMMBjc7McLKkMsvNHhP+kkt
+BGUGAf8wj+Xmvvd8o66yyIBR9g5SSTmoAToZrpogez/DDCQcZezu9E+iMnB17FkH
+mJiy++FZU1y3n/rnbbJybkQEHLybUD3EvYDhttJFu5mdlOzCaNiOiMDMrcX5qUyv
+4rXWqDd/iUA7+FbHrdtGYcnmzZvnGOUJ7e/nITtEJAIlaDqeQF8ErUieWlrbZnY2
+tOhqvzhV0W2H5Z85S74HidjsH+1Jh+H/PTUDFPYn36W7f/x1DE81yRg3VpH75xru
+VM2NvbLLSTGwSwUZD/IXg3CTwMGK4cGPjXJUtRhgk7/GIlMQqfQxCZwHvtbyFSiX
+cicXoWbRjFSks5A0Y9PNmFObG8i1fg7Xr2e5k48jtabyNkYJdzS6W7IOgZ394SBm
+jIaKp4ED5HOrXOlBZIsADOPrUGQ7uxDo0vWDlVd5bMdrCJpAowBG5DXd88PbKzBw
+IV8+6ku006a5jysuUzkYiASEcLB7xnB4GtnpFEKdk88HNVCTB73nzjf86uq+6uww
+OJkLaidPXF/tPdBxUoYx
+=CFFZ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmfs/metadata.xml b/x11-wm/wmfs/metadata.xml
index 3fcf9a077c2a..8f9a0c008876 100644
--- a/x11-wm/wmfs/metadata.xml
+++ b/x11-wm/wmfs/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>jer@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xorg62/wmfs</remote-id>
+	</upstream>
 </pkgmetadata>