Whitespace.

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

64 files changed, 621 insertions, 693 deletions

diff --git a/app-emacs/bison-mode/Manifest b/app-emacs/bison-mode/Manifest
index 02aba49ff9ea..9f9d2df7947f 100644
--- a/app-emacs/bison-mode/Manifest
+++ b/app-emacs/bison-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50bison-mode-gentoo.el 130 SHA256 e2f7827bfc3aaf8cc4b59c7e90c720694daafde97e6b2607824712bf9e6dc11a SHA512 50b14d2baddf3c2c7597d202264c19bdefe094f887f20b4f4b96f8de0ad11d520f249ebc09fc8f8200413824bc84495955ccfb6123140972cd14e4524be94feb WHIRLPOOL 12d0117f8712ae09af03315389aa83f169f47917d45c31ac5ae5e0966310d95eac6630a44eaa246e2d5b56a4f085439c002e4602aa173d2a3d09274a6d205851
 DIST bison-mode-0.3.tar.bz2 7541 SHA256 ad29b3f71d1d52a36a22271aa314eb986e3406706c34bfb5eca11161dd5adbee SHA512 b3b173152700562f813534d9352ed50cfac8ad131f037b1e2bf9d1370f0b56f109f14206cbfde82acac0c93a1bc0092da7f78c1b42fc3154248dfb1222a7f85b WHIRLPOOL 563b9def2187fdae93220a30d0e536eeb504b0f3706454a1c49074846ddb4c485c181ef0b3503e14d2c18c3553ef77b310b7fe5fcba3fdf860efc41f77e3f4f6
 EBUILD bison-mode-0.3.ebuild 513 SHA256 83f0ffc79d82a70572c7edc0a6bd422e9f2b131d65906aa6b5fc7b7a51308bdd SHA512 b52fadf9c7c6e5f493e332849ff3769c4859226598fa15bcf981f5b12387052c8a74ce445a4b03db25660b55ff6e06e6250fd68b03e1e335796c56a201918e6c WHIRLPOOL 59c639a58164ecca107e8289624ba0b7849062766bfa2d8b14c8630e1a61c89468b91857baf6d23eff475a99958639a0bd2cf22687d18f8654960a013905bc8c
 MISC ChangeLog 851 SHA256 a277b44439f6fbfb0350cd81ff23368f7a138b984393357e39d9b90403c265f4 SHA512 32bded6581839af9c2514feaa1223691220de9440a7c7c02883cd5db42a29b3a02eb10b0ebfc274fc3723070980a9263d2f584ce45045a08012c815261453e2c WHIRLPOOL b7f92b4e1760f0d2d4305c160eb7595f0d77d4ee90a0ad1395cf20873cbc232fe111809de02485e5f6754c321234b6b600a956c056d910e85d237801ff195d45
-MISC metadata.xml 350 SHA256 cbe43965b77c06361b5940066ec242d4cb580952497c27fc7c707b9884d73eab SHA512 9893977641f74f693c860ff95e07203f93af6d5370610c8564bab2d5edef97b59b17729a5ac8d6570221504834f6b4cca247520b4c1d9a83fb2f106a5f5da113 WHIRLPOOL 7251b0d8f16b38e5082316dc7f0f563d3b3914ebcc75f3206913245b48580828defa7a9a8d4c58906c7ace67c54bd70b23b25fbea403d9d733ce34e674ce7339
+MISC metadata.xml 334 SHA256 a36ac490e43b065a77cdcc545518a7337d22f6c372ab28c16cfde13437dff203 SHA512 877e73d938f00c05c67529b5a8088241b653bc81ba002e7b4acfac74bf8887f0e9acf041831f88a1b8b2dcf8ac30611e3264d479a865bbdafdb81738e4963781 WHIRLPOOL cb22f383b654ad6ec97a9efbca92f3a986c03cd057a7b67b46c647655e3332ca0590452b33d80c1ea6fd26def0378b33ffe05163b069d9716eb8b89ebf30baa5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVcZQuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMXwQAI020FkcSei0YeOnbw1Ki89q
-yMjYFKXIzCgy2F0qkKx89YSGrkkkbaVtaj+0zYYInf+SkkQ0MfEc4wqWb1sP16h0
-3d3+eRF8SRlaxOJ554VDNysWjT/U+kdROpXx45NGJ94m0p9iidhvvzuC3oS9/jvp
-a5YOzNDfNFMkcZiexokSgqu5aZoCaRArIKRtJcuZv7DzkipMz8ifQfrNVRyTJf7H
-sXbStXaD2j9epNNKFPR2b8Y07rCY8eFXZqXtWVwZlP4X29SYYA1VWjtyHqqRBVCY
-MSHLcALy5bjMDtXNzILJUVAtD0LpLQhbP8ZRgneuKJgcmU1JGAXIsCjwRAcJs/V3
-2yk88lktVdJLfhNLhIcECaaYytFlP3x+TDP0aoS3s8YlT3eQiO+sJriaISiabHAI
-l7bEGu/ZxxKNEN90ov6qdTMUAEa9chWMdLgDb14lQp739zQ0hTAx76Npf3y0z4mq
-axMym2/1m+ig63/At7x/DpXcFd7KzBxwwLmPpC4lnvDDXTRv2SkP1nxAxxwwlCk/
-6/1Ts/W1tmbn2EVDZDuSts/qKDY/eUcPiQz8tXI3ghJLhJ2YIQQhyM6E2Net1Hp9
-Ogs1qwqfjcM2adb8ZVZV0u19/HQV89dhMJnuFVUFRvGinJue+K+Z1AzJKi1Ri0c/
-lXMWhLaiknZuwSmIDWH0
-=Y+fi
+iQGcBAEBCAAGBQJVdt96AAoJEJQzkH1pP7W4J8IL/2GlI0E2kiHNOKzWumuSWdl4
+TS/Bxue4NRh9kYZuWE/BsNoK8DpijHsr9zcPUG2QxuGSoEwEMIK/k0hb2WrY2NG9
+FVBbOR8VcGut26HZCeLbJojCFOR36/SfYbt+x4RRBu9LcfjN42f8HLxLwHjRUF0p
+RB6ht11/1RAvJW1AUGWG8nqBe2f6BCeX+ncIFUwfoyeqPUo/CMik7p6HpDMtYdcc
+ehhiC/zi19VWqcvhAyJohnMADzdnLtM3eR1BPqgA1gx8RZ5J4DedheJLQAzeGnG9
+xIVoVZzT1Sl/6+4D2WEa5bXnvEPWUuXOBA5sPH7cnuwHZV6SDRGXrniNRJtv0eVO
+mNo8ehHKuqSLWp7kT+awIBGdZUYwiptoFt3IYQ9tx0k0igeGUN4/9HD+/qS7N8ij
+r40JiD+YiwZer9M7r9yrNhkWjK1N4UWyr9NRgP03kr5rNbINdp4Hr0YKlqN02so9
+6WOLK1hyvXxtl8zPS6+7G3VYbc25GRFKG2Yu/MqL2w==
+=7Osg
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
index 0b0186a60ccc..485301c7a4ab 100644
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/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>emacs</herd>
-  <maintainer>
-    <email>nicolasbock@gentoo.org</email>
-    <name>Nicolas Bock</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Wilfred/bison-mode</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<maintainer>
+  <email>nicolasbock@gentoo.org</email>
+  <name>Nicolas Bock</name>
+</maintainer>
+<upstream>
+  <remote-id type="github">Wilfred/bison-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/chess/Manifest b/app-emacs/chess/Manifest
index fb6fccdcfb60..d68cb3b258b4 100644
--- a/app-emacs/chess/Manifest
+++ b/app-emacs/chess/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.0_beta6-chess-common-handler-gentoo.patch 689 SHA256 de6e8a26e386c65cb6d856087b48720316997cd7f36268c26eef2bbcca055c92 SHA512 5952d4be2ef5f143b07d8a0489b846db6d4b505361d8d97836767dcce6c60e141eccdc7b5ac4ea78bb6087a701ab1c698630bb544a213ad9718dd449dc00ceb3 WHIRLPOOL 707c127108e8c973bbc69654e33ebcfeb50101a3636c96dc105cf5adc71bdc964bd82c3a3cc0a50686e6102ece2c060a52a246dfb7dc1271b5de3cbd9cac33d0
 AUX 2.0_beta6-chess-pos-move-gentoo.patch 441 SHA256 c6c9dcbbc97afd5e97f10fdb2df59a7490d672b10ca63b14b4a1e03f23249d5a SHA512 96cb451529466ccf6f17d3ab044d85c096e6858c8b7fc46c3791c38308d598504c22b86559c87b6538646a9485e9d713e7d87f8922e884dc064d088f82cd594b WHIRLPOOL c5c25533c4e864ccb4b6932093b7b1f10e57be568702296b42dc74279d862705757f3d9cb44c9c26be7ff67bf110ad05e24ee03909ee880b71fed7589c5c90de
 AUX 2.0_beta6-texinfo-5.patch 255 SHA256 2eafa12fd55cfd222476347f58291d36e40caaefc335c3b65e04371330dd8bf4 SHA512 7f5f9bff1054ebee39c9b82a14f289c9067d1d6167acc1296148214be953fd31c4f22f38235d619abd325af7c2662569d36bf9f3e64bec7b73fc9930cb21767e WHIRLPOOL 565d7ab24e948d090fe5aedf61162699d69f67f47e7a0aef4959b9c6be816c89aa77842cdb15082b68578bab5eb3d81bde6da1fefb25f5b2cc7147a0e9118e0e
@@ -10,4 +13,18 @@ DIST emacs-chess-sounds-2.0.tar.bz2 3390098 SHA256 32c3577c512157523bc40d514a168
 EBUILD chess-2.0.4.ebuild 1254 SHA256 3a55a02c2e53df3846b30dbea86c5940c4769c940d79a941bc29d21658852845 SHA512 e8f9032bc384dab37d66bdc1ebbe794057212d1abecbf8f152352fe62d748c169d2d7c59dc8761c300049db3d8966bf8ad10d1685992320ffaadeab968a06a80 WHIRLPOOL e370d2faf938fa54baf992a9ad0dc76d7ffc40c5b01561eed11058e6c15e39d95c106fff75cae4bba81b422512d87d80b1addc607bfb807e074bf407126e8343
 EBUILD chess-2.0_beta6-r2.ebuild 1053 SHA256 05f616b208e46f404442c4ecb091f9be92ae76717d7ecf0650c3f1873bf96f12 SHA512 c1f504247ebaad85a7a8746c2ddc0853fa9d1de2eca4eadbd1715e54512fa6f9ea01c3c860fb29853e90541a3961bd382f4501dbd71f475c76c0a599eb23bd6f WHIRLPOOL ef22d499bfbde85145a746328bc6334e92e0d1951c48420dc47cd315738a62380ef3d412c6f4225d5a51fbc928d0b7fc1ec4b7be66144d3dba6a9b6ceedea6ce
 MISC ChangeLog 5849 SHA256 3a1080e324c4807acd717ab609212dae5f9d3318da87ff844344fc07e0cf44b0 SHA512 9eb00a6918327379b4de974e774e63d2bc412c8ae236ff2ceb39cb3ae9a0d5b015a529826d4ee11d011dddafa4f4b37586a67d1e5973d1cb64b5df3939d58caf WHIRLPOOL 3ce6e753153bd3f9f13e26f6a3f6826e22725a6ce01232fd0b73b0a38caecf25c5ccd9314e0f8b392986d1a2c21e6b2f38a0cd1c29da8094acb4aa35b64163c6
-MISC metadata.xml 1204 SHA256 80d103c4869cc6e1df3d7eac14dc43efc5d436a1d00a4dbb58805a6aad227d71 SHA512 f3dc2ca05007f68db615ca523d9cae63031e57aa00a91e60992cb545a4a9613d2afdd1239e1e8980c9e4330d1247027fd4e74c59624aa84262a8391259a96892 WHIRLPOOL a1967aa1e01e7e4202e2bb492af3b8b40f1a153885a031fb3bb05d20fb4fe56d97fc4d05a5b2f03d60a991a9bf8014537188312ed2aa06159d3e50c967caa612
+MISC metadata.xml 1194 SHA256 3c00012b2acc91bf136a36eafe202276e51cb147ddedce47dea8c314e726a199 SHA512 bad9d9ba3238d039039c65173fd73405fb8ceed063e8b9fe6c2885d6d6573bfbf3992d42fe941d2d516e8b918833fa478b3a61f80f384a13e7e15d7425c2df5f WHIRLPOOL 5e41a119a20ededd94d681bcce8efb22c1f94ea9db8fe03b47a7b873166ed1dbd18c97e60a434d884cdedbd57cce23b77b1005771263105d530798369fa186c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQGcBAEBCAAGBQJVdt+2AAoJEJQzkH1pP7W4LAAL/1zdNmvoPR/xm1CHKAOODkRZ
+cQceUJtejchoXk1u9GeTBN5ftPqoOnN/rRqje5LuAgXzno6RjY9EkG6k/LCFdlGE
+Klmpy05lgJrYtleXEap5s7/M+sV12x9sJZcNc+9/BpyzcBBsbbkGe8pyP19KcwOQ
+bqEMKrbtoOrYrodIJYNMQo8ViDe7ghEkRBNlqO7w8Errno9qdc2meZfS01P4uZ3d
+OqJS6n4ZgM9XlwjvrwwCjrL42XJojVD7hWucj2YmTElE6n1qf0xArIaItONrjw8j
+NDggV0mYWxzmfppFZ2NU9iX8Emz1alBiNTo/DJlMsNvBtO5LcZCu1vxCynZN2C3X
+RX0FThzn/x8eOGevvFN5PrbCOwxVUZir6GIhGKD7+8JCgOCnsQmej2vOUxxawF2q
+/YodD1om5sWVBuOHJuoxxT7sNQmumnFkO2iJxY8UqUSCs2K7ktJAEYDc5w65ABuK
+TOT8LYPkQvOCXi4NDMwBX786xOrJYQc/uxvaz9DJxw==
+=IQfl
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/chess/metadata.xml b/app-emacs/chess/metadata.xml
index fd132d2334b5..d1df4e744e0e 100644
--- a/app-emacs/chess/metadata.xml
+++ b/app-emacs/chess/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <longdescription>
+<herd>emacs</herd>
+<longdescription>
   chess.el is an Emacs Lisp library and several clients on top of the
   underlying library functionality for performing various activities related
   to the game of chess.
@@ -20,7 +20,7 @@
 
   chess.el also provides a mode for editing Portable Game Notation (PGN) files.
 </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">emacs-chess</remote-id>
-  </upstream>
+<upstream>
+  <remote-id type="sourceforge">emacs-chess</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/circe/Manifest b/app-emacs/circe/Manifest
index 522f568942e6..3ebf9bb5f7d7 100644
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50circe-gentoo.el 84 SHA256 8ad7e92e41284874da456b1fd93e8afdbe95ab1bded7196cf137df832152fd00 SHA512 3f3c92f02e0a6ee760e83b83c4685a6b7f3268d0cb99abc9be56bdee8dd794d177f865582e45e90f895d1a2d9bbdc2ce39a3a60c7fc4eb973021eab66d8dbe47 WHIRLPOOL e2a40b7697540b9aff5e292e17c18972431b389a2878280a71984e7e0ab1e38a95444483daf8310b99a5e913626fac89a0f9a56e870b6502270cfe933a882c92
 DIST circe-1.3.tar.gz 118776 SHA256 02598a9e1e28fffc526fa81fd5350622af303f766a45771f99d0c0df08e294f7 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213 WHIRLPOOL ac531d3f5aa4a5697c2927c4b33913101383ac92ff61f159505935d33bf0b69e61db90a975840d55e790209355a4e4930bab6928503a12698558089a0cd39a92
 EBUILD circe-1.3.ebuild 582 SHA256 20d7039560787ed670feafc8cecf3a23a5fef17571eb860e1eb6f7d9f4465e3e SHA512 c55858a8b629a76e9baa7bbf0c76d93b2a60e01dfee993ad249f018df899ef413711bb58ebfc9f06b6b3808ffa8a3e38da6123e8097e64a22709f405c2b57107 WHIRLPOOL c2da72b849f0bb457a885356e6a2daa6b09ae1a320189db80766cde450dbfe59a9caffebaf7d858fcabbd397989cfbb7811433a99d1b2e9396278628393ec6c2
 MISC ChangeLog 2223 SHA256 930a7e03159069a6fa27c8488207aba00818f4ff54c039c9e694a37077d565fd SHA512 22f313024edd470c50e7eb49d80eac300f9e03361becb5b9f81178e1fa1115b216ef7e707acbce05796acba24f9d3692bac3feebaacf9b821d377aa89742c5cf WHIRLPOOL c95500a9e1ef9d4a5db2b2d6bca6cdf9a07ca2d1a21fd6f56ab2640ef20ceb7f4d39260c80ce646aa964faef97a40933bdeada988ef7909d570be0236bb1c0a3
-MISC metadata.xml 249 SHA256 937a2611ac4a5e73f50422d8eae74f6dcc55a386cbc44ab39569e0dea2c83189 SHA512 80423c29f335acdfbb0e2e6609c5f68a2fa52c2a7befcca14328f9d55147979509c642f4a49c3b457c0a3c8952fea7500614ae9a802567e93257f1752a294599 WHIRLPOOL 57c794762d5458ffd6c279ab7075be14203629025a36c0a5c070c92a6adb8f23b633ba63157515cbbe9dbfecccdb6cbbfc97552714ada4fcc44353555325b6d0
+MISC metadata.xml 241 SHA256 95d7b598a32a3d888b02e22d6aa53387c19158282b5038aa862c717683574f94 SHA512 49a21dcf4a213be163e991f6f790d45c7043ead13ce40e7f2a7eb24ef66577f95cb5222b070048b260c0f842b3d48016aad1fccf24d68a422b564dcd5fcbb7f7 WHIRLPOOL bd596478635e25cf905128278c61a5bdf97e5f46af91b0c9aec24045b33f3e2a516eda2d785ccf096c62b7417539719ba3981f4dc0665db2806d849ac55af21f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/dbXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7PgP/1/9xCCzwPoeR7iEAytV8rMz
-DJLjg+MRtaCS4u/oyCESgLbdKcPuwPSTFKWCET4Du1PiaAbbVJJUZoIr2JDIMbEc
-iEFG3dLJrxFQZDAtadSNIBrTPTcLwkxgNyxrVHHHUCKJhjZN9HyaGwD6ejD2jBHD
-EfsVmebF23ERhflhS7qJiMUgKInlScmME6+uwLfJrrwo+ParpOjVvqACncfTC7ko
-ex058io/s/2Jq/51KRvLuEFCXAOHS8UkYG8lEez9yorFgsW84k/xPo99feKc7M1a
-F+KxEm4OJGmeyJpPL0OaszXBtZZ9gcUYOrPVRCi+S7dsQKDeKvaHpF04mXmcCvmh
-49ZIaSzsVxz/zEJIfUx/oyga4xiyodF8y6telAobh+bYzL7CweGn3VCM8OGndl18
-S2znILpiJrybQJKfubmlTNuNulL7fZakYrFFD4ubx15D02kuvqAc4ACC0LYiVJoc
-Ih8zSutumKZMZLCAY/sb9wQtz5phnLgAr1PYtJSwKgCm0EmiyBvfTCFAF4QjNbFW
-mNUSFCh+M/x5Rx5TGzp/BcQ4430QQLBuTSjl7Jd37yBCSx4P2sq9hVWlWkCuNdU4
-wKtlooI8XA+Z+hKJa/VsDrAt1hgNKznJhZqcjbFI6+vyys6WM7Cw1P1cIISW4RtK
-sk8HgyvxDCu/L7zYPZ4h
-=idsP
+iQGcBAEBCAAGBQJVdt/6AAoJEJQzkH1pP7W41joL/2aN8K/JKJmK5gY4x/25dJSf
+TYtkrzbP2wYJAecsG7p+K+QC2nGba67b5QkPmIkYMX+vSSso23OcoNspECHMi9Fc
+O+aP2rshCMY6d9TbMczNVwRsoFrHKxVI+qdia6/SE3c7t2OYUDbq6JXdtbWsE1BE
+WzLfoWYAH/u+744TcrojYjsavQ2Tpe7xKNngqBUfzKZp78iiyyLVWsdZeBS5cw3P
+fEuZ0sRCSLVWE7466L/xBgnYoZ8G8gSl6zwC5lvJQjIl2dNCDUF2vK3b5oIa/EmS
+n0B7cSKPPS9EvLWA2+/VDfnNB0KXZ/ksvx7fsiRxWwy1bjJHO4dKoBywkPK25sqn
+RsbyI+ZvVOP7a/LmqZhpyP3BYufssUdt2BVDGhzpzNEai0SZ03JVelb7nzi7VHS/
+ZnccPl1BmF3HAjl+QJlKxiHfWyVOr7IzBgw7bdqS+fsOJKzjSNzI5ctkoqviyVh9
+EHV4cJqKHXyumXObT0CQyKnpG0BZhWGEECKUiByjBQ==
+=+7fC
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
index d7b8d1827421..5c42e1ba76b0 100644
--- a/app-emacs/circe/metadata.xml
+++ b/app-emacs/circe/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="github">jorgenschaefer/circe</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="github">jorgenschaefer/circe</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/cmail/Manifest b/app-emacs/cmail/Manifest
index 8a05657e9544..518baea5c79b 100644
--- a/app-emacs/cmail/Manifest
+++ b/app-emacs/cmail/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 70cmail-gentoo.el 115 SHA256 02a814ee404b20c4a2b5e2fc8a37d05daa1de1f5652bc15616bfba7317195275 SHA512 a98b4d706dcb17d2141354131241e820efd86372988beb17bc5bfd885fc3e38fdfb9539005045e52862db6c10fe5726462ce1c03491ee77d38b1408c349600fa WHIRLPOOL a27d6a37b762333e12c755105958bbc90a9cdc52d8bd7304c6c4eec21a4c861116874abf17ae53c8aa3b4a5e8f7de02b1994ef5eb2d5653a3d1a404b2b04895a
 DIST cmail-2.62.tar.gz 507137 SHA256 b59c19fe9e8ecb0269960691916f5328f8fa133363808a59ece125fc7bf65668 SHA512 0b042861b6975910f281e949592bce7d83f94f6f5c78690ad7a4ecd4267b57c1e84fda0746d3018194d4e6d1a3c84a5a4c7fa172ec25027a957ad8400aff17b8 WHIRLPOOL 3611265181dbf9b4c5157c171f1f69ef59dec6f166f674c7ea75dbc6c5dbcbd3eabb39b445b6e2f4e7c23fdb22b763482bb0b3d011248e4d803dedc95227f519
 EBUILD cmail-2.62-r1.ebuild 1473 SHA256 bcd9ad432176e9f8f1a82419abc372384d07eb94d60de123131b279e082e4d57 SHA512 dadb0d491e7a7a75c303375fea427108cd84a7b651d4f2db882717495c71802122b00bbaeeb286ea1fa51ac9097660d37ad7b3aa7167c95402dfce75da16c46a WHIRLPOOL 5b0d6279690e5fa6c4c84a632c9dcabd0f8c280b52fa6896e280da869be137035693e149491eb94ba1aab86d95ba8cb5f9daa6abfa3937be8e27cdc0f97f9ca6
 MISC ChangeLog 1809 SHA256 0e3b711499f43f8060e11f88484de77843d2dc503003cf11e08399dac8cac672 SHA512 0ebc4ba466643afa2e8a74d6894b2a0a8aa52c95d4129fcaf9367bd4e08fba75542d081cdb884f154230f426fbba350f9333e5c94ab4edbf6e215f8858422d56 WHIRLPOOL 1c18f5d60bb19e5663b7192311ca0fd8012056927862dad14eb78985ce6e562c8ae71ed084011441dc8e74766453be3cd7b517dda91c8e5c622c2d2cc3236c8e
-MISC metadata.xml 237 SHA256 82e00e03c32112c6c6131e5ac2110464de8b292b0acc3c0a187b1f074daba5cc SHA512 546f92f617d384343773fa696195b6647ff7aecc063bb9dd4c89a66091b9ed9c2db4e366463d86a4b35a197509bd8a09edd1807e6a7274605957ab80cfc64841 WHIRLPOOL aa69ba2aedd4aae44046542c7f90fb907f0d08cdd939c781eab0a0299313325c1b8fd51c807cf2ca366dd9a7509d5fe188d7053e8df6e538ba0c60ed56051522
+MISC metadata.xml 234 SHA256 54f4e3b3026f487f18c5d9f2b13b9e5722df7a44b2d6f3193c1e2286d5732cc2 SHA512 e2c00d960fd726ebddb5f6f6108abc043a03fafa726a9ae48742859018ec28a421942df51fd1b1042bb622bbe3d9d6aebe277706d685a9745eb6cf6a434cd637 WHIRLPOOL c2df8627a81956c97b96f497c1b1cb8ae25673107f6e7cb2e23f2ae49f8002142f965ffd354880f6fd59b0c7fa8a15fd15ea7ce878a9372528ddd6af1e84b958
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQGcBAEBCAAGBQJVduMHAAoJEJQzkH1pP7W4qaAL/2XfsKVHKNcw89Q2ARDYhpMI
+zku6pucM+l0CIo+D7yzQf5l2cb4MkqK08o5JJu0KZpE1CXJQs7qLXxsWzmWXwiug
+HKB/LUtq+P7BbGSqvitHhjsdngl8l/oZFFe9A07INcI7Z8WyaL959fFHWxDOZ6SU
+smooPwntse1tAFTIrZiAiPgP7596yXrvRJJc3Ru3/jaxUtXVw8WCjmHUwaf9Ijnq
+A6+18GQ0IUwPg0NDmn6HzP+6zcwNjQdV3d/PY5ieE0r6Jgmqk/7zA98llS09nEb9
+aZ6co4cac23Hi7s9fc0cLRFihX33grmF4TqhBrd0eS6g/DJ4+g4m5W5nC2vCiC0X
+OKFCdw9Hf85s4+Mg+ivAiEu3nBQmVGKywnWK5wyF5Hb8M9+iGl9g0bke9qO4xTCW
+YTL1C7OAsB0EDCyjQ6ruifMWLcz6SW91NSvOuWFNv+P2NTRq9UOCHTxGlXG7NO1X
+IyVCjOIRNvpwYmLInkGb5RJajhLAtIZfFLmjVYiHlw==
+=t+0c
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/cmail/metadata.xml b/app-emacs/cmail/metadata.xml
index a34bbc9d4b8c..955ea9e4689e 100644
--- a/app-emacs/cmail/metadata.xml
+++ b/app-emacs/cmail/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge-jp">cmail</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge-jp">cmail</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 5959946bc104..a047bd0ea9df 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50company-mode-gentoo.el 79 SHA256 9e50754cd23e5babffb29c4c93b4df8c34680fb714f6fc36a73d5c739cc4c3b0 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99 WHIRLPOOL 6f7259e32cec3249764b5c1858468f3625f7084b8b651392574a9ed20a9b42ae00d6abe5c601516df5b19cf934859237151d388b365bf5e0ba713d44e2a37bbc
 DIST company-mode-0.6.14.tar.gz 51776 SHA256 5472cd634bf09da4557f055d3615afdd5436f814f63923ad94ccbebe60ab5e08 SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9 WHIRLPOOL 1aeefc6e4a5d7e3696150c38187131811c88fd3e9478a401400a31a7f7f7e3aad42736cabb093398470f9b20041639143665bb9d7335e2ae40ccfab8d2ab91ce
@@ -7,23 +7,18 @@ DIST company-mode-0.7.tar.gz 54670 SHA256 73d55d9288537800c23f5e9e5b6208dd5e36e2
 EBUILD company-mode-0.6.14.ebuild 1104 SHA256 4cb0f249a261e1d01d5ccb7c88ce188b83dc4e429343a2c2a71290912ad68936 SHA512 1571251ccc9dc8ae11c6e779440ba2de01070b6e468ff9796b2a0349ab3261fe14a2d716ad04c0b08d87b27375423d4531d8b04a35a5cb704ed82d6b8304af0b WHIRLPOOL cf04e7ff832afb307b352d15824c1565b432dc85f140efbdab39ee6e920a3e74a99fd1f8d8f0e55d94695804563378dff543bd582bc27c30f41edb845db5c686
 EBUILD company-mode-0.7.ebuild 1101 SHA256 9ce2c41641075d750c48cf65d882ad3e8e11c0643bddae44e2ab041821e8ca90 SHA512 2a222a3f33a7cac569ff37323e165db1b8d10827c7e448840939b2554420426c891c525f775febdd437337a2bc38e35dcd1acb976d88afad8757b64e394383d8 WHIRLPOOL fe1631651412d82df92c27700addaccd83cdc129516b37895f558785646ad27260a670e46552b25750c327cbe4bb4c37bb755aa6b9a3532857e3a51d47afb5f2
 MISC ChangeLog 3423 SHA256 e8bf0d3f8482cd2a8ec6e94628aa0d59e0c92a50cd4ca9f95291b303ab35ea8c SHA512 a0b77f5e626bedeb3a4030bc126a49d6869bef1daedc5efd51d75457d488e99c5a1b28d2362c9ea65b00484f060a90412303421ab0fd7372e73d06712075c749 WHIRLPOOL 0df18fbe5a148a549abe61ccd8584fbb10b1cbca929278f6246db04759de54c25626942df803a99304bacbceb541e1b7e901aae0bb7fa2ce7400ac8b774a2944
-MISC metadata.xml 359 SHA256 73a76fb0dcb76c2b7f69a7dfa78ff618895aa8909dbb333ff209f07c2b8db1d7 SHA512 c34c8880b11b2193d1c0aeb5ff2ecf411fc7327e5e93a9673d96ce3c1e96c1680a6e9ace7d863934eab75b78c65a9a76f6ec6b9400eeb9a654726e2306a7d6d5 WHIRLPOOL 02c37d2c6804ec0b435a78b66e935b7d9b9f25a7aad5bb503c3f7c876ff0fa29233b9983f9474898784b7242a1a520a0d936022a7b3a298b8df0126e559d9e01
+MISC metadata.xml 345 SHA256 d12c62b2672baa7c8e00260e46f7663afad0500344021aa6fafe8da61925990b SHA512 26af2e9740c55678ff4c2128e74d8df5398a464fb0bf04a4c7e544bb504feb886a84f3eb7948712ec613d639919cc3db227fb901237af16a83b91bace849b2f2 WHIRLPOOL df53c301db21187d7a8ecf585603a638c7cdaa62a0b8d858e5edb9416073cb878ccbaad921faf1b7c85400875a09e971d758bd6e1be04a5b455f8ca07194dae1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/duXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi450QAJKY/zMBVbdKn7cWBK58P3Gh
-gxsguB+QaG9/4Hw7qGW8uGCKUhYpENDWcm2kJSUDoUzM92nvmsTv3gaquc5D78vB
-BGPv2EzhVEQC+Dcmtjh3Yoq3cHEWU3GdK5vw6AE8qVkWr1tfOKZ2rpWTV9Q4PE6B
-uDp0FrGMDWlaeYW8FgfT8xG0ixdkPnaKJ3O3thntLLrue90pmZ+q/jygs3ZPs6a1
-layFjqFQ+X5ckhuj7nJzh5HIucVgHb4XTaEIT2z6/iNxavVb2xxwoj6NAzz28Z+6
-KihcBXNxojldyX50qh1foXR53bNQ2gxg0xGTzA8gbCbC5Y8DhO0fq5Wj6CX3tFUN
-ctajNRAuza2L8EYE6DaA98ZhiFvFQGRCdeU4FfIGqSq3QAGRNOEXLmackhc0s1Ps
-2UC56f/MeXyQcSS/6zvPAbwUyNdydEDxKjSU+cPDcnp8BG/4g1JWssIobY2ixi44
-bT9HGRY/CpV+XUWZfyKwZ07UleRemdItcMaBubZuLQ0kzx+tYodqRVHhFWVy2bsh
-quQbQxzbBD+iAI79gtTe3q9utM7VAfOHlZSkf8fuSWE5KGJGWDdEFeocnS/P7mP6
-eTreXiyNmDWTkaitQ7hBE86j0WFcrZ8DGTqX2fanaeKeXmzo9PLJJW6QQoidYteP
-j6dKFu7EAo4kr7ox058Y
-=X0A7
+iQGcBAEBCAAGBQJVduA8AAoJEJQzkH1pP7W4OZgL+gJuxP56a6EjtAfWtNAN8VdR
+knRuTaJ8GRzyRkPdn1yKX7zlpk1Y6e8wPj7+Egygq+ueOVDMklJ7F038Ii+IpAbq
+hsJLswaV/BhD4AcJt7lmNzIB5SPRQWeqV1q3EHkcg9JIQ2ykZMCO5ZBQ8b8mHh5M
+ugJHyqnu9wXpHvAxVrg1a8Z+BDXtx35ZBTjOrLZ+McH8ULwFwyyOsmcaNbgQZxvr
+cXl751ZVykOvjRSXykL3s7lJYIffd2lkioJ1eIgfABx+j6UeOn4qk9qcNK9aN+B1
+I6w4KnA3JvzMQDcM4bm3PLTtHTU4s0IroxjaTO9pOMWvZHmhjmqH4a6iKpYAnxRT
+0I9hs9wp3bTWOHCYG4kER/C6R7wUw/PKA/ZmPqnITuzvgnPx1LcabQyEIw70YtrF
+bu3AOYmXZ+VIDhCoWJ8ZJ8bG/CXAh52V0uJCdeD3SNmEDIgiHttYA4iT4NMoSndL
+TCjfQI0qf9b1IrmipFwL7aU0N5LvOpwMlUITCBXHoA==
+=ie1T
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 430a27036cb2..91bd7f737518 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/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>emacs</herd>
-  <use>
-    <flag name="ropemacs">Install backend for
+<herd>emacs</herd>
+<use>
+  <flag name="ropemacs">Install backend for
     <pkg>dev-python/ropemacs</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">company-mode/company-mode</remote-id>
-  </upstream>
+</use>
+<upstream>
+  <remote-id type="github">company-mode/company-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/distel/Manifest b/app-emacs/distel/Manifest
index 55623dd9b4d4..ea15619273dd 100644
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50distel-gentoo.el 197 SHA256 da2818eabdb810c1a762814765f39c725c4b65c5350a935c24bb0329d57ad725 SHA512 1ed45f84dde596713c8f14b0eed011d9e2f073196f55cf355f3ad8c4b540aac94d7d4a1780a0020719b74f4eb3a610094ab5ed4e1ad142604937fbdaf50d2b6b WHIRLPOOL 187f5e493b98d09fc41bcea108f4271085203d2b72113913a32ed898548ceadfffb02534fbae5d63fb1eed905ed044c4350c073de89ea496d32081c413de02f3
 DIST distel-4.0.6.tar.gz 210257 SHA256 a80538fab51008f4821f687e7bcda98b7ab9e6e3ef7d695087505a2e40caa1e1 SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f WHIRLPOOL e8fef7f804f98fdf7a1bb97cda97f7d4e471ec5ca01d112d80c1ebd2cede5c0bb8f5ac023407820843a61dec959f31755aa50a2faf34021c9b8aa48d4fe0bf45
 EBUILD distel-4.0.6.ebuild 1027 SHA256 d422179beb82bda294cbcfa718aa5742ac0c7e293442a2ddf5818058e78cae5c SHA512 6c7835b9293466a419b4e949fc542975ec3ccb9d5ded2d49dbd96adf56afcd0afbb48d0191f83a6bc3505023e82eb23f19d2b8ff260b4c7fa0c0115b8a0b07b8 WHIRLPOOL 80ff30f30f9ebdfdb47fb2bb17d9670d6df10387279dd35fab6ca95b815c9cda7932bb0a7ec954ddc3e4221b07342491d3cf12994ebcc8f9390fdaba80144f36
 MISC ChangeLog 1472 SHA256 a654e71a167d4b07ca1a89b7d46fa75cb6d010a7db7023c374f1b2b6235faa30 SHA512 16fa1cefce4b31b9690d94129d56ba21ed11fd6a0a4f3abcf9cdbde70fc479f7a033c65269551e44d616a6882991f287a1f3f6224062e5b3ec0a9a95b5e64b00 WHIRLPOOL aea6ecefd926beab94996ee6933a7f33e5590e4194942cbb55d408abf4cd577a2071aeed6c4431143bcb18459776064f0c28890cebc1bfa6a5764731c639b73a
-MISC metadata.xml 299 SHA256 b0b45becc811e0112f7e33c5dce1059e1b0c3070bbe431dca7503c2f63d47e86 SHA512 617db1c03fc582d3e8d4f17dd2ee07a2c29130845c5f44b98bcce6c9aa0cfae3ebd82a3d925f10eb2b95510b960390d5b55376f9eff3f3f8577f90b566d2d812 WHIRLPOOL dd590426c077deebabedb8a08ba1826714d0bfae7a1bc6426e46b8199ebe245a902c00d9d0eb612300dcae9a3a440d91e36e0dd5556ca10911cdf2f3b4c6328b
+MISC metadata.xml 289 SHA256 207e43e7a4413ac943620fef3a091e47b417e0ba5604631a1e517b35eb904177 SHA512 b95ccd423133b125309b80813e2340a395c436d330a7e7142b0c1ea1256d97ee15dafe37b87145ed3e7c9c6c5eceec96c216ef85ad60e02b01d20c96d3f247af WHIRLPOOL b4ff8636cc42221670d52bca487afc50fc36979608dae6721328ad339267daa514d42ad272f75ab480c3dffaafa01654ec582aa460e9dfeb8a58b87006b47ed3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/d/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmimE8P/2GZHjljDw6bAfUqQ0UX808/
-IDibnFkMn8X/H2G51zWiZIk/RmLTlQEGE35QwbAyl/ckd6dtNqn3NxK+MCsmoo7A
-2oSst3kOXqEitBS6PcbGspsh1JsuUp6W7ie0XrAqghcq90BdxnXcYtCTZ90++zmO
-B1PmdoiCGf72MKW29bwVw4aTeNAep3b3D279GpXcZNkGtWba8RzATmh4g02UfB1T
-7rx+mPiGUBuCZ1ej68SC50F8L6VpEQyYNraBdI2z4+GKlY878tOF5ECoOXyRFtJX
-XwWucinMbtVpYQXEaJ8RgZsmKdi2QkFCE6R40FJbZlI/sFSM5dIhnXECsP8nDQAV
-1rGE3QWYuS8KeH8MpgcOWs3NIzMYv2VOQqbKwXHZ7dqEEjp9j9Xwx2m+ZtnDSsqe
-Wwq8bZaeGyZf23eTp3a90GizUiIGa5BF0ub2GQpN8MzA2RfoZ14xaDdoN7gdBto+
-QHbOwFkfnhrTappzMO77khzycIB3jVdAyogoH7W7L5GiFzivz+Iyx+dbh3leEps0
-9I9NP36v1vwKVyLT8fyCAVzSimEpXU2wNw2HbwpeQRwf78lkH3fjTmZUAgH7OrTs
-HU+LHo6/HGrwgvLjcgyRl/z8cj6JFg1iX8+66Cj5eZvWfbQvkk6ERPeUKOOeaCjh
-GZPkev08SjKtHRYmnw9s
-=dnAi
+iQGcBAEBCAAGBQJVduBYAAoJEJQzkH1pP7W4+tsL/j4vmkGzpBvzxbGWgsQpF73z
+5DNIZrQP8x3F4Up7aYY9FXlj3Pv+9SZjZO7O/t41d1dxyn0UV6mZehHRLIAyxTbP
+zmkpGs0+yk0UPjdD8uOU7+h3ykJO3cqY75FyKM3DJc94au7CNApadlLzTXGp/8+B
+wK3bU+tltoSJ6bzzO726K9EgbuWHeyxbzb6j74SJuL8jO6I0XwogKl7REgS8ZkK7
+PoaTTzZyJcTvuCUjnvxUCciYM1hZAwIRUYbat+6PYpzkQ5zMdUJel1BhFBmYnT2V
+DiU2k9WJE+3WSB93nvavhYkok7t8IzkgcU+VizknBBR3su63NcIsUlVR11qUibwX
+5H5k5QKjlhh5wNUCW5jztvA9f7QSaCYU9YzjZ7U5liVpSDry8JLTcyluJKihMId0
+5+7MvqEKG7rsGCx7Bz//EWhMBG2gDY9QI7z5y8+buxnmdpUa505e/dAMBcaisvRr
+EeoGyg8in8Mv3qkAzgYv8Us7cFLF30Od3wqxOwcpbg==
+=QjVs
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
index 8a99032f2b27..0eb0d94a3b42 100644
--- a/app-emacs/distel/metadata.xml
+++ b/app-emacs/distel/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="google-code">distel</remote-id>
-    <remote-id type="github">massemanet/distel</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="google-code">distel</remote-id>
+  <remote-id type="github">massemanet/distel</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/doxymacs/Manifest b/app-emacs/doxymacs/Manifest
index ab900aa72128..ba9b40aea42d 100644
--- a/app-emacs/doxymacs/Manifest
+++ b/app-emacs/doxymacs/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50doxymacs-gentoo.el 502 SHA256 55d0746f7855c7bc3e09cd332076a64bd7528199475643a20354f37d525d74b4 SHA512 1ce4aee60f650daca6d1597356ccc8d2e411c8d71f4236dd396709c6d2e03699d78626dba1e0f0b7c67701267436d62d56b70c9fbc1a5770e0018e7014badc75 WHIRLPOOL be57d8df024f98ba9ba90154d661fe6bece33ad60e5068f69dbae28cd7cb7dd5d6a068cdc32eeacd53fe08eadf58010dbe3baaf191926b5ee0093317f7d52e53
 DIST doxymacs-1.8.0.tar.gz 133600 SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac WHIRLPOOL f8b39d0a38032c1364d1d4ccf9a78f87be877fc8655cf29a8b189a01ec0fb76ca2b26b52c19fd780c27243c0ebf5f344331b62f1278efa3c341851ee7a9c86c0
 EBUILD doxymacs-1.8.0-r3.ebuild 794 SHA256 40c4696a40f4305a1fd9bc008e376d7c70d6ea9bb445a4fd237f90901da99a5f SHA512 265b427800b0bf2ed57f3fa3256a7fb9b2411c7eaaf3076e7d4b33a6ce2cb762072aa28198b0cad2db6223073f66ef6d4f1e90d7c2a71f3194eac8be92f250ff WHIRLPOOL 97859baa1b3c538086a2189cb1864c53ada23e11a8b6aca28ba7e8a4c406417bec53a07243f54cf00bf17c543febfb40837f576e07334e2ce9aa339873330629
 MISC ChangeLog 2166 SHA256 88acb57d616e6e28b61160f08b01af93c49fcda34d7068725380abe30ed6d119 SHA512 4bb21d657d5791f988b0845598e1947c31d97c957dcaa3c0dcf52215eb48daf6059c77b7f4b75392672eb4667caa73ac04df6b1109826110f4930fad0b334a4c WHIRLPOOL 327ba9eb3cd869dc27b88cdc9984d63fcb2515ebc5c0943bba7e1f95bce3121bd341a2f90c7f0b5563c274ff468f11e086d8f0c45b485b92b5ccd9076e81cb1b
-MISC metadata.xml 237 SHA256 7a61204372682bb56de8f291aab9173fe106e7dffaaa4d9fdbe4832bc029d134 SHA512 24f49988b26e82962fd450aee706f0f1ce593b906beb243e78a62dbc66fafd3dcd5dcb86abc5be04995795e6dfe4f867a9ac0179e1bc847c2b8ab018c3b91a52 WHIRLPOOL 1a3d4558dda179675b4047e54dcab122141a64514cd2604bdf05c18286dc5e10f9176b5ce96797554bc032044e9178e66f05cba961fbf45e1422ca1040f6e9d0
+MISC metadata.xml 234 SHA256 9d7aa4fda530ffa5ecf21e2be7554d12beaaacfeb9248a5d17e911c19380a26d SHA512 d11797cb46dfdf329824fc889d57b723288a5588cd5ef0e98a125c7cab4cac9d0260af8533be24c594ab0da44071f1b449f05c3a6002aeebb0473bffbd242027 WHIRLPOOL 405b523d0b7b8df45f5bda9d7b558709cd3191520e98c1daaa2bc09d2ba482209eac0d210237a69a4806a3fb50b145b6ea6034a90e11b1aa240deb5995fcdcd8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQGcBAEBCAAGBQJVduMnAAoJEJQzkH1pP7W4I5AL/iSF8gP5OoQQeUus9N21gnxt
+MgL9yhPNkkElC33ymM09nOZv4JFNx+kFUFQY/69OxUVyR90Gc2s8MM3XEAckYlsb
+Uosw3wTCYs3/tM+/6Y8Wth0B73hHyo58JpguGMXQkgGPN/20ylTQsxc6taumJVOi
+o6sbpPWWNIWRM1hJYk/L4FBQL8j+Crdp8fgyRafVPN0Ut+vPhk0TWQnyfd34Bocq
+oymXTR7vhVqLOKNaXMst5Pze6wDezj7kv8zRMrGQqW+P28n0ZD3fLZtAd/sZmAwX
+0Ge6chWiElqjsBf/yhcMuEutemr9frWMZqDId9XgmmUsGmw+HGCMoXtG8eek9MRg
+vi7qKJN3m3oKZgJOv4T5ONRhk67t464BF/Q0Gyv5QMWq7vx14yag856k9zKq057y
+MVCx/QXuM5aK5l7nawy5Yn5aC6EmW7E+pis7r2RiiVFLIGUQWNjnYJ8QdPhnqOF+
+dzDyVizQrSztCrD1W7gxuTBFr4hDLIEVl7kBZGoCTg==
+=0in6
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/doxymacs/metadata.xml b/app-emacs/doxymacs/metadata.xml
index 0cb818a56ff7..a9e1348325d5 100644
--- a/app-emacs/doxymacs/metadata.xml
+++ b/app-emacs/doxymacs/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">doxymacs</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">doxymacs</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
index 32cf83712108..f0f4c71666b5 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -1,5 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50emacs-jabber-gentoo.el 206 SHA256 5001cc665a31196abd76329df413389e042cdddd72512505907a771823615df4 SHA512 44c94b318b547689788c60d41ceb8b93ffbb479099fe94933636a9a91505abaf62bfcbddb145d34cb509d35dec3c0f62b2dafc91477a723ce6585a69f45a9cb5 WHIRLPOOL 61ccc389cb0848feab2c5be55a9f0d665916b5c1328e7e88ab6c2f948087c05239a0b5a11bf4013a8da1ac6db219b97a7e7a7637900e22f2142421e71d597ff4
 DIST emacs-jabber-0.8.92.tar.xz 293948 SHA256 f2efa690ea21a86ad0d0d8feb38d4dde809306334cc1294ee9f8f128313b9c93 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882 WHIRLPOOL db53b7c758b81b5f512877f33ca035760804c989f08fc9e7d08960d800b7d5ef68c382d9cf43705ce6f8a0c4d9a253244a679afa4a34bc3b14bd90a4d52f08a4
 EBUILD emacs-jabber-0.8.92.ebuild 616 SHA256 f0b494de4af93ef69707c613e5e921f3cb4bb4a0747d18fe701673dd24f9a17d SHA512 606dbf74a1cd5ecd61bfa2aa5c809f8cf3fa1528cb46dc091b7b7e5ac111424e34a3776d57521fbde20110fe450c391185efa55d73b05d2812f3e3a649709649 WHIRLPOOL d26c6021a949d7fef5bea41bce827cf42d2d09653b443a239c7849f064b431e488d0ddec0c2a642fb8a30709eb7f43fba32ad66351b7526fcb49818a5774434d
 MISC ChangeLog 5008 SHA256 88aa67fbd9aac3a177904ab4cce252eb20630b71ef59d0ba31f9e2885aa40be6 SHA512 091805fea84e7af3d832f340e7b1304d2f14189a554dd01410363a492d45b8d0d03df6f9369bfaa4526a64e6edb33ccfb09b55d4484f50723a3fdc2a219457cc WHIRLPOOL 833fc78752f256836a2ba3b61504d9cd591ac7924d9bc96bee3feabdf03ba3ce8366421312fa28a6c29cf94787dbb28e9eef8fe72810180ed41928ddbf935de3
-MISC metadata.xml 241 SHA256 5a97d80fabba1eec657343bea913542c9dde60821e4c391451c85d98c999f0fa SHA512 849c2dd3e4285a4da4911712039c95a4f84f3a358c6226b5096f18ab627f543db089320e32e918edd6f1d04a2dce6c126b4928b637a1dc834d0dcb51eb6f6183 WHIRLPOOL a6a5e78f6dc711e5b7f2c9dc0ad614129ac50cf48b75b9862a846293bc35305abfb89f1cbc25b516b6c4ca147fd15de02f6dbcd0ea7402e65e7f3763bd9b6809
+MISC metadata.xml 238 SHA256 00063d5ba53292625166d1f8c8fac74fd354292c5bcf6bfad3849c86d818c684 SHA512 0227372b45c5b932365ae14b2ad7946be2aef569783ade7a46f1c3ee0cbe4b35f8b41ad270bf15e323eb42a00819a71429e572c007cacb78c10c9df5fa97bd13 WHIRLPOOL fbbc37752a2942ba81996dc450fefa4073e3415cd77db9fdc8d55c7033eb5bcad22f63ef43ceae3db326f5f58e53e4daa4b738e92088617b1648da032c38df96
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQGcBAEBCAAGBQJVduNJAAoJEJQzkH1pP7W4GrsL/js8Z9cU2ljNpUlvpVeIROPq
+jICoSc6PesJfqe2lEUic6nyp4pTwhg0RGIlI0cD3UcAOzjtt35n3SREATFrbQeBM
+O/Bv+HNZWAb90ksLJLq68kcSP/yVjreXWH28B9BQ8JtoVTjrafp7JtELVV3o83Kq
+lrDpppRFT5vChrfAB8KuBn59H25BRLPWIliYdDLUMwq4GZ6aC/UhrKLJmpBEcHJL
+hbSLDQuDcQZvRd8xrtmBTH26fF2yn6gCCPbYOZo3AvZ3MU/YvR4kZpBqI6zF0fIG
+uJWiNDt2E+ShT8U6hSYS5AjN6bjzkTL6vyq4ZreH4YIrzB6BAory+nyE7IpoSDVw
+ZljyxdFG+dkKuvQJ5i0DqyXbC+NdCvY0bvZWI5Rlb4BYOMSRNZ0mm0JAQpP2UZu6
+KlEXooIW9XJ8AO6JhFUHmJFwO04hpO+k+metS4spMBzEjN5fNL6AzDk2+nT4nAk1
+EY08e5WwrTsmWBoI7d44ihEhu60JeAMvwZDp1xc0Bg==
+=enUH
+-----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-jabber/metadata.xml b/app-emacs/emacs-jabber/metadata.xml
index 1280c4e154bb..2efe4fd9d4b2 100644
--- a/app-emacs/emacs-jabber/metadata.xml
+++ b/app-emacs/emacs-jabber/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">emacs-jabber</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">emacs-jabber</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 9a1afa8cb61a..fb18af1f3e00 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50evil-gentoo.el 99 SHA256 77889bf1ea4fc53c9e9df59a16382e13280e7ca05e095bd155df730af2d0a1ce SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3 WHIRLPOOL a3382e2fba92407193aa96b55256a26d9a529c5461bc9cfcb215cbf595581000d2cf47952fda977b03d8c9984e66edb92bcbc22f45f48715cfec7941fbe3cfb3
 DIST evil-1.0.8.tar.xz 427884 SHA256 f88760b93fd9c918a1ed567e1ce23ce7fa6709b1f603137df3397a005c2800bf SHA512 d827ff8856c0240c334088f4c61226c93994a4c5afdd775a7170233add884af134b22cdc8bfa6432d3f44d3e6cf3cea89501a4ebfdc37ed5c70b3c712ad2ea86 WHIRLPOOL 81c8f6fc175103ab05e993fff516fa17c82d22ed5409eb59c8640f9bab1914746a47acba8f80d4a31482031086c7da70efa7977ea22b521469b95f9808f797c0
 EBUILD evil-1.0.8.ebuild 647 SHA256 e8dd1196186224de75402b1284fa529c97a9046eae1d26ae1a78917ecd6d66f4 SHA512 346636c569ab0cbff762c1425ee70d728dfb3b99d868fac71948ef8d3361509ff51a95111d3fc5c9eaed6cbc23198de6783514077820923e56720402cad22340 WHIRLPOOL caf3755f93bfe72abacb7121d020b1ede14d4fb23574dc7bf4fac199eab76789b0d5d24186e0edfa357b612e16be3c324a9df4422fb051de4d2176184cb31e94
 MISC ChangeLog 1387 SHA256 258eb505c37a2fb9e3f6dd0e976f18e504b939167cbedd049b4a3eeb0d0e2dbf SHA512 31e37e726b2c4da2bd9ed823fb0d1c78d3b2508afb4d4a1d5fec3230f8ecfab30b6b7339e901e91b187087c82356fac98ade5ff7f2dbdf4534ead89cf12d9eef WHIRLPOOL 8a1638b74b0864edfa013116250bd61b1634ce78bd964e2e4bd9079676d32f757ee5694408461b7ac107ca1322f9436d4d3325aa5a4c3e16de6d344691be5a55
-MISC metadata.xml 231 SHA256 bdf1adbf83082cc2bf8cea5be6e4931ecc2d0e3a209f2e558d1b9f1b61b30594 SHA512 7b55127fe8468a236fd0f1f21a449be17b7d3a6eb10a60437edb488c602b88bec61e98ab3e290e32def0f8bd3fb84a993e85e14ff36c28d138846b9b90988417 WHIRLPOOL 8514bc044fa3219c2877aaf185dfc576ae8f0e9b01b796eba67b91306a65761d33f1bd63397211c3caa881b058333bd161f5e51f4f7ba41ab2b4a575383a4842
+MISC metadata.xml 228 SHA256 cef6e12791fe8322531c7f3851bebde9165a8a9c3c5c1a4ff98b35ab610c16e2 SHA512 e9bb7c30c8bc5c34520fd9382ecaea81a6ed8b17f564a083046033d589a3f1a7e7c8eb08140aba3a2a0cebf964565ed6612ab544291af7e16668eba9e89b74e3 WHIRLPOOL bfc70d0c4e438e5e85cbe481f7c46859387cf250bd023d65fa7dcf96cbea5e3e5bb3014ccb8e1ce3e1f4c5d030e796b7a53e358281398fb086fcc1cb479d7e60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdseHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4KcP/iV2YOw/JAtyUIwl2Xhw2wCz
-jqNbK/hEs+bGdMPSkmBDK/12ElVKAy/OXFcSKBbywubrXR3JtBNFsZIhLhYMSkZ2
-VcKhsrnfZIndv7Unctzfhzc7JVny1FGGLp3rpUAqnlRCBcKL03D8pud7qhWbciU0
-P/2XI5HTBC9UIb/Y0Br/5U+O4KmF/P1DWZI0XE29iulrQwZxNVeYHDLqo/DWbSWi
-jXPPOTcj38SJ+k6T+Ju3OWxU8jdNZJpnYzX/ilDpjik3HV2U5OQaT+H/9YnOcekX
-vTU5HEcv1DfdzKWe5qHdMuxKP+jWTH59sMDHbd2lFC7er/shWIe6KbB1uax9ePGq
-BFNDZ//vi40PrJ16oyfJlyr/bjJW4YWbYMglVyRLEQr+tVE7H00a5m12Nxb3MBf6
-7yyz1nQ1Vn/yS0FNrjPgUQQdxx7CSqWxzQsoH7B9eivCQyb9plFB1shof86R7Etr
-dJbiv+Qmyyj+pjUwTifsffwMICuxVdS1VN2dYK+7VAfJg8/GQC+L04Jv/KSPoKZ3
-qvt+CAli9+SV9WLFjCQZFMdfuFAhKdTV0DeIskIb+BAJgN9pcgguaz8VRr1iHv0M
-Kv+KjIMHmGTQ8ULOgldIgPygLIha8vxy1LCUTGmJy4xvwEEXrzk/1ZT1bZDKySqN
-2XNS64+JF/ITrnKc+ye+
-=WCxE
+iQGcBAEBCAAGBQJVduNhAAoJEJQzkH1pP7W4HPsL/iPs6satSsCEFm72AIsgRUNt
+wxeH6TRhBjrCsdFCDe8pf9L9FmaGH7YOYIZ4YApl2sbp+ygKD8xtjxWrDt7bss8c
+pVvW3tW05qjCjh4nNzb3vhtgMb05wAxSyRfeHVFO9qKipatW+ojsm3isVhr3vqMe
+NYGXlo5tCONqzX0XunmkQRsYGHjf3qUqSBmiyHgsVqBt2GRd3W8cn8Rkmx1txgPf
+BFBR3Ne0Dzdt7c0RNXulMIZU/JH1/DFxG1F4iIXtradQ2zeBgOjwT6Ms60OanaKu
+ln8dCjgWZ8GJbfrc5gfNCOXt9k0gqIRKZa2UIZfqAm1il+9PUrSN83k9iAOliqYe
+iKXpU/NSrbrM2Uh18koAcHK6qlIPIHpOfxWGy6FqM7N9dLnZqF5/a5HEE8dO5VEf
+CbO3XaZz8zIl8bpMMuRVr7N/u/x1MXbFgBcguAu4GqnHi4uSNodOmVUgm+2tJuYm
+vpe9zXL19qMBWZdyylTHHdD9FeEoFt6lKftoShb1ZQ==
+=YdEl
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
index 4f7b63f65438..bebc85a15a5b 100644
--- a/app-emacs/evil/metadata.xml
+++ b/app-emacs/evil/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="gitorious">evil</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="gitorious">evil</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/gnuplot-mode/Manifest b/app-emacs/gnuplot-mode/Manifest
index 739c7a700f7b..705301d1bfd6 100644
--- a/app-emacs/gnuplot-mode/Manifest
+++ b/app-emacs/gnuplot-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50gnuplot-mode-gentoo.el 347 SHA256 31623784370f844d803ab4da2c866200f721dbacded3d7be2617cd616076b3bf SHA512 eb342c60bee1a9e45a50373093207545b8b37888432b082afb7c4f0911eed08481379094ee5a73888a03a12898c3c41016c2d9161f92a1a7cf7be7f2010c1c83 WHIRLPOOL 87d5f6fa02a06fd2ab2161b1ca7a55ac853d0986c7d6588bd60c2ba8739bb732f66ca3c83c300953a1b16d47336e8fbe1b17757159e763f7ce3a3874e39a1d75
 DIST gnuplot-mode-0.7.0.tar.gz 373475 SHA256 310018d8c313ebd817e3e6116ab28eb2b848fa0992917b5ee4148d6073f59f3e SHA512 fdf04a3a32755892d422de8a535682ff44d1b635ecdc814738564376f5c7027a82c23807439835f2b7bf959f4f8b7a7d38d07a643f84ab2056ba187f3558e596 WHIRLPOOL 77f98735fd0fa6e1379278aaaeacf2834d2fad3c5ed3f56b4232215142a1c8336c4d7375282856fa4fe754dfaae2500027f9022f5c2799e90571af57e8be783d
 EBUILD gnuplot-mode-0.7.0.ebuild 1121 SHA256 91e3203bdadbe1241d9e7bbffff0237119e356d6756bdbb7290dcb9d07b28b24 SHA512 a0218d525688b3e9561e3c4ba3914ac10d71a4053812237b863584b354bf37e353c97e7e23a2bda14a9540ab04fb7c2bcf5ab1e0a20011e9fc324ef784b3a535 WHIRLPOOL d43a064443dd526e4b8e72d44c0eaf86ceab7f6e1e9abccb0990947ea3d9d593c226944204f38a6930a46cf2233586ccd3acb86ff0939ab3d4331980e4231e2b
 MISC ChangeLog 3082 SHA256 78937c95b042b446123997d87365c4a865704233665bdf88313fa1a5f0bd492a SHA512 8c5666b1b87704c609abd81f7d66289c93f42813b7cd582207b1642fd563098c53bd48afbccda1dd796beb2d084aa823cb4b2715e8fdceeb4d14e3f146c7dc6c WHIRLPOOL bb9b4ccdf5959648b65a4455cb703f54f1b5e7adea7cdc87e36e1257ac77119ba756ab86ef86235ded4b1a8a3bf0d91b6cc52a9e8db6c77cf176a50485fff2d4
-MISC metadata.xml 252 SHA256 667ec182c0d7924c82b97b657661890b2ee6a9255b3baf29b19f6072285a330e SHA512 2141a2fbcf10605b76737597bf7e17210f91714c00d82cf7c02003ef236baf3e11a2a841062e62c1641f67af9fc1121c18bdb9392d5b2085476cf873f69cf06d WHIRLPOOL 16b66010020760ea933f73933294bb78e5ac9d83fc6a940b2005380098f22dccbfb010cb14c43647236a9db53a9d07641ad8290f5c9ed9283328c54cfe7448ed
+MISC metadata.xml 244 SHA256 22a25c42275d94fbd5cd7c4ab00b62a350506c9ee42d48d6676dd0794c0b79ce SHA512 72ba70a0cef99dbe495944a0efee22913ae747aee453450c8dc9b45e189b2bc752c87f27bb1d55935ced933e2b6ea339a7c1fc6980a7e2208df9a2f92f86b971 WHIRLPOOL f033218bd600ea2f432d0462f372d8f3d67f76a1282b9c7740be08feee0862c52e17978551a45491953f45413d7a3a8a4361f6e6b7036326d2a0ee47e29a9f46
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/eiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyGoP/iePfSy8e2yLFrs3aolEmoBA
-84jYgANDxrgqBfeY9TuVj2+FQItS04czSO3r3Tako/IQ4M3TLOvYQ/i8AZjKHXlC
-L0+Wzl2UGU4Zl95JQa5lEmDiq0du49JtetwLnUguWCzQ5R+nFb+zqrNJMxayfjip
-0Y8sIkMbonTHgRGEdoV4JjNJ5q4SWca9iIbpUntEeyvTe5DovLvEbvCC/FH49ueZ
-qV4Reg0Fsytj4rTh+FIi3U3hfIFu3ptiIrSEtIw4nOEuItB0ERyRaeqczB00bDAd
-kfNDjAyxwla8OXcdMTgZdDlpUoV5sT6s+oj2yq19cWjhw7v/4qipBYy1gDaz6s+F
-PfO/4oQH7nAQt/oJOzLMek8FPPRExS9VojhK8xs+2VjzEJUEmYTxHLmftIdykRex
-1QIexQNoORHAqx8FWT4bYcQiX0ur7fpyxB8dCiob4FSAR+DU66/ZMBLiEjSXuXQe
-6lZVt6OMy0b2A2pOvq01PoyacC0KKZkFVdL3nlXeEMpSy+dOtlJNSIYVCVo2gc7l
-B2ppSKdzQx1Op82vxT9cwUyfcWVJO1ubmnkGCWjsxtRlRATI9PGtFptDEN1kuvfm
-pgZFWFtqM1GLzty+xQG24cKp5dbgmToB09VHkFCuzs7ZAuucJtlW066KFKM7UG7X
-Hjw+cjuXPIy+k1Cf33gG
-=7zPR
+iQGcBAEBCAAGBQJVduB+AAoJEJQzkH1pP7W4tp4L/i7yuYji2pzjv7eaeyBX+sEb
+FtMiPRF2ayt+knuIPciEvlUKAii+/KEpBpiGXUj19XUEQGMDcSXAK9B7amFnyLc8
+FxfEUCSQ5b8ZF1IlX3W/VQdp+nSLGe8hlKR/lX1BxpGurn4/eZ2POgK0t3FWUofS
+DkdKovREgw1YdmFyM2sxixXOzxnekhmc/9kAhs/yaVL+z0CtgfkrzsO0U5tgpGYX
+serI6MmElT8IwZVdU+a5D14QLMaemwXpdGeNpfaT7IUG7cMji+BSR3dNowi0vR4y
+DY55dwYIvEH/iL7eYmCzvEZGlYrHk9Ve86B5oaZ0Zl45+AuQruonlyJGRbU8DC43
+sj1kwlphItlVgv5qy2DrSEH98x7ODNrfzF4Ec75Ag0cGFOM2QhiiUq3qoTwHSNhl
+UdQIc3tjnIoM/mePS73gdEWzKICUyHNz26qaWsbTHnOnWQeOnLoV+dnMghKJBye/
+30EWdYj48O+at+H+YWykE9RMrRO5/BSsZzKH9PcKlw==
+=IYv6
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
index 78f1172a2fd3..536405d4b31c 100644
--- a/app-emacs/gnuplot-mode/metadata.xml
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="github">bruceravel/gnuplot-mode</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="github">bruceravel/gnuplot-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/haskell-mode/Manifest b/app-emacs/haskell-mode/Manifest
index 76067b54aa7e..6e1512a22a00 100644
--- a/app-emacs/haskell-mode/Manifest
+++ b/app-emacs/haskell-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50haskell-mode-gentoo.el 44 SHA256 1396f18ab3b90d2c8175a48ea562f22481e22d5288cb00c808a8599fe7815ded SHA512 3a4dc946f9f5b5e7dfed41d19b8e576f3d164d81049b7bcad08791803116104f0450634569ee60a65f78e42b2153b925062b05f31cf8b5477160a73eadbfcf2a WHIRLPOOL 1b307ec7ddb69ba898de4b22bde2a433a27c90c92d66efcdee8f730d4941c6ad33a4d69e467abd6dbda1cf6e95c07cdca0b648259cdf34cdbd27612fb61184f7
 DIST haskell-mode-13.07.tar.gz 131102 SHA256 7d16441f67e027a9fccbe58e3d8284489f811f4914a9e07fcc73fa9a24b38895 SHA512 e19d55a99f4d9a571c1ed0b095254e4d1b8080d9ba671461aa228cbf8aa7c7a213e19e588c0f69450a1bd4ac25793b523415a6f11bfb5dda7706dc35f7beee68 WHIRLPOOL 56be74675d47928cbb149515f796f7e45fe5238df26021510a140c1ca0613ded959b2891525350a9eb4aa39bf2a2f1e0a890e9a5cc8db35ac75c1ae37ab2761f
@@ -7,23 +7,18 @@ DIST haskell-mode-2.9.1.tar.gz 123579 SHA256 cac350804a89d0f76fcbe8c2ad10e4b9f83
 EBUILD haskell-mode-13.07.ebuild 1256 SHA256 78e39028524eb02e574514bfcc79369401b43a5c0412ea89663e9efe9778fd7e SHA512 d9633ce1ca0bae250ef79649b434e780206f7c83bc2862cf61ac090f78540cb5388ba63434073ac8b3c9b422e61f6f401bcb8a92a212442625d7c29932d51c9d WHIRLPOOL d215d2b0424f1f70bb04fc6ac6f96b525879deabe9ebb802632f8891435bc5dccebac241c1474c6826e494007abf13c547195bfbff866025c068b50d72636d05
 EBUILD haskell-mode-2.9.1.ebuild 1145 SHA256 223f167fc1550d411fc90fcf2b7a01924e829aaf0414e3a606280d3dd52b8ef9 SHA512 86f54eca973712e1832ddae136040dca755a1bbf88b6de4dd3cb05eeae5417b4fe111592cc406be08162e360f1ee2a1a77694c762faf6448f89eeb7a4df7a7cc WHIRLPOOL 17fd4ec82d13aebc01306885abb41206e2325efb44c4acf39801eaaaca9737f2c5f0173b490f902f4c44c2da0f6cc147ffd46d5697e17b8345c5d377cb39c243
 MISC ChangeLog 8060 SHA256 c43dfe4673003910d15b8f2bb4339df6feea4bfe8551ac83e10113636df05773 SHA512 05fd8eafa6a0fb4c7b5b5f82aceea15c2d7f8157b9f064f74e71be2bc22ea6f045f41672b930c2a6372f3f65affd03ee6efeb80e545cc631c1e814c15385c3e1 WHIRLPOOL 78ecb6b2c984df7de7762968ada66de8a109bafe4e01cebe092b67a6d9bf7fca177c97ee40c4a020f1ff53b4aa0e3f143ffd42d543f6ec8536d7fe290b10f372
-MISC metadata.xml 249 SHA256 9641baeb8f5dfce1f9e0c4e6c6e36696d27d4043e1cab68ea33c24a0d41838e4 SHA512 6caebb9a2ae907ecf26c8e0758136cac98d5593ab32d77af856c73367e53d225dbbf0c57eaaaeea83e951de7ed9221e0730170d3cea57676685142c446cb632c WHIRLPOOL c6f8e76e2f724398de31930acb622522fc0aff433ee377fc734b7b3796b6a96a0dc5e8745c49e4b4cb3e07561e4116954cbff5eb7644152125f07def71e62e8a
+MISC metadata.xml 241 SHA256 74e4a3bf714bb07331065e5d44e4014f4e769c269dcbc2c398542b6e89697918 SHA512 44c5ad216a38d1368b3c278b8e7086d8a375a4b82e3647368e1d0060cfa19aeacdbffae90b657f3ff2d6dbb38f667bab4187b41b5d024ea9962c86e0fad019ae WHIRLPOOL ca11e09cc8303c56676b4bdf966f61849b9a578ca369c6123271bbd35e8b10dbb56a097b59ff32265dacf5c594c8d7b0bdb17d082fc6a7952f1d0ee60f854273
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/e3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi6CcP/2ruigX8ZM9tzRz3ce2WNQ3B
-3rN20ZE7D6fENpVZ9GHH7S04EkC492SVmMobfjgwaPlUOYFfm3ne0msmfe5MR8OH
-4O6+4s+0rquHQWBDi8w36f1mBNhluYnoUauxFYrWy6vxLODcG7LD6/bVFs4j6StP
-/LobvkbnHLWmJ6tzx7I0P8gpLqSOr1soI1C8BEZj6UAYTPQtsxgOrSnYitIkaybV
-UkB27kzs9GR7UmI3ZYWg0w6SV03lTfFY3a7edu+aSFw345Mo0o8DLb6ETyO7HvZe
-mDosYwfbwGZKMSRMEGpI+jjBuMCbfxKaLzwTyQXAEEXtKIm0cuJoh8Gd6e6xAII5
-Em1sgd+xL9ITei3YxdikeklSGP9DTpVqDa5fXgAw9BWMF9qDjq3AweX8AjdOrw7G
-uVLSQmEuNgFsmCWAkwOEdpMOFvxMwBhh7ezABEHzNE6md09H1q3pkOfbc1snYBHE
-sU2FTvvALt+aLtpaqxt5K422u9KeDRkKpbbMcxJsR/WbunfcGDDCURdd2c4WdxED
-dPhmYBNmkhf2YUSNArCuidILCVvKsI5p1H2HKrLT72+z24q566hQLmtZRBfA/sJr
-KPz1liaEF3DVVhEEriXecdp53yllfWNflE1P2jgyPvlx/9ehzCpRgNyffZDUiV+f
-YHJsJnDhYtPE64oxSd/4
-=n/Gq
+iQGcBAEBCAAGBQJVduCZAAoJEJQzkH1pP7W4f0IL/3s70HkDxso2dNrd4x3uOSGE
+EBuNNXx092hp6NH6tl7DEtaUzQVXdukFCa7hhTGjK9aqquFCf8i82Rcsdzg+O66h
+AfEtriJ9/1+7c8cXn8CkUQwA4Esiy8IymSHu1j89d8S0LK/hAE/H02WNGisAlpb+
+qPfF9ORWMRRJDWPtHfULIEZcwpTn9CpjrThhHU8DDVcwqo9UxcpbVVFg0PCq/3Mk
+xbZwA3E2BI3tudzgTM4NL6pkW65b1RQ3qtQ+6jZyteT4CteD29RfVQyj0sq/TN1w
+nuahkcDM5/bc3DREeB3SXRao6U8LW9Gwq7iO4+GBGZ4ltly/p17dhjXb5HJ4AgDK
+tGzYhTL8GgxHGVqjqLGBzhOsE1lQhcWPZgNE6jESjlLIrzEfe+3ksOvaeQZP+8RO
+2mSKYHrkaHWnNyRK16NEvng44JCAWtrlP2CDDj7FNuQ+gQqlxpZJu7kMzxo0YjAT
+LOW9TEqkCpfokh43cVtWuPJVN/dY5xnq6H9A60wM3Q==
+=Z/4A
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
index 95708cb1aa97..c94cb834097f 100644
--- a/app-emacs/haskell-mode/metadata.xml
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="github">haskell/haskell-mode</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="github">haskell/haskell-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/icicles/Manifest b/app-emacs/icicles/Manifest
index 39052900dac8..48e07e3f9443 100644
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50icicles-gentoo.el 112 SHA256 9aac68a9080afed725ab5d886dca6c3d2046c6b477b03cb318e7371109d689ce SHA512 dee9b1945ea378792e71efa674bdeae5ec82eaa8f8ea07fd7859ff3e48d812fc50c8a4809a2a66c99ffe08c4b2b71a107245970ec2cddbe0505b63999b62320e WHIRLPOOL 838b997bfb1229a5257caf83fb05319714212d260ccb261ac49862466f2787cd8c396bc9444845c4a298e8baf6ebaf6b3477937f5dfdbbd8bcfa52432a5f10d8
 DIST icicles-2013.04.23.23400.tar.gz 886525 SHA256 a7d80d6d8b8150dafea8cf2f3e25ebf3846091edda9fdb7e5910986fffbd713d SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5 WHIRLPOOL 11db63085253451f1e84e371ff47173db2fb072060afc8a4db943907d53daaa5247036a4a33a9aaf09cedac557fcc185668a47e28b844e70714b9c6f92644797
 EBUILD icicles-2013.04.23.23400.ebuild 521 SHA256 572cdf7313ed5813a5f83fef127c88940c6a66c3bc3142305b7b7776f76acdd6 SHA512 fdf4f2664c573add10c32a11582326fe196b3f76f5864e14f9363331827ef7847077ead37abb75a4c75986ea240bbe54b9dcd8f2a512a2849d8cbc65e127682c WHIRLPOOL e4f23d44928368ca9d8d5617c1bcdbd3b2a7607f5b47f3c81279dc41ad1cf22e3e9301ae644a2d317e4d30d583189e3fc756ec5142943d29b094306d95cbcce9
 MISC ChangeLog 1450 SHA256 04e1fb8ce018681e6bbb8b3d1269192373ef6a6415e2a7e5e5397ecd0b473f81 SHA512 5fb6de16c19dc2dd86b74ed2c8323c64550e3394d9431d8c4119408fb7d71f68aa879574c771a78d1021b8aed3a51a31e9d03847cb25d4f0baf3a2b960f686b8 WHIRLPOOL 4d46c2722fdf179f78e4c6bf2d9fcdd091585026a661c5cb7c3ce9a7a2ff7c5f269151b6a2b10efe5ea02d5e48efed460ce1da1a2f21eac237c662947f891e57
-MISC metadata.xml 248 SHA256 8aa46657cd0c30dcb9c96b9cfedc2a40ddc96e8f0d702c129a69d18d6fd94398 SHA512 433754f395171ca675fdf9617e20649cb55916d93a710984d512d74d5165d0d7362f303963b1d94a619f14b83e9ec020194f0be221d0b99800f3a2ebdf287f9d WHIRLPOOL 5c5499e7c95db97d8bb2a8c6a8f5d18c60cb77532021ec215fc5e63bd028b01d6459129433c378a4d2eaa641955c72ce5b08b010296710488de486657b42e72a
+MISC metadata.xml 240 SHA256 6dd915a1c420000f345ba2550f106b026d3cd934e5b5134151977958b877154e SHA512 6f2b19a63e7e019923e7c906270ff5c5a8353d1eb49c28b9a3400b47372d967e3fae744fe5d3ee2624f6f6da86d92f17c26e295c3ca912dc381f18dee486b0ee WHIRLPOOL ce8e5cbfecdefab082ada7245e7d36d2051a4208d56e7262384e3a8a894ff8eeaa9c4f0a5601a420f7465c02b4c1d7164256dba789e53478457017ed1667fccc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/fRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUyoP/iQNmZbOZ+klG5h/VacBWt7a
-4i5EgWYvxlIDm0VRRiRjFXkUAnynfGDo+00ahBbaNYlsLn2mU0BCjEAc+zF71ERQ
-SjICaIkwYvKKTV8xNXTB0EpnOMa3Fw6jNAdtGH55DAMT3WUqN35JRSEWQRIVRIiJ
-JzHPRB7ieKJZ6ZcxxEVW8tbDluINUNbf1scnWA+K28Z9a4x+9bl++pnBDebuRV78
-66mqCvmoUBUVF5hRwk+hn4DCcm/yIMJ/xfaYz5BHnVAW7aO/bnsLfm996L6dyaGx
-1LW0BfD/MyJNJLdDimrtaWo7yKE4CNVu5qzfTK2rSPeP8hmcQVY7cAqWut7OTpPH
-wJ2RU7tZ7qmiKyzhciGJWftptjfx4ESQTBCuUl4eN0dqpJ+DZ2viu5pzj6DDGZRu
-eSnAcTK6zrF2OiIr6sf5nVgYFvs2uDGBvyJYaTkB3FzMVZsPHNvYnV0OFRXeTl+G
-MBsXxW5CPMl3LtF66J/hlrAkEvbcw08LX/BbqUWg/CyktSVEvM73w0aJLXJniRhs
-J3oMMz9BQk6Qk/kP2p15px+aYiJng+fQwRQJSOGKy7FyLWxDtqLON8Ts1NXbpZyN
-oCRwDb7nqwragRkvb8rwoQFu24QDn2qRAYK64Vr4h9I36dGdzlCE496p+AG+59Jg
-epyhWbIy/2Ua+mIg8dvg
-=sPOn
+iQGcBAEBCAAGBQJVduC6AAoJEJQzkH1pP7W4sX8L/RTyK2LAmNGS2Z9nbTANqie1
+7SQq7A+b6dP4Na0UBDhMXZYDX4Thjl4yYqZVXfxyUFpIh6DGsMeN04lpHpsqeN7q
+YlFB1V0cDgc50jSwKcWC7ubaArOyU5fzOiPk3VaSkkKh0ymD4fjcmy1a3P16Fxi7
+bczlmL5nczI0qS/Yxa6vz2PNphEZpmcFFkLnILGjA7yHoYTAsZ+hYeTXN6nbUUKB
+gggNbTWr4bTmuhbxb+MUU+10tTnY8isOWweQxKHwJTJtfsFtcBzmcAi09emnHVU4
+8mgvtWQGG1f2yex6OfJMPVMS8e8Hrg43+WxYRsyjLr9wduHBKISUkVGXVcHLRewE
+qVAEhj1xA36TStUp796kE1yyXD+tDaLuc4mVVEjkcpBSBhdFRcmE9sI/FxmC3kgf
+UxWYBirD6Ge+u03qAjg+88VGlNDBrA+sS424ppmeA7I7FnCpuHiSmVfOyseZnReT
+YaHF8C0KziRPG8VkPmytBNNjJFdNEkm2sL4Gpj1F+w==
+=ABFC
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
index 053b89447874..730939bd5524 100644
--- a/app-emacs/icicles/metadata.xml
+++ b/app-emacs/icicles/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="github">emacsmirror/icicles</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="github">emacsmirror/icicles</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/lua-mode/Manifest b/app-emacs/lua-mode/Manifest
index 4c71fa14ead5..05957aee1dc7 100644
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50lua-mode-gentoo.el 206 SHA256 a1819d365cb19d2133500b9364714d5dd8976d038f336103e54f1f79494e9ca7 SHA512 b062343ab77dcaa50355498a63681c8e5bc6f209b1aa5ef82d65be8c19aa52d58c2efcd481f091804726b095a02b97de5b6cbce232ee5d9f328c5e3d888b496b WHIRLPOOL 8d3c4aa62a920240729a78fc512677ffa30deb67ebf3304e09785163fa1d62393f13e6842b083c4fd12a0f49b7f97e6c65cada3ebb64c2028c331a9bd378a11b
 DIST lua-mode-20130419.tar.gz 26236 SHA256 75c1696421983fbb58946ea649d2917f0deefc8b4f1dbc16b819e0cd603e396a SHA512 1fecd953b5b08dad26345c6e0d2006f35f92082d7cd244e4d668808a2694271605f10eb15d7b62ab8fbdf029fa6bac8bcebe8c8d4ef782dbd63ebcce8abc8439 WHIRLPOOL 4477da3bfb707459c14cefbc55ca7303b1774627c143cfe1d2dc3e70a7843fd7f9d0090f4640b934482a39b020afaf09b4dfd0b8ef10fd46f71b3d2c799e6347
 EBUILD lua-mode-20130419.ebuild 674 SHA256 3283ea6e2b901ac327c5c3d52fdf67f1659208e6ac7bc4058b3af17c856c2c0a SHA512 e31a474c13b15da37679f30f6c6da07a019c7b5bc79dfb5eabb867696e82fb2eaed461a7c9f906f6bee074547008bac32b17ad5dac95fb7d1af97f3b47564bd1 WHIRLPOOL c4940ba1aefc513cd8fa92ca05f38579ba2ba782f69ee5904db48fe69624e4641e76c218076fe3c925d26abbb9208acef4e838c659e79d3d9494f44055a1fc97
 MISC ChangeLog 6734 SHA256 77fabb37b15e5e3ae093fdf7aff04b9701e02ac5184c3bb8d02ae48a06e743a1 SHA512 8d26678e7d4c43c570b6852df4db6ad7bd96f5474f054d4f62129561a1e6e266729c9e99d003109a25f3546904c0d113d15706d170bfd3082b259201fa31a2ae WHIRLPOOL 3bc6319e04a62ef922275c609ec978c59d339e5ae113c2bffb6a2d2add4aa59df6e224359d1e84f31128d4862f92998218022ee95defddd86e6be5fb9de75f21
-MISC metadata.xml 245 SHA256 bccda7c290d2a0b65765ecbcd2234afe9893544a34ecd968a4895b3fa5fb315b SHA512 25c4ad7d4766a27bbc9ff00f505133d5879c94817bd4a6cb5efc45092b7b48d9997f4e06db8c5ed9f6ee56f1578683a931d4b89d119e1f7f08d6b7aa8c8e61eb WHIRLPOOL c5f9d85ed07b357c600fbc0ed316897440d21925ab3d72152f6116314bf0c58554fb97488b9cd4b079183bc2611161d2282cbf046a2b803438f24c26a946c83c
+MISC metadata.xml 237 SHA256 8c66fdedc35b11c11fab1595ca68f7da575d535c2858d83421670599000c15d0 SHA512 ca496830c198940500ea74621354b75d79ed4fa567c00a0106ced6749aaccf3737f1eba8254ba07566bdb931ca54cd771e85b98ab1d850aea7f19bfb51ddb251 WHIRLPOOL e97ac4b1e2662001b5f78757f4a215f5b428a503f7c1bf98549b87a78432e57acdd5864a135c3903edad3618e56af57742c826812e49a14f8be15764d2c54a0f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/gFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLMQQALcIQjDaDF0rYtLlN5PSf4K3
-q8HHz+lGAP7ZrPfC3k2zNik7BpczH1XSWbGzP2y+xDZ7NXwnES9ByGPm40DmPOjb
-ElGp+bV8o9xyqo9xUDqJxpGQ36p1RGE57gcLEQLIv76FdEtHxDkWsduLwZfOfTHo
-dCiS27CcRZgy1zJqaIWiKCTj9iJdEb5nLrY31rbQCz9tavw6wFbgqqKi1muz7it8
-iC+0RCA8EMQSrzdV9nsvtDhhrO8gGQnR7qSdGKpA40CRKKW6qzKfOkARsaV+uQmG
-DoqxoeDQp4YoYwvXMlPSxdUSbgzkUrGhL/h7g9LoUaH4HHcvhiJpfOWqYbE7Dm9X
-KEDhDS4DWlaDDNVaKpyiCFlST1enGTma4e/dBE4YaP0lnmZi4ZARHpN73WaKEg5W
-u4jBx/ffFk3/TMRWxvO/kFS+RlKWxFlPAYrZq9uqIXXn67ubYr5G9h2+mbybrxYs
-fweMoDKuEffOyAUbJvDFRgQlqokNtnTcGMV58gJW8zshhwOBO4loB0k4wi3S/5Ra
-c9qhK+suJFhEy6a9XXHIryUmpcpI8xU9bMPg3usvOyJ3w/2pp09P+zbvsu9vzrn3
-FupmmX0dvRWVy8AT6yP/j+pONWTf2rpNZzvG2zL4B1CnqV4y64CAmPRlZsIsQI2l
-MfW0IXOC8aTmdXklp6Va
-=lYjb
+iQGcBAEBCAAGBQJVduDZAAoJEJQzkH1pP7W4K8EL/RfPJhNtEozrT6evLoSXTSp/
+91Mfm8Egef63IQk6RRcoXmO+Ufl1PedOGNcpbyL2PnxEvkAR+Y/b9pBjlZ5ag3Cp
+LBh5SK32/U1CYQd5uRk6ptx1Mclsmae8K/B9U6ceTs+964vz7QinLVBdM+BSWK+T
+9otKLCnUNnxPczv6rkNrzQxAPsVqzCU6HqVu3YbkGxMYNIwi4xLr/4e3ZeXAD8cV
+SfDaV45/Hd8FnhqSDfYaoZ8YMCbhmhEeqYRAA5NXx7CBFlXlKmcgrJaQtxD+7/Kn
++G/AkCCGXEQCPCNPc84/c/l6k3ysxfNGXh7Ow0SbUwLZ3stzZuV1fX8/m+V7vPdW
+d0RiqwJD6KSUuOeWyJA8LcXEezO9WTi2oqu0pZfPoEG2zwqlmisUPdzzPcCZFGG6
+0CydIROWodonj+aOOkonZUFq6ZFXrvJY9oS+B9aGdYLLti+eQmvPcbQKr6h+qLtf
+uKwsrbT492Yz7KbQz5pqcm3T6HMBeAMIXvzMNzy4Tg==
+=rP+w
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
index cb01c41894cc..cca32e07cd8f 100644
--- a/app-emacs/lua-mode/metadata.xml
+++ b/app-emacs/lua-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <upstream>
-    <remote-id type="github">immerrr/lua-mode</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="github">immerrr/lua-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 9a7385042587..6d6abab611a4 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50magit-gentoo.el 77 SHA256 f3c97d1e80e018ed8338bdb9d1f7a0b8be54ad3e84a590680c2bc0422dc3caef SHA512 ab812cd1f5451868dd62a4bd3e87b2d5061ef4e3010a2a4c63396c9b797fbfb45c02d045dfde55de1b7e91c98375ba7a56b98f65beaa697d35228b9c870daae6 WHIRLPOOL b84bb8d7ca0343774c19c7d604778cd7d01fff37a0d5cc15696002ef335f2acaad21a96084e86d539b13c2a4f589a20b83099170d2a0bf8a67627b07ba98cebc
 AUX magit-1.2.0-delete-directory.patch 1315 SHA256 b283b6742c045cfd0acd92d74450adb4f0aaf72eeb21a3091dd572c2b485ced7 SHA512 498d1d0a48709e72c1023b3254019c035c42fbad6f43ae8312320e28180d7a81d8f4c5f14d59e2faa6e167494d2b6e2b6420b0883f2c52542c0377d6b6c8ac55 WHIRLPOOL 53557bf1c929929b3e7caa7638bb336f7ce4b4587a20b9f682c505dfb9e7f74bee97aaedb658ffba0607f34f1bea2fcf595e7a6d3dd179d682ca4c0d2c5b86d7
@@ -8,23 +8,18 @@ DIST magit-1.2.2.tar.gz 111245 SHA256 8ed300887909d0990cf17b1f4a3b902944db2471ca
 EBUILD magit-1.2.0-r1.ebuild 1126 SHA256 67fb8784df391e0c11c626038587ffe0066193c37845a69d0169c779a4c122a0 SHA512 8e34befab1f721f37c381ae8bee2956445a1659de172cfdf26a7aef458653a3cdb5f4888280d0365547968065c268cc4d919a1c560943987ce06fb22ee2c8db7 WHIRLPOOL b771ab764e6452d894943c43522b7ab249bd765a9e4e1433f2394ba3d61d4a08e36abadbfc33645df6e330a985b561873e37bde4e8f309a161c12912ec985ff1
 EBUILD magit-1.2.2.ebuild 1073 SHA256 5971ddb16a21a950aac2ef4ee3093819a738873549b28927b53366a9a17644c1 SHA512 8f3a97850736eaee1cf04eb6cf34de2d0e7da08f668853f39ecb1d3221e72d2fb34f08d4ddbf9072098f78d41e841f741abf2a634215040dc436ef4e5a9d380b WHIRLPOOL 7ed2a2bc3575fe836aa31d4e04b546858285b19d30141d440fbb1098c57b8287b69174f12e940ecfd1a26e7d1ca041ae6332bd60f71472f02006f52b0ceea9e0
 MISC ChangeLog 2737 SHA256 67253fab4226703bf49906a191e2f90a32c07869b8aadcfdc3255958d50ce799 SHA512 abf9bc95ec6529cb651fb9e657db2a95fa4c9742fddcbe26fb55feec5d7a8e6780766b1fd283f1a64f472385f50523dc26846c976d0bd9d79fa717006dd729d2 WHIRLPOOL eb6300040ba05c6b185991179def1495e6cfe4fba685a46e607edc3392a6f6989cd3be2a7de0cb63909d6d4833ef189c3cca3bf382780592558cb6bf6b9b8f46
-MISC metadata.xml 777 SHA256 69237dd726329b2cc2b67f6b02c175456d87b02cc5976b7993fa713ea6349039 SHA512 db76d32f4a191eccbd447e066ded33b5fa6e165f65f3b5a135f1c118debd7c7c45d96ee8940384eb4a0199e6e62f93f076e2afe98d8aaafd4790683f5f537f44 WHIRLPOOL efaad8286475ea8d6ab2f0b9fc0dccc24ddb50744ab85de857d2418a278c411b1a6fd4aa19df7c1f1d825bc4d4e31c57e6dbd911de1e454a955e70a9313f88dc
+MISC metadata.xml 761 SHA256 0e077ad085e279923485af8772d50f4be15274769193ef796dbe88fc53688b6c SHA512 e914b27dbba5b134d3c0781dd5fc01289bdd602b9300a82356b3c300d037be98ed19b5a1b22e609472752fe6dc7e1f418ef558e3ee7234dc4426c5c734e1f40e WHIRLPOOL dd255eb29af1c71f0ac14990d4e38ecf01935bcfac43341e8f219254645b8a43f39df4e14e19f66fd3572de09b3690106671fc879714b782bf72ff6056072e2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/ggXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYSUP+gPy4wNikClhdk4WrSVsdxMJ
-8kr/j+8/6Q1faqePSa8Gcb3Bx5A9PqyMDX0aoeGQVv0agBCDmiKIuhYDt0cySrsd
-3HsMmo8/lxrHu0hCeoJT9ixIiOHKwnRKboP9IwghCXxOgqJmaUVYghuHVE8knZGk
-iLXdcDmx5xd4HGDIs1PG/JgYzcGSvIhymdJ0eelaP3RpcOko4sjNiD+eJOmFwKp1
-OcmBOyX9+Xe9BSmKEVb2VfQfVGUaEJmWlOzwDrVRsnbIxq2el2NxZSNgJbg0Gw5E
-lLUiU8qFXT8uBmPzdaJa4/2cCcOR8SfZammiULfxcJTVepg6Axp94cT8mOSsQ8yf
-OV/n7Y2N33y8+XZzOdm0kgZ4JC5KjoKecC0Sj+goom2MNqPnvX8TtmzN7uyCpmZ+
-hzHxNw64jWIlXzBahft9v0xOZo//H4/Z7lZEY+LE8Wsw969PKnswMKjinCAGWDh8
-AiNuBkj1zx/B7Eo1wLML4Ub1jmdTm/KogjqRa56bxGmqZIMRQ7qpUtPcNO6xgsya
-I6398x0VQI7UcoKrkl8LfTavaebOzNY9rn/9e8/rDb5O2+BqAxUYh3lDCu+VPfnE
-i8Mr/y9fASBwmx+afX2dSKHV1uu4DK/ax8hspJhizrZm0bFlpIvORoNGr9AMaIyG
-F/lOLZ/NkwwwYBjN26Iq
-=/MIr
+iQGcBAEBCAAGBQJVduEnAAoJEJQzkH1pP7W4C/oL/2xtWoQUw+nQCJQzFOy5lhWZ
+FbGlnA0DtrsIRVi40OX1GwI5QvOgUDsl7hclSGu8MSlKM723/k8f34NMgSWx4czG
+wwsFsg7+igB4BqEgvvO7lfZf008iAX3AFdRIcHJQlOkr8uUAbaY+r1zAxkz2979L
+AlI3+4r++UqMqKcnne4rMVF27iSoLiweMp21Wkuu6h4JtttI7gXlO2SaBT53cDFX
+pTSuRjfVFNTepvz0Ru6mauqRaV3EzONBAHP/1Wvd+nLg0bXmh66EHeG+eN8Ki3qq
+mztppiNIBC64BJZFQ3ZFQFE9elU3Dryfd8qsA7C9/CoyN1s4fex0LZq5+AB/PXK/
+Kqv6snZPnEBVyh3Bi6bC5aYYDUuTDYocwmpCcxTDRkHYCsQbj8w3kNAxcDgfH4nW
+LNXgw0B7cPx/vnLMuZ/0OeWgMzXrOM4wgqFgnDfKw1WUyd0hKVCLB0q11P5VQxlq
+wHr7lb7V1iHz6BXmL/n7v9JmX4PmxKMOZM5tAG1Szw==
+=Ik3n
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index 49c6dbaaa580..b95826009842 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <longdescription>
+<herd>emacs</herd>
+<longdescription>
   Magit is an interface to the version control system Git, implemented as an
   extension to Emacs.
 
@@ -12,10 +12,10 @@
   support for cherry picking, reverting, merging, rebasing, and other common
   Git operations.
 </longdescription>
-  <use>
-    <flag name="contrib">Install user-contributed files</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">magit/magit</remote-id>
-  </upstream>
+<use>
+  <flag name="contrib">Install user-contributed files</flag>
+</use>
+<upstream>
+  <remote-id type="github">magit/magit</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/mailcrypt/Manifest b/app-emacs/mailcrypt/Manifest
index a0abae977828..ae276dbe3f11 100644
--- a/app-emacs/mailcrypt/Manifest
+++ b/app-emacs/mailcrypt/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50mailcrypt-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 DIST mailcrypt-3.5.9.tar.gz 172073 SHA256 a195e1e56db44519945861900c6a11c787fc28482d939d5a7564a0f0b900e054 SHA512 df6524ecc42d4c7bdddb34439186690192bc4091a1965e405223106fc71047c33e4bbbd571b030c326efec46961ba0aefd018ff1205d230dc74c34daf93ba079 WHIRLPOOL 19e7cceb7e1cc400e53165f21355ab501e0712f9d3da23cc81569a440bf20ef0d423ffbc7a5f4a9a00271fc3bccae2a322bbdf89a717aae55dea38a071865d5b
 EBUILD mailcrypt-3.5.9.ebuild 1014 SHA256 d990608a53cc6c8552853e86b7992683c086d548c5c3b9dc747f2f836980634e SHA512 bd270cdca662584770f2a775163f351ec5eb483094e0ff16e7994891ac515cfad4f1c5d942f08cbac668c96c2a959f11fd4946fe668389398c2652542937f5e0 WHIRLPOOL 01951a7c3b604b1cdb746d244afdafef42c8b39f540753095c46ab43c582fa0d597c4c7a951e7779ef5045b8cc71a7ece81b4d3d5acebcb3625a9e2562305d98
 MISC ChangeLog 3554 SHA256 669764d3a4f5dc56bf3776a5c89fb2a67b824cfa0173e58da1e784aee7618ca9 SHA512 3f6143f0d78b0a54a02f32a06b823aec7c29bb865f66cf7a08cba1dbcc4f820f15c2d346ee7036bff830e4aef1bc868bd41b557a2e25feccde5d15c13a3b3bf6 WHIRLPOOL 2a216f939b2b0457aca693996ba9367da549e11e9c5f2bd84b730af6aaad2b5349122eeb06376de860f5dd6e1923f7ae2074bd4bdac22ecf937f9e8e9a2028d2
-MISC metadata.xml 238 SHA256 a147bc9f58a6515ec5a0a222e425156664ec698ae8376968c229d5e3dd1dade2 SHA512 4ed279bb330fac32a0739d7e64d326c7b41865c8a8d1e58e9b723cf94ea792a42b5616303e23e1d6aceb330b8db22786dd41651da4bd141f1595afac184d998c WHIRLPOOL 2a28be37d826776cfd823591ce00b3ace5f4d752670060909a3a672de8b30fc276f6b3a4fc41ede80ca59b7a14d4f3fb57fb52e2b861ca48d754db5853819627
+MISC metadata.xml 235 SHA256 fdae1c994bd813f4d499d3b9f0c8eba30d0f67f530f4bb958900ca5d8ee95c61 SHA512 9f63bd37bc9fe42001caecef421de23aa816eaab48c5f18631139e73137ac70f954eac212ed67a6602c25fe09e4e56e21c203f8062ab28207702694aac2d5956 WHIRLPOOL b3436ac9c6686e42cac527f29e288bc2199f5eb229147412e3b8fbfdcadc3379ef2e3b7ce5e9eb7da83c6264db0c5ccf7801012772a849fc005649c48531389b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsebXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifSQP/2RS0exa4g+p+SM+EfHpT9U7
-PCzCNKc+6b7HNQib2h+1m3ocBRCgUhscjjY9wPxqJxEkYAMlZgicjLVQJdHgw9C+
-kYKEnV4Jhg2SbAhbNQb40L3jMWz2D2YroO5EUtC66pq8lJzJins26leUV1zrN67a
-DUEg5N6lgnjRVSQF974Dms5fI9Z+LB4Q8w9EGHEr/PHC920hhMmtQ4UfeNtDcFW3
-7mI2cQrHMuI7dMcscu+PmhIBNpgtjyOWGEe4f6DG+ruSo+K97b4GByXSJXqVZ3mn
-teM4n5uVbka45Pyw8STvRqmdxWvXrQV0MfTzmQCbgn0qQmsED1N5DBgbk2bwbSZj
-8dH7jMMdE02Pzj72aCloN1inV7LBcEX57ksG6+FhwM8fOinEBc1g54HmtV/wXhtO
-6FzVaNWvm6UIOU3wkGpflgUv3NJUYlJ7oVQ89nHCPdXpMpeRJSbH1zDTK3ma21cS
-euZJsybiGqmF9qG4sJOwCot3AwaWiskzV3yvNfK5iTfLZlBXINRlyYLQYCGLlJ8F
-RFqETARI9fxgJU8ZgmeI3CzkDp3k94O/BXoQ8fppeYs0McSU3SLmTJ51IsAA7YWy
-6e6sKu18WoJRmJtPY9iBVAZkCa+cDxOiOfrXl1uhmCLvoq+zF1qODNgD2ths9iqT
-kOEp1hZJo2I5IMAAoDNN
-=xvz5
+iQGcBAEBCAAGBQJVduOxAAoJEJQzkH1pP7W4En8L/1NCNCXnRM8kmZM5YNYIK44p
+9SlA/f+z5OLOiBTx+mawF+nUyH+6wgcJ0cdlansW2avqA6Y4J7Nm5a4Enq3LdM9y
+MZlkV5cE8+VkHCQRYF6VbkOo23Sk8PAA0vUX1k01+przEtLqmSn8crXkVe/yLcU/
+Fy2lFAzpsOmfI1cERXBgk4xGc2SMybf0j60btrVW7Ak2FeFU8mocaV0x6/10v8i6
+mE5v+k7HMsrfHvGIz6OTmSuvH0EPq6YTT8/m9qc/dMiDZOq2h4hTbbWYzClNPd3z
+Ta4x+6UxjhWgB9s321eBjcdEfmVt1S/Lxqd9Nat+mtkkNHcw7PhKaOsyp4bNTSJ3
+Ne6JIL7g+jKrrnQrC88+/X/YlEBExfy/kUseGsawGMRIVWhf97UuCqxi/hGwmb/V
+MjPpyWKwLtnVuna564ZeyCEsc1Fk3pPbyx/efUYVGw/SiaJRUbP0ah0eEcrID1K1
+uoDy8jHMihX7AYQNJmgGd9ephufNovDFk7yC7Hq6jw==
+=DXoH
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mailcrypt/metadata.xml b/app-emacs/mailcrypt/metadata.xml
index 2be449c0a3b9..d6d654a5d70b 100644
--- a/app-emacs/mailcrypt/metadata.xml
+++ b/app-emacs/mailcrypt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">mailcrypt</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">mailcrypt</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/mediawiki/Manifest b/app-emacs/mediawiki/Manifest
index cd7fa855b269..7d3ba5487e2f 100644
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50mediawiki-gentoo.el 395 SHA256 4a9ff9c12b336f9a2086695a6f54738f0d48c58d554762f82fa9c6770715d868 SHA512 579680b31ffb86b68e1ccc8c7f4969860437a34bd2cc308cb9400ea861d313c2b2d538412eadbdff9d56ddfdab8f7312dc8cb97137a6c8c2707ebce4437c7b79 WHIRLPOOL 26397e81dd71667adbf57ac41cbfee82ebfdfe7cf119e9e5ba10c7368e4f0f5febcb723b9f74e3c12ddfa03be0fda04324180772d28716b5bf64bcf8b127235f
 DIST mediawiki-2.2.4.1.el.xz 19108 SHA256 142156428be0dc851e0d25771fe519574013ad55a9aefc1d9eeb410c7a1f64cf SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c WHIRLPOOL 058fb322d90dae325ad0300cba8cb173a5c749dff23bca160f69f502e748b7b410299510f69abdbdd215b90def555f048e3eb072975ecc5ac6d614d055b274e6
 EBUILD mediawiki-2.2.4.1.ebuild 472 SHA256 e11863f9990d1dd39e84651e6a8b57c434003d875c49489b0426429f0ef0114e SHA512 2546a546656356dbc5c6af927bd060cb5aa8e0c05efaf4d20d1904e788f6a3b64c5767d53f3c3392c9ae94f185e0484648f85ae40607a7691e49381aade5e41c WHIRLPOOL ee01f1b3b104c6b21af0cf212b2dbb5839354bbf5b9057f31ed63bb952b779cfd0342e23965b0415efcd88203ebf6231545def994054083ddd7f2fd72e583ae0
 MISC ChangeLog 527 SHA256 c3ce96f923888eecf5ce51ebcde51974bade4c0dfe659fdee06e1e9bbe9043e1 SHA512 693432eafff16e056a227a33db4ebbd764d6affabdee669c56e10f6a8f7bf304ca8eeb79af4894cae110a8ed49562a953d5dfc6bda38965eb9fde3e726d088fa WHIRLPOOL 7716636f49eefbc1481a4ec927b7527f2aaeeeef510152aee2b0e256ff5a7ad0f8a3887089ba0f83e588dbcad001345b1337a0c4e5f5ff62d7ee80a35b3a0601
-MISC metadata.xml 239 SHA256 f3c1c2c35e893fe42d637b938e20642826f5182779384a093bec2faf718a6687 SHA512 8c7deabdda68e77ba56597874b10b485051ff5e508c6b0dac9b8604bd5a793c32077150732459ddc9926ed578fc22dafbfdcb419b8a8eb80bd2908a9bf892899 WHIRLPOOL b06cec119e46aec473c6c5c4851ba90e240c1ea385792ab23c953f77623c1ef0498a53341e93594dcb0ac871cc1a12c96cf99a605a106516e0d21b3c5dc1c5b1
+MISC metadata.xml 236 SHA256 4e784bd469e83d8195534781dba84e94fd6b22a8d9aa13080c3f7569097587b2 SHA512 3801e530ff62b2df4ea080ef90936b10f3d74b199f06c792e7651b10dfcf759d3d59b109966855aeba3bb64733d4605425a1505ddbe31c45debf42b0ecd95b43 WHIRLPOOL 2fe5e1b69e4866be96f56ded5c0b1bca89e4e0ad3e4cd213a265ce67d9de3a8af9f4ba9aae08a930968bc75a11b49d146b0808755b6984076b5c2f71020d0a07
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsepXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWB4P/2T3rjpzsyNtTlAnrD2k48ej
-reVHIs5ZXdHzq4t9Hq/dYi4dm4F3EfmsjeuLGEJ75RfIse6Is8AbL+Uis/TZnKfM
-rczhbbdkihXDfl7VVj7VZR2E/CHzBNvPRljKh8TwX5aJuCgIlReYczX4ssuMNqeU
-dx2VqOtlLSSqLT9oL+zRfC10AUYDD/jehQgXywDEHxf1VevIehJikhBdp1Sz0KN5
-7OGC81ZTBaGk3Zkf3bbCYvJFkiN0xRKDrw6rn4ZeFk4uTcFD5ePBYYrhDCP9IsGw
-GPwsBa0z7vV8xsbolbJkUh9KSxa9yEPLOGWU9RcGqPFB8TAajDDA4O9r+jmuhBVV
-H1NtOovp7YU4o93WHlutWbdvYO09vAWapW+NEDv8Ihyti4EUwxXr9wQp5k49XRzO
-/8doH4pSQjzlkqv0Fxn3lQhUGwF7oYJufTLJwLnfwVxmsEvixYOxWf8Weu7ut43k
-5dPEtwu/zyg3xIpUlENRousVl5nLZHcqJ28ChjkE4Ydm0vhvnno8WaN+m8IFm2vw
-z7+2S2p5kgjiGRHBxQeLbaz6VqEqnNdtsPYMAZRojIKfg/mWXplICciFehEnQEWk
-akX4CRlupUnSrh09iqjv81ti8b3u5hYB38fC6xELNUTU5yR2q3VG+YjK6jkGmRlf
-gHKxGdEa2y6+gY9Vgx7o
-=njkv
+iQGcBAEBCAAGBQJVduPRAAoJEJQzkH1pP7W45KML/RZ0zfOlquodIyaxkwbMfYSk
+WJ6Nol7lgZojvYCR4X2BB+E3aY4NWlo8U/p9XM1W+vyAW3fexGAS5W/RIEWEOl7r
+8R7L1phh+u20kKBAGyaOrdOPB7u4V9G35xcmXDYNodFznoL5VByTf/n2qxasoUds
+q4FmcirGBIKFISdUptROMgCCS4kXipR/quqM9un1IwIBdlFpJz+Wvukt5w3Vknfb
+Ems5uWK23CCCJf0cinoMKEt0AX1aY9iy1pmZqHaOS+J6S00n9QlZDjuCmCtqPHWM
+sFdJzYNqzUeUonO4q1iin3Oh0Ahn8CCYI/clZa8sPsVj+e9rcD8tuuWAusPoGXgp
+nZQ41uso9WtRW3pSWNnilJx/oywGpAFdIf/mrPueg7nRgLoQzhDJtyn975YRHPHL
+2j+KCG/2AZ2BIMRhL8uDLvQnk5s5do09xocG1hfbVmP0z2Gz+17mdxOPZyCs9uk5
+07kAHRKkUS9a0QfUwmb7p8wB5FomI37Kgy7aAsO4iA==
+=6Cx9
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index 336f2ecccbf8..c6470844bc55 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="launchpad">mediawiki-el</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="launchpad">mediawiki-el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index 415f297bda73..411f3aa82881 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50mmm-mode-gentoo.el 58 SHA256 2debaee15ebea94b9a79687e018c8c722c21d230a1426c6e3b486fcb3b3ed76a SHA512 4cbf0da7bcadcdb30947fdb789542daef059112c894be4ad418321cf526f7789e86f612c92bc5c11504ae2538f0e73650589663b3f87421543f0047932c6126f WHIRLPOOL f7a1ffd84b91e18be7d0ab2ac5b3448efa15691cd3deca7fd9ec6abf65516761247782f9954fac349ab13c41e56258791fe0a1fb0ee63ed75b7758e841fb267a
 DIST mmm-mode-0.5.1.tar.gz 247841 SHA256 d0b4bfc9b30bd089e58bd513664f604b0e2614b4056f2f44bd356868d53b10eb SHA512 83fad0abe26af7627fa7416fca5936bb8347a00c5428537b767c98201af137f2d62eceaca09cb9e7572edc9a93c5ea6ceca422e55984d4bcd5f69ec060c2ffee WHIRLPOOL 28a81aea21756fb3efc1cd4b591e109aaed69ddc86f42c5c5604150105c558810b12130c4acab523dae480622ee6e6ee5fd70812771213341d6b3286ca6eb3d1
 EBUILD mmm-mode-0.5.1.ebuild 791 SHA256 fccc8b192e6101be34df7d95bdd44f9d0cf1b1a5ba56137e79104be3eeb116e6 SHA512 4e98b7f1dd1b597b4a6f569f9f102e2ec26940f914a7baa71cceeb157d81ccc5d5f9ed16679faaa0986657968c8a633b1c842f3db2b8839f6cbb23a46ad92cef WHIRLPOOL d3ddd3d081655bd0871bc604cfc65283df1160dcf2813b8a866f56b5b89696bd8bf8a5dbcd2d950960985a18b492c4b63538fd4e615f5f0605256801afd73c37
 MISC ChangeLog 3341 SHA256 07ea5626b64ffd1516255e1787787f7b25e6e1d9188cbf35c431ebf577da1ad3 SHA512 63b24bc795e86b6a0c6c531ecac40f43a71bb813b3a5ff4350ae667b60e022be384f5f2c00bd18dcaf74b250f425c3857a335057c7d4a87956a7e712ac53c402 WHIRLPOOL c23dd52d107f3c5d7bbdd8016ec0aa4639ff6cfa41ed133d7354255ef7fad4c6bb2a5c1dcef881cb2e4a160b172dfc53e820210de01a6fbfa5ed15b9f85f3bc8
-MISC metadata.xml 237 SHA256 0e1b1baf9186172e4a7f3d7665aae449b1ca91c4a94946a0d6e09e18a562d9f9 SHA512 2a2552433705794986c904f6c1326b946366c72f570633f2af308bc919031572b885ddd62661aa1afff80b082e615b503a36a5045a55d412b70a3ac4a58bc719 WHIRLPOOL 1a9895e9c1c979253959404939deab05fc89fc2925e82a52079e0b428fab49c0827281df762bb007236fcf7698b5f7f7b8abdf42b9ebb2e42063a5c248f38dce
+MISC metadata.xml 234 SHA256 2557ed3d91ba58575704f91aa46bd5b12c851b1b007f7b59a6630a0b2b520d6d SHA512 3760d3cb14fc7997d0732dd18a10175998bbf7155ce79c6126e630c45afe772b01a5cdba0a02bd20af6b14c6bc55a7ddd0407277ed1ca772d44e8be09527bd1f WHIRLPOOL e32d70ed05699f93cdac00ee0ae54bdec7ce1c2d557f0702359e0fe3d3d370413a1cb2300918b32eb469f990e3abd61808f4decb28cd581ce3b73178d8051385
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdse6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDScP/i10qDbuCoF7mPWnRSV0UYMQ
-kYftdXI6MIsVmyYYovDqwUqxUM/8vzu9b9GBkw9bHjiHlp8ncDFYj+KXBpAUKMcS
-VTgsdcOgJ7WX0g75MlQ2q0YFQ5eT3tHOhlDchECFWOpPph/SXeK2+bmu1YYzM1lx
-xtXvTNi249Gf20jUkij2Jew0nRIlFBj85XV0R1BfKpcU5kQ1u5K+RfibqcBuA2YT
-FNGk++8SgLKQQWSDwtzEmcBg4t7xzP+pGxN6gRPsQD3exyrKt4T8pA5ArxrsFl/s
-hImwGM8Ouqh/rQUhZVonPrkGO6FFd/p8lpBzv401KhLiMng5Q6v5QXmdnqd6y0OU
-d67XEjfslt17FrLJh7IWE+dyODeaSQcmwz0yBoVc6ezSSNuVyOSGQlX5vpG92Tk6
-xmjq1kZsa33aj9PRP/lBIWCLV0GjuHQ2QwEQodvy3Tm8lgtr3CPsxXoW5LGMMoSJ
-xCpnHJZo9mdfk/Kou2sCefevMmg3nGHf81YqNNyaYubM9gXZWMFqJ0unHVsVUIUn
-/dFTDYalEgLJkbygvOEazWkxZfk6st+bAlRa17gPVxtD4EvGM7fMmMCcgQldvYPa
-2EUHlO6Ssy/BrJ918q5TuiWqoZ+N++prQCkXqZiGoiCDFxWD2pFjeLlp+gznefQO
-QVgyMT9Z1G9Z499tpHHi
-=vNS/
+iQGcBAEBCAAGBQJVduQEAAoJEJQzkH1pP7W45KoMAJiDNE8pEq2nqi0xjrCNwnQF
+5JaclIOyyfDCfpa8GNVuillUsCtSRJ9xj1fS5m+RcpVdlI+aFd+W6V2f4RCmNtX6
+ut/JlINy33Rt7cBjd/ECG9YgW/TyDyfLz+LlaCkCAg0Y5mkI/HhgVnaax/KnWiG5
+kt61dZdqG122dlKt9OFqtuH1o+I+1EgTBbLJ6NlZ9JRGc3lEeTmqOzPGlmE/0m/+
+y70822yAL2x7jpUUZVVaYZGZSkjSPlSzvdMhoFLdhLTK95OykGGYPcOgzXFdSCHU
+YlRBvQsEKO2iC8q0xOaM6jG/nm1dFqFx0X4nk73iGFWJXJt0JOuOWLYHW746bcOQ
+j5Gipx4VvpZZtbi/0seqIPKGxyblsSIiV2em6WWS4hKiucuVm6TzZyabWWQrFwed
+sWjQ7md/+3axeFwMfo/lC3/TTUr9o0XoIkNnWBI2Yr8Qmd4dktK+rKFPF3rlLcY2
+D6OhSd3+ep8zL1HyrDdwVr3Ke+mTZur3nUcRUxdfRg==
+=QDwv
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index 4852a6ca0b1a..54383fbb14fc 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">mmm-mode</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">mmm-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/navi2ch/Manifest b/app-emacs/navi2ch/Manifest
index 064dc289a39f..336ead716aff 100644
--- a/app-emacs/navi2ch/Manifest
+++ b/app-emacs/navi2ch/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50navi2ch-gentoo.el 101 SHA256 1b9026d17095867506f6673927682051c9b88d868d8183dd35512dc5f2f959b6 SHA512 c7efdd0ef06c613628340a4f6f3a1a249e137eafb75542967b4a15c1114260375c9c527fc4e037c98041520d6771f03500f1e37b3d8392b67f6d3509a4a501fc WHIRLPOOL f8b88887a6c3bb8c04b1ee31755d915ed71ede1df3565374355adfbab60f4421769e6a6035bdb56af043aefb9cbfd97aaf4a07b986a5e967b146874ab4749394
 DIST navi2ch-1.8.3.tar.gz 477433 SHA256 671091f831e97ad05a1d106697fdbb7447201df209af550bf60ea6a71f7b4b05 SHA512 cbc180d9ed895c19519e8fd891dc3487b89ce90f139cc8f7bfeebd1d563740254d963ea38e588f05e42f86901eadfefab9f37040d2798bb15ac4ba7f3d693b81 WHIRLPOOL 1bd3219a4816be8a093d047f3605a175a9fee6f7d9dc9ee4648fb31ea5e9709b415d36813aa1d83327aa2ec4a8d14ce8e8acceed4b5752ca712a4f2dda709728
@@ -7,23 +7,18 @@ DIST navi2ch-1.8.4.tar.gz 470499 SHA256 a2647881d1c20539148f8a01fcfa6f230d595823
 EBUILD navi2ch-1.8.3-r1.ebuild 1450 SHA256 1cdaa940b47b1dfb4f467892789fe0b6f90ed60d2de1569c034263bcb0a40d8c SHA512 74e2ffaa0c2fe5bf6ebed70bc1baab140b1ac3983be450ea77b0e7c49eefd3f6525419d3ba2d99fac3410ac116b701a174f5ec9ed42e7ef4986cc1814106a4b6 WHIRLPOOL 9808cfee8662ad15fda67c4027528b6949db31dba294fe14699aa0c89939da823044dc650f220a8b460c1dee869848d2f38f585659801c7193bb3fb8637fd95d
 EBUILD navi2ch-1.8.4.ebuild 1447 SHA256 e14935e183b19ec3f3ee9ddfc15ceda76af409e71141066f5b192681610e2a96 SHA512 a0f1b0790971262b3ef1ac1d5ed6649313c82a8797f44e41083ac5233506f10d8cecf4a86bac0bdd22c7d65ff171ae0bde32e082f4525e3ed7df6ae78b95f41f WHIRLPOOL ecfcbaeff9a29da528e414a766eb52b68c9b8db34c2774d22cdbb2d168e71a9051de0ff210bf9d9774df9a1ca9e03c9e4b18f771eef1877a4c43f76c79a853d2
 MISC ChangeLog 8739 SHA256 6cc700f0121c8a2be795916f3f2b2ceed75970d7f7cfd4510157503592c01441 SHA512 533ab435a842fe5a7aa416c17360fdd20bd976919ab4bf5767863dec37a0c97cd4aa678a9fd5b485fa263f9b57fa21ea4c48afe53b35fa982ee62cc806092d62 WHIRLPOOL 0437ddbf191216eb7bd3770db9133588674d03cd521c1371eae9bfc91aede8ddcd7c98daa104afdaf57b16cd2fa0409b3f022c7077dfdb73fc62912a5e9fe6a8
-MISC metadata.xml 254 SHA256 427b686d6fe435f7a9889c16596258f88c49f4aed3bcf34db95835862edf9714 SHA512 52272448a103aa0483725693a3af91e7f785c837b93aa998f1a1ff69aa81adec986b27f44e350d90f0776e317f2b31672b7f6cd3b09094ea140d85b00cdfbd0c WHIRLPOOL ddcf326fd0a11809b7adb8c376a992ee046131352a542c51454a3a442b454c74e64c7516f84d9c74761aed3452a3c6eb5ab00f49209a6f9cb2abe89f0281583b
+MISC metadata.xml 250 SHA256 6c7bc23dd734720279431dda6a1e71b47e34be0c8419673645cb22aa6b44a79c SHA512 5b712a507f50c1e381787e12a3ae25be7aec03cb26eab6b3a1fa9c44805c22d0e7fbe552807dfb107f71bcd83656f96b09a75343cf0e241182d1a318e6509731 WHIRLPOOL e6ba11e55acf67bb8d5fd9af9e8084c80fcf73ccc46e6b5a458e365bc45e3b0a1c67aad45d953b2c462e91f0715dc5be1c32ee62fb9eed72e3004a9832145c70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsfOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiV5EQAKcbTMM4YDGaVRmd2j4MPv8P
-3tPlqGqQwT89mRD+nwzepS+hp1SDfMSy5WEVsYFxhQzJToD27jW5HBur1PQ8O/Sy
-prPcgPEZvSUGX6E8b5Iwf9Vq17Y6j/JOcxgDntlM8ptoYycZH8f5cpZoA+PPfNZ/
-OnnTOFmmapJzQTg7El67UfIftCXqGNjE6b3X3g+TEwwiPaRqm+BsjtTbX80aWRR4
-knVrvjl8yWgS7DjB34B3pNHbZt0K677ecVJrAcUmwECb/HKpe7Y9nNOXsQ5kthII
-/tTJyNJ0VPq+t8Fesz4/lQF2jwMCZAaK3+tOstUo75lUEc6nMhlRVK6mUxkIZgli
-JQDQQ63QpN7jHrpbOFtE9xwSF/RQPvyScW73G5eS5xgP40siWuFE2eTWvjzlQcwc
-aPutn8jGWPQrrN66qEyrg5q0VeLf5cj1mkKOmPW8EV8r+IfjpoJr/3GbZ9EcL83j
-KtMCbGfuHyfad61y+OsRBGoEJAcVktCSxSiLCLCZqTKLG1UjkgorjtM2d8crtf/T
-K7+kNrWowKr4m2z1aCEgX/EMbOY+FHBCqiV8NSjp7zDPaMAa2tlzTgtkRJ8Szwpb
-IfmEq4ab7BglBo57V1CEOhAi3nVfokSIhb+5S9M6y8yveAmohAXE8ctPJPBPPfOY
-gSlv5BEk2gAzqnj1KWhP
-=0Mas
+iQGcBAEBCAAGBQJVduQZAAoJEJQzkH1pP7W4JSML/3uu0nKADu4EGbggc8shGpz5
+Zf5Ux1Ej6S23xNtxIv9wKPR2QJMltR4X9X/QcbAzBmG9TtlsbNXxQ6wxE5i/bt5+
+GiFwxoc3/2E+BAHwlcpfpTM5isZb+cbMW1zOqyVOLO4NmiI1YZgIcfTTbICqG0J7
+YPaXCcP0DRegbhXuIkJnuUcsun/6cjxzkB/ntwFbSTrmYAiJL6+VPoFG6jCRlCNE
+MQ+8fSy3JLXVECC0i+C9v6jUR1P3abQklZKY9eHqPV0KidDszSRZfwh2FHK8Brbo
+RoFd2EnjXCmqa6eHIitIe0A0MKBn5BMWEifE0tNRnnqXxIVdVOULwroUL/EUFBO4
+6MQkkOtTeWtzCXGm6Vw0hkqSuRJP2jDlj2zYSTgai6ndbMEEO7ajWg2opy3NEtpD
+BL31VwpVrK4AWMV6u3SaTcLH6roXGWnjyXVFzn2PYh+eJEnQbfjmRJwbpESvifLt
+jH70FWK4F1z5VFMFkeXw/12Q6rLcSyCqjxPai9XZuA==
+=MXju
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index b0efa1756d9f..7751814d02a5 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">navi2ch</remote-id>
-	</upstream>
+<herd>cjk</herd>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">navi2ch</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 9f88636c745a..8503e3881b3e 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50php-mode-gentoo.el 286 SHA256 1672449466bc724544f7019e4e3af429c173d7263b5b7b205c409fa79a04bd25 SHA512 5f6205a7f3300d02b612a0aba58566dba1ad2a5f090c827c7d2d740af9c425cccb8384b37ac81e05eb81b4e31e649726433105b9862b92913e56752c554eec93 WHIRLPOOL 67486620f577c05d0c95af3c20450d9fa14dc32dbb1f32360501f1cccb7ad04573e09e20d52576c0983246155ede5819dcfaf9a82bbe973c146dc8135effd80e
 DIST php-mode-1.5.0.tar.gz 42687 SHA256 d8b179941141994d9cc9e77d244e91df3b4d845f4c6e1818eeefc59bc97bcead SHA512 e05cf9eeff3d17f6af29b03d08f279e4c04f79a2c018de5ddcf097adbf9e67978eeb9f0f9e67b9406c1f33c494597ab1bfa629bdab131d668de40b81d68e796f WHIRLPOOL fd5a92af5c006abc00d10803770a64452f49d803c16c3b57a77f3f87ebf984ad3db951304d6ece9fad395cd46ac4a0e7ec2d256e3dbe7c75d68b276bc178ab74
 EBUILD php-mode-1.5.0.ebuild 590 SHA256 7b12b55354fce0a7540d6cc636dd15ce355c7d509c0e3ed93ac51c9b3673aee4 SHA512 dc92d6d14730602023da0fbb42ca042eac1f1de957c21879b40f91ea8883a960c0f005bb570201bf6ef52ee605b586cb79b9ca7c7322aa4fcd8821bbfc7b7d3f WHIRLPOOL e2b1d86bda24e898276d9d1d95f486d63cbf7e1ac5cb7992fd3bea88d1d376a1f2dfa94d4899b1565ac7a37dff3206aec41f0ffb69cb1a3b77f4f34b6e529292
 MISC ChangeLog 4239 SHA256 e4d75a44a3241a7fa6beb4db40ac651c36dde2c3849396dd3ba37f0b1223976f SHA512 5375a57b458f5b1f9fb502da5ffe255ebcda369480450d4727970f2558b8db0b9a0b8406faa2529c316c81004413fefbe8c2998ad8c72efb813faa4187b7ff03 WHIRLPOOL f0a39e6268a4b9c13dcd8cb7abfd5c1fd417bb2b8d16cb08863eb28f5aac2660ad134f0ed3816ea51863f81c48142d80e327429068d5dd9a9ae343f49a7747ee
-MISC metadata.xml 237 SHA256 dfcd7a0943c0333037031aa335b50a5d012cfccf13218eed2690c83e7580d895 SHA512 672fa627928d4e3f3d11e0b13ff11777d1f2ae6cbbfc8f93789da50a0ebe50212da2cbd01d6d9d2480bc4e7dfb259c95bfc53ed81f12e12fa2c3a7b466a65673 WHIRLPOOL 87fdc987e345c7e0c41047e4ee8cd08487eb15185663d92cb1b237704b529af12a30262a0430773ac448abdd69079b700f689cb5e9aa127bd37d339e4d3fd907
+MISC metadata.xml 234 SHA256 f24d01e4b7f1b95e5cc8af6cb66f3da517c465f24641b2bf0da1c20a1bdd6338 SHA512 ebc45258129568e355cf8514826830756877917661791e333c90ed0557284825abbbbd5919290e1e7a9523f79051b328170d3e27e80099d378a864baca8afc2e WHIRLPOOL bc4b19f61b798357ee360fb2b47f08bd034c4c9b5b2f4a0c75422ff6121f17d99759087389b99b9880d39fb3c4b829f8d47185c219225b895bafeff35148522f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsflXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIXIP/AviP0E2pgXc+toMc9XVL4CE
-vJzFZwB3dxWbOHeeu79VM3GD+kv2LFagT/nnJB8v5U2LfGGQMXMw5lB4UinXb6PS
-2CXo97g7dMFcl8Jn99qMl/kE3HqelT6l7F+/r3h15/WdWCTD1nb/A/BjK1QCU3fZ
-lSWJlx5KwZbMP2N2LxccwA132jmC+sL7pBszp6R0Vk8WFerVZdpvP7K3EN+I8HTz
-Pd52HiOJ+ILhgOHlxcAbUwvep8kn3olbF2Pb7U5SF1jYTPmQV8ba+ujQti9XLtFc
-avz8hUC6jx+ri+sZkKzTmVopCb3a85MnMzzVArylNvLRr+yNUaLEmNmlmp7p75TX
-l2AKzJLStydD8WZX1afkiksvHgVUoNe4YoO+wQlAn9QVFTGV3Ln5LVjhvZ6Yd20B
-R02EhVQgesXVfrN3os7TRmRDllIeEytjmzSHX4RkoKuQ5YpdtbWRZ5mo+0KQviF7
-aN8skmJxccyw8/N/NWPnIRkqmgX/JVPgtmfuWeuR8NcfNUc1DSTZ4gWBPjaEBaUD
-2GjFT8Xqrnq6KjAiY9q1kJjjqaUb9jrdkRjbJM/EZPtiO23A/77OgACLqa8H9yV8
-pSblY07UEcMEmsPDqHYmDT2b8tPhnd38QYgTvf6Hho+XFMecnvWUB+vyaAo6UeZk
-7LEkfAiq4JN+pUkP+b6y
-=hWOP
+iQGcBAEBCAAGBQJVduQuAAoJEJQzkH1pP7W4mAIL/3VatQG2+P3XnuVTOpH1JFgx
+8Dw9NRkLMX32idPiAEsIMAilVDXf3c5KPg4Y+6Wrf1SB4BcCUceVwerT0p0m85ui
+b9v9peM0bYFTB3z8AisVT2DKOzVwnIp0F2owT55EQoKSf3xZYWj8Qb1IlCuRieUD
+Pr7KfkNzX+4z4J5PzAuYrWvSeMY5i9OgaGqP7IjPeY35ENBAMMdxBSzz0obY/P2T
+UYIP7nqUuSR2tEG5zWFeT/o1oHwH/YM0HRc98BMSHpBMXrJs0BA64jiGdWRfD9mm
+CVvVvGFMABw4ld49Y5ypc3uzEwmlD+3P6Hwh+1+BSowYFEC8z9F3Em5ejzfrKVSA
+ZZVu5YF0Pz+W/yUmSYtQ4ns1RK3+UhSyKNquP22SAZ4Pvh0RZaXZ2E6YHzAXaXj+
+1za/0tF6TqXoyJgnyH3+q9QGS0GmkKNN13Oz/A3Y7WKP5VvOn8HLhpqWOyKdBz6p
+ey71y+0fjlZUKAJ5yd32LZ9KP1x2mIpDqfpAN2J9Gg==
+=N5tt
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/php-mode/metadata.xml b/app-emacs/php-mode/metadata.xml
index 831ec7723b4e..f7f0dd4460a2 100644
--- a/app-emacs/php-mode/metadata.xml
+++ b/app-emacs/php-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">php-mode</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">php-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/pov-mode/Manifest b/app-emacs/pov-mode/Manifest
index 86d7db91487e..29cd287b5702 100644
--- a/app-emacs/pov-mode/Manifest
+++ b/app-emacs/pov-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50pov-mode-gentoo.el 423 SHA256 c3a85e9efd49f093b9f13491f080e883f62f99f5180f3739ebd2fd3facb17e6b SHA512 d2d27e6770909ebd08a8c53dbfba3896aca814637c861623746e66097f0f21686507322c734c0a48e15ee281cca0e51a82fff716276f9aec65e5a1419c8dc028 WHIRLPOOL 971b6b5136561f505df07169b09d417a201fd7e086fd4c14dd362e9fa07aaaf3d9b48279c1646b579f90f2d724815fc4395d3c99d8709e6de663b1059ea108cb
 DIST pov-mode-3.2.tar.gz 65120 SHA256 b98f6c1a1778d4d7f9ecbccdf20fa233ccf9f502306a43fd2f52bf8ef3d019e6 SHA512 da8cc0172fb47fe201457609bff36ff9c9b3b9930c23ee02eb2d302c44275e8402916f3a6424013573a190d0ebc0e652f88a6f47283ba0e5953009ececf8ce31 WHIRLPOOL f3a70ed0aa0d12cc161dc003a7b208f626b5b7f7cbc07b01e211a94e7f9e8cbdfcdf49ada05625fc3a5d8602c832a53b8c1a5a5197d1e22c391358adc4f980a3
@@ -7,23 +7,18 @@ DIST pov-mode-3.3.tar.gz 65929 SHA256 ff766da83af91d17a2ab4103ded50fa2025a6e79dd
 EBUILD pov-mode-3.2.ebuild 739 SHA256 397e401b8dc2873122a8a95e2b5cce5435c8a90b4773d356a96e4738d2853863 SHA512 954e2cf64caeda7c041090c944101bac066965b1fcb5c88aef6a96698c69074f393bb3f1fbd4386af042965ff6b9bd55b39df0ce266a1116fc90097c7e080ff1 WHIRLPOOL d1ab01aee9dda029abbd504fe85eddf13225f2c32b2d277adc61d2c8df68aeb4b8277cdf1fb2bc9cdf1325a73ecefb1ef7d3959bc4b3ec2ee0013eafe2c1a38d
 EBUILD pov-mode-3.3.ebuild 706 SHA256 52fbba2f874d994a026cb66451ea6dd671227bfbcf86f71dce459053c1141768 SHA512 3089c10129a088cffc8bff0cc4f271c3ab75a90b9ef99d74a41f7d57c39f767289d92ff18e0b2e5e5275525e5e6647e47b59c73dc1b9880c1ba909e621a0425a WHIRLPOOL d638848d5e33a486b07adfed51ef8a5107267db08c83b2f5465e2f8a9f5a0c94d37a870d5b73050405ae9639c92eb8f827bcfe29afad37afe11524b34c5e90d0
 MISC ChangeLog 716 SHA256 bf7e4ae2892896d08d4382931228c7d0b4eb8821f5c6ab345a2c03976e9967df SHA512 a925416d9aaa2dabfaa22393f77c950a4dbfb768f8ff6b0f0c12b82d8131138ec4d4d49ec88059790ddd92838549109405c1da1f007d663c9c320a9ee61a5fd0 WHIRLPOOL df5f794c35cbabb0a8042987823a6f70c49a203921c21b67ee5910f9318ab3c6ecf8a75dbbc8844c400a35827fedbbaa51368d98d4e4aa1acd75740d5d9c7ec2
-MISC metadata.xml 235 SHA256 b319b00a31bdec5a104b0f8712ce59fda578436f40ef389544160d3a90c85e7c SHA512 3594f9ce961609adb3be5b3a4067db3439f8fca30ddc0e65b8ac8f00527389e4d3bf1685c2f440b749651da75df2c96fc646de84aca2426c3b1c9eedcd06dfe2 WHIRLPOOL 09701949ab56935a7030291ef84c18c3049ef80dd854502f24d4c8222b3690d693282ab96e4d730a195498d228996952a2b94ad90868e3661b8f4acdfb853dcf
+MISC metadata.xml 232 SHA256 dce26019ca4124f4c5f7eb639b62786c72bb91be5dfde00578602ce20712b930 SHA512 97ccc0aaad7a3c7100782ce05f3fd59b3c24dae7621981e8270738b1869f49b52822bfa2a4b7fb9eeeaa8d35358d4d85f421aaff11317067fd8e9c11a3edc5a3 WHIRLPOOL 799618e15c5b51949dbe837f447d71e009341cb9d60dff8b49ec2c5e92be821fded533e1612321c58d3d02f0751f42fbce8104333e794b226603673159fe197b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsf1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiZdYQAInofvidCzSHUTYKHFwK9sYC
-wwbTg2N7btlPDQceOcBfgxqdmluyb2R1QXaorsM4rAqYRKOYFS9cE0z+EM137BRE
-DgOC8j8n5C58fg4trdVShd7Yn5q0jFlqqu4yey9NkftQ1X/9leiVs70pvW4Jp50L
-ntebIz7dPW4kuINKJwiBw/mvz41Malg7oGMnAzap3Cwxw/aPj2oXtCfu3daLsIe9
-2YiSSiBxdBxzuCiYkVpfUiv97ckNLJRoNcSg7wu6DSOgxme+1eZWOgTDvbF4K6KH
-guk49mgVfMAHZtsOaY0grFrGbnNYssL79E9mjDUQmNwG2MhzLw8H6+J02GgeZPI9
-TTHlOQ1Afhc19wk8uWXEHz3F5vjiQR2i84om0ulP/6ow1nHqnoW/aQ4hEVNHZ31M
-lpHHJQ1mg4EdkwRfKHozHlRu9JfPHJbZuTgNru34h6LmuuZj21P/kh79x6+13We3
-Exd03iri5mMjEgZc1hkKij1+4LOvLQQfvmwWccJ4V8i9U8KUsbG5y2hp3ZLwklOO
-MunqXpX9Z3F10/x/AgeIdHM1H8cl5+INseGkoPBXYrSDH0yVZxekaXljIvgphxaX
-xgbhiv7PiQxVKyp93GMjRbIsUEE6kS+tVPYnubGTPErhewHpcKWPR+kXhSSg2HoF
-kmlfa/hkkPF158zt/lCF
-=Yz4N
+iQGcBAEBCAAGBQJVduQ3AAoJEJQzkH1pP7W4x0kL/jad+WvaBiSNEYm2yl6l2XuE
+MBxot13khixfO0PxhQMXyXBTGWgxoLS6nv8Yet54Ytopef75YY7E6nfqQCZesBdZ
+uwdNp5bKkLaJ1cTpAT3wwljyDfW7sb1WAPRDIgCVY8jhbK4001DQDJ6IMTf/kqCM
+qEsNNvJv6bpU4BzW9NBC92Q8xx6UGFn4hvmq5ZcALKWItcODUknTf4R7WGcoEvbc
+R8recmyiZCfGj2041U6wu2BU847gBzRohFxkNS4N8cbNQ0sOvQlUAeF5dht4jOBc
+uRHulC1TxLQ++CTMqaMs62KqeX3mDtar4/spB3ZUS0Y0/z16Wg8mvJCz5TcEKSf7
+RYJCW1Rga8eUmSBXk+We0dznonYTD53fP/bHD0qQ/Y7p0ZyX/Z9xnM58g04jthQm
+hAD5iCI88Vk2ZyiwVnCUTnCfTFXmt03bQkHMgPoq/CdpmA+SfttcdsVPPbiGnGa/
+XS+vP6Y6RQTK8Ses68Bf50pQCcUnWW+aZUGUqq+ImQ==
+=fuGB
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
index 2dfc4378bee2..f09c9defae46 100644
--- a/app-emacs/pov-mode/metadata.xml
+++ b/app-emacs/pov-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="gitorious">pov-mode</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="gitorious">pov-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 2926357535fc..dda7e16a7481 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50pymacs-gentoo.el 183 SHA256 99ea80acd692dd6fd44049dfb5aa80bae00a3abe7b7da3a6fd23868756e64b98 SHA512 f59fed86f859b796c901088b38fb570a5e5527d774a15456105ce75598c31fd20d0afaa62ad9cbf12063810fa592dbbd7c33aaece5871b36b488e5af6de0fac2 WHIRLPOOL cf845dd35dd09690b9fe6d20cba8dcc821f0fb4df28070d10765c912c04dd7967c01193d5c087ec59da0d6d6ae105e320555aa58285770bcd1f40fbb485d57b9
 DIST Pymacs-0.23.tar.gz 92161 SHA256 eb419e307c9670ac5ad76de44c8803bd91ff0a1a8d6b6035fa4d0427a85f5163 SHA512 c07cc4fa75ca3f03a517563172c9647f1f8402bfe7cdac45aa285c838fe15ab4fd08cb2a0364d985fc4d0ad5670436c4f2c6fa81efe1424b10d2a430699308d3 WHIRLPOOL 5477b4eaf9c134f80101be9a83c2285d8105aeaa189e4f39190abb024073e942c660fe74eff2defb42f5422d64fe73cb24b8e206c53f624aec0e1a9795db4f58
@@ -7,23 +7,18 @@ DIST pymacs-0.25.tar.gz 120597 SHA256 51dc21b33316e6e244e78e5e88d8ae9a88afc0dcef
 EBUILD pymacs-0.23-r1.ebuild 1326 SHA256 6b4971c90a8f5d22c397f973252bc941eb79a1e895b6269431c3f0af3ddf389d SHA512 9d5a1087a046e92503665a27554281d3f1f4fbd73c0bf4c1dff393c56f45bcad0af0e873f4c2c6f48579434a1445ccda947b71810565270c11b9e1b0e43646ae WHIRLPOOL 2b905936f68f02e005761341c1362a5654e4a4b3df771e921c4b4fa344437fede0aae4395a58de0af06d4860256f479213328606f3240976724ba19fd83d12cd
 EBUILD pymacs-0.25-r1.ebuild 1256 SHA256 931261095a197fda8af1271ab77903aacca1d86d376ddc524efdcc2042c269c0 SHA512 ed60134f75961c2646717127cccbdac639286b964d0ad5b83fc3068b47fdf434d9c94b7e95fa2a855dc2dfa937ceacbc1dd4f4051f2192b39dcefa18374b8742 WHIRLPOOL 68afe12b4bd17e87baba1551940bbd1460af4e4c692245ca00876ec03781ab911a1a6a7e998b53567187282171099a7c0157508eb66bee0e837d7633cf1f7cdd
 MISC ChangeLog 8617 SHA256 34729b122970c456ac7d75fb299f6f247c323f7f98171368c688aab4393a71c5 SHA512 53f3d2cd84a784d645301f2dea07fe8ebe1532d4fd6271abc046036108a5db315b414e057af7c7d6685a697297dd77ecd5fed5bc11d9febe63605965a593a7c8 WHIRLPOOL 3bd63dc7ebf8cf30aa0733bf99555bd0282a8c3115bd124d6bc9e1f4ddb00999f11a37c015d2ecba88e63318bf86f0f048dade9fd659a4b63038626873407b89
-MISC metadata.xml 264 SHA256 ea9f6cb18049bc47fe49a7b8bb9faf4a45019955824eeea699355bc822cc6621 SHA512 81847f4b2df09dbe2d7b7958a92d99196159596ff43241471a818ce4b74e850bbcb94c562ab997a2087a0c82cccd2b06fa3558f55055483fffc8288a064728ea WHIRLPOOL 06c7e85c0c00cacce3fed691e88aababcb16647efa898854b468c309ffffda819ed44dffced0ebbf0d957669558ac81fa7730538e820179d41497130ea7be251
+MISC metadata.xml 254 SHA256 352416285c91e59da419c97b75708b28d983c6e48097d0577bffa136c17c9022 SHA512 8d9624ba6f0ae55b8689753d5dceb9d0a567828317e0d78211929791c1c27a2a87becbf7d24781b65e5110e68385a18ef89b489b0e8cc7e4fe37268ef3531d15 WHIRLPOOL ac4f356464589353e3adf17ce9b59f1eda8ef92142717761528f883af82575e7d70720fca857068cd877ffa7524af4c59191d93cbc656c1b339b586d88a4a887
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/hEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiX9AQAKbmeFBsuNLIRXkcw5Ny05P9
-61m9duwtaPllbzlZkR2MckgHNPuquHIBXQqNHvIu/ZpdY1vp6bJ99+y7HXnZoAvf
-FY643eGBlW6UJdECm6oF7wf5A57jwDYexLE10N1VXBdOKRi6LF0RI9PjOrmOOK3y
-6kuTwTVeOyG5D7uBrX9H7l4XwXOKl2OsRqOYUktx7Jehc86qyjjCFNWcBqCpX46a
-s9W4mh7Gtu8YUnsjfIMUTSiJEsKn83651zsngR018lxlYDmAKMVVN8P5d9tdtoQr
-GZm/m64nv3fb/l9jKOFzHFX4KyztniX4amFTEPGkVOuIyys6P6Vvfn2RfZ+ht6uN
-2FiThyYM0zcfBpAPAzndwb+u0Yh+hnqvnJcMHSf6RyufS4Vit0w4ONmC9tlVo095
-4VM0Pg85pNrSH0UI5YPo0PtvVyi1Bnhb6rzyfExJX+Tyhx4grThE2sfSMTzah4fD
-OxDSIdg8EMHrc/lguJsTgmk5zwgx6yzDRi1H2F+ucEX9ZPgZ6ZZIJfCGglOgOrel
-hrjn2GZwjDcYsMfDEsnFF/uupA+OOTMXR5p5pbBPDcWa0b5XtWpDnt7jNNQkkOj8
-ZQyWrrT6H7MbfScrOGmTnVY7Wjz41ReC5ohbJLJwrO5sKoMLL4IB7nCUwqkM4dwv
-k5xC2ODlawAG+C04Pftj
-=vn3y
+iQGcBAEBCAAGBQJVduF2AAoJEJQzkH1pP7W40wwL+QHrg30BbEL7Rpo3BGq3JyxD
+MPx2YjWXwmTX6k9KCTYN7WQl6T6mbRua1sg88a0R4X9LZZQMyCn6lDcYtGjvi4Xz
+tVeQJwrXnEjkmqs9HgDH+7jOCmJB4pIUVcBQzKQaiKxHQJVHnHe0YFcrBGOA4HIY
+8V64zQCfVtNRJTVMaoKVqtp40LQFLAoKAdnDx3JKRuOutL9R6CSnIY/BzhBlM/uS
+8DHsm6uA1USIdHAZTJZ4rP5M5NoWWakGNPTYWZhY26SWTOehisEUBkUcR/ATEBcn
+laPMqyDgC8xtbKbZ8FFwjiBAMo3A6ejhXUTal1r6J74YodEksXei596dG8MpZGN7
+I+Jmt88CkzZjACqcxkY60GdQlsLmIcnumrEYxI9oyrcTYapmLmHjsrRzzabyC++Z
+Asvs/bYvf1xerRU+VI6aSSNgVY6bmVycCc8aT7VbU91/UPVdkotriv+2Vj/+E7/2
+p7nFKcowdrmaatrXogArmB5xVtIbclnMm6/szCr0NA==
+=tHdA
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 4f7be8f8a824..3f864cf6504f 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <herd>python</herd>
-  <upstream>
-    <remote-id type="github">pinard/Pymacs</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<herd>python</herd>
+<upstream>
+  <remote-id type="github">pinard/Pymacs</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index 0650676c82ca..898df2feb2d1 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50python-mode-gentoo.el 541 SHA256 0aa900dcf319ba0500123150301a0a01c1cdd283e60b156315aa79e1df181581 SHA512 8e1c2c68409c48f3e7c2ae36128380fd5358a12470db571ffa22b1c9cb11730a2f2a84ec66f23c064e32b504c8ae002033e77640d85e11577c50e31462cd5274 WHIRLPOOL 150590a2bbb0d11b3dfd7564adb3ed976cb1949323cb2f3d90ddcc7affa0e71c3b32888b54a0d903b8e7e6a36365ee449f48095c04a12008915b62d82aecaaa8
 DIST python-mode-5.2.0.tgz 73566 SHA256 84ee977fb7c639bc96cd4e8db0145c7a182489456e4d95a71c3612258b5013ac SHA512 cc31962bd99f76d5a250418ce53a88d6b06282810389d737c383637fba867716a8845a72390c0f87213963647315af34de857e5beb674b921461bf02212b62ca WHIRLPOOL 38e2097f65737bcf0e208bd50b2e34b8d2478160344806b8fcbddebb74f7622ffda97014be551515b996235900a7973fae912930853b1fb362dbb3d763de449d
@@ -11,23 +11,18 @@ EBUILD python-mode-6.0.12.ebuild 853 SHA256 55025deaab7464c342cc8346ea90af781d9a
 EBUILD python-mode-6.1.1.ebuild 829 SHA256 a123703964321222c212336ca9b9d9de843b079fd9919f2a436ccfa0ee0d45c7 SHA512 0b77c9df014499fa056d4dcab4b2e8d5bffd73735c3a4f5eef3d050d8b0d61f9971f712a49f3f7c8b79776bdb60cfc2f94ae5e28b0ea45cf13fc8e9f672be6c7 WHIRLPOOL 4660c133494cd31af90c7b126dcb68a20de240b7f3e33742191de721daf50fb783ce2e0d22340d6d9d0726d1589211cd9aef78ed711c5cd6b8d1ae48c7a3145d
 EBUILD python-mode-6.1.2.ebuild 829 SHA256 fc8e5cadf05103d3ab1418a8e3549f6d2ec7184016fff81e271ee03149658914 SHA512 2533fb4c642608fc022ed7f31ea81ecd4a029396a3adf006bef939effd9316861ca9d98cae6c86ce15c30556351e03acda917afbbc43a0cf6a5212c8f9653822 WHIRLPOOL d2bcf2879ee7d331c346f18cfde8038f153adb2d7a72bd4f904fa4d0c37ddfb19ec7471fb8b1ed6396c45ea85df5b46b3161519037e54c80e656e55c3f082517
 MISC ChangeLog 12056 SHA256 96b9f5180a076dc36d6f9dacde8ad820e9fdd40726bd77d2c5eeb4184c18be93 SHA512 da213a029a08e73c5dcb7aff7ca75faa8fa02ec2f00942c776c6e82163462a00ee7a485116b8bacd3429e06072a5c002944924ed094a9d408b20b4c2d096a6f4 WHIRLPOOL 73f05a4f94bc83b2ff349c85589dda5860949c19a2d88f0dda99d18c2891e293da35a944f96c92b89726a9ba24e5a783320ab94812013e6042205336cbdfb333
-MISC metadata.xml 238 SHA256 e6ab0b96a65954c8632a35dba7a220e9f588e1520f10a08f35c684883a4397d2 SHA512 c9ff15b4a6e82823e2f6ec820786bdc576d9f8440a8765adbc6d03938936e11a6a57f5da62a8ee4085babfde7c5a90fbe597722402ae1deb82785f696f201423 WHIRLPOOL 039010f5cfb156c11b985693c67715f293a0d5ba998938408585a3c0bd49babcd18e84086377fe9c2473a727ae4f30d3ad0a2e0e50bdd7a71f764c1f7fbc2e2c
+MISC metadata.xml 235 SHA256 faf1424a45cda74d52a6ec59702eae9a173c0ba6d876570e602831bc8e5016ca SHA512 07be0c50298fe093e0cef62943270f6a8427e5d1c59f5bef08635a95789ae9c1df4df9929da76addbd5c2db27e726c041da0e71762f5982b8ffb0a9dcbd00a55 WHIRLPOOL 63c70a45c2bb6014d92abe4548650b06784a8958bc4e6979799f5774e923c0f97ef9ddf2357dab0d5a57dc707048fcdaaafbb6a145178b90aaded277e97213cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsgUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipjsP/3KIeMkH3w4pYuDzFKe9oAiE
-8aXn00b4okXC4QPz69FYxRemRR0/QhAVi78KWCwKEvpIaPcPO2psy8Vfx42T/l9/
-IBqGHVMXaKh4A09U45lp/0CqwIQr2OVchRKL+uIXrDOC1RkqSPchKWb14wh+iiPU
-4UP4SyTsOQ5wAh0YLPfXlejOfroPEMCuZuBUQduC75WmlZg6TpdqMz/Gc/f2CQOR
-oJmZugyKFBeBLBEAgZ5JE85Unm9IhOQAydRzGPFQTm4193597PGF48OC6rpFqci8
-s3Iz+BDjN7js7Q2Hpa4eSku1zcz1Hrp+Spdl35Whf3DHalbtDVx9Lyd6ZaRtefbF
-laOZV6iC9Z7UotUkRQidBn1vZvKi5xUzPRcFvEeQ5viKAdHaJXfXcvoYcu9cjn4z
-KOfj2UUHyrIZMoqEYoaV5bmIf17WCa/Dw9lV9mOBleO/G7nVX/mfe23Di9emEma8
-peetrPpv2LKMjmWKZSfz1WZd/u36SSvElECsIEam+tMBjjj42+D2MlKLT4X3uLML
-q8PeyibPK4PNtIgHTMBULytyxtNF1dE9cPYcTX/c2SuKBpXBJa6+VbOo3skaRASW
-MTqrilpsUKI70poX0PYvI0LDjOkSv2fQraBYM9vniJQ5wBzsMRe8yfypBENnF34c
-gRxLS1arVzGQFeRP7fpu
-=1Nkc
+iQGbBAEBCAAGBQJVduRXAAoJEJQzkH1pP7W4oB4L+IciA/ReGZwY6NZvfFJ89HJO
+WJAEniXkf29Kl2bCdCXNQsYvsSF+QeAxYMVMIjghRI8/bHa4AGBVLp4b8U0NmyNM
+y2ZjzyU9QdpTgtThs0GlBZdXDHLasWaIpBdjMDv+p8H2RF9VPKcjgwrngjlMdv/z
+dq07OPFAsj5XwumbRoKZ6AHFn/Fc/NBnp6uy98rGA0amFKRKF5yOo+vK+bbYbDg9
+XyWfm3vtwyEX9hlARnAfLZ8e3UtAxQ8KqFNLhhIyRad6Q4VUIyrHPctPGnX0JWA4
+J4G1EF7O+fei+OCsYVfkHYFP13dHYpPhl1h4S8J13Iwq7f71KiTCoJVUJ8CR+SzF
+EseRjN21lyZPAvWRTjYIrgUwtHfy20YGQ1s9+Pdg32NIqN7sZQPOGJ+SUoOIrt0m
+dFSGSxYpW1TTO8VuSMSZMWdrZ8js9QTnHm6wC7RRT09n0kppiKkKElw76llEnHm2
+EYbYpLGbOVz9DCc9KATmBUJgZzCgwMzjSDPI+Abu
+=TNZn
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/python-mode/metadata.xml b/app-emacs/python-mode/metadata.xml
index c1879f87e1cc..4c84d631ad42 100644
--- a/app-emacs/python-mode/metadata.xml
+++ b/app-emacs/python-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="launchpad">python-mode</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="launchpad">python-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/scim-bridge-el/Manifest b/app-emacs/scim-bridge-el/Manifest
index 0f41064c01ae..65508056c33e 100644
--- a/app-emacs/scim-bridge-el/Manifest
+++ b/app-emacs/scim-bridge-el/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX scim-bridge-el-0.8.2-im-agent.patch 1052 SHA256 f2d9d41f486201305e5ee9da712e8f7371b71fb817d8fdc6f5f3686a31d9a966 SHA512 bded77c74c13d0c0a3a3ba13cb5865d9ecd6abf00ed5d4a0d01e6e482a52211ca3a665a3a8ed5a098e6840b13327a80f9ebc2258023fe5d1b7c1f50693fd527b WHIRLPOOL 3d4286cb7d89371858ee55cc809dba84ca35bf7d0c61f42c71f2ee7585d55cbafa6e2f363c2054d999ce8c5774df8abad0b787999d5f27c9fd8f575694f328cf
 DIST scim-bridge-el-0.8.2.tar.gz 67369 SHA256 c70edd7a2688d67781901f87f36854a3f6f74c46b6768381da5258463f151b87 SHA512 2d173acb2d0182cd4c1fb6301cb34de0a5a08f4776e9dcec16bf2d1342bea98765c55d61cb7d666c42c2bb8c63d3083f4d4e59dbbec13a6ec72c7c48350c5c0c WHIRLPOOL 5c9d2e9034e3f395fb6fe446895e413a65d35b56139835cf8f4ff559e45bb2287339d094a7f03a2c82d07b585ef73a19875a56ed31d4393ca8328a44e41551bf
 EBUILD scim-bridge-el-0.8.2.ebuild 660 SHA256 92dcb41895a66c724b8bdff012ad27c7f92157802fa46e5df15910359bd3950a SHA512 152b93b189bc32ee75e3bc8b04a1700ead51ade04361cb7ef900e2d29d39b3de96153ccd1d24d2cccd3933927716910373b66fb9f606cbd3a40db8d94a31aff1 WHIRLPOOL 731317d61a5a5cf712c1c42587a1b54022a58e45820280b090ae92ba3cf86ea879f2bb4c983ae371bbd9cbfc0fd06e3ab5662c88898743e21c97c29cbc854798
 MISC ChangeLog 799 SHA256 0a2e64b9c383ab8c76bb4efb5a6bded6b0bd673f0bc0b7f99edf5a3125a72fa0 SHA512 05bb1b56cf531ae6de90593424d4b7e48fe26b5db9516ac636dde5528c60a7d7a7672a443297c93199ef5de120148409a1402881945755d8fe32e879a53159a6 WHIRLPOOL a3259a18b33469e637fac659ecacae73868b5808d320fafea02e653786c5d83178887a288c74fff46dffd07c0c09fb3ea7089e67485bd05af393471c8c248d75
-MISC metadata.xml 376 SHA256 7449edc0011910fe6230156e36a44cd780a94c82952b93399d79fef13105d801 SHA512 06c5d56b952c74d3f6c3c3be1f5ffeb60caf62dc34b6356346bd724452a74268892959bf8de6d58ec40c9696aa2cec11dc03ccdfc2be8ab0c2ff37718cf8a480 WHIRLPOOL b1bdabc0eefb5dad9b8b274729e28280dd9a38d21c2f6e0e64f5262a4283256e7267fe9146d42ceb1712c96afe616fed57efe9b83c0e11cc2d223fcc1e683e56
+MISC metadata.xml 372 SHA256 689b679699c99e8789eddc324a8a853a3fc5f41597041b07f6338dcabab64c58 SHA512 5acd753e9fbf142861970dfcf27630944fae6c5bf5f02a90522397f3bb87aea345d42dbb6cda396a0261a25a044ca353cc3a94165e64827dceb438d48742737f WHIRLPOOL aa442e2e7a5f3d06000a8affc264be3086d8908b1fb9f8f51c0677e202c15f706c2a91bbab50636919069fcdc0c306c41a8b26dc1bdb756fbc762a946e53c1db
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsgjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi8rQQAL2pqvPOlHDN5WEdtAwlZn4f
-Q9FdMgxqZ18qTUQvy6ayD9JD78x92So5bfMxjFJT7A/NGqVFVmHlOea4Ei+1PN/i
-IrcmMJMZeErkUqpOo4lSn86gRI5eJElx9flRkXX3GRcKXPR0yhW2JvFUi4Gc7mLX
-HjGQhns6FgYcwEgbQ1sf7+DYWWQkArvvFzIGKSOOw7MU0pTUqV/QDKeF9L0R5Nv8
-5pouo+WyfhRd4kEblFrRufl5gJqbmQQ+fDmNInLCeh9CSrtpv1iHSrZ7ADKvVUdE
-9NWT8I/Dhc1tt7d6yWiMLpJUQICCewAwNFbbypJskeArDcyFl/2CJwz1zPthJE27
-S1MNwwX08I/7QGR7RD9ZmLvaB4Uw/nnJLY3mWqjpGaezRiZG5S/fKSubaXfh1/r5
-CgZn6i1JR4ev4gUL5TPKjl3FbBwaxj3J9whAkDWyCX9CsGotlGBaY+RoXZKNT60P
-fLP3vVREmxPfr++CCk8LFMURUvbuRqGL1r7kk7fvBgjhTi1mQ9r1PynC0DfLGJtG
-OijpvmwLELl/4nXOEMTMnZ+TnM5yP8lhkoxPAO5xJ82V6OWgd7of83doisunfaQ8
-HUZNo6EfB2tTLKl4MJweAcH8W/EO4TuU30ubazxR4MpkhfO3kCRw2CPqxeUdu3/5
-DwFdkkM0nhOcPDy123eh
-=QXKB
+iQGcBAEBCAAGBQJVduSNAAoJEJQzkH1pP7W4YPUL/0FdiNjl1Sjt/o1t/x6B7x6k
+AOWpul6ekun3UZF6WHU+QAghpN6kSkW/yzNYI6NeXezrNPle3uqejCZv2HBNEOl8
+bfDXlnblDfcyjKsPJ5E0aGkMP6WPCbK3mAh1g1L+MAKb/0Gc1y2MB56vy2zkVAC7
+A5A6loDd/aGHv/aXsn6FBRluOqznu6YMn/qujb7eRXNcGU38p0FkY+PX4YMQ0wxb
+anzrMy1t/F316LXMgdom6qM7WDsImMCmMAMLSmpbiNbcV6zKQGXLVBgzMwQSreo7
+uCJhBobzoa5iJx/e+q2qdZegG5Hovn1VREa97uUBZcEBBQLEBzRgUe0V4+zCUsQ5
+4UYnXNm8ci/Rd5pcGAavQ0lRuFSuk2yIGXEYfjjCkBfls+6iSUv2Aoq1Yopis+uK
+rKg73011JlCRcN5QuuIRcA54H+gvJQO5sOPrNMfkMM477eDN0Je02sM0iODw8mTS
+Y1FfrchQDo0dGMpB28X6OgXlMqeAOUzmpQRhgkQfIA==
+=D0F6
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index 68fcd688278b..a3dc60932031 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<maintainer>
-		<email>heroxbd@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-a SCIM-Bridge client for Emacs.
+<herd>emacs</herd>
+<maintainer>
+  <email>heroxbd@gentoo.org</email>
+</maintainer>
+<longdescription>
+  A SCIM-Bridge client for Emacs.
 </longdescription>
-	<upstream>
-		<remote-id type="launchpad">scim-bridge.el</remote-id>
-	</upstream>
+<upstream>
+  <remote-id type="launchpad">scim-bridge.el</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/session/Manifest b/app-emacs/session/Manifest
index a3aeed51fe3b..a34a8f451bf0 100644
--- a/app-emacs/session/Manifest
+++ b/app-emacs/session/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50session-gentoo.el 38 SHA256 f34ea07a3270a25cce3430e4781df47d9903052c9f3a4ea24efb64b1e63bd115 SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5 WHIRLPOOL cc5e2fd5081f5fb0018e1fa461c0802c7c90891accc55c02c2935dd3d413c5f8941e918af9341040526b037be4c34dab26008dfca91c153c11fca41338f77c14
 DIST session-2.3a.tar.gz 26648 SHA256 592237b1380f3cbbdfa83629f386d5f82b15171930832bd8baf1db26342ad9e2 SHA512 eb0721c780256ca5dfcdf5071d73a89e3e7e477bbe2ddc380adaf7a7cbf870bbc0e334192f59362df93571ff91063d53df918761322e31d7c6ffa8059d4bc15a WHIRLPOOL 63e2084204dbf3680c407aa48fbad18633f190ffde64b7699cbeb6c282604dc3c26910d2f557d3f031ee287b9873d93412d3ae2bf896f65840de174b2ea23d76
 EBUILD session-2.3a.ebuild 746 SHA256 6545d6d853c6f241f419068eed7b47fb579dff2285a1643990adeb2858d29adf SHA512 e2c95f42e6cd95afc14e7aca3ef5719438ac94565b35a0a203106489e94db5a029c8bf2201ae7ba9fadf79650b833811aa794b48222ef623968f862b6d316c12 WHIRLPOOL 75de98b5d68c9dc2b74f096642deac537a3d57ecce83f1e1400e42193a9880b16315d597f158f29c696e131e554926e307d5e66ab2cecd4d33448edf46d91962
 MISC ChangeLog 2406 SHA256 bde49451b0a2557e3d3de2b74f245aba40853716ac5bbe8a8ae79fbad1a207a5 SHA512 a751930047808f8703ead5011e3c2393dadc9aa6d843bd063a95e9a4a5eed31e4c8811c808834c69a2f1532974c36b31b2bf62a4381db9041bfa7007bf39ef19 WHIRLPOOL 5da534dd89429511efd65b91ef4f3b54e379c01428b6cd3cfcbc7d2dafef11bf0c1d66fb39a6b190fc61e760eb39b2c4b120f57782b47bccfd00b80f35b528a1
-MISC metadata.xml 242 SHA256 c99d9ff352ca3731b54a1d3922cc2ee17d16d303a55542ff70a9ed4e1c55894c SHA512 ac7ddf1277147abc04db5a839980c519730635e5ebd6af4e5ab525c9514320a5c0331d0362af48c628b8cf52f103edae8a39e14cb2e52bc49827f263f3d3f12c WHIRLPOOL 161d64d3938289b1320fe890d95ac6e9b83db42dbf7e68a512142ad18e1afcca0ac9d0ed67c57e2244c68bf13b3fee1974e05c1d9411d4857f6e0b8847bd308f
+MISC metadata.xml 239 SHA256 2bd0635ff6214ff117da273d0d215a83b39f1c9cde61deaa6ba113d910194989 SHA512 b084ff70244497bba22746af776100c954aea6334f45126d6686a972eabc23887a2ef85de85c7fe13b6caeb31b77080c9712afc11fdbe8d2c3728b8e94a16360 WHIRLPOOL d7f153e47d70bf32b52ceb7b71de77b11bacc91e28eea51c98ee2586c25e72e962ba3df25d11ece8814d30e5c23c3b7168849ba947a3c81c47c244d897bb6bee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsg2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid1cQAJj/Ah5nqmgSBaxYIvq2slFh
-+ylelytwTmZ0f31rJXV5l5AlSTfDetdM3S29AdzN4agrw8c5e+RnFjsogjXLnJn2
-iLbZrL2jB2eyhDIlJLYSoHw9sfWDLorVcOEbxs0KpWUTvxoWcSPABDu9UuuQdW+b
-9dcwzseD5HCU/cmYiyXzPK3w99K6HkWsaCeUrXWgTx/q1FhLzGJr9tLKNI47v74P
-TV0/nI4yFMZTaWK2NoHgRWJYpNA9r9mlgOMpUmVmuFcMoSqUylmSolacwApZ2ifp
-NvnH+UEHYeLX9kjr/pMNDlUf1IjlMdu0ag92SQmlFEizVLTlaGCHcCpV7xTm99dY
-41ARdpJUhVi0LyOOK6ZScbr/s8167eC6Y7ODFQ91y1tIRDWkj9lfgTWPAPjzDHG3
-yiHdlP2aYDPD9GdgTWjl1ic52DCGZ8eJ9PMaSAmY1zIcFSk3YCvPNUhLRpsYBPvp
-HbSpLrgeFz+qG8G/KiT9jWDdwHIdKkqC2gq2naQW7/QAQE8qj4DTLJ9tWQJ0NCEd
-K7KpZdHU3450qenu3y9tTY6RDtxArDiR6QtiIf6JOyb0TlxFyY+X31EiSaI6f2Ou
-CgekzDUOO7tVYyXol+NH6vd44mRLQy0rRy/fdi1xfQTmtbEnQeWZGI0Ref7XbQOA
-CoKcCTXFVNSSmcjTkysD
-=1zR6
+iQGcBAEBCAAGBQJVduSjAAoJEJQzkH1pP7W4YKYL/RHjd8uJhx+WyHqrMpGLzJeK
+1zSIjPSDWun2RMP7Y4dCVc7ol0y2Vwpawv9eL06V2B07MigvGFafdX6L6zUPRU7J
+1/IaS0QQcKUpidPs9Ws7/oSYwONelvCAE7+rSD3k4E/BTEacCkE8YHLxCGZ2ebpX
+3QyYRUsw6OA2OiOkNvptpqVwn3Z3XyTI35RIxfbsbS2YTA7ATAhDAIpX2Iv4PR0y
+xdAdcTvSWgHz7kpx248DOIo+ZcCFdt0lcbjKdI6eYt5YwOsgeS6ddQIp7Cj881wF
+Vws1AmJeP183HJhdcITP2R7jM5umVkyUxtIUKBq/VElwJ2uNgRGgsFPJqHPbQAOp
+SwsIJu92VW10yGT3h9R34DmhlcFHl++0ppMM/px9Ee8rBY0sBKUL7R1YbChtYPKE
+N/8bW2J/ZYyP9qRYxT8CIxdt1fGCXHq0t3jYtX5ABQWi+20GVkK5AemldMqGhmzt
+byd6BAuAb8lUN39QIBNyFzSFV/4x7zqCyqMgVunN1g==
+=VCHB
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/session/metadata.xml b/app-emacs/session/metadata.xml
index 51db92a966f8..1839c43c667a 100644
--- a/app-emacs/session/metadata.xml
+++ b/app-emacs/session/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">emacs-session</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">emacs-session</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/slime/Manifest b/app-emacs/slime/Manifest
index 19dd21bc59c2..a7a5787164af 100644
--- a/app-emacs/slime/Manifest
+++ b/app-emacs/slime/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.0_p20110617/70slime-gentoo.el 573 SHA256 942bcba3b2ed32191f7e531ebeee15d8f35389adb7d89fe6c3e16088a59dab1a SHA512 022e0934c8dcdf208bdfed9810200c8b925059b75e87697760b7e8cc926569da607dc3b723988e1ec49d584c92cdea96afd46642090743e4e593c860a058523f WHIRLPOOL 8293dd3006ff1d63cea569f49bbf86a5c83c4fc780dbd7024070471cea8629ac25e716fc0e9dc5c9ecfc8e9f01a717b762f2aee622ac9b52c8899053c41583e6
 AUX 2.0_p20110617/gentoo-dont-call-init.patch 638 SHA256 ebe27ecb8748a26d943ac480e56a5059fc56ef18816359f8728c909c3875ffd4 SHA512 b99e0dc55e61fda9f21bca9661854b84166834b4330e5f46b10bfd2c3fb61f092046fe8553fdf2d7a7a6350adcd3827315ea681bb53a3ebfec3648b25ac72b84 WHIRLPOOL 8aac59a44df9a7bcb2f274c0262fd6a44fe2be7434e9d7e4e7c37e820f65cda30c237307d10fc992556542c4f8a1a14867846c551d8f129a352fdd6e663ec113
@@ -21,23 +21,18 @@ EBUILD slime-2.0_p20101103.ebuild 2572 SHA256 8c3276507279f6e7e9cfb72ea9f9466bcc
 EBUILD slime-2.11.ebuild 3807 SHA256 4b9ba483df21a3d2e0c140131997cd7fcdf4126fbb3fb20bf4a88aaeb9c6a252 SHA512 8bde739a0169821ea1b12f84e40994f94130c7e63f30ccd3e38491385d2e53d4c175cde6e38b756c8c7c4e7d93ebff14d8a23ec12bb2c3d285c9497fa06b2f48 WHIRLPOOL 7b1fa9c93e213b9d82b5159a6de029332f6f089f4c0e79b9b5684f2d4978c270cdd67a8889da80d7cf97ac4ee11f5ec0f6fd6046d956a02de9daf849c7aa1b03
 EBUILD slime-2.12.ebuild 3807 SHA256 21e0c5b71a7f7e813f7ea83d60e55818cd877ca2af32f569fedb731e73c2b1ec SHA512 4183305e04cd156611cb477fea0ed499557e3e0f830397e3cc8e59fe9f09a16451457076ee41516937f983c32d9358cbf152f2dce13f2f155bbd391c8857f7ff WHIRLPOOL 188b0b50d0d1e766375dfde27fec97040aaa0d01df7711988c6c3e256f427be34bdfb50aa24a4697ffa6d5fdedb83ce8a8cc90349f892c7942373d02d71e8514
 MISC ChangeLog 18052 SHA256 d5f2845d224c070fafbb70896aaf73fd73609994093d7687c08a5fee4ee0f9db SHA512 6b5ba76b6bdde9c301bc089cf7982b5009636a714386ac766126e164790ffdb53e686d381c7d4dc0b0d3146cfadd7645f566cda2f1424d45f3b61874c0e938b4 WHIRLPOOL fb030dcff0451ed821e49642a3daf18811612ec28c1c5c95dff1c81828861ec73b39d48bcce372f40c4876584f355505dab1ba4afb4514063c70c49409d92a51
-MISC metadata.xml 1440 SHA256 cfbae15687b9555c4cbd9d2e23b7761681bab7fefab0d13a47dcd67db1c01258 SHA512 6043535674f2a054922e34e9aecf57347b541166c4cc5eab6aa7edf6e41d6c4cf4058407d72a8ca674b75917890c48e9767434de65fd745d2c716ed8b062c4d1 WHIRLPOOL 608b144fb559b5a2d582bea8382e39512b49dfeb23f36c0400be6ca9634574bf8675117bf076621bfe134de88e02418d14b0bed3b6359ec8734fa22f65f0d293
+MISC metadata.xml 1458 SHA256 fa2c33aad66570de2d15bf5b5ae60365df2ef318baa3ecc71952748e506f41e0 SHA512 6aad9414274e7a8b5c395eb68dc20411dd70a26d1bafa23ffeae33f1e3e04fa8e4b566f5c5c89dcc0cf629f127d71b0aa2aa19a2f6c278bb76493d729069e4e7 WHIRLPOOL cf4b4984c188c312b7f4ceb9e3953d900b4ab52c55d7cd70f2457c47dc93973cf2b78880828396ae8a95ea1d3bb4b182b29766961dc239db6f3f385b2fafac03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/hhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitGcP/1loPXNDWeQ7UFS8OXr+SWAC
-isimnYk3Aoie3N/qHkP26H4cKT3NiaGyljjHxiWyMvZVbpJsLTPZ0S5Uf/l1LgtM
-JlaOaQ1UcF6H4MAA4xyOomNhrJRps+0e8+HQHcICSLv7gpM46Othphenppdb9vfI
-78zEZYV4rq0ojGtfzQ+/vTJgKjY2pU/6h9zhYJwsirqKPuyL+ZfPY6UkxGeoFAbz
-KhAMSfrU/o+FthaNQ1tW45MvYIXgTir2YveCqEgWb6pTkuP9JBZdSVAox7LsnOPm
-fyohqwClKGTFRABJ30ygJa4a5YfVHfM6yzNL59u+a/uu49EooMUsOmjcKRghj5Wm
-ZVHtqvggQzS0VXiVSuZ3FFNL+CVwKbkW+o26jThehQi3K+4eUGUFqrONJgJWfEcG
-w91casdZ9GoUgUsysJIMr/A/st3wJeCd9Nd81vxjjOfOH4dDO14Z922HMIWhF+o2
-bINbEx8b3+gGlx3GGgUFpR62gOv67yhbT43ea7qKhuxr4369AIUGBwncMIPtCKyK
-3o/MAMTyODJ8u2JloCZCgbSH1qIEI0Il+xroU5hXSCT/aDHv3490RZkuq6tV7e1v
-gTbv8jAtF/hdJEwxqcfFrYguclioRsntSsuMsQv6ZzVH2vagZaz3qog/6E/lMwm2
-G7Iq4uAUc4RsCk7WZF+2
-=us0V
+iQGcBAEBCAAGBQJVduHhAAoJEJQzkH1pP7W4A5AL/07PY7HjiqJdCtLhB+/mHs0Q
+sk3966t0a6+uVrXzqe7niTJJvbqA9obTBkZSUohswXelH3cbV/kyjJY3IsD8sMv1
+mbUw8rbkW8qnzyNR2nr5AINntqSpeoFEnZ/u6b0ivhBYcutROo+taSW4hsNlH/Yo
+muMND81XcCdH6xJACCVSppI3kyuuwi6VsZawdHveLPwNDiFCbex4IyZ+gWQ2R7Ue
+ozmBE1f36YXJ+KIJgtRKDckJxIrctxYCrZKi/zgnRRBvAksg/0EH4s/IAKc2YHBT
+JygFtj03D5Ro/CmSbZ7mVkKwxJ0YeokugsSDYBWjPiTFnq2xI/uGM997bCf9uGrQ
+HueX76Uz7uaiusrwdv6TfspLCp14Hnv8zQll3KuO4CyOwupKoSbaJfaMJRB/qLGu
+XJSyl6NIYG5BromCUkOD0ubeqwrUGNl1Q7nsEO5kRuh7GFan0rO2kB7FeUs3AlAn
+4mvdFQgZ4gTRwm0T7ObDDcwbYiLV6KRfI4vAAahLuw==
+=kTBm
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 0123edb1a997..907cce48a952 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <herd>common-lisp</herd>
-  <longdescription>
-SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
-fresh, new Emacs mode for Common Lisp development inspired by existing
-systems such Emacs Lisp and ILISP. Feature highlights include:
+<herd>emacs</herd>
+<herd>common-lisp</herd>
+<longdescription>
+  SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
+  fresh, new Emacs mode for Common Lisp development inspired by existing
+  systems such Emacs Lisp and ILISP. Feature highlights include:
 
-  * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
-    o Code evaluation, compilation, and macroexpansion.
-    o Online documentation (describe, apropos, hyperspec).
-    o Definition finding (aka Meta-Point aka M-.).
-    o Symbol and package name completion.
-    o Automatic macro indentation based on &amp;body.
-    o Cross-reference interface (WHO-CALLS, etc).
-    o ... and more.
+    * slime-mode: An Emacs minor-mode to enhance lisp-mode with:
+      o Code evaluation, compilation, and macroexpansion.
+      o Online documentation (describe, apropos, hyperspec).
+      o Definition finding (aka Meta-Point aka M-.).
+      o Symbol and package name completion.
+      o Automatic macro indentation based on &amp;body.
+      o Cross-reference interface (WHO-CALLS, etc).
+      o ... and more.
 
-  * SLDB: Common Lisp debugger with an Emacs-based user interface.
+    * SLDB: Common Lisp debugger with an Emacs-based user interface.
 
-  * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
-    Lisp for tighter integration with Emacs. The REPL also has builtin
-    "shortcut" commands similar those of the McCLIM Listener.
+    * REPL: The Read-Eval-Print Loop ("top-level") is written in Emacs
+      Lisp for tighter integration with Emacs. The REPL also has builtin
+      "shortcut" commands similar those of the McCLIM Listener.
 
-  * Compilation notes: SLIME is able to take compiler messages and
-    annotate them directly into source buffers.
+    * Compilation notes: SLIME is able to take compiler messages and
+      annotate them directly into source buffers.
 
-  * Inspector: Interactive object-inspector in an Emacs buffer.
+    * Inspector: Interactive object-inspector in an Emacs buffer.
 </longdescription>
-  <use>
-    <flag name="xref">Install xref.lisp cross-referencing tool</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">slime/slime</remote-id>
-  </upstream>
+<use>
+  <flag name="xref">Install xref.lisp cross-referencing tool</flag>
+</use>
+<upstream>
+  <remote-id type="github">slime/slime</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/sumibi/Manifest b/app-emacs/sumibi/Manifest
index ddab04e56e54..0a148c94b633 100644
--- a/app-emacs/sumibi/Manifest
+++ b/app-emacs/sumibi/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50sumibi-gentoo.el 55 SHA256 ba7c38497c4ac28ccf4fb7510158e877fd018e0f0edac32351636a2f509609eb SHA512 d0042f963199f820cbf231168362873f1a701f81decc0b26a5b63eda68d9cde3485d3cbe23b77e615102bb2f12bf83c41e30c059873f5245555903fd026d453f WHIRLPOOL e5d461616261ef6b1b6431b78cbc8ee7cbc92d5b5a9e3b22bba41d9608074e17eff3c816889888df6f08e6ec716799b0d7b0ee6881809696b04340187a5b932a
 DIST sumibi-0.5.2.tar.gz 26755 SHA256 345d956a537f56f36139e679e61f18c316908f92d21e31ad5042a92466066fbc SHA512 b630be8b7c73ba5e0babc2c2946ddb05019fa15b0a8aaf5b578c97de32094de174d6ced9c0168b2e802e35e2b30b4a02501a0d8c41b90a8f8bb4a85fe501cff3 WHIRLPOOL eecee77c92267178da091433158d3f991b9aaa42160589b209d4ef3a945a5eabf6434c4fccb9d8e6aa8ce8cef03fbc4f73654d183d64aa39b1716c8d88739fdd
 EBUILD sumibi-0.5.2.ebuild 817 SHA256 dfc5ee09ebff0534efd2166b7b324131c1d817d67e1bce3de8e9eec458b788cd SHA512 2998d51c3b7726110c4d8f485716f6e2d4ab48f5c67b393a585992746c018e2f9ee9c9940edd0400427a2b1bd3a2cec197dada78a8ca43bd5b89a2791647cb4f WHIRLPOOL 65b70f4dae50ba157aa425f9e9dc67abbf3b5e20c2afd73ce4bb107692f1da36414a69ba845173b5f2f2e47cf769fc5b0a755b683f82400b678605849b24c226
 MISC ChangeLog 955 SHA256 df8e12a0c5318c4a2764df83ed5a9ab5ee98eeee416f61c60e89d33aa0ec335f SHA512 a8a29fa189424b44f0a648b3391ff77f5e11b0b2e7fbb20dbb36aea9fb69a79d5892f1a7dbd5059d6f8975f387558f37eb75a64d45dc7148e75c639a60fdb96f WHIRLPOOL 82fd9bd15ba3a3cc229afe503acfee610cfdff3445042292c09d1a7cdc289a21c193930e7d8e88d5a994942894465394ea5d8f7ac8cf87d6161f5bfee0394b36
-MISC metadata.xml 256 SHA256 e8cabb73c0d1bafcb58337670b16398bed0dac67e7224ecf4571521b6e5d4305 SHA512 a9030cfbe0db09aba9700295f203c5af5e67a09170456028b0554d1eafb41fe51a5eb90b964ef3e9d08cd0c5af2e1b24738a48188cc3266284eb983f6d55d5b7 WHIRLPOOL bcad3f69db18fe7ea1cb3583dc25a84003d832c6a722c34a70ef4221f5639ef7e3a53fa5083ad1b4ebdcebf43cd32db01834c47bdf8544d55052bcf7f757c7f4
+MISC metadata.xml 252 SHA256 b1856964c6aa0edd3f58f63578a32b2217a998af96fcf0720e5ca533e45f5213 SHA512 e4d954c2a26b950df032e9c1b58fa5f97bb5673f75e48c35665df22944d937d972e6179bed30f8bf824b1896a06507c2fb75a4617a56cb0e7dc3ec0b90edaadb WHIRLPOOL 647dca92c78506ea7f1b4b7e3d79c333e1b6125c0a2e35704ad5f4abdef3ef7f74edf8e38d41479c88c0b7f4380087cc7b287a69b4692f1f39cfde881448533f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdshGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqO4QALMZADF/MwBP4JjCGZyKANrH
-bemC8OvEHdKjBhQPpViBoddeX8ifauhTAdk3Q36xPNPTsL/x00VRX0Ow+VTHgmpL
-TAB2yIu7zvftio3Vrn8nQDxPbdGp/wPKd/RjZeQwox98whTwhoWE66hXHnn1dYnZ
-Sc6qzGLU4elPHjznC/OoXu0TSN2/+SnduRfefrAME+FoErk85vYdAlQI97UKM2ZE
-SQtUDmRTGnyz5/71E6kyeuwQnnIf5WXdmGhbAeOokzuaAcMDuJcKkqlG++kF0rt2
-9cx0znJOMpCibYjZzty6kKlRYAFukl8Px0asjDRH6WrR/RMl2CgxIQY0/dDzLeOp
-J/8ykIJM/wLsGMkdd9bceQwyLkjxksx8zS8wLTGKu+OllDVvaYKEKeGJlNYk53Rt
-ze9fRibqGZ0RzwQXK6J54Hicwf5Hqc+YAOCV3P7LyVK47pDR2nv289OYTVQkC00i
-g/Q6epevBDt5HeWHcpvW3mgNdujKIMcb1ScmCoNtWuNhOrPkG0lEGOjIAzNar0/r
-oX5Mu5CR6SQzgXuzT7zdiZsNiJ7E77tmKElgGKZ7iNq1PjM2gsz4y2VzBXLZwgCd
-j5FzC4R3M83qWtD7Oa14kPuWhCS3aexc5DvLidDxDGDO5KoBBubvNxLYYhTXVCHY
-p8qNtmIz7BNhs9+GR69B
-=AZDq
+iQGcBAEBCAAGBQJVduS2AAoJEJQzkH1pP7W4yfIL/R2tlgz0b98MGWhB9kIck7pm
+uT3bg/EIYNcOF83rF16kQbRcgMTxspBcRgkIiATW/xkK776ZjLj4d41V0/ldzYHh
+lP5IkEtIC/LanNY+lr0DAztlMpci08swwCY/ERY7w0/Rl5OIbJactKMyUANko23j
+Idwmn5CjekOJNWUWvziNxHZnbqHsRYoB50aWva+Ly5Otdkv3fn6zsqWg7MX89kFO
+5n/kTxj+qBwaz07m70veMsvpS6uv0SEp6x0Kp0lOvLraBKknqiSdO1y5d+0eQNs/
+Z/VCOTCV9rU/v5oahp/G7R3/tsYaMoEZsDgh6dPJIXmOpKb5FDdUpvJp/aVK/65U
+COtcWPuTe2ZHsut5EycJfGB6/YzpSieeyrnP1icRKolx8sWXOnFjxTjuUXNMb8h7
+Q/QOY7K4buIDGUjTKyt0SgZ7i5B7616yhRYk78CVFACmKSCDwQLNEMJlo0RyKUdG
+5OkHaTbfb45/2a7BWLVbx5Wzksu13stUypmb1YRj5g==
+=AepN
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index 922857b320da..ccebeb74e563 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge-jp">sumibi</remote-id>
-	</upstream>
+<herd>cjk</herd>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge-jp">sumibi</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/template/Manifest b/app-emacs/template/Manifest
index 0f190e2fe41e..7163a0912728 100644
--- a/app-emacs/template/Manifest
+++ b/app-emacs/template/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50template-gentoo.el 968 SHA256 863761052d393649d241927d429fe231a6cba5f74dae7148b820d2061147d895 SHA512 a6c4fd122ae1daa7e0a07b259dba0581cdd7868d220c107c6979ef5f842659dc51c0573948979d9907241918686b48da4a89baff33abdcb12bfb30941a068396 WHIRLPOOL 088bcb445758437149273a61e26691358c3af140c26a97bab1c73d7983b6fe8a5076853873fa0c23061c11aa32d3ce18c0b5333d07a48b6cdd6220d452a3b863
 DIST template-3.1c.tar.gz 37903 SHA256 d71885ec8d230a5a7cc909f052b97ed7cc30423ca0e2647392424dfd10459845 SHA512 d9fee39b67ff986d7c2dccbd09af3ce208f0e1a616a406fefefe4a6399f69a3527fa5609e87d41f7ceec5bf95818a62cb8da62994b28945998f8a9074821914c WHIRLPOOL 57043085455aefc5a378fa0d48525d823345932d67c34ceee1c5106481d468c1e9fb8559d511f4184d326e71bd46b9416d92f0c080de04607f559da34c163683
 EBUILD template-3.1c-r1.ebuild 751 SHA256 2cb7b4432cf6f18c9efae9662686cf6937b0733707d1bdcedaaddaccab04bb75 SHA512 b9c628228063825b489f4f607802945007513b526b9bc04bd035af72d1b2ad7c97b849c9e337b08cd9040a08cfcff913b9f3873f643f39667b20347c60dbfc16 WHIRLPOOL 2a5044cea0a8f791d993cb1887df7466f072d1c13bed82f3cde182c9dc5b7c58865c4c1f6389d42eb24b020bd5368613476378beaba9d909e4bb5e88c9254f3c
 MISC ChangeLog 776 SHA256 b197a04a800a5f8c5852685483bbd1a320262c8cf779f74e6c27f9ab76fb0106 SHA512 cd9a2309d8ca0f195a831ce6abaef468f96220f81ae11b83a43f26717f682d3842596754b6169dbad5a1eb0726af9518c2a23b9d2e58a8737bedba90c52bf80c WHIRLPOOL 87e72eeef033a48028e9ed0ffe029c035071bdd24695326fe0041c5d12dcf35f77d95431d0053318b94f49a8470124df643d4e0dfaaf2cbe21305a36c0081e98
-MISC metadata.xml 243 SHA256 63181e9fbb62a156668f58512e9b386e45201be50f89c2299a1a1a47aa99c313 SHA512 9e2899f9ffe8bd3c26b067ef438c0bcffab40eda9d96d557e4da4c89ca6154c1af5ece7d04c3c4c409220439b3e7f4f5d056330ac2c5155c7db2dcab35000c7d WHIRLPOOL 174014f24004282fcd86b655b1a1ce0279c0c6c3c2521f94689aa11eb8a431c8de7cf453831431b28ce30a131fb1ddfd8c780f39aa4adf8cef738622533e97ab
+MISC metadata.xml 240 SHA256 65a91140418638069423a356283672f2045ee3d2a9cdab6ecdf0269878812f36 SHA512 dcbdc4b6b42c3333f36b79c702161991bbb8eee5eb54d8d4657a76a0e5ba97a93e9af518c6e3ab2f26e302ad2cb23e5244b202346f80e40998c109725065b9d6 WHIRLPOOL fc72264a45de674e2cb53fb795542d3bc728bd5b5f4f95ed844bf82894b7f14078e8a782ff3ce7834a448f1fdad6ceeb997b7673f0d3b15dd085d1ed86a8a25f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdshUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi80EP/i8X2JbB+uYTSn6+tUIsqDhH
-zgZkl+NuOVC8EuOKAJ+zO0227zPSRByrtxUF7uhlwL/U8TCI5lxm8KgyChLrOcAB
-PsnulTKI+tPKPBNMRMPRWSALn16F6ef2lkgYC+cvFQ0HnEDBBPD+6vp2/ZtDw33t
-a2GSEioxNYjYrkTeOVdlAfxtvxOI9TvUNPIEqpMtPoo1uTXBECuP7SWoL49Lbl0E
-4d5xeWYaeElgELIfasb68mM40FK4UEqO/A3AQiqt/YLbsrq64B3d55Apj87DtogT
-LPTn7I0jIQt2AJSz2/IVnWv9m58UDNKYqZpKMyJ+oeGBtXo5cVVy87b1fagOFAoJ
-K4xtET02GTwqJOOCTYjMUlizdgMPiIKjpyDRLmvgvll/fHzOLV2wATPukyKScldx
-yg8E1jFZR631t7GjUbfL1VriYYt2IKma1B9BGkLffq+T6MHN/s5Gp5EQb0KikzDV
-zhJjs6lf0zjwnAAaFPlNEhpnf+vqpWjrIpYxArX+vfpi+Yx3u6wPfq9LB2EQPFof
-cyAzRNSCSNn1ER32ADDwOQs61br5iX6BuSGFHvvJBxhEfbmKtZN0/kXQD6dvvZUH
-ew/lWNev4/3di1aPdDQNnwCpYSlMuXHDc7rtLK9kjKk/3x6yzXJjsOUatj+bbyDa
-z4KhO8fSIDsBdAQAkLwY
-=/vKE
+iQGcBAEBCAAGBQJVduTDAAoJEJQzkH1pP7W4wWEMAKqSHFmNkFEVjj1oDScZgg/S
+kTpaZGIMdfhTYnd1vWZZMLS/f2RFDW3YlxV8iHW8A71eJpnxuBoBrmGOX4RZtteP
+DxNZr5orQtSNx7pZDmeGwSE2giJOKDyCu2dgqSZii9z+EMsFEyqZU3n8hFJcpUPH
+LWaWa0wvDg6mm432RWl3e/ExxPERU29ZQCz3td2uD6f0vl0Zt09VaruekGlND+JI
+xPi255y/xmsc2kGAk/7yQbexwz+IhMknjfcLzqxgfGFAzhgnAJxAdhaG6qBZtJ2J
+02ceySOzxLgeuibgtW2t7/DgbvucyKqoh/F3wbFcVElY/DekSS48BjLvBcx/NR+Y
+beqaWPP+Jbpx1TtmJtZIY5np4jFHde/9YC+HZCOkEQyKJ7q0bHnFhAUDwLlHqKHS
+QKyGWuwhfHZfsp8Bb1NWt4hRCDDkjgtOs2JA27UbKkBpfTYsajUEKVp/2SfHE9Bq
+14pPcl5zVf8c2HsZKrc47euu/7uX6Rh9Ny65Ih94+Q==
+=/pfG
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/template/metadata.xml b/app-emacs/template/metadata.xml
index 9e59d463a31e..62541310d2d2 100644
--- a/app-emacs/template/metadata.xml
+++ b/app-emacs/template/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">emacs-template</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">emacs-template</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/tuareg-mode/Manifest b/app-emacs/tuareg-mode/Manifest
index 463dd800463f..5973b4d4bd7f 100644
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50tuareg-mode-gentoo.el 343 SHA256 254de1abcd93c5f7054e8108308b1e4232ab50309a0e3ad50c310a64a875ca07 SHA512 41cdc5aa7c083afbe044c730b898e06817fb8c5d9799d0c88be9ad15501d4135e16597623b66ae65a40160d9a04358392a98e03646ba2207e0f981f33e28750d WHIRLPOOL e43a1cbe471138e76d62c3ac2165d312b7993a95cf9ee7ed886fb178420ec6dff12306cff2f13e4b548a99189bd1c85ce675daadeed98539f672e46ceb7c627f
 DIST tuareg-2.0.7.tar.gz 57999 SHA256 7ba8016cdd2195d37ccc1c0e300323f807b8bdc6d3ce9e622ae9a36355d3a9c9 SHA512 6cf290879dd9b7993a046dbebb9944a245fa82d1e7849b46f477b7217b46026ce5195e40e4d9b990e047a03680197827334e6d54d82610da6fc2e62386357d42 WHIRLPOOL 19b6c8fb7e7b6427499aa7aec0b22e0152ca35e93c042c2f3e4a760a76ba4c89c7951df25a128414a2f7df5aee7d76aea255c0b235065c9dcae4e62ed3c05c86
@@ -7,23 +7,18 @@ DIST tuareg-2.0.8.tar.gz 57777 SHA256 13da95153d6d50ef697878c45d81302340f97a42ab
 EBUILD tuareg-mode-2.0.7.ebuild 623 SHA256 69b43f2fbcc82fa924904a360c2cdf9bdb9c53fbd3cbb2c0191919b89c31a8db SHA512 7068a1e388966c22d8bc4f74657b51ae18e71ea050b1f4fc51753bb58f67990bd5835f5987738b16c9acfa0f8925848119071b7a7a9f34d34389229f3ee0d990 WHIRLPOOL 0a402f1412994c87e7f79629ebbe13c68e991b596c014183fef2f9d02706af189337a2916801980f7b62206739e10d1296db5cffec67708955b66035db995fe3
 EBUILD tuareg-mode-2.0.8.ebuild 636 SHA256 2c425c4f87564ea0447046831a00754fcca14db4ebcf65c96c7a34931d530dc9 SHA512 4601e7d83cc1eaa8724ac4ad7bd0a93b2e1c9c8ca1eedaf26d8bc3ebc5cab5ebdc33c0c5dc1d978b240203a370ae30c6e789b0de551adb827144e3f68e8d3eaf WHIRLPOOL 4a4c83a5565a717d783a81878d957a3b021460c0f72e739eb7818b5827f3d73499366523ad9db3d3391adf98c46373570a40e0aae359ecd2f7b83f8a87a76d4d
 MISC ChangeLog 7746 SHA256 7da591248b414efe9d2726dbf9bcafc7f4b7a873123036a1d8fd937ac4a97d6b SHA512 a5b5fd95e6e5f057d747851cf3fb280b303bea4b4fee2b4ef408a2692d374490d212d03f7cc3aa1ae41282f8a9adc61051dbd6344840054259869cdfdfd9c109 WHIRLPOOL f1975f29c5f01089c7ea9604a5ef62184a2a5433e13db1c331fc9763fd9083c4a9bc8a1393a5f80ad215a6842b00c7c7efb38f50d3744b70f45eb4d487f520ef
-MISC metadata.xml 573 SHA256 6d28c587d4ada8ea0b33ca8cf2b26f49554cc2ff448a7cd39644ac3b4eec7f12 SHA512 264213bc5fed3053b31a42dc1a9d2c7ad23105b66a5fe55bfcb89da25a8d8150a0124433da063bcef6c4f96e4304f3be7442ddbba108d16c1954a9b28568fec1 WHIRLPOOL f6db57ecc6f6485d7aef595670bfd6462cbc24cfe310f88f7b79e45e778354c57b47a7bd540a02e6a3fb0cd243b8ae23f4523ad9c6eca093f5484ff6485cddc2
+MISC metadata.xml 566 SHA256 a720a69930d11df3fdbc85badc82a59b729d323ab8faacf1fe8e570cfcfa2451 SHA512 2115a9e77d3824916e92cc0b28f97bc42e286fe3d24be4d1cded0fe253921cf23e37163c51f4b3849c0f6163d0bda8b255301ca843b8c0c1f2593eb0b0be1013 WHIRLPOOL 180b1585ded6937a429c7cdc5bb08bdd46ea3a875118dfc6699e10400bf61198fdb0fbee81c69f134e663704b7442167d08c293aec47efbab291507841aa096c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVc/h1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitf4P/1TKmYabslaohQmUhDUydKt7
-NhsbbiehYWrQ2LdKhpyMVpidYEMvAA/acbsaBYKjYDOFLakCdEYJIaFsOGhaxLc5
-mzQGdjhzY8GylsqBxKb6hBpW7kiloQZY7VzywbqLw8D9qHnOp/1waj2khVRQKNwV
-I+Wb2OWEBtrSFbHqqInJUe9Sf+kHcQ1HQy807xxh/DIfU3B2bAZ4qahvSnxWJnkD
-uZW9sYITKY7zyUtR4tg1aQpBEsf/gS6dCF1qG8Sm6lRpDs2kMU+JQZxZTHQEoyAq
-FOhhiHp09VijKhDewEQ4GRLRsbTWoQVpxIihUvoeag50Oyi5YIKUR3t65mm2KW6u
-r5Kvr7cWBOWq7t8FQhtQKx9ITKkea0f+7J5St/sHkVaK00HBJmUY3U5ZxpCtKkvL
-E7HyHEVt7+O/zAIEsLGP/phcLyvih4Ll/z39eDCsNbnr5JYpVMfyPLW+xn/jG4gA
-J47eAk8hL2+WjLV7tdPEcSirEz36wrcpoihUa3Dafg2sPNstsGYQuQ2sqr0cGJzf
-SX13poID8y+qu0TMMEsmOfbXVAYvgHAPPWBpVwZ/2RlLR5oQaa5W9xQc5TexD/wz
-id007NhJMBD2+H/B2h7a2PymP2AcAtLqf5wMO2CwGFW7zeIBLtl9phoszjYzcaIU
-EePKiq+bExF0kiRcvUTZ
-=4dpW
+iQGcBAEBCAAGBQJVduJdAAoJEJQzkH1pP7W47fEL/00PsToKqFr6SHLfX1u0r+n/
+2m4GrzKteKZRc9SRcRItzmTdq1n5suNTJPUrzZ28oyktJUWQE0uKidGF/cxtl2hS
+0IHp9fZtM4EOiU+fasm1DJDQ9AXG9VA98aEj683nkyF6ZcKHkDMDQgdN6Tpwfkc5
+Qy/I5DloUknNfIk4LCEATbTIQoDNKn6GWiZUX0dNBIGeHzYeDdJign5hJivnUGXD
+n+8e1B135yp0Av+gNQdm0NpAdHtLLBqDZOnr5f4/jXGMrnbQ/O4BTVW/qsdp5FRp
+XP/Q0DXaaxXgohyt+wgAoSm4/u2xCruyRtiCetnoo2Ko6qhxiAKNwiVY0eVQ0i79
+ulYsHxegt88XKXCeumgDhN31P2+6aeltxP/ue3jYhxldqtxKWPxXG4gtrTIw5ied
+EP3LgerDQhJyPZh7ojzdQam1aQLbAGlXdVaUJkXeHol5L1MWgFv3OG8pkORfxCYG
+JjpRm//uMOThtdevsc0z6zRNx6TvIm+n3UrEF4Q9qA==
+=2Xag
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index d377beea954f..0899764535c6 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ml</herd>
-  <herd>emacs</herd>
-  <longdescription>
-Tuareg is an Object Caml/Camllight mode for Emacs.  It handles automatic
-indentation and syntax highlighting of code.  It also supports an interactive
-Caml top-level and debugger.  Tuareg attempts to do a better job than the
-Emacs mode distributed with the OCaml 3.x source.
+<herd>ml</herd>
+<herd>emacs</herd>
+<longdescription>
+  Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
+  indentation and syntax highlighting of code. It also supports an interactive
+  Caml top-level and debugger. Tuareg attempts to do a better job than the
+  Emacs mode distributed with the OCaml 3.x source.
 </longdescription>
-  <upstream>
-    <remote-id type="github">ocaml/tuareg</remote-id>
-  </upstream>
+<upstream>
+  <remote-id type="github">ocaml/tuareg</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/twittering-mode/Manifest b/app-emacs/twittering-mode/Manifest
index 29e345094144..4aeaa951d9c7 100644
--- a/app-emacs/twittering-mode/Manifest
+++ b/app-emacs/twittering-mode/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST twittering-mode-2.0.0.tar.gz 615223 SHA256 164f6c46eae1e8ac65c60bdd40fb315df0044a5819ef25ce5ebc639b2b4ac1cd SHA512 318768c54c99c03c7641bfeb8396fdcaf65752121da6a64e6af9c071b6c429f73e44d1698df600915c4c7042233ef96cf86c037eece21b00d8e52a01ae569601 WHIRLPOOL 4b686e543a3b9ba0bc176141f6f6908a02cbd4c81984c5518092d489613595697d6bed1c7abc29675fcaa50b8fb961c413da5f69ee4640072b8755a8d81b5817
 DIST twittering-mode-3.0.0.tar.gz 1363235 SHA256 4848c4df0aad547d77412d04ad5f2c5c690a853cc39605a0a220fdfe828e350a SHA512 c696a8f31abcf6944c127575719d3e9b24a2bfb6271e0193e2a6faa8137c6468c7686b88d1e4ec0c3cc3b833e26853b435726d1acb422e9f37d3c0334e278494 WHIRLPOOL f926861a842bd1325f103ae2f0178b543e6a3c8cc366fbbbaf71005d200927c9d9286edd302517897099020e30708f835e97483723fb20023714f168e606b7c8
@@ -7,23 +7,18 @@ EBUILD twittering-mode-2.0.0.ebuild 971 SHA256 2993b504c0251f7f1d2806c8150aee3d7
 EBUILD twittering-mode-3.0.0.ebuild 971 SHA256 fb881b029b95605e5376b554d21272b53e4a51da72cbc4800e26c3d2ca9e2863 SHA512 09c55ce11f724a7e7f077c20ca6144fd548f7d48ac454556a514f06072bb4aae6dc6fcaaeb4a49b2fb5ab7d0ddbc6bf0735cb2794abf6f59b972b88a76d677f0 WHIRLPOOL d862f1f01bb67dd08c14af2a67d55f8c6c579266c7bb64d15b655e029ebebc0826dde7718d714e050192051bf7c1bb65cf70198ef4a9f13fd87714231521df23
 EBUILD twittering-mode-9999.ebuild 970 SHA256 c934f59e71ec2727340c79112c255b143dca447ffc892700cd4b95afb6e050db SHA512 6d405015f63e06ab739a17f38dc0b8fea07f6e8df94518a7de45ecf81b884987b5d5dccb5980eb26e5f0cfeffa9a5fbab1ce23ee14e71284149ea0945dae7b15 WHIRLPOOL 82fc74ae439169f4a973e03c3dc58337e07e3bfbd0b6250a791cb85984f122de1a2c51e780c8db00f6e5f1c99f0bcb209650a3ba80df50f924f381979d91a727
 MISC ChangeLog 1291 SHA256 522791281971e22c94a15bc511203203c2ba9b3a2e5929ed35fa5a11cb3083ff SHA512 a5ff9ac04ab34757d1574a352834e74f0acb18462addb06465d0b23b47bcfb8064c5de01b90bcd2a9622c002d2798c1a2b0e7e486f5d7c06d796b34c080f3f76 WHIRLPOOL 84a9f5862bd0b8c1119bf9084983d8359141e289e86eb063722f323e92b18d651eab3555fb49a09fb7e04e815577ba8427cd23a9372f33f620bc3b310f31e83e
-MISC metadata.xml 307 SHA256 ce6bf561feb360b98198a22f13ddadd910a6f05b1295e83e6c679931e195167f SHA512 3aaa75a1549765d92b94bb5b7d75a0f02655091333c23256205caa236058973caff33bc1c8d1fcc778c53fa1bd160a5b8fe17ba62ee8a0afccd90d889168871c WHIRLPOOL ea3fbab0e3fd0eb3d313ca6467d91767b0a767aa1c4470dc9005e9def1318a13d41a86ed7f5050bda9bde710f7a1f795496ad977afc26d7ba558b0bef26dc1e3
+MISC metadata.xml 293 SHA256 ad9245c788f5094c83ff814c8f9567a18e8024976a721ca9f89766693c9e2d79 SHA512 9e465e55473caa372640cf7226e30119b1e62fa9d31191075253d175fe49956e5bcfb2007916e85f96a0e4f06f5d1ddc1543cb604f2f299633ea52fe4b6a4d34 WHIRLPOOL cc8eb2da2a14b06da6c8ec0e44229a31f59ff836de58904ca16de473749c2e230f10dd583f027eacae5049d7acb69a9239ce4c3db571876e97b0543b01f29aa1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdshjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiII8P/3PX8Cg7lH35EPp2YHyCvNjQ
-XWJ5V163AWywkSJkVC83mYmP5mPaSbj0/OjDYkiXtUNFZpnMwretaDLDRNYtmoVq
-gl89Qi0bESFMTJAsMme/lAcAhZrTw/RL3Bkch5IMdoTvl//jSJGmEnZlwwIjIDrj
-GBrx48ssUePF6Kk1CvQR2oM+PB8OCd1wA0K3sF9OSrnCCfrOkjHNjWWW0QkW0eUG
-6cJJPriB8JcfD7BZiGajwb7zoZzxLiHVOjWQ/0cmO0VQOe3N46E0cNzQu+sy13Zp
-+ao5MxTPFa3DW7zZ4mcBTk+GIOaj8rRoU9TBKcdms3EvNsboweBuhqABfoBpGV+3
-fbOU7vxt7bS4rMkzWgynPiWSqPT3lenOPsXJozJ+5CADEvpdiGCiC4UZSHCgZvyK
-pvN9/CQTFcSzrkXAaM2I6QeRuPkTRS2c3AVnUnXzy5VPplvq4/wpJQu/iGInMSKn
-AagFAshHfttdH26TgawV6Yw6EGYqCXxZj3wmj0N1x9W1fpXZ220ZZlKzzmJpUThv
-q96ArovCmLpxp/P0zcSi3CBLbEq9d7SzgaqtD5XHyvIOUD2PY5U/eEU6MLguJdzL
-3EaTp4WeZl2wjQR6s3yhXZlFRjm5i1QO6RONX8RvXUfq4fJ9bkU/xzBJ/mHvj2Ab
-BFgBvdplorxGW8qEGsxT
-=5S35
+iQGcBAEBCAAGBQJVduKEAAoJEJQzkH1pP7W4GKEMAIQAvK4wTFrWzt/Gg3PqfY68
+hnqn0yGS9HDNozJ98kiR4ZA7/b1EfBrRAroQ0yHOUoPSGIANt7hNP3JzvLN06Xj8
+b4iMkBBYdb2m0ns4x7iYedd9i9c58ZPCMgikfMe6aeJQ5ZO2070UsBX9Wxhq683b
+EkgrXxyD8dU6Ezax8NYTKsmX2MUGBmSMy6kkXoznwePhPrCkMGR6hgrZsQQUeFR6
+tGj7FpLCPBs1E+QO8lW5wH0obITbx9fH4Hnuknz69vEsRsqp3tqyXusXv51sB8QD
+btE1/983f098MxNLVWKrYu12ygR2CpeHSnmfGG2NQcm1Br4H5XOpTYo0LFJ0zWbG
+P0msDTHG1/JgJe+i2AT9DG/l2JL9qeDqsqr97Yf9OYxJtcqe3UPwYa+sOCFk366l
+OpxfNLTPCMuxnp0V+ER3q7YnZ7Hd4OWJmGKST5um+btAYi2OpwF8It/Kbdd1FsyG
+dd0KwoKM6W+Sj8b/LHElb9WVhDu9pSK/UQtkzvT3NA==
+=/nSK
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/twittering-mode/metadata.xml b/app-emacs/twittering-mode/metadata.xml
index 986b2388c997..3da2601fe3c2 100644
--- a/app-emacs/twittering-mode/metadata.xml
+++ b/app-emacs/twittering-mode/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <maintainer>
-    <email>naota@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">twmode</remote-id>
-  </upstream>
+<herd>emacs</herd>
+<maintainer>
+  <email>naota@gentoo.org</email>
+</maintainer>
+<upstream>
+  <remote-id type="sourceforge">twmode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/vm/Manifest b/app-emacs/vm/Manifest
index 15da1c65ac58..1caf2e48f8c1 100644
--- a/app-emacs/vm/Manifest
+++ b/app-emacs/vm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50vm-gentoo-8.0.el 147 SHA256 b79981760d6c58e03cd1b57d8e413f2c1b2ebc2d083da03cbe6eac287e89bcad SHA512 9573b5ff6b747c8ac8a8d41c52391c320fe93d9e3a2aa8c22bfe5b4ea2e703fdd1cf18c59ec22aebc8fbedbc324561945bdd3407ebde432edb0015af7ad2c4e1 WHIRLPOOL 77d0c10883d135794a1254d6c759743ac25f9d543c18b63fdf71e152c31459efc026bd004860ce9a6fa02e5bab70168f2625ab7012cb43ce0faaa48c891604fe
 AUX 50vm-gentoo.el 62 SHA256 ac5d651e855d765a458cbc33a78ca9c86bd3604e0d972a0cfbce1dbcb6dc72b1 SHA512 e58660519b0f7e6d4f608ef09d0861293133ce25e7799e163a1afdf62193f73f0c29a081b4eb26d808a54168ab6f5f6083a107dec7228bf054357bbf16bc90c7 WHIRLPOOL 0378c36ad9d8ad9de344608ce13b5a5ac47e0af87c1f41d8db68b5adb163d9519d74f41ddb68959a529a57bc4cec3270aa7330efa22e41e01d9815ed068fc42d
@@ -11,23 +11,18 @@ DIST vm-8.2.0b.tgz 839789 SHA256 6945821a521844a429ae3d0e25db69755185fa848343fdc
 EBUILD vm-8.1.2.ebuild 1168 SHA256 924e81a6a3d4c9bfea679d6b68342fbce4cb634f057cea27be68e0f72616a257 SHA512 af41a377ec60c22f2681645281801b0e367fc2c3ecbda0de058d1d3c3809b36b7cf21d0d0f8eef21818870fe03de1c181d69befb088d9ce096f5bf5b0f814050 WHIRLPOOL 7a55e7bf73b1efc16944160f063dfa56d4a65fb12d9429580a2e83611607b921168506cb3a69186f1aceeae7cef805c41464014e4d554185d8a0d49f2015c1ca
 EBUILD vm-8.2.0_beta.ebuild 1629 SHA256 876e9b9e8a35eebe1a0ec6622cf2738b214899f9be99f2aeb019d6c97c03c182 SHA512 a39315a3c7a865d6eb992e975154aa05c6234d8983a849e9e14dce3832d863e8c2dfe23a1ad9a1aea1eee813d63b49d391c3f6728ac46a97ca175e610c6292c0 WHIRLPOOL 3e7332fd2a27556d509ac0296d1cfe52a1cda64f7b36d6a72648cde043c25d6fe1ebb96126c09679890a98868f53f375c87ee102a6650a6248dc3c3eaac1a001
 MISC ChangeLog 14557 SHA256 96e39360f0a50c8ca2727e1070b6281d2b775b3ea9f31bf3ae4c2f6dc3ce9d0e SHA512 a4fef4b0835df3b139d4686d9940ce5ab087c679f3172475a68fe75d6884b86c60a69bdf4069c485954af4a4edfbff5bab73a55e496724873a96ea55f6b2378c WHIRLPOOL d37cfbfde356977d9c7772ca6b046ad976aa62432360ffcb324d179035009fd8831000bcddf7ccbd24af0aa3a8e3fdab8354819beee7e93781d64d6f4aab323b
-MISC metadata.xml 700 SHA256 57aa0ec7a0d8b0b1cad64bac62159b210c84fa53726018157217d8f0388a0af1 SHA512 95a6c1d7e4d929d5691e0948e9d73ce62075c072fbb266c2f7c5577172d327e3780f4ad9fb522e917db6efb5c2bd8fd0f1cf1ae90d3217026065c581ce8386e7 WHIRLPOOL 3e03f7581dfc9c0ad7decfbbc6ac764bb0ae911828024e0c23fe8accce92e9b3ae924259e85142dd7e9f5b97f076b0d4fbfb9b7ab279dee001596835226584ba
+MISC metadata.xml 684 SHA256 6aa87f57e7382c99477c6d86398f70be6be244f87427b50f074107dff48c6e63 SHA512 e1b1e87de8cbfe17d8cef42c4968dd8cb13899af065055607de456e9e217a8e388e3ec4b614401781a3d850977210f00aba73c6433f19235153933992e33fecf WHIRLPOOL a9068ed9c9ed0a6463502f00617e40299ea92bf9c664267d97a6e0f0cf56c6561bd3bf62106416a909ede6c6e69e7f3073a20fe5bbd88ea392e040db7b08ea1a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsh2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi820QAIxZn49N+q2kj3tZUZgUQRYp
-HI3eTinLXMy3XdUxjvCrHCQioU2Km+Oo9G0hJyfMBRV/Ibtn59w/vyh0dK5EdkwG
-1Zwg72Mcu3iihlxyIrLRCJAYlCoVUdmCqFsPcebn3Co6cy9EqNBo26B4vZ7csJDi
-UeVhrESIToeb+Xj7BXGt0uuk/DrK+7dC0xQQBII5L47CebXtMXM/9xGXbLT2PhPe
-FrizCRw2Wm/FZSmRf0WTMOgzdV2y85Pbac2ENBemyotMAgeYWkd5WM+7rlVnKAP/
-yJdPU4kgkFsOQ9AfVPCWmgzfkPc+avdryZ/aOOJzO3j8YMehv2yizJ9X3Aal+DzE
-7ZgkXemo5wRjp/FQt5BkoCSl/MTh6YkzKGYzdZpmW6BWO47H8iH9wHHzaEdvGRT+
-Sa5susvKvX6t0BmB9U/nFYsaAnkCNwNKmH/gNWKaFB6xFjkmI6zrmHYqAHwuR0rZ
-oFD41OwJ+joQOSnMV/fWnfOcCWYGh1AY0RqGxfb8gyXqaGpzKdDGtcCDs0Qrmcjs
-tZ4GMXsfrl6MOnZR2Z+n9NnahOpVTLAZrQxI2Ur/Q0udg8lyT+S+NCeZveJY8zwf
-JYBVcV4ALkNB1LYGOFLR4TM9Rc+uJ13P/4MyD6hy9dahGciqMdRUna5uKtf7a9xY
-pvCLH/ZyZON45PpljVWx
-=n7rM
+iQGcBAEBCAAGBQJVduKnAAoJEJQzkH1pP7W4PnUL/1b3TwUVvT+mBVyzqAAdrHni
+onstIXZeSrEnm13dLe0rbk9Z7VYoEMi2fmr4ryU8wBE/8sodhoA8hflgdDmCYxZf
+Cigbi9L6uC4t3C7qt2LZiVUB5PzFA85gfw4fUD2BHnZugbayA1WLKNW6NfmTlPf1
+nDUI79dSso7vdXOVCwQyytrk4Blu1OGRxAjaF+DwlWTG++tNV2HerYP8U3JR6Thm
+BqbOPJ7oxUBVsr/baTA6po/ZZ3Rn+oeNy1iqbNH2naCZMB92A6qG5bj4u7+0iqCT
++c7viZIXfKKVzIuRrRrzScOrhebl0U0Lqvr8+li3YDyP6NKFeFQFRSVTQ37bilgP
+xJdcvJ0kEt9g3cGWV57a1URHL+21TUHMq4zrnVsPEW4rBOkvUbqvkyfinmb4xtJF
+hxvwIKYgyuVrW9Q95xgxKWzQ5MCarW96a7xjR8ss6g6n7Y83DG1jgSwBRqwaHgB+
+QJG28a3FB7X2PfMB7rW7smhyMesRl3uPNDbM++rR/A==
+=jJuS
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/vm/metadata.xml b/app-emacs/vm/metadata.xml
index 4b762a00dca5..b0fb5c476928 100644
--- a/app-emacs/vm/metadata.xml
+++ b/app-emacs/vm/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>emacs</herd>
-  <longdescription>
+<herd>emacs</herd>
+<longdescription>
   VM is a mail reader that runs inside GNU Emacs and XEmacs. It was written as
   an alternative to the Emacs RMAIL mail reader. VM is highly configurable and
   easy to use. It supports POP and IMAP for mail retrieval, understands MIME,
   and reads both the standard UNIX mailbox format and the BABYL format used by
   the RMAIL mailer.
 </longdescription>
-  <use>
-    <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">vm</remote-id>
-  </upstream>
+<use>
+  <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="launchpad">vm</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/xrdb-mode/Manifest b/app-emacs/xrdb-mode/Manifest
index 3187a627a39f..618827956c13 100644
--- a/app-emacs/xrdb-mode/Manifest
+++ b/app-emacs/xrdb-mode/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50xrdb-mode-gentoo.el 223 SHA256 a2bce51247343dbeec9956d93a50095263890be39681ee45d5707484c134f390 SHA512 324609b05517c26d58759bf3c4445b690bb8c8ab00361f3157b06964458f9ca777d8963ac9c5e49df6c75d4d8eb27ea7754639bbbb8d1550b96fdbc954b3ed5b WHIRLPOOL 1a6bb1b1013a2900b3c00de304b94729c31f6db143b1214fcd91c0d818d14ca7e776bc23a5500fb10f636d7eed93428313ce69c8ead976138dd41be520fd0b30
 DIST xrdb-mode-3.0.el.xz 5448 SHA256 3fb184b9f186fb762f38751955ebdce63b66bdc9e549cb1901e05c1938f7e4b7 SHA512 1ad0f92edf08cca604b9534a5a715f79d019f73f8ad80bf8297fa3b4a201f8dbd864c23bed86579b7c48ddd9180add7b39e22469f6c23dceef4be9fdfd1ae290 WHIRLPOOL 59c6cd342e7a4517043f2fff4fa577c823edc8064e9909cec6b622899a58cd30b979d033b39025506bed5140a2c32e8824d6dfc90be2b88d67b47f94c37b96ab
 EBUILD xrdb-mode-3.0.ebuild 615 SHA256 d25ebe0bc51591cad509dab2ce975313f8719b755267dd62c96349056c59cf90 SHA512 e383627715450a0f20a8847535522b943c3a622ced3bf818851276f144755e7445ac29fb113a73d391cdf70af47238d297c523bc3f183968cdbd7846d9d84819 WHIRLPOOL a5713be17e55766fd96be406db8bbd8bd1e36fdaed036fa12df68ed20dd1016e7fc3e2989032ec99024021b34dd6b99966f4549bdcadb553d49c5bced42ff897
 MISC ChangeLog 1734 SHA256 1d1f658fc2e0f0bfa3fcc91a1085a1fa70bebd35ced1237d622d6bd6fd744d55 SHA512 682ce698438499b54a066b5e2ee871b2711d769191dd17370b9f65664ea76eb6df873dcb191d3f9103bdcacbac7ef1deb11b86f1ee8e714e5dab41b706541b3b WHIRLPOOL 4220828dba132f78146347e91b176aff68d5a6c018b85ed4c906ba005bace84f40f801dfd0e5c8c72a4a49e7dd6b2b747efdb8bf80373de719768428eef05a13
-MISC metadata.xml 236 SHA256 ffd934688df58400706eed81488b5cd796d1776d94940671371d223ab9457d6a SHA512 5ad7674332815e8b7c8af84847ac93721adb411255d33d55452978c7f45ef6db49f4612e2c66144adbaa46c195741f964d78ad7e28fbb0b53a4b0b7b2ec7dd98 WHIRLPOOL 6820fca49ebc4af8451e8bc2e7fdcc535ed900ae5471d988934fb9a23369848b9497634752645a1421d42ddd16761d750f4409f9b3d30693e340c941103257c5
+MISC metadata.xml 233 SHA256 d9060c744bbfbe232ae3eee41d39267bc9490af83382a69b505e15889b614435 SHA512 d1aa29428c0f212a793d67ed1266ff2e4f68a1eade9bc79140808fc0e2d3e8a002b273d0fc4793223a757f9370662940346b9eec75fc678575e7d2d99e3a1407 WHIRLPOOL 2644c8f841d316b851d7b21a188e59c5ae6f7d2cbba2e4a108621f19425d02821b031060c9449fe03b846c85b1a4fe4e2c42da6ec8a7bede6a4ff771c2b03c89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsiIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiKqUQAJ9qUa3IS5qAN7Zl+AyCp3Fq
-UMXXYHvaJrtSlxIaVFN4M4BhYn+t+/6JnzmC2lUC7vXZQymOQ7k1T+mq2OIzzr8A
-j2iLcGgKAYBN/AutUsT47gSTPXL/tqoOWF9TKRy+HvVl776G809D3QVW25jzcd/2
-24OQnql9BJOIDGH7jDOfNSPrb58UzelPko6E621CggJhNlMSV6EAE1J6Ox9Q8W+f
-FF24bgAilygKhfaAMyOUSZw6d+4gfN5V5fVnL2Roxv5y/F0iezJX1Ww3i33IBC1g
-HWwSPPwo/IJ+R8YMFLxbhUiF6yZds1gjK3Z7wm4bTQ3xeSGJ1jUQB7vbCdbv9qUX
-W9Qp4T8RLGgOy5Dapld44Q2z/UPrBdOdLJYUI1j0+2YjnNxPsmyhn88mN0HU3Roh
-zxAMfOGQCbA9fsr1YgxY5zsECU3BKOcpyCvKOZM00avKLZeHhi8bXsKTuT1kG1js
-TSecSMwy6by0k41YjTjIctMkcsLz69w2L4SYhI8w0zqd9bU70dkKsFrkfN6qP6S8
-exY2Fl9yz3Y/xAqglUZkRUNSlbIckBMYVMmjqf/mwhl2NxtPAa8IaTFGRTOMxlfy
-86Ej5USA2jHJO9s07cwY+nuC9GIdzwtA3NnIoG9ht0YbYBKxlfzafd7wed5DuoDl
-rfor1Ju7D0UD3yK6Z7fV
-=Ovc1
+iQGcBAEBCAAGBQJVduTZAAoJEJQzkH1pP7W4C/sL/29fqQsHQ6F4fxmf5aaOFgds
+urQqsV/BFOY8gNeq0LSuM9RZYJHVTcoeQQIVSG+2OiXJoJXQjcchOLMcS4ht5GER
+B8iDVYNjiTDRYkLRreGsrqK/4aFsWVdw6uCVPyo9DtjcMDaWrRLY9iTpxyyinD3i
+cQTM1nSVl0WaWK6nGmOfpC6QG87E62J3+52SmhTCnpt4J5oKatSqp5tPrlJQ6fUN
+kF+j5u61MPq3pIsTlieVxBm+gaDq2NNlPU3ZGJ1nt/5Bpng+WBo2HL740xnBcXh0
+SuSKaWbrf1gmiCsX9tELAxTiV/0JqgXWIOsxhtWiKKwTRHQ2PpMiSD0ftaDIN7eW
+XGvlbLleJOqSoy6yb5llNITGie4/Bk2bqpyPR73fjZYozk6sLZlrNX+FmtO23Ay5
+5PWXY0UWXKri1qEdu+A5HXg+lX2QCC9J4Xw5dvJrOZ1AZx9x6MubiyqGKPf7bIC1
+A6g6HhQatxKd2+pJq2j/RacYMam2eiJs/7Gc1OPCbw==
+=A8yu
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/xrdb-mode/metadata.xml b/app-emacs/xrdb-mode/metadata.xml
index 448785b3db49..fb51ee8b64e7 100644
--- a/app-emacs/xrdb-mode/metadata.xml
+++ b/app-emacs/xrdb-mode/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="launchpad">xrdb-mode</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="launchpad">xrdb-mode</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-emacs/xslide/Manifest b/app-emacs/xslide/Manifest
index 1786a961ca84..7f1700e3af67 100644
--- a/app-emacs/xslide/Manifest
+++ b/app-emacs/xslide/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 50xslide-gentoo.el 264 SHA256 35440d5728dda67a9b7a7bbb3aa1eb6c46f2c7913ef5e96ef85dfcad1af8f247 SHA512 54dfb6e7d40591dcf7ee5625ded053056305eb72c64f3808758d20b9c9fdbc78f914765909c44ff9685b075f5d87e03a94afea156b179d6ae16275d1f9ad05e8 WHIRLPOOL 1ed25c9b9c8c05bdfb5de9fab0e8ca66c0e37ef13ce0061cf93979f02ea551de65157dc30b78a5946a83aec487aaf43ee4069d0ed6295755495ff0c10cc8e99c
 DIST xslide-0.2.2.zip 29051 SHA256 dde9884f1584bcb63a8e218542c1a2d619327f4e94847974b6ece31b36c63c42 SHA512 df658464517704289d2695faed02d733adea9f5858310b497d66bf103be5c3e1c3635aa1aa3c93f63c64cd2927b4948e53e7b2593622564f5292c583d6e245a8 WHIRLPOOL 419a49258c9ddf49f5b8870378867f9f1b591efdca685e12881f8c2edb4ddeb4a64817c206fc87df2ffbf7089d08b9a7b3291c8f60c1ad34749de063832ba952
 EBUILD xslide-0.2.2.ebuild 629 SHA256 ffecffe97f0a081407882cfc140a6d044c64eba28e058d157eb43f265f9c1cb1 SHA512 08e7cfe7d68fb1ebec652c77ba1a1b0e820d1ad80c103415bffdafb9b6f931d802c58d5958ba1eca5dc5a503312183325cc877d97d36a64bd6de26060862cb80 WHIRLPOOL 904817bb4fc42a12a3d480511c3930bc4fcae785a1188ae427de8479385fe01410cf6259fa6ca20fff213469b4fda2971a520511100956b2b1f08ce3a352dfb2
 MISC ChangeLog 2303 SHA256 2957f1946cacc05319ac94c3e0ecd7fa2de62f35dafdb3642f78629a4bf09ef2 SHA512 e23bef2bef40369c39b4addb7305a71a77768e436118a990f82683f96a147aabde86162dba5b1e2a594537855e48cfd095548cf3e306a005881043c06c30edd8 WHIRLPOOL d7b010ec709c0e9bf8b064aa07b48c7283fec4e6e3a87d38e23289d1539f074f982ae2983316182f6bd497c85821af432e6578c0f9b1598918a9a05badc30082
-MISC metadata.xml 235 SHA256 3d883775314c2f0d5356adf002a9f175ad080868cf715e56e7af508ce9eeddb6 SHA512 f7d17aae446247d0ea782571f9e69ecc5008f0d38d8a3d8ec01d2d9fc15ec8417c537e99c3e856bbb71709f691c38130d5fae49555e488c739e36dbc7ea07c97 WHIRLPOOL e4d09f6b07333271261786791d65fea42ae6c16be4120cf6d4ef128f3704d02c43fc32d8ae2f1c5a52500ca99d247a370a7328b9ba248160196e0f36077408d5
+MISC metadata.xml 232 SHA256 1b29b14e0860d2555bdc2382a5d24ab78fbac73e57fa15bc54fd74e3a9bb37b8 SHA512 7922351dfc2e2751fe9dfee5bfcf63fe5304da824501c656b26a6497a3129be2f155536006377581f2d3e7de9a72762faec9e101e904f9d1886b59d365e608c1 WHIRLPOOL 91958ddd3a6d8bc307115f6a4b47d468d0331c8b4ede60577477c4e236b658e9d8bec940fda187125564a043dc765308d533aad113ca62089967d23861502c1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdsicXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi65UP/jBQkwje3ThSUqRz3cGSc3mo
-DXWJfOXp89LzBzmLyMcOy1sdbuBeDf8P23jKwQ3ryFrmp7w+Sx1Gv7AMEWiDF6al
-cOacFbZI3qNbkg1S8EJhznR0J1kGmv/nZYdKok4BzFbIZU1U2DTSP3Se2y9FSbkM
-X75mqz/+mKymU92fkqflv7v5slJnttP1+JdcP3UODm/59U07irXge5NIhp24Ia3M
-mQMoCrVdeeyTvggMNRDhkyem3HNAh5MAF5PsJzGzp/s0XAqaEtU/CholVJ9+23tC
-tLKr0vOR5bcdMsSrPfpr6QidovDQBkcwnQwt4Yem2bHA/Ri0/GR2cOgquDe2eC8o
-FSje0z3H46N4Wqct5zuNITjK+MI+PL5pCY3hrwl2uD/8FnBqP5C86IHfzrIem2Wj
-kOituGh6ShVHGvyElali3lyKfpUx/8OcxayWFBaP45gjtLst26uzgKkepq5X5UpE
-IGSVQsq+txd+hoEiJf2tr6CVn3Ue78VnUKDRRQUpBOM1Vs03an9kOkopgyWs2MVh
-SZ4eVNflp1z6M1YI2zL9c0k+LaiDZkSZ595GfBxPqN5Jf46KLgiLbIrWO9lO3QfE
-6yl0cV8Wr90f7rDannvqvBsNF984XbTjeVVxNFMFsS9ETQV6PxV8v2HuRU8vm3mB
-uShWJy4dNhPJ7QTSycf0
-=BcNN
+iQGcBAEBCAAGBQJVduTpAAoJEJQzkH1pP7W4xXIMAJFOGUVJXUOZvm5UImEOJ1PT
+REBTH6i0a/0Z7Mq2d/Prl7PDXSOFdQspOveB2JQHBUbthnttbHAkXH4G0mFex+5Y
+ksR0LuiVwsUM/GaxaLjuYN3d+wMvviaX47YLvDzC41YAx62wGye+RPk4SBzMFZsK
+nF5bgsg7s6CYv2mcg0egBpbPlRCPCIyPtuJIgsFbC1oauxSx4bXOJtA8voRmfjnv
+JgEadS6kEDirXxKqQPmxUfZUcPKrXIEDolRRVLnWjpf4zcAtiw5QGTUkImnM+x/U
+wfOKjDriWDdJQH6IQTzcHd/fsr1MwLNl3xzHE3EcVyvKM1Om9nkzQzTi2KdOdOw/
+wKKeWtvBlP4H5BYKbDv/n7rXuLNxOoxvhsbPP/RIxw46UH91GCh1LU6DO9PuQN0u
+VFV/KFISkAIny3AUtbVlZGwnoeSWzLPPuVbtD1ff9BzQb5AUgsvAPNqomzgeULbH
+KvfDO7Qt0LjSI0maWtazcfUNUY+ILHWhZnGXLV/LpA==
+=wC8o
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/xslide/metadata.xml b/app-emacs/xslide/metadata.xml
index 697c1753769a..abe614759038 100644
--- a/app-emacs/xslide/metadata.xml
+++ b/app-emacs/xslide/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>emacs</herd>
-	<upstream>
-		<remote-id type="sourceforge">xslide</remote-id>
-	</upstream>
+<herd>emacs</herd>
+<upstream>
+  <remote-id type="sourceforge">xslide</remote-id>
+</upstream>
 </pkgmetadata>