Updating remote-id in metadata.xml

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

62 files changed, 719 insertions, 388 deletions

diff --git a/dev-vcs/bzr-explorer/Manifest b/dev-vcs/bzr-explorer/Manifest
index 9ebf628604cd..57e679e5578a 100644
--- a/dev-vcs/bzr-explorer/Manifest
+++ b/dev-vcs/bzr-explorer/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bzr-explorer-1.3.0.tar.gz 1469939 SHA256 e3584df263a5004765a224cc38d00449e0ad47495070edae59ecbcc4dac94086 SHA512 60cf3e70e5a4e19de3816619646ac0445a7847bc48c640712bd1042fce0cce5964de13e6ad5e1e65b85c9d596f073571ec918c8132c77d7348bc34e1e318b156 WHIRLPOOL b64dada7af2bf7502c7ce7d4d16174ffdb97596789b50b3026631da52d595f491cff930da034aaffa6dab938606f3a8a8312fef30f3070f1a6d59541d56ebc32
 EBUILD bzr-explorer-1.3.0-r1.ebuild 833 SHA256 9b837c1207a82b26e88b6d403247984994aa3eb84b14d6d7513642abdc9d7a24 SHA512 fde258bdc7f4af8a869b2a5f085b8bb8c582bad7c3dbeb00467b0ae4b615181455fc6c164e3b37e6a9a43cec3e618938ffe2ede009bea132ce6b8577368c01fd WHIRLPOOL 04711cdae6430c192d1a0cdfd1ea4b483dc4989201c70e591cd53c5a4dfd3546d9963d2832dff80e7de0cd5d6fc96aae7f0d729a2f1ac399cd3d6fafbc2fdd51
 EBUILD bzr-explorer-1.3.0.ebuild 741 SHA256 2ddcedbe97e23b527bfa42e6c8793cd70a9ff560a7e424ed9594ee4e552b7006 SHA512 0943b4ba3b120ce1bda5c06f5357048cd25892b7cba49a662cc0a71a6125b6ba50639359796371ac88329891965b2656404336ab6f56fbbda04ac206f6c7a985 WHIRLPOOL fbccd472c0cf3462708e08187a104cfb2bf8f13d780f57c0635834b535b321e9948f08f6e1d1b655771a8e64834e2cda89a473095564f51ef92c87ec9f56a15a
 MISC ChangeLog 3614 SHA256 5c3f7edebf661a5a00dcba128e960415f8a8ab898a8f37187f237dd07df9c064 SHA512 efff1c31cd609f21c1732f72df572790b74f84f000575a473acc0a1622ce398f3b2cf96e814626a932c5037be2635197bd00092d03f361a1be9b7b65c52626ba WHIRLPOOL 8fb658ec31501c5408d8788bd2313770663cb9cb5a15292958085e089c1c85933f76bd7e38cacafd97102920a972c14e22fc46b405865418a76e1ec82f98de75
-MISC metadata.xml 548 SHA256 9999d2e2ae17e6f69b0494acf7c6724607ca8bdbd060d8f3f8d87822769df48c SHA512 3d571a5d625017ebd9de053b06fda1a69c297c2ec4b0660d6cb5efd7132e6cd68bca012283822467f3b3125331a36676f1e5d4209c6014f93aaf1b363e47709c WHIRLPOOL d380eb326b9b5720d7f8669091b898781f155aeffe0d81fe2478921dd472fad1a0f1d3e800dea7891ade6d7110c4a1fa373b05cc7474613cdd239e30a78dc7e7
+MISC metadata.xml 632 SHA256 164d4acec82371bedf75019a1d777965299410797fcad566f7e6efa470b7baf2 SHA512 c7e777de50332beb655ea9c102a4ad152df2c0efea3b7cbe87ab7bae14097fffcbc63b044cd42904e494cc4902bc13ec4113928dbbdf65034b127a079284bfbc WHIRLPOOL f720e90f162164a585f916db70ebc9af8a034fd44196716ec97e737d5bd1a83ea5fc2f87391492a5f29619aaaa1803fb470b63ebe0cf66669a22f3d3a19a13df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlT/ARMACgkQso7CE7gHKw2TRQCgu9PvvFNoalTT4R2aVsFC6sj+
-+ysAnjYHF+rvRKjzTeAw2Uq9XN+Lucnq
-=C/Vb
+iQJ8BAEBCgBmBQJVfsF1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiLjMQALJ+unIokBX5Zfm93u9Apnv1
+59IcuuXcrTU8sy/qkAUS4hU/NafrX+Fyfl2VtlV2gI0yL5a7hZYfgNiYlotXZM7V
+uNsQAIdS9HR1TAy6f6qKTvRgQX71kb3uW0v+fc9Da42aZcZ32jGUXByzElQThYT5
+0vTeHv31AP06P6ScnQz+MRTNrbayB18V3JX1nMusquJmceD5Qkvc59tdoCX5/Fyj
+n1NIFwwujo1JBI6tFtIzbsvuJyFnPeDiKRjgNEOWr4w3aFIXTZbuEQsRTUvQ7UPC
+yRX5DKMQ/1Rr0kX4X+FXsGWqEPragK9+GU8QkpZDtSmu09euwM4ZZSWzmVaQ4m05
+/3XA34aqgE+EAG4o2lUvikzUe2WdZYcgbnzCoBMpwol9BGhdrtb6QExTUTvdeBrb
+lzhIi3fqwdX8oHaBR2PRTrgJBpf5C+NSHDS1XUREi5SPb20Uppx+KWI+fJzWd3wT
+3ny9gjXlBiEHHE9RxnR8n+7Gby73g51/n4GBqI/P+u0JcHsp/cHo/Ax9hH3Q1KzU
+ujeb3y4cyUMypUXpbF5OnjVeEAYGZzgxRtSaweFMD+j4tDHsYlMUtJcLOscfW1Al
+lZDOQltuWnnW0vXOHkjx2YxXO8ofKcRClJQC4889dyBe56YGmCPHyAFUMOe8QWrQ
+LqmCM3UWANsTtiHS3Vzp
+=UVLG
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-explorer/metadata.xml b/dev-vcs/bzr-explorer/metadata.xml
index e3361642bbe4..764351126d2d 100644
--- a/dev-vcs/bzr-explorer/metadata.xml
+++ b/dev-vcs/bzr-explorer/metadata.xml
@@ -9,4 +9,7 @@
     to provide most of the functionality. Alternatively, the applets
     from the bzr-gtk plug-in can be used if it is installed.
   </longdescription>
+  <upstream>
+    <remote-id type="launchpad">bzr-explorer</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzr-fastimport/Manifest b/dev-vcs/bzr-fastimport/Manifest
index a6b58d03348e..40f241443bce 100644
--- a/dev-vcs/bzr-fastimport/Manifest
+++ b/dev-vcs/bzr-fastimport/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bzr-fastimport-0.13.0.tar.gz 80255 SHA256 5e296dc4ff8e9bf1b6447e81fef41e1217656b43368ee4056a1f024221e009eb SHA512 3677a6ebb9d5d36d7d29198f239289a9670ac4f1fcbf74a1f219f8a0a5a9cd4301dbdc969c4bce2da18e3c4f7f9a3752919b662473071a7b3f1d84c2de27d821 WHIRLPOOL be69b7541b2d2bdf7a85278997096a4113ef97aee59d6c25deddd89e8b5e406590f033eb1457946c3aa9f3f2aca16df6c2bf590b7d67f9ba6cf4ed33c72f2c56
 EBUILD bzr-fastimport-0.13.0.ebuild 1068 SHA256 7b9b88899bb5ecd08e33242643a4891dcaea81c6c01a5c2b371475d3c83db435 SHA512 a57c47f680ced07db81b240bb36bd532602b17c051bec48c52e4db1adac3ebbc2dc893f6e7e20b5c6a7e40880f5d9847467e458aaabcf692dc6ef609d37f6878 WHIRLPOOL ac0e6528e5b7718e10516a73adb27a7456e8cf1a2aa7873f564f4de16431b6d857c9ab14015e80ec5e791b76733fdd696cc911041896e8a69eb20ca8df717052
 MISC ChangeLog 1707 SHA256 79811712c1311a7b67eb504127f8268ac7d36fca479452fa5167f0124a539863 SHA512 5bb9a44b028e6e831f367df53ae9f1b911c9d9ce4470032bcf86bae69a9840926d4158fe187f6d71c5f4a5f94a707b1fd03756167a4e564cd7e63084d372fab4 WHIRLPOOL ec13e8375650a7efa2ae06ef6b0410437f560105f24dd788ea86449ef392429a24886ab03fa0c59321ce118c1e5b1ac70106f3959aa130c4023fcf68e7a8070a
-MISC metadata.xml 258 SHA256 5c8f8a85aaaf5adc553c57e421d9c8d53bd1ea5c88f2af7c590c3698071fb956 SHA512 e4a133cfa5155a7611f27c86f13bc29382b282d56db85bfc6bc8b5001593cfeb36b96066af256a63cbc815be50f1fd4b89be21c52587052496d3396948645f7a WHIRLPOOL 82a92b82dc2e5102a46c5ab44855a52b12cc612f4b615cd45ac2ec57129f1bcf42bc02ea84d1e4de17544635f9f1f32d8dd5e500bbea9ccc58fa1dd801ac1f72
+MISC metadata.xml 345 SHA256 e113b3e69f88f7c6853bf81a6112d9d59e160c59b0feefc1504d4f623471d434 SHA512 774b52449c4f0a5d0b529a0e5120a13dea7d6eedc49ed4850ce220824bf17cbd0f0430af407a74720361a5fa5c451a29f9637eeb9171bfc899d3d3e9b60a25ef WHIRLPOOL b89ee7412d5b12d54078b3c0b1b24d90c21956d44d04600e66c464cb0b1868e1da9f30777f6c0812f85e5f662a296a39666ef4e5ba34fb36fc665964fb546fbf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVVt47XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNVusQAIMVTpmeeX/EOJg5IckkBwO+
-DIqfKYAaxeLWybmoVpZzGnNyHhGLWLNIsJmw2gyTOqq9ppdzqt1h6B//21k9iYsq
-xLCx0nd8Hg7mUIjVAF4KEUbrHXtwGP38Dwjw+ESQq1mq817+bqq1VBR4LmNTBIbA
-Yl9PGETNmJTzNvZsk67duMjSv9niiL98W/VM9QSur3S1aI2ocCwbglRU6zJYJ7da
-z/P8o/WTdufn0I8Fkn5A04Pjq+U66PIsywzU+U6VVQRkn0kvsigqkkpo1ZdXvhBd
-HJ300YvDisZzWn6mfqiNvZMPFgXu47jZSBbXCGYdyLqzVk9uuVj2n/BQMjJNt8zk
-kAyy/3TH5vFsaU9XMk07Qy3LX2hfuN0qROa6mFC2OnhTLufMWmaizuZtlPq42pCO
-/mjnwRXqFdf9v8yaLobqcvrDJPjWGtwN2X0oUcd87d82rWYrqADq2B6ivOeYnWzt
-kuNOVPxllIo0dRv5kYsAF8jrrkGSliOW5uRI0hZljOeT0OCmKUIUoDiy1mzzXxZQ
-H8VN9vgYVmKmBBkECMGUaHWVnXhfFQOrCluZHpDU8mGp4jKyPQ+r9FNiVvAMqN3m
-+GCxa1rlb5inYjyiin6BzpbsL1B8aQxSP4Glj4rt44f3nEpH44rJ3D7Q97HPtoRC
-0P/4ZAw1neYfoFP0YC+5
-=TfyG
+iQJ8BAEBCgBmBQJVfsF8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi74gP/AgX/uXs5sxTWHEMOoVdQwSn
+4JL320T550M2K4k3UzP38X+dwdVk9L2IhHNNvvHLKJ/RZrjGsrROIWl3CbtUmLcv
+h7G8OLgwtcYSXAH8N5QSt9la3vIkh5yLV0/LYFDuvU+rYCzk0LLRvA4015MI2xrp
+JlMrpZopzMT5NaM24tj/Cze7nNjEkm8Yoe8q3eD3Y3uKI9vBKG/fUKlpBAuNsSTd
+AhFrs064neWPp/FCK2+/wagQJlDBNnz5OVFHarWl5QDBWg8hbkJ1afu4GHKqtg7z
+MFva9JUy0MND5XYTCy0OMMM8Gg9PkaQnuGi37ojOqP0MMwFbZLfdq4fCRa7YiT/M
+KAkRtjPh7OBiDydVD5f3M6HCHT9g9Pjlrkmp0dZxrj5bITM1U5Vd2aPFcZLB21Ka
+O//60DIQXTIOp++5DQvrOH3JF4rxmEVTpyC1y6S7Nw7WwqC1/cCKU1272XJwB84s
+EbMppiIJ2LCRTtnrZs0P/irG4HvkUe0+3Wnfini4qkjF7GZzxekqkx5YvnQPysSB
+dugXfWoS0IoCFNLwOYA5VElBOtyO5tnz8c/VK5XW7ClB4mgH3bNcto2/05Tr4yUB
+MRfw2I8UEZcPAM8DpgLYFqgN8QAeNaL+5Gyq2haCK4qmnkSZWJNKuArkio4M5GZQ
+dWjiLdZb6C6y04PxXUOm
+=VliH
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-fastimport/metadata.xml b/dev-vcs/bzr-fastimport/metadata.xml
index 3a93a539663f..e8dc124c31fa 100644
--- a/dev-vcs/bzr-fastimport/metadata.xml
+++ b/dev-vcs/bzr-fastimport/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
-<herd>bazaar</herd>
+	<maintainer>
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<herd>bazaar</herd>
+	<upstream>
+		<remote-id type="launchpad">bzr-fastimport</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzr-gtk/Manifest b/dev-vcs/bzr-gtk/Manifest
index ac45aa7f9a81..0722a478712e 100644
--- a/dev-vcs/bzr-gtk/Manifest
+++ b/dev-vcs/bzr-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX credits.pickle 3540 SHA256 eac484f4bcdff0cd26e46c6af3112b71612f26021497076df99cc2ebb5577238 SHA512 9d308f4e870436a56049c6a4963ac6d4d366b0f6c5367990d940daa3ea900f601a2d8aaa03084f1ca7ad3f826a358b15295ca97753ea98c2b295be508eb5e100 WHIRLPOOL f96f896dfb52fc209fce149d1c917eecbb51d8365ade9a82451a1b7f1919fc2f91e904bc9c636f11f1786f68e1851e024fe6e8963c04b80f37a91aa3fe0a1172
 DIST bzr-gtk-0.103.0.tar.gz 210971 SHA256 5dc8b222d36f1a1d5d9a4c5048b9c5c2febb653e70a9a752dae941f58d34e2fe SHA512 b95496e514b2144ffc70f516360c4f59f885ad2105a8b989ac469313dada9d5ebf05fa5b11f4e6cb16f41f0b5380159ff974f867391387f702dd35ca6dd4fe27 WHIRLPOOL 7d9a2ea8d27ed25e6f2f3a83e0eed292b758dd25942c3f26b99cf2f267b9242c77d4be814dce6d86e226fc710752ff5e1664554fe5c151fd2da051eb69c6a21b
@@ -8,23 +8,23 @@ EBUILD bzr-gtk-0.103.0.ebuild 1249 SHA256 284b370ee03af018c7fa1d2e7883bea5772470
 EBUILD bzr-gtk-0.104.0-r1.ebuild 1587 SHA256 6180e38160162e76b4caddcc45e171f1a5c679977e4d5b30beb3a2c75042a124 SHA512 50d3e38fdbdb949ceab8121db51de69577c2b411f225bffd34ca075ef4a009a60b5dda5a325cf72ab9c6e810aef08a9af97103bf4b04c0fb6dee160d312e306c WHIRLPOOL b21e502225b20c44317e80b2517595de3f50eb9a692b8dd0d5e934f86d34c8e94a84297dfaa2bcbdcef37a331703d9da58d90fc02b02b1abb068109dce722d93
 EBUILD bzr-gtk-0.104.0.ebuild 1253 SHA256 30a820f546d6cc44ac76a274cbff171c6b87db931fc22aacedf87db38f003184 SHA512 a6ee3dc2684a7b41eb065a61dce1291c817d800a7017d170d0af40544ed373807ce7ab4fd9a4165183ad9c8c17a2506c20b7b4aa614d63935f2d75213ea280da WHIRLPOOL b275f7c2cb4a82153ce325ed2f9d54cb6b06c3b9cc1bf5579a3e0fa2c988dbd41359d6f281dae1a4c2459cacb1ff3a55457a07ee0507ff1e42c2cb4c98310317
 MISC ChangeLog 3323 SHA256 60f943c6bff678fadd37a4685aa83b81341fd5145623e10ecb35fc9b166172ad SHA512 e8eb05ea5256f97d776b3fa9cc0ccceb4477d809486fb0b4bc529c9c5edfa9df16d670094a4c1b65b09f6b606eb906fa0d5dcb430cfdc3eee23c93f899deb75a WHIRLPOOL ae0b305496a2cf3e7068e5737edc4c656378366c3a1cb2272997850215a0bc7734d3978175b3be8ec7db4da9ca93a6f7265074bc7a4f13a7854c971fe7d7695c
-MISC metadata.xml 590 SHA256 6c7d40211086ddd2e883dd28ece54ace9980935a04c5ca40c4a79ed4b6d5c612 SHA512 064ed8f2edbd6e4343bd4fc1eba27101b3863ce216f4d3e13eae6fcdad617f9361cc4c7a28a02b73cc438ecad2c29cf53a77e9e027bea9eaa0ab7ef4c64b6a7f WHIRLPOOL d9306cf10d679d53f65380daebbc8a4a85f921f64aa156e316ee0be4bf7d69b47f6f36a5352a75a9978d52a9d968e2968d45291f7bb0dd9b1bc6a63649cb33a2
+MISC metadata.xml 669 SHA256 01c5bc36fe550c013ce7758be69b634a6577c80d924692ee4d4e091bff2a8d19 SHA512 428b4eec659be3f24a4eecefe667e50dd08b66f483fb2044b0f4ff2f627adafcdb51c699e334fd015b019c1e486edea23f4bfaaa513278173318fed29b761806 WHIRLPOOL acd7ecb3e4939cfe488d1e95ec33dd2fe5d2e686df498531593ae733c4707cbde61966435767664b09d4cdc1e15eb32d3762f848187b2a23c60f2de4ca56c5cc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUm1RBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXDEQALYcTbAAWzP19if7Ne5EQIMw
-BS8z1U1XVtQNVbcf/WjtqEkoduBy65T2VW/GrBgmHISWFI710Fdne27QRncqbACK
-1YEiqMGKMvvOuUiHSyLno1NpASz/zWMc/bicXwLtisIdPo1tGaR5iOq6esxOui0o
-SmAJC+wtF7xnA0Pmwv5260qyF2kP7/AEzqN/aWYYdtg3habuR7piaqxdCFt84Uc+
-G2gA2x+S0HLPknuz6G5uOSOXabfE/K62DcEYji3voaET6p2YsqAcuCB5syIZycm0
-BfLPYFQoc4WQiF6mFODtxWh/EG1Ae9CpSDhnaKwyhNkK5Mck04AraeNf6Z6SwB8R
-xjLIBsNmmHJKw45dwEA//Sb7jwmN2MajofCvmEw1SyGOvNbLkRnC3BJHJbExrtqZ
-mKPsjjdyEX7DUbHEbnqIq3FvfWG0Q5/E3xgeh4z42r2HtXzY/1FrQuxNuf1eK4X8
-T6rczz1bAbbolgPKX0sOabqRcUIpUwg8BSUj+nMW62mP5B4nI5oEmPhYNjf/RB00
-c/4iOOs8RBLbt4pcI6+qW8b1FEmKk6jkLwTIt18Lxmcijg+4sK3KPE9n71krbMY4
-82+HpA9yOvI3SDgI2d1MY950F4o7cV00S6mVTc+ClLAaNBiSI147PvKxaiflrUqz
-hpQx8wWp8PDSSWFWYGkc
-=H6yY
+iQJ8BAEBCgBmBQJVfsGEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiubYP/0mXxL8wBiratJ+M5ZBTgmfl
+Si5HOmgIdzmRDypPrNNFR603V81q+96PpVJ2Y9VHg4w1eXhA/POoxqG8LQq2GSaj
+ewtBlkKjBz19eTs6N+CBY8/wQAlJG4dBfvnUZZ+G3kAI4puV+3on5/06T1LCx384
++FtFTelu1UXcezCcStEPh2G/DWhIuAJI8hYkYGSGbor6HNcFs1zIGhW3tJuHi4nk
+Y/gak8URCsEU1VtKvhryX4oJjWyLzMYSrznX1aBSWAuLEgz5hvteUzLwSkh2apZc
+fwJ6FR96ngxD7XmxQ29r7A9a2kb7XF9J5Q9qiPNzKS7dKSunD3rUds3b/mvrhAZB
+sfLki8Gp9xthsTWltkypCM3nJY5a5CBm/y7HAKiCYtyS/OnKOvGmTUkc88rAbvQz
+a6ENS57GBeJX4hf1HNyW+oB/0EQxB9DMTbZLVNV+glWdvSdheQM6ChmVtmX5TQeZ
+SQ9/2ZAt5dE7smn6n1pgaONrHbflBYVbUUvZ9zcoFfBSP7BI/Yy/ntUcolLttg4w
+n5WnNOoOLx8Gf5zQxKxWeymWZYRRyhah/1IAY6PrxV/vafxubNtkte2DMBurCzaK
+3GXpsRCMhzcJFz+L6PRfQGwPsH+TgQZtnaBQd2bZrh/wTMWAPhkE4TGakl4rWjU7
+mM/G1My1bxoOCKrGAMyY
+=+heV
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-gtk/metadata.xml b/dev-vcs/bzr-gtk/metadata.xml
index 1394c148c83a..a41036fb8275 100644
--- a/dev-vcs/bzr-gtk/metadata.xml
+++ b/dev-vcs/bzr-gtk/metadata.xml
@@ -12,4 +12,7 @@
     <flag name="gpg">Support signing with GnuPG.</flag>
     <flag name="nautilus">Integrate with Nautilus file manager</flag>
   </use>
+  <upstream>
+    <remote-id type="launchpad">bzr-gtk</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzr-rewrite/Manifest b/dev-vcs/bzr-rewrite/Manifest
index b178fa758ff8..541a48ff27b9 100644
--- a/dev-vcs/bzr-rewrite/Manifest
+++ b/dev-vcs/bzr-rewrite/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bzr-rewrite-0.6.3.tar.gz 33045 SHA256 f4d0032a41a549a0bc3ac4248cd4599da859174ea33e56befcb095dd2c930794 SHA512 f1a55307e80090dcc3739e4b111e08b02e4c4ec07ed479a5ac28d2d40535a699492eba785c142d8f6396032ed9db143d86dc68dac5280c071b79a9818ac69250 WHIRLPOOL 7c27030e94ae0f57449fc77d226c385d8956965c693e2e24e1b431043021b30a519857ca9db3d0018ac93081cafd3908221b0dcd526753dee2d7d79922927115
 EBUILD bzr-rewrite-0.6.3.ebuild 660 SHA256 e56e68a95e8b0c4bd41b4fbad17926b9af170f4ca8117fcb5c8547374e1baafb SHA512 1324f56130be9b0660a4bc4c5f0ac876c86fab14eb38f1d7152b8478a4a2d176f8c483dc7d2c9b192169810460a45d7c8e1ddc26a58a3adebc9a0a5558a46bff WHIRLPOOL dc7e3e95591d7f4adc654a5df0f82e637c0616895c8b19a1a6b5c3d274564a7f363855bc73091a4b258bcf2724eddd494b8341211078c04867d971982d7fe13f
 MISC ChangeLog 2986 SHA256 ae35a751b7af29c1c88660adbceb920c01ba2100efa0a4083cf09de0aff122df SHA512 7910d86bfa647a6e52fd4feaa373912ba7103c31eca324ccf4628d026edaab715802eac38e9c2f6b207945fa4f91133eca95529855015ef6fc4caf3cb50a4281 WHIRLPOOL 0d674650f378fd70ac625b6e1851011615354aebd3f39b8cd3ccf94dbab8d0ab79fc5479a7209dbe244d92dd4535b3a2c2bef87f0063c0e56d1d386ebc0e3371
-MISC metadata.xml 161 SHA256 10876eb627faa0f7204c3bca5931c5579842b655590d4a4205d095f6137074ec SHA512 8a036f43ea235edd491c209e25d64ed620bc9d7f6c0de4b155f3d73c1c4fd036d9c5f5eb26e3aa7999592903ad3aa107d650cc1cfb9b4b096149561bf0d13fed WHIRLPOOL 2a528814b399514084b09bd1663e0c30c05b1861eb42411a70a492e6f2ee24915653e1322c2c33e668e8475babf54409abf95c471f18779bea6179da7de6c9c3
+MISC metadata.xml 244 SHA256 fdcb875c065ed637ba1e99ab4574bacf67b2741658ecb37720205c106aaa40dc SHA512 e405b287721520b6d6e14eb946d0fb09d0d3bd3db488b405e2a20e7cda38ea9cd6afd4fb19bafb55f6c3bef634d2b7c8ebc6643a98711597485e9099fd7eff1c WHIRLPOOL 6f42091488e4a9fc561e1a0c7aa2f397258db71442311101a1ed083b872314b62fcfe85ca8d9064802d144f17574c1432dd45a585374ae564438745cce13629a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZON1UQAKEA57/0Q9SJWIusSeGX8lT9
-fx9/Vi2gwgmEGD5GeAPxfKX6W2oqw0WM1It/KeQ+JnlCLBoB340Qo2XcwRe4CB1C
-xcl9dFnSuDsSNAqVFJMMH690nBek5N2OUbqyBKaHqFXEPzQX0n8lO8v7L+zeo5bg
-FNbiLkdDiHt/lQDvOI6Z1zxxmFpR3lQC6VMEbXzmLDp2UoIcbaDghFwxteyfE7pD
-ijXk7kAkeIQh/kSIOfBr+odz2tOHE/4Gb1VmP2/AkH8Tqk+SOCOtMp1Je2ns0qpK
-j+W6EoAHAW5AhhmKbJFjYxZJMptzaYH0ZQCdQAiy7G+EUdoK3ueOArRUs/rkqYX2
-F6LoOhDSPbnJwKw09O0Kw60NCd48n8v2iZy0cFAVpfjC/vP7MPA1nhisvrAywwc9
-XOX3O8eHXeKpApacoUz70oiSlYX/uSNGWO7e2hAasfXz/AcVHN3WpBVpf3RuVwne
-7R/YG0DNPJlcmD+GdsqjXXWsbrCKVc3T8810y2RB1FPwwxYq7YhazPmlxynkRmMP
-PG6zWpGe0IUodfN3wCTJ7JREnskHg2P5v5N6xqxy6xLd5E2Va+WMpoVFWSWlEIli
-B0eG5QVa7/McdKkJkBL4Yji4PECyekEj6fWM+FRnZAo6cs1scrowQwvmMXgMc2Vf
-GuFJktI2dpiJzNc2WsaQ
-=H3bi
+iQJ8BAEBCgBmBQJVfsGMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiX9QP/2JoaX4BFXVzvqulUOW1rxRv
+mu85qqxgsspvoUUGa6whrpjrreOM/ZwZkhmkL45HZb0Yireb+rb7k/BJhws3r10U
+qXoW0I9fSi/JPWn5ubHgi6MJ9omIw78QDyqxx9KSSKdKdg7Cyvz41mydNEGvMHAa
+N4aOqF/swiVezWDTSJqZJNXXV1RZrfu3s1/RHqsI4q2yHu87/M74YB6sVXgTnZyT
+o9odF4c/n2wCzX+jXlW5WBueCYsQBFv2hTNEkWpm54lMlKeMR6JQ06wgMBT0loYH
+XEe54UnDHlFXVFavBbRaf3/464JeR9H6xV73aetZtlOgMdVsS1WI1ANr2HwSEwLW
+/ellb0oaYKHoHcWCvweWM3NDMKhQALvPvM+lD21XH9Yc+fPbKEVptuVJSlR7Kv0X
+N0PFJEcXMpcZDckWxch26wuZfbalQqxFhIwxQm5L+0DPWOPsAkr5ilE2ZDqB4tYF
+3pUpHe+Dy2BWcE094XHZpOIhQg8CepftLw4/CzkMRGtiX6Man+AbsXfJPBm9oWAA
+DGYosK4GlcPrTFe5ZLqIeKJS4bp6kJbZsa+MWsab+tfssV0tj85mDirefMA75G/b
+1zlgSVgIITNKb1qIdkdKhI87c0SMtLLzj28cSu8YdOZam/FDvw1J796NduXc8SWQ
+N3+MHuZh95HlQ1LkHirI
+=/dWc
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-rewrite/metadata.xml b/dev-vcs/bzr-rewrite/metadata.xml
index e74a92d1562c..49b47809416d 100644
--- a/dev-vcs/bzr-rewrite/metadata.xml
+++ b/dev-vcs/bzr-rewrite/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>bazaar</herd>
+  <upstream>
+    <remote-id type="launchpad">bzr-rewrite</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest
index fa46d70fc20d..3b8841f00482 100644
--- a/dev-vcs/bzr-xmloutput/Manifest
+++ b/dev-vcs/bzr-xmloutput/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 SHA256 96c8187bd4bd266a808763ff0232c3bdada7169e434f7f023b90bcf38f9b8b29 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7 WHIRLPOOL d744faa1593f138d101a2e566ffe073df2a8b7da7fc97ebc6dbc6da589c08ced875074beb3bfd9b3642a5543364dfe3efa3f1179fe1a1f6dc4c9bca4a3af4e02
 DIST bzr-xmloutput-0.8.8.tar.gz 49969 SHA256 73b9b2f6ce4d9910031df7fd153d56d14f833c20a106f099bee5a33463f73b36 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef WHIRLPOOL e07a08cd0738524207e7ab8d6c645b86d087391fb06d1e0ecf08cfbe78e6f6a1e730af41f4e2dea9e197e7c7f0de69cf6494ab1f906919febb86e06b490fe4e2
 EBUILD bzr-xmloutput-0.8.8-r1.ebuild 712 SHA256 fd9c30cab6597403414517cbd37f4307e32bce4f7644bf85f4bf6dc87251b4d8 SHA512 5c2420213d26eb667390509b357b8c37d7ffe7842f752d9e262092c8e4bf33f3b49a0d98d85dc67504248b6456a179d57dcffa38aa3a44f440a88d92df046243 WHIRLPOOL 2ad0c48553b9605f548b7231eba0d4b15e7006f8f8976418eb7441fe094893113d444f04fae38246f2b7c0ffe59fcc68371bbe898f67272771c87b44b599d7b1
 EBUILD bzr-xmloutput-0.8.8-r2.ebuild 744 SHA256 edbcee40aaa8fe388d942bfb9e9c5efeb66ea32a9c883d77c690ac6832e9e4e4 SHA512 16a08379165f95f51ba72a3d95ebde5729ea34a93845f58ac28ca717e083f4d1e46c5e19c36b2ce5ff36563e87d6e5e556aacbf260399003d29c45fc08c7fe08 WHIRLPOOL cce5a4deeb74c4b428c551d1de594c168bda4079ac0270d740d9319d1413fdf88daf89983c6d5e155ddcdf2057c2c1189941b20bb2ce7a29a401d1c73e66573f
 MISC ChangeLog 2755 SHA256 b6ab123213489184c8c251b59d5dbddb9c4875cf98fbfb4707ca74f8ab688af1 SHA512 3a3e14f6550ae38842cc28b6d3c84e5efaeedb503fc80314c8e92a5dddedc459af9a5cf0341d1f3739775a9a88414096cd18a71af8727b384da373d7627182d1 WHIRLPOOL 672ceb850e76010a58d827ff9e143c4b88be68dfe1d8adcb89e4b93c180e370a550bd84982828fd7e63b9bb012d483e82256c52269375fc6e20c4c14055fba83
-MISC metadata.xml 161 SHA256 10876eb627faa0f7204c3bca5931c5579842b655590d4a4205d095f6137074ec SHA512 8a036f43ea235edd491c209e25d64ed620bc9d7f6c0de4b155f3d73c1c4fd036d9c5f5eb26e3aa7999592903ad3aa107d650cc1cfb9b4b096149561bf0d13fed WHIRLPOOL 2a528814b399514084b09bd1663e0c30c05b1861eb42411a70a492e6f2ee24915653e1322c2c33e668e8475babf54409abf95c471f18779bea6179da7de6c9c3
+MISC metadata.xml 246 SHA256 341f40e26f066ddcdf0dcce0c11647efe45fda4064678446d644774c42d02c20 SHA512 b5f52aa365e6cb9ed0936c7b90dfbed3f4881df38124457ef1341b393690153b34419108259528fb3d45ad1ca691778548bb6b4942609cc127ae8f9054375af4 WHIRLPOOL 746e6a3d23b2d22221475224ec53fc37d1bcad28aba997ef378acbe72c1998e52fbfdeb5c16f85c1fd8c52dfb96610bf06db2bb5bb6f8921e1279339a3c26581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfsGUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi1cQP/0vXbgZqSOMMw9Uixhpavhil
+7/Hj2121Ee7a/U6i+J5mgyEmIyUjryR2750v+QJXFsFzitFrf+uVvOGLEbC97zJW
+7d7RiqPrQmLanZaK5nLyLMBG21DnWDyRU3E7COi3y4NP595JF3kgfJgQZdGKTwnq
+bBWE0mGlqHZdKNWQd+qdZXmAOxNlJkT7emi5eCP/o+UhChLTLbOH0MGozcjFw2rA
+s4lAC2QinoG1CkWs8pcSiNkxuEGGSZaGXLOVUY9dJ3Dz0Tu1jPCRtWSXIw89U2wG
+TD7++Ce8hAZaOsI2L4ibHkAKr7vF0bEdYF7omA5I2leEyhy/0j9FBgFHzsoB/BqK
+w6VyhJtJqBI7J3GhWYxsh6IYA9PVdDPctdI7qEJhjGOWh8eaP7oryUb/aIr8yh8n
+Yct1G1ua/IXel9Jb6+6B3k+Ut4OxHVOA+dblCMRSjCEUgfqu5/moGL6RCcYd1oub
+psqNCy7cWTtADhWwT5VTxC7GETzMSn3dZkr0EQPw462+1b/QxY0U83qKWCe9ZMcg
+bfvTOqcwcamdAusyAffawe36z1scqJHiOTL0qkmueUw2usy/0bNvoE+hH5Hzixsi
+dtnMTpK0qLf16YeHGgz/CbPkC8f+ha5zOSf2EImAXA4RQrKkpt+YVOoXwZ8mNcaW
+pOesi90pc6xAibvpZmGw
+=0pw3
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-xmloutput/metadata.xml b/dev-vcs/bzr-xmloutput/metadata.xml
index e74a92d1562c..db982428e047 100644
--- a/dev-vcs/bzr-xmloutput/metadata.xml
+++ b/dev-vcs/bzr-xmloutput/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>bazaar</herd>
+  <upstream>
+    <remote-id type="launchpad">bzr-xmloutput</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 78e7fbbdff35..ce06373a8800 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 71bzr-gentoo.el 124 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454 SHA512 c10333c1f2a8d6bbd41aa27432bc03c57a87ca107e13f989f989ff371dcad1d7ac229967ded405d4813ede92864f11c51beadbf1b504440e872263d06fa5da98 WHIRLPOOL 885bf06f30bd7044a35929762638098bc723fa377772aba25df34bed27f77418868742a89f11d33d34daee769fd004c7f8ac3c0de23593afd3cd5bb1f64bdbbb
 AUX bzr-2.4.0-no-pyrex-citon.patch 1191 SHA256 aee30b05c68ee692825f49b30db8841b93a2ef844c1dd97159cd8d0a8f77fc09 SHA512 e526cd9a53ef9c47748b86b75c1e783af8397418c8fb3de94e5878754c1707a85f1f5a3b4b811f4f1ccd8e63572bb43e3d1c20f9ee3523d3895a750425ae9810 WHIRLPOOL e7625c323ae06350483d71e0f9a504513a9f98ee397f73f16ea000def0397f113b3412f2d286d94854cd50a550555a5306e70e954680cb70f33977af28861620
@@ -13,23 +13,23 @@ EBUILD bzr-2.5.1-r1.ebuild 2749 SHA256 3b9980964a98b2bcda77c497b495a26428382df37
 EBUILD bzr-2.5.1.ebuild 2462 SHA256 688ae93a487520745e0ddf547671f2eb8b4e561e346570d7caedbe6c362ee9ed SHA512 138504e2fc67df44e8f214659a927f1c83e3610f855f47940b711dbb97adf02fd118dd6c264a962beb748b6e9f9f541a863f9e4ef45bfcbe211821c36c21e5ba WHIRLPOOL 24e1606ee6b288fcb2aa91f1cea531a912eedf0f708b8dcf91ba43b340bbb72042a273c8568e766d2f95acecd2094d85f1e346dd99753e914a342248f8a2727e
 EBUILD bzr-2.6.0.ebuild 2669 SHA256 7c184a15b3957b96b7bdca65a718b769ef336e9b20f20fbb59c2835eff41341d SHA512 2152c8298b61ad60544766a955ee0b399175717d3825274f969a2382348774cd7dfeacd9a85e4b9519b2bdb401ebe32aa04382a1dfe3786533f958a78a802c60 WHIRLPOOL c827cb0e0b56a0df19f2fb83448c3f8f0ec883b05f1ab1172bc0e8f6b0af491fd83111352b970b3ac6d572ccc0d80d8972089a811e7f14df89e59372e770a532
 MISC ChangeLog 29348 SHA256 1380c3dfd4d7fad64ef84db986083d110b07855471777174ed6ace712509daff SHA512 04cd4f00fc177e53abc0ac87fd6f21119eab24ef3779f2feb1945df3377cdad70494280bed05e153aa9bca15e24aae20c2e519c894ad981bbffef98ea04bff52 WHIRLPOOL 3ec20d88db03984e5b8f7fb59d372b8b6895d29853096334b6b5af59ef91b5cc91c8bd84dadf7d6fc3a2059df6a175c82f1c726ec4d472ccfbc42d82de2999c1
-MISC metadata.xml 690 SHA256 62d739eb6428cc287b055f975c5aa73d82aed94510162e4cd6073f8afa2d4b16 SHA512 263f2818011bd953c361876912fe16b4ba6579f4b67817c17b3ee87280e485d6f891ad30b8f2552cbf9d03f32ef50377bc43b56febc9b940d93a097cad2573df WHIRLPOOL 5acc1a8be243101554d8db86d8887cd8816a108fb0924e2d515b6132cac4047223731eb465ff6d7f8f826311a9ba2a0c2857ac24414d238830ab900e6cd235ef
+MISC metadata.xml 765 SHA256 db207375e53f8f017459e684072a3a7ff5ef458dba60e95e0e2aa6db0256c769 SHA512 5b281caf12871f28ba7a03c78f3688014899817e45cc28a550da7eb905404e43b76d5d15204e6f8bfe2bbb2bccd464a5aa0c3193ce48434735e6193270ca4e72 WHIRLPOOL 2d5c199bd5279832fcd72ed811617943e39b991cd9b5a351e5ac979e710752bf8818b4e297a853f563ef396ea350ef9cbfae736c1f0585c88bdbfe83fcc84bcc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOwrIQALnvScqZIDorBaxvjonA+rGV
-f4s3yMOm1XGJh6dk/audjLEL6A6/UFqcPd/ybrukkdeJzh4n6CAqefqDwW1BXM66
-Ovz37RwRr7/J5gaO4wFXiZkm6R1oBirqbzP08gvam1uLickHGDAvyhzxa0inugnq
-GUBOgw9trxC4f5zRwH4S1OHogYWwqy1U/7/dNSiRwfZ9RTkiXHCQg90UllK3r88i
-t5vHeEC1SPwHlqw9TwGEOFmN9Q7AMqXqSbwXPbRK6AONYsZPAgh5n3asOnBfI9aY
-9m2LlQdjbEjNxKYslZhlHIF6D4X9U6WU/SnjOHaGcOjRm1R/7Mn924pANGwIAmnJ
-Az7ek0XLRnXdX2g+61LOjVGirUQELzBMsRFDJYrNkL90jYm3eRULb80W/A8MBdpU
-3ODhdXP7hxw+uquIalnp4h3zVejbxa2HdXLRg8MPENdakkEZL4X2fD2kPf4O5fez
-SsqbrOSBZe+MohhJi1PD+tf/v5hfdLwtVj2ueeLgStSy0l6JnhxLKfyPhJo7prhS
-9eDAeppIoZtlKGEzfKjsuEdfb5eTNmxeloLGeya423FNtvnRF/SCJcKwJpI+vWfk
-A0vSSt9/ceicN55fCI+LsGBTwEBGHwyxTtvHAmaf73FFkz6MxXKtl3BMhiXSc/G+
-0WBgXFV8ZEOUU1mYmdz7
-=ppFI
+iQJ8BAEBCgBmBQJVfsFtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi7l4P/1nyjcpjxQbGm/OvWLn7ssCB
+5L4wxouJ1QdOQ8ojCsC/QZLAxtUbbRpZOqzeMo7V57aFJYskT74e+oiG5Ipm/wmw
+itBn7IByUfngGJqc/X3YIUaExVcDoBsQXRPjjtg0fTPuwskgj74TJGhHZlSGu8Jp
+ZbFFkU7Rwq26henUIpGbRywTPn3zoidaVcujp4WmkLK/09ow6XjLafpmgmIxSy1S
+V7xa1ubbfVem2FspHw80umi2jngr+VidH//c+U+HmRGkrMKaNIMb6ClSejlbwFTH
+SPREZsmjhVfsBSCYPUlnFaDPdnLmAy1SBWcdXo3gw6VeDhj4WLT6LfMcNggDqmLi
+slWPiJIO+BVvBxU1WSZXLDt3RjNS9FrGWZpGXeBWhzJBvF23Vcboyq3bRdrb1Jzd
+HfRB4/ZH/tJcSMMWfcUr+evfh/fKExtftU0xu+6DmdqTg/yHJOq/Im22E+OpwP0k
+9rSBGVSQOZU62aSeIP0DZoZq4RkhBM8Gy7ZRD0kDGVixsppFzuW8Ii22zp8gWyBQ
+o3fBpYc765CH8AMMokq6dY430DeMP8D9ss5vgG1SOWpLic8VGAeWSuBmPNR0DEN+
+mhoPRpd5fBLFXDsgYMOh7mBTsRAV3Pz367HffT57S5KUPrJaNMZTHHH9+Q6mWRmf
+arhvvAXHQwyKGiRoRMQj
+=gHA6
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/metadata.xml b/dev-vcs/bzr/metadata.xml
index 6c21509e4124..3950aca74bad 100644
--- a/dev-vcs/bzr/metadata.xml
+++ b/dev-vcs/bzr/metadata.xml
@@ -13,4 +13,7 @@
   <use>
     <flag name="sftp">Enable sftp support</flag>
   </use>
+  <upstream>
+    <remote-id type="launchpad">bzr</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/bzrtools/Manifest b/dev-vcs/bzrtools/Manifest
index 6e8c7e86e1ec..f0756b540a2b 100644
--- a/dev-vcs/bzrtools/Manifest
+++ b/dev-vcs/bzrtools/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST bzrtools-2.4.1.tar.gz 77725 SHA256 f62771dd221ad820e0363386608985e282cb88b52b5a6f0ed7b7fb2e99804def SHA512 da403e8564857a8f0b2eee58d6e27d6e86ae7b2e67ec13c7ef93d8180f49164dbf274510fbea5b8426d397a3546b449b1fc950f487ff86f8b67658e2401044d5 WHIRLPOOL afb588fd98850edfd2f748f27bab51bf51d2dcc2117ec54f37da1156dae95baee41270500606595d41cb3912256c89f12bcb5ebc17ba19d5cd5934cf6905fe4d
 DIST bzrtools-2.5.tar.gz 74508 SHA256 bccff6fba6129013f92a7bf16e73efad159cabd7957f4de765068044f730f03f SHA512 5bc07715a3ed525a9bed5b789ea7a4079c9a56a8ce798b2eff56b27e6eae574fac23b8cc96529a5ea44b8d4ce02c512a7e22d21f046801461ba38a8d2050aa16 WHIRLPOOL 8e03d00f988617ce5dfb015cd6b19caf980d48023952b7329fafc157faa69657d9e40fa6d90864c1db3f707f2f3ca1579679f20faaf309b0d6aaf8833747f4bb
 EBUILD bzrtools-2.4.1.ebuild 1740 SHA256 0298d173f308bc1ad521476ba3001b638d6a0d2dc0c97acf3885ff4872aa873b SHA512 6dc844e298e7fbccb582e9953ee3b5d47bca2f117cc0fb03f8676859d18ec07771b490911cabcbe0b4b7ac20ebda9711ba5c99f28ab31efb9bc609ab457a05b3 WHIRLPOOL b3ad0161113f6a3c66066e3907ad785e65ebf00dc0c0e371e7f75ee45c3507bbd3fb3f48db990c04ffd337a40b814c7695ecb9ba2b9c5e7f2a1c6e5b259b656c
 EBUILD bzrtools-2.5.ebuild 835 SHA256 45538d7611c42a4451c815bb7ec5741432871abc935a9d0aecf38194a63bf412 SHA512 be6c634f4903aa981533dd51e7445a3742075319b2ab7ba1b92c5892ec2df531915cfb9f80de80168a63974b54d72be2d7c9c5b7f93a7e8d7c965f126ffce538 WHIRLPOOL 3bcbf51f078b4c0900443026d65dcdec4a0e4728bc723e8c55dcc10b8923cd6bdf7a746392e78f536d9b0c58a67113cf052851e91af343182403afadd44dd27b
 MISC ChangeLog 14940 SHA256 75e0aa7b93140e24616c7840223f9cf66bdaf4a936b176b9f7ad9f90203627a3 SHA512 e3f588263dcba9533b31dd2135cfa01b6d62250afe2ef957045a023635831f7cdefa57990022d156bd47dd174370f28af8fea309c26ecdeb6c96cc9c918ae377 WHIRLPOOL 2bf86a515b53dc5216896916003ede1b8af9890050be67336779f2fcece1ef915382def89b56ecd5601da0a21846fa91a1ad083b036342d05e0f56c4a50dddcc
-MISC metadata.xml 161 SHA256 10876eb627faa0f7204c3bca5931c5579842b655590d4a4205d095f6137074ec SHA512 8a036f43ea235edd491c209e25d64ed620bc9d7f6c0de4b155f3d73c1c4fd036d9c5f5eb26e3aa7999592903ad3aa107d650cc1cfb9b4b096149561bf0d13fed WHIRLPOOL 2a528814b399514084b09bd1663e0c30c05b1861eb42411a70a492e6f2ee24915653e1322c2c33e668e8475babf54409abf95c471f18779bea6179da7de6c9c3
+MISC metadata.xml 241 SHA256 04b64fca8e46459af638220733159c89c9c08c311dce01bdf60a5cfacfbc5841 SHA512 44a53bc137288537f42f8709bb6cca7569c86705ef35b71ad82e20b8be4b2c4549705f65f2f733ca14b285e64c9cdd7deeb359704e8d88bd7a1d74a4341a6b44 WHIRLPOOL d6cb4329df0fe78d647b38ec3f688afaa963dc745e665dbfa9c3246d4eae60451f84031dac9dc08ef01665626d138696e9727cc1c69c10af9bd1169a004aeb42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOrEgQAKFiEqTRuX4S86eP/IVCLseu
-rxPKsv1xDkB4NGoRP+Wn+PxSqXGrO1hE/6rb9YdZwERSy1wT9+ahod1t2J1OaP4g
-GCaAc9fxwVXh7/AHIwEh57MLQXQRCVnpgU0z4hUfZqpwQXMgL7dpfd/XdDOZrqJW
-smItYoJfMNx/rHn7Dx2nvwy5vruXLTlHeihX+PkYh4PYe2mc7phLaMO0Xt9gvxsD
-RcBJ20tbFzw/Q2c1cMAdQoWb0KDEj5NyxTg/GCfWDlzLGtfuqser1iEiU1jfUHsK
-uKt/z7mBMA9DuMlsi8L2qfsM6JCIxAQU3loK6LbOzKI0b/NMxHklQWT23N3ljqRH
-958IuwwDoN6KpCkKgUJ3aFtQAWpjcc8RfmhXp/Vj8Odya/hfIMkO9QooXmfvRgkd
-Ploie9Lm3vtqtRmGIm7b9VoxdO4ALR8riz09rqve60KuJSaBNdJfZ2qV8Ra8BLM8
-TUHeH2GKYilWX2u20Qk/sv5AS668wmcI/7ASkrQbfhtimuzhhYXr0D17OIwWOrC9
-R9KE1yltGCTC5M6A2NthRiKyEqZ3tYpHNMersApjSKpqFqWeOrvFgy89lE2361x2
-PQjdwcUhCTyDwnsMgXF1R4JcIlWlbbhFF6DDKetecrfDTOTvrVuM8OmVTVMpbshi
-PBvw3yPUdQ6Byntauoye
-=MpLK
+iQJ8BAEBCgBmBQJVfsGiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUX4QAKyemN8y0Fem+A00yl2mDjAa
+Le4YexFOLJPhq7H2Yf234IH/CxCGVwqc9mqR6sEK30jg1TdLt0HttMZ2G7y906fm
+0/ijASuc9AwEoPvz6woGPoN4yHL/jaEQeXBb59QIwdi8KO5zdOPLMg6rJr4lQeUo
+znXAaxMeVL9af08CRUG8iivpw2s6YKr76R2DW+xnPrtNfTme9cNrS9mWSXAmallH
+Ma8Bdec8ZTBe4gVBe5KVA6IkHI93TZN4L7BVY/N7Rg9FEOUS5aHPCl+8UfhMiRUE
+yTYAntC7dVYKxhDcl9J/e0WeyAsd3Vcwru6lxqXeVP3PWG71Owx43g9Ekh4JorSL
+IKimhKJ5QWTUL4k6XCW9tEX1WVNKwluj6dGTp//HidrnZnS6os67i9yb6dqQ+l3B
+cu84CfsUk9adr97yTrp+yGLi0Qfz8zkVIJbv19jD9IUGJ7HGPhr5pb4YWEUcGO0S
+BC51eFwpxrOrznbyTQXOsyVTeQ+LFjsKoPDN1rc3QA1T7RxLSH0zc/v2M6Ci2iCc
+jQrQWQ/TPvTkNEUYLbNjn2ut5MSaVOSIRqsVROKQy/FccZdbu9qYKUOwTjjwCnvs
+dRBGe37kh34Lyb7NHEF1ldkNsn4zb1zapr2DE77llh9XVmsDgJUUgUARbirOn1d3
+x19DxFSQLdbJaCCJezUU
+=0vln
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzrtools/metadata.xml b/dev-vcs/bzrtools/metadata.xml
index e74a92d1562c..5277693b7c63 100644
--- a/dev-vcs/bzrtools/metadata.xml
+++ b/dev-vcs/bzrtools/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>bazaar</herd>
+  <upstream>
+    <remote-id type="launchpad">bzrtools</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-bzr-ng/Manifest b/dev-vcs/git-bzr-ng/Manifest
index ee42a2f48fb0..5f6884f1e2c8 100644
--- a/dev-vcs/git-bzr-ng/Manifest
+++ b/dev-vcs/git-bzr-ng/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-bzr-ng-0_pre20120130.tar.xz 11596 SHA256 cdfee5b8a9d6bb5980123a00933f71de8e38fe36d3a3ce57a2a92eae1b4ba5fc SHA512 2621d60889fdae75d2fd291e4ef628f888524d6c5cd48b3fae8ac793984d3d58b47da2ca38477e1154714de7316992a879cae21103636e68f4ae0cd03de7bcc8 WHIRLPOOL e06dcf9caaa8cc455447d3956b311d7a69f5dc898e526b68abf0589ce371c956c8633935caa5554f1e9b2ec41c449e394b6815bff24452e13913c70456deff79
 DIST git-bzr-ng-0_pre20120822.tar.xz 11592 SHA256 315d7d567ef173d7a8e2f17304bd73a1f6779cd754e6d4ea67f48bd5d75a55ec SHA512 2652b76a1fbdfac7f7387b53167d0c76a0579e232f66be05c28a156eef638e40bd7548154e6c1853872cf6978b474b948396db176976f2ac15e7311fc731ba9b WHIRLPOOL 783da6136a4a4f1fb95ca39b285b58bac2499c23ddec82f11468fba7d4303700ac388c5decb023e61964cda8a06d77420518ffdbef0d6871081ba8be0dd8bf80
 EBUILD git-bzr-ng-0_pre20120130.ebuild 863 SHA256 be14c37cee041dbdb57ca7c8f405c1a51a9028395b7977d98e8f69108a47afbb SHA512 b7efe7a3712a45eca560344bf6524f75545df036e0d43c3484e1b5c06644c07cea54ec6561e61e8a402b810e3328a5d666a7f4b17fc8cc7d070f62249db57b8a WHIRLPOOL 8c573b7ce6b0ab27794c917bbfb552fa76c728a8650b5311953fde1599f2d3b6504a74a49a364048d57d63aa7b41912d91b23c232754f13ec7e00102eb644bcc
 EBUILD git-bzr-ng-0_pre20120822.ebuild 870 SHA256 001b5bf552059494f63dd99ffe23b248257fc8ce0c19d292738dc9ada29f89ac SHA512 0273bee34cfa898c0d28876c2af8df20aac2d960ef636b6f43c05d8177d9fd58e61901e333a8e4fc7f19172f0f416a016c8b6a31a16c841813099311ebfa5e1e WHIRLPOOL 34c1f7edfddb211433123b5d9ca94f09c04a691ed984a57bba7bf1ccd96e4285845e10018112d33ffbd7fe5607795093acd453280aa220ac4eb0d835c28237e3
 MISC ChangeLog 1166 SHA256 c86ed4ac080ee65d852629063b20d854887547b4ebf9c48b5fa8233458147a36 SHA512 72479f6e21c7174dc7951cbee2365956417adf0bd48e4b3985c6c1614cf7c791e28909c72bd5631914754d583c3fe45b3e6fcde8727f4a848a1642ac2faf1c53 WHIRLPOOL 39a2d1a8f8ee1f9ab840cdebab9bdfc1ff112b8cc654b09831a6999a428cd56916658354b70f6dea5e92ca5b93e8b9dd5479a5c78421b54248bfec736c889b30
-MISC metadata.xml 258 SHA256 5c8f8a85aaaf5adc553c57e421d9c8d53bd1ea5c88f2af7c590c3698071fb956 SHA512 e4a133cfa5155a7611f27c86f13bc29382b282d56db85bfc6bc8b5001593cfeb36b96066af256a63cbc815be50f1fd4b89be21c52587052496d3396948645f7a WHIRLPOOL 82a92b82dc2e5102a46c5ab44855a52b12cc612f4b615cd45ac2ec57129f1bcf42bc02ea84d1e4de17544635f9f1f32d8dd5e500bbea9ccc58fa1dd801ac1f72
+MISC metadata.xml 345 SHA256 4f60b61adddf67dbd967c9c8111bd9166f5b60c9b9ee6d97456d24968aef3bab SHA512 909a9490d1c7d55dacda56e41b1e5fbd10c1b5708549560ab1ecd1088ef307785e66058b4030a8dfb21f7e056648a8b6773bbcd2b2a828871bd8a588dc83d074 WHIRLPOOL 73ed7a3602c8cb0e110042940c2599b99c15cc9f20c502c247b00af788f612c6cb31a4babc326f04bec45eb6de23ff87db1426e92013914cda984e92eb9eb446
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlDAIQIACgkQuUQtlDBCeQLoxQCeKW/KaSNbaSmk1xyBc3SWBZ9j
-HL8An0XiEnIWhkZD86o+B0PNPfxCowLC
-=77J3
+iQJ8BAEBCgBmBQJVfsGpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiltkP/jApd4kImC3/jETqfa3FIc55
+aoQLyKPrJgwfxoc74pDV08IMMt/LywiiCcrsHMgH2qjwUJPGV0FGjskz1KIE9nLP
+idEjAlcoeS5GCMWfFIJ/H0ojGg+llMK21pTcNWQH0/CZAJFFwSMEhhFHbDsFAfUk
+wr6xeXs3ffX+ydgphBlhLjvQewI4l2wuF1X9LdKjJum2oAzeV+BwVu8CB3SN+5vn
+78VtalKnKZA+o/ynPtz/FcW6icy0bO4rgEREcunh6yYleFNJXzu7Bqt5cj1nnka9
+JKPPiJEsIi3uZTif/sG4fOHoyDSVlV/qHeLBD3cGk0NU8t7KHeneAp+6wkHSFVsq
+0mnA2sVmXB+6AF82xRnRkA38vTJEX3QvkirKf8p3FcFvPyXuOfu9xe8xkzdFxVzI
+Eb3TJpXxfh2cofjy9YPwLi89SfJ2ah4jKBJhr7C7AXmCECfXCWX2sYEr5v0sF17N
+M2bhH5xBWyzKe1ge6PJ6s2IGa7Uy1wPEEVv0kh3flwkSj5ngoG5VTiImbLW5nNwt
+Gqag97mQn4XAZNtBopa+gDl83gteuwQ4i9LNU90FXZq6OF4Bkc9Noq+KEZH5A4oo
+oyMwfUniApwdzt+AeUSyqCcL4gnHuH9WXKS88l8SEbhlX3q+WbAxxQ/6edmRyOkW
+HLydbkwuhgChjRxmjY4v
+=EEWB
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-bzr-ng/metadata.xml b/dev-vcs/git-bzr-ng/metadata.xml
index 3a93a539663f..42972bdb6b29 100644
--- a/dev-vcs/git-bzr-ng/metadata.xml
+++ b/dev-vcs/git-bzr-ng/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
-<herd>bazaar</herd>
+	<maintainer>
+		<email>tetromino@gentoo.org</email>
+		<name>Alexandre Rostovtsev</name>
+	</maintainer>
+	<herd>bazaar</herd>
+	<upstream>
+		<remote-id type="github">termie/git-bzr-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index f48f64f69508..cfeef4d9a4bb 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -8,23 +8,23 @@ AUX index.html 355 SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b
 DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
 EBUILD git-cola-2.1.2.ebuild 2509 SHA256 c32b98d98b6935f82f4907da7ad41b91d6fb832d241c17e31782f90b0b38c50a SHA512 1f8fb9aa7ae0b1a7d3a4c57786842fd4d4af1a994ee950c451ce0fafd137a3b3ead39ed791cb1ea93c783c6bb09845ce6d6b3262084b10d9747734ea85281e56 WHIRLPOOL 241ae40c1e7ffa737aa13f041e47a00f3286f23b172769d6ae1ea279161f2a7d50b85c65e2c528caaf2d9666e00b568702cca3d46dbec6f1e11c5a690a0280e3
 MISC ChangeLog 10351 SHA256 0a6397fedfde72d113463402a3f1acf310ba4f653182eaf2916266de9ddc82fa SHA512 e2f88e7291553fdd2d5e437fccb914a086203382c7e35e7d589a6ba1e1d24b07737f3535ce215cafda62cd421868894074d6273400469cfb7c4c3193fc8a009d WHIRLPOOL 15989a863e2785ff0ec54175b75c0eb03a64844345603a15bd651dd346d2530b6638cc1a8656597adedd4db6130f7392d83101d3e4c93e4d1b993c41896b4098
-MISC metadata.xml 339 SHA256 5d6def42fd0ce0e9d5c0aa784a1d2bad275c6efce6e3d617b92cfca27372744a SHA512 f9e797ec792d7db14d697fa4ac0ec32c0d164529b466c98069e0cd40baeeb21b84ce395e8a5974fdb454eed2dc74a4a829459a189caabc3f9203a3f9cd3ecdeb WHIRLPOOL 7cb339ffb3ab6b5f1f9105127d2d24cf59c930474f5b412a9bf26cfa7c0369d976d99774de16e4d046c5bcffb5c0664bce3741cafc39c3dd717f97865d5bdb9c
+MISC metadata.xml 425 SHA256 446e75f079f4b04245385003dfc201ebe5c40bbf42e4dea7f117c800ada3c7e8 SHA512 8dd6ce75370e754af286d825f7c4c114377bd6184d3624b865cc27c64c7b6363c2eb98b48834f7c24c24b37fcf09c2a82b5826f0bfb8bddd269645751f8f29b9 WHIRLPOOL 63ac828d0c867f8538906a7ab4cfd82927d8037ce299954c4bbc143627e20649a66720554b88a44eb7ca380790d4fc7fc549748ec2253495c5d4680fb98ba7a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVZfg4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVfsGyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiakYP/jKaONVs4GEnFNwpHOH5v+gh
-TGj/zjfV5cPixxn+t7f/qAywFj0tLyQDXX9Hw7yb5M2clMd4SaWLgbPYHaWmaLjb
-Lh3MYWuWhg80HiP7KJSiHBTkv5Ms7vzb5xOkimEzSBqsqQn7vSiCR3g3M11xGP8w
-8rMfyL3SbJTtZTHiyxCPPhB6tbpNxIIfBtyIyDG88yznR77zO+UOgmdTAZNsKKao
-+znMzoxvPti98xBI8nUauN5JhK92HE0p8+VL9rgn4w1Zbp81RkxCqmamzxC/6t3V
-aq9gop/DFckfcVJE0DXuuia00ehwGRlNDQfu/d+jC2hJ6mDvIXC92F54I1jxsPsP
-kvoeyCcGx/M3nIrFdvdEmfjmMmDNZ6er0ep412c93PVw62xpFi+aBqbibzgVwJTA
-SIIk2HXRQdhkVGqtQz/tl1h2YNoygEt1cEsl+rErTWEp9mEV4BB6YOc0yPhXQCf1
-xoI/t1c05JcHfnmZ6Fn2BqrTHzeMffoemLUP0A3jfFgpoNFGwF8JrnUcq3IGj+QV
-PjxjQ/m/PdfnrXzNmJJSWVK9ga5Bl9xFbIpRlsdBzTk5kTM/MEC+jxuIol2DuqdZ
-2Xe28HdUNv5c195Z4vvwcB7s5YUkREEo7h0HY5/y2aeCBjS+FcGdi2SIT4TZjtcd
-r+03BAO2ATPqiKCswgW8
-=sjVu
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqz8P/0etZ1GSEwxBEkSit24lk6bs
+N2m9sU1RH6UvdH5VSb9CfBg0qpHANgGOYaVm1nMs18Jn7BRTmsiQQz2K4oasJN21
+nEpZPkXoL/h40GnQ74P5oXEQJn57cNMHDEfZHdersYgBEn/HcE/5rkZMT4FUR/OQ
+GaqePraDPZ+aZ8dPaXO42CNcqA1iJJn590oUTPHLgxvUXotKmKa7LXS4j0g9K3RJ
+7U9yBVtXFIHb+AAJ87jDjQzxbzQcJABV91MWIe8vG568ce4Ist75mIFH4zrrjAov
+nZQFc8iuFJoLmdi9xqK0q0a65xIoS4tmnjK+RIHlldqeoMxjh4QsTSeJtToHk+SC
+slIeYKt/RHSzDKGFm0Mj9+gmZtPyuquXzO7Z9gFiqWyZLDFd8U/hDeaVAcIHeXal
+2xo94PL44UmVw5Glcwwsav02IJs6slaNgVnMjnwCVn67uH6m5sG4OtAerM4JloQn
+6oXpcHaMIJHOqGW5ZBNei709JJm3nmVC6sGQDuxXPfygsp8XQgtKWghoDgyHBASH
+Bumrcq7fzFgu9QfexJf8KLVW8kM20NcFACaj6JhrhV1BGontip0k1GcPEncf4wVA
+Eb8fKvoJHZrcM04HK+pZdlpn+3yRqf+RTSeGVt1d6JSJE/A68zK+V4XHJmq7r9jj
+kPnhGbwZ4Wq+TdW3lXqq
+=0MHs
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 6952e58e7e07..7ee28e37558e 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -9,4 +9,7 @@
     <email>jlec@gentoo.org</email>
     <name>Justin Lecher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">git-cola/git-cola</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-crypt/Manifest b/dev-vcs/git-crypt/Manifest
index d990142a455d..cd8184b9634a 100644
--- a/dev-vcs/git-crypt/Manifest
+++ b/dev-vcs/git-crypt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST git-crypt-0.3.tar.gz 20660 SHA256 6b2a03d28240c06ce4c06c3fc73ecd88f61b638e42f8534a9f2d1dbd17132755 SHA512 526630e58a2e74bffe954bc2f489311fb2261337092a1c4462788d9412b7fa7b1aa744402558bba39fe776cfa6333700c4e0ad651d262a7ca14d920485192adc WHIRLPOOL 80a2c9129a0c6bba05418469163a6c32242e84fff1bef4179cf8b60b2bea3f01c6921fa97459e23c3bd08223cfe18f6cf1363f01b5244f0f94689d55954cfa90
 DIST git-crypt-0.4.tar.gz 44146 SHA256 8825200a353ba9fe5f972c67e2ca4f1e7194cd3ad369ba14fddb1ba840dc2140 SHA512 aa146d922258c4a68ad1a211b58e3b1e1b1135661ebecf3ede1b344fc93401eb9d0aa51cfa068f76fab3ab7c936ad6cf46e61e0e9505aaf4f338e54826ae88f6 WHIRLPOOL 8bd32cc735416a2eb3df1f144ccf7e86b09bcdd475f766df4d83885f47ead097614641df95d52e8afbb8c5935bffa7716eeab67b4ee73134c790745bc45d1027
 DIST git-crypt-0.5.0.tar.gz 56694 SHA256 5150144a528bc74eeb47a2884cf2fefe978a1d1dc0223bbfcac395fa6a73a410 SHA512 0ed75e6962d8e8260811e048c22d724bdd63d461615e8f99c1d65a07f931f9630c1b853112f202b612dc69746a9ad03995f2947ad6fa39af56a878d993d65d77 WHIRLPOOL 0fc57344d3a0996572db5b0184611d27f8e6574733d0b7d39f52db17c06f1a2403358ac3da2f0e46cbf0c004446f82c5bedf9082f627f6ce18f5e99462e8b559
@@ -5,4 +8,23 @@ EBUILD git-crypt-0.3.ebuild 577 SHA256 fd128b4154941597e843c047ec608ae082b939a88
 EBUILD git-crypt-0.4.ebuild 577 SHA256 8bc79bbbd5712d07aded256ff59af92889c35ebacbda334fe96034cfb54c80a8 SHA512 7aa4f79f2fda6b239c15c7d93581b1cf3bf8a248fedf1c1c64083037721872fd3e229789497836d8b444a592c28bc426a39f7f8a2b3f147167ac21819a0af941 WHIRLPOOL 26b4af8fc11e3260e2091fac691154e380714dbfb2be97295dc953de94e94536e914a5fd4f13a89e35f39bfb759a862bf0050d6526b5611854e85bd103ffe6d3
 EBUILD git-crypt-0.5.0.ebuild 579 SHA256 d05883e39c758f923b56e896be6c5f7a359534b7b3e9f6103c673f4f7ab9f5aa SHA512 aa4f000433dde56d1dc6e11351c1bc7cc7d88d4bcd05bef7371a88a3e071df5fc3935cfc5871c726b1b060143eb681fa04b8545011bc62a2813aca32c0335cbd WHIRLPOOL 13dbb9acdca5ff13d3a02a50240fd8996593f7a7c323e8a139b7f772c01b11eafbb45e323565d562098a182ec671d00e358fd6d812271db5253bba8d6b8734bf
 MISC ChangeLog 593 SHA256 a2af594c5fc3be5d7bf04e6f3e54fede72eeb38f1459511caaf5f826ed6f1a69 SHA512 3a92b0bd6592c5f839d673e8516afd17e98a45f4370c6074aeddabbaf9f99ca36a79ebd332b1759b9582f19a2ba5fbff9d048e23a10dfb92cac1f85ce6e9675e WHIRLPOOL 1f7527c807afe7e7b7ee8955203947ee5ada855592e2e1b9d932a138fe724c6aa04cb3d60b811806cd3391d39783f6fd26ee15a60f08c8601c83af5548382c33
-MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
+MISC metadata.xml 312 SHA256 4aeb687f42e5e34077d3b89aef684095f2836c41cbbbdab2ddc9f6807cb54082 SHA512 96a282f0880b946b56c883eca36d9b0a5f8d43f6dc91f884dfbf887ca2e8b2ce8551447885e44464ee9b89c2a08bfdd85522a0db5b61db391c38e2d9cc38bf88 WHIRLPOOL fd93f7f028d8dccfa5d42c34ee74853205a8df2cbc7307dc9bd77748d4ca90d55d4bc494b55b0075167eecdba4c00108c1353241968350f76c1c30f194c1ab03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfsG5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmizgUP/i84+0BorQIWpDGkMMjmkvBs
+9xGamMNY4dPhSgDNwUy14Li6fTKv2ymkewqPvZCAhXoSKTLtcvuv/XDEeCCRs2gy
+yUq1QvzhHksOvobbrJibn0MjCcVgTApBWV/Djzj76fqL4L+dPadbLULTSO6Wm6hr
+qoQd1ese+G+g6bvYYj/GbJjEnTNz3ljXjS7Yn8rfcq6mL9XMmL7GplPavFNf+FkM
+97seenFuuyuhS7mlmg2HUYBuzxxaPhFNujh1RUuyaCjJ4c6VK4vF+8quXOfD5Npv
+K+NJ7gxrsBV6WP4TVrjUjD7Hd7m4Ts96Rd0HBqyUpShf27zSHVNevcOoP4A7f9qN
+WJJTgZvQ/J1RhhUZ3af45vOVz6YIRUKMi0QE1hWtYSwtfDvpvJMKoHYJSwSqw8Rr
+NY3k+DxYRf67qk+DNyvWyuW3JqgSXnur8mDA1MMPTr5z8rVYGBsK4DfU98wakSBD
+1did0sMd0nm/Gj4F5GQTj62Mt2FDXoj91NcaPHPhG4OvpDFfreKcyh/GQydTnfGI
+MH8cGoOnDLGnjuROiFmztEcO/3oFOETkBsJkzKDU6eFMAidSwSG/oY9mfkz+9l4u
++KYjhCLsnxj7m83Kg7X0wVKoqVNlDcugywNmMzyRwB8clhP69h6Xz01EzZMBN+YI
+gX2LacVJL6KpSsqKyJkU
+=sksA
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-crypt/metadata.xml b/dev-vcs/git-crypt/metadata.xml
index 24cbb90cf0c4..6536a3256f44 100644
--- a/dev-vcs/git-crypt/metadata.xml
+++ b/dev-vcs/git-crypt/metadata.xml
@@ -5,4 +5,7 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">AGWA/git-crypt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-deploy/Manifest b/dev-vcs/git-deploy/Manifest
index 17677ced11f1..9da780710150 100644
--- a/dev-vcs/git-deploy/Manifest
+++ b/dev-vcs/git-deploy/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-deploy-6.0.1_p20131024.tar.gz 55394 SHA256 fe5b810ed3a9595f1d2c733d1fd42f83ff8a1f1995f3d4a11f1f9b006d0a94a1 SHA512 cf3504b8f40d86cd8322ed93f2fe43593bcbf2db37685d3337b89501f39b38298dfb6d6cd51dd3f518f6048b680446a1660b85887ef73647829608e77b497634 WHIRLPOOL 0a6a1e8178d771f6d32967ce748fde883c5604da75a9c37fed06291e183dfe5a90321be0d23a593a72e68882ed44b0d7abba3a85264642f057f962b476115c0c
 EBUILD git-deploy-6.0.1_p20131024.ebuild 1527 SHA256 c1cb657751c7c93e4f0028ff4494263ceae4b90d339de0d435ca971d5bc85e4a SHA512 f08d5cd713602a558a39b5eea8930f51ebb1937ff7f5176e6743601bd90adadb5eb6eba3e912ddc16059b927328446174d503910554112270dc57d759b02b417 WHIRLPOOL e72fab5403753b92d9b5cc366daf03fe0740e4f2e52ff002ab9e94fa1ac1e828a024ee907a6c7d53d6f51c6eb0a995c1b364bd894da929a7c683819ff5d0b874
 MISC ChangeLog 562 SHA256 3df929feccdb9e2ae520153216e7354a1e5f790050ec79970c930ae234b16a8b SHA512 8fa4dd7bce66c5cfd09fc560abe66f69bd7302e1d287f3d35db766e99719be511cfe8e4f7537b726662c10ffce3ef1028348ae4e01414fc6a95212f521b5444e WHIRLPOOL bfb4d11789d8ecaa0c35a46fb07dec98fe70de5ad17d3c686cbe48a05bda3baeeafb59fe7192034ede539b090025b5e2982badfce80a3e46889ece4c6842531b
-MISC metadata.xml 236 SHA256 224586cfa8d5e5362a62f8100d30f61016933ed37a2e87b3a795f66eddb8a177 SHA512 3edf7cfa24fc1b13701ec10dc6ebd1b1b9e17d6a17fa928d6d4d0cfb289f8f00fd9c4a5a098a58626b69cf25c4c16968009dd7a5c795630fc6d9c0339f2dc805 WHIRLPOOL 17162dd818aebef715cfb224c845bf3323bbc4b54d328a11e61362020379db60d7d18a3ec4b8293d47f956fd45436a28bbf779a9cd073714afad0c5520afc2fb
+MISC metadata.xml 321 SHA256 24470cbefa4455c4cc60df5ac44893f15367e0894a1cdec7480b9cc0d3e83d87 SHA512 a82be880067ada0271ab41053f5443ab04e9c471e3149dbaf2c1e2a2c4ca488257ac3850cfca538f9e0dabae9c19d97525dd81c428eda520fbeb32b7b2e475cf WHIRLPOOL 071eca40b8737f58b1be55c5dfaabc3f63d699ed9e9b01db512c4749a8874e5053c84220622f24ed21d049f1fd25106a5223543636871f75caca60eefd45caf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJTCLP5AAoJEMOx0zmdw4Z1RbQH/2NykHieYKgKE9J0JHplYQS2
-reFQhdQuf0Hhb7OcY2l9/RBZ0fRrxlhldMXgb4xY07WDYp+35EV2Mg6/+y51RARe
-Sx21ZIEzFFJWnowJneY/Wdkod+UuN3xGsPkfKwm81+yqy808r8iSSX2MdvwwDqiM
-7s8ewinimiZVQiwgVwqGGFJkCdPTBhXwmuKVUUf28xdoHOJSeJpUy+/Hu7mT5T/C
-CIndZ0uslai9g4Qxr40RTArXMEEwWKv4G0ZURI7rddc7UNU8JnrghEyQB0QILc7q
-1Gsgx7ReGrIjK+iqkXWtpCSDGYLYCP21Arn/Ye3iU79HxlVj/WuZOunVthD33hY=
-=879r
+iQJ8BAEBCgBmBQJVfsHBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiz5UQAICZ9erotTDST4RhYfEQCJft
+st0BUcWBgjxbOdNY8/IlLmF1Dc0s4GUy0F5GjGFpXDRavsmCPBXKap16Kr43xRJY
+qMEqpUFRM9mvw3ub8pCtdRYpuxbQYxkFIWy4YJkS5O+t4+5aTLFiCppJcas7VW0+
+oJRk7JoHd2gF7FgdeMY4miEwr4axXZqtr11sMhxtBWgyZcGWMUYwL+qKQDD9+ovO
+nV01c4z6CbqQ6i17+FrNkfiUkFcxyBj8nbjrmkYJgmDUCoFStdcA0Mfeb32Y8KFo
+0JhSC1Tv1HmQx5i6MVMurrnPgarzu2d3L5tB5S6ppS9g92DJiP0pko8N5AYT3dTi
+yzxuWWonWGBWU51zeF+WyEyLUE+VHSDVhttFxc4GkbHRO0fqBTwCm0P/VbwmNHvK
+JuNAKhEHOjgWWPr9H6FwBeeScpTEdtPHNy+S0ohT6pNykvmUCZhEHss5sCyUHPGK
+K/WRTf0+ogNX3TFMv4ukAqwLW1NXfiK/PmrasiqmqFTHNBslnyQLkMlB165vOiwa
+guJtoLU321nalGwIqSDvlOdfMwEVIDGreVsDzzI+J41dl7xoVuy0kLifVLeH1jaU
+DcgdKZ7NV/fKv9RWfjwAN0dnXQhuudHKY8UY3fk2auhEovakl5nRYrkt1tk6R/vm
+mKpVCU/70jGp2AA5D9Vu
+=46Iw
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-deploy/metadata.xml b/dev-vcs/git-deploy/metadata.xml
index 40fcaa650383..e63c222cb509 100644
--- a/dev-vcs/git-deploy/metadata.xml
+++ b/dev-vcs/git-deploy/metadata.xml
@@ -5,5 +5,7 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">git-deploy/git-deploy</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-vcs/git-mailz/Manifest b/dev-vcs/git-mailz/Manifest
index 1ff485f0b55b..b14ca41945d8 100644
--- a/dev-vcs/git-mailz/Manifest
+++ b/dev-vcs/git-mailz/Manifest
@@ -1,20 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-mailz-0.12.tar.gz 7957 SHA256 15608ae026a31f6fc0e89b386edeee5c7b1d2de210d796264eb735f17de3b20c SHA512 811f646e5d89fa3e870fbd59e79e350329097f5533b42e7830409f97bfc35248cf1965591df40300bd6ef5a44c71928504dc0b8aba1037126df3b5bd7a427b51 WHIRLPOOL d6e90451c49a4f81e9422e5e1e09b127f84ee3b905e5678025a410dc0ae2a7de6e96f40ae769be628dabdc23aa8a843ee289282133f3f943db7f7f89ec82e195
 DIST git-mailz-0.14.tar.gz 8204 SHA256 422cd5828d285d595e9ae8657d09b20298cb30561b288a5c8e343b89c8107f31 SHA512 fd6c518de135113482f2f3a4e9d89b41b1797c8219e1ed9f424a5c4ae575400e7ccd9f835b40be5d74a5eb4e1bc7d3dfedd2412a317baea7e20494169399b70c WHIRLPOOL 361c4fa0f6c0ae7e9a9aa3b7fa40904387bf9cee49e095660bd4258d62bfb061573a2272f3b097c2fc87ec2a2970b3dc060fd3d7ce4cafebb976bcf4b257daf1
 EBUILD git-mailz-0.12.ebuild 572 SHA256 15a45bbf9857752abfbd3c9618a28c352e1449a5423b30b691ca799e7e991584 SHA512 31e178fecee334b67d7ba19b0653de7f40e3b47649dfdccf5e5c711c13ebe5e6f44ad9dbd77976be0ff35d4ebd39ed31b09d2b88b2c65ffe75ec5a2a0a0183ce WHIRLPOOL 5a5c3b42518a2e33e7e8b361d01dab29aaec4877bc4dbe62d967c0530d39cf8ae77a93a60b96a0a5ab77832443916e1e1d47a0462afe772fe61ab0c804191033
 EBUILD git-mailz-0.14.ebuild 572 SHA256 b4c7f9a97423c7e585c390537b0e7115230782ca0ad32b812eb622b327f05ce6 SHA512 135939ebd20f64ed6237a3820c35a3edee81d9c539d4ebf938bb8798390513f7e484d4d1345e32bf70a0d5be07e34f6645b72a198c026e30b306a00ca5fdce92 WHIRLPOOL dfeb7c19066d69d839870a14c155ded8f8c4b3e288650f0d45c421c1e66ddcedc6aaf6362753f1e49781ecd867776d6d28181fe434a4872a5c27941ade80c038
 MISC ChangeLog 514 SHA256 40ab6bb8c0ebe88d1ca06ce02210b83ad76d922bc2b3b3e72a823f68261cdf6f SHA512 04e7b1731c961b310cd7be019f643a54191f34ff9bb66c1bb517978d4a26771c47390c3e9cf045ff69493d92826b5851d96ee520c4fdf322cd62e2b28f75aaac WHIRLPOOL 248dd6456a855988a72a2d4cfd8971dab5e2755e654f6b96f0ddfc0f3eb89e25e2ccb268b1b4a386ce8ceb79d08e0e9dd386154ae8ec2e9d5e1f7046834c7c50
-MISC metadata.xml 268 SHA256 d173893220e19ba6dde9cc3db513ff5fa1fe796c32a4766f36a82b2c827de26b SHA512 c86cb4aa0ba4f5ab207d70f4bf2d8f9ac18c2c6792396b45d51dc48eccc442cf9cae1be062a87b7593f9eaa811de63dc6f4598bce056e0f6d7abaf2574b89725 WHIRLPOOL 6159321569f8dfa30970ed89f3252a6193c1a34c4b6b583603e6c3349b498032f1803f210548f7c175dfb01483d42d333beabeaef1f3c10c03489bea4660b47c
+MISC metadata.xml 365 SHA256 55611fd321dad88dbbbcee03eb8e7abd493950a53f8d8105035d719fbba9a43e SHA512 d30e0a5ee21d92258af00647d640398fb22eec1ad167f711d767833ebf6ff44bf39922a137337b2cb682dab7f4fe8d2f69514e9cdc33ad798d878facfec19b6e WHIRLPOOL 48b2535a9650a458e91ae4225e167a49a2168265a79e7fd52de35a34ca8191b9bf17e664731820aed04da437aef53afff0624559958961b5335b09ab90c9df2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVU/PNAAoJEIN+7RD5ejahqZgIALOoOlPvRU/uJBBwplV2Dxne
-92hJBAd5gZZCMvnu8AqRSsFD1rOFrCPF5ODb+FugllpZMVlOEbCbSxGvm59AbtLL
-O6yr378bd00ggMIiMVafGYpepdmm/DzHEJ8ZdN8cTXYNK7YYFB08uqBgHIcNLi9/
-0/NfJF9/68GX4CAyWwpWHng61cRZt6NSmdm6WesHqh91ZLjuhJQFsZ2cHVsFyRpl
-HQGHI/ksshbSCYVBWRJiIiFDDNuXr+FjfZybHtnQW3KCDnXtVc1vw+rtmG97CTPy
-He/klm7l0vnEi8qu359RMLNuhERPCDR7P8rMizHZ+Fr0XwM7u2CqByFyVXQtduw=
-=RISg
+iQJ8BAEBCgBmBQJVfsHJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmis3QP/2NK5hWuGZTKL7F8weeuxiwk
+v7/7kAP8GJpsk3tw1d9324IQaFNJjtz2OjCM6+WCHglkwXMAOdXd1LCj+EM7vE1+
+ssz/F9j/w3QMvOCgweVQQ8+gWVe11AdHrGTx5Hur7LCR3c9dFYzlcwgw95sz+zvf
+mtlJG17Oi0k7f9Khmqdyn4FsgVjI623iYnhmDVYTHZPfyHBIEbr+dCZzWHmp+mmp
+tMIm34NFWlkKRiUfVb/tVpwls+chxWWiABJhxtsVSnuOv3leLkhzdia2d385+8OD
+fQKcs8nMrUCDIkcc9/bOJSPpP3GrSP/wM5hI/OAmIgHocBsivMQEDKLH2fsxoWAW
+mvC+aqLJrISw+/JtXEj5naHn6jYsxijwE/no9Y2wsXRTDLRf77janrgTQoAH9N5Q
+LbNxbhOL119Lep5c0DzzkFzvpWCJpOuO+9K9ft8gwKJsmGA1eIihLVa95rN1PgQH
+nGU+LkEr8XNd/nc4sApIx8gH7QMbz+eMr6ytqxJHkhrlfnCYOoWgYtiCgGihLrHN
+rQ6cTH+ZjFCfoUn42xWVL991yagx/vphgpvUeYCM+H9JwQtY24jeKH2CXXKF7f+r
+tES7Zq6N3Uzp0DNa+DtweJ682EaTFthu3T2cL8kzsQz4e3oGAj2VL7TSWYa52rUR
+aHFatjlFAyMJwsIMix3r
+=Ncin
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-mailz/metadata.xml b/dev-vcs/git-mailz/metadata.xml
index 57aaaa1668f3..2edcc4239e88 100644
--- a/dev-vcs/git-mailz/metadata.xml
+++ b/dev-vcs/git-mailz/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>yac@gentoo.org</email>
-<name>Jan Matejka</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>yac@gentoo.org</email>
+		<name>Jan Matejka</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mailz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-mantle/Manifest b/dev-vcs/git-mantle/Manifest
index 2d31ce035877..e1ed7c535cea 100644
--- a/dev-vcs/git-mantle/Manifest
+++ b/dev-vcs/git-mantle/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-mantle-0.6.tar.gz 9896 SHA256 c812a0bb2dbd3a3c14b118fda1e71d8aee803cfe3136bf020137e4ecba516c11 SHA512 2498ed29884a8ac48bfb413c39e5bc9f232d47736ea4c0045404bd5f7268c7009a770c5c58c5449f843d8962bea9f288248a61308c4a71eed1b39d0c4b3375c0 WHIRLPOOL 99aff52c7ff505131e6bbd0478f2fdec1a6994e45229a717f276a2ce0fc233b91312ef7daf68cbea6cafa7e626526a5ccfbe02abb678115ddb2e635c574c7719
 EBUILD git-mantle-0.6.ebuild 564 SHA256 edc46356b49671a1e6d2c41256020e08a09b812f8dc988bcbbca493dfad941b0 SHA512 7eb866afdc3894ce87a47b81c7665da7cec05537680fb0b118fc46b48d718611098a3309b285d581b0f63123f0178b204b536dbc2e533cc906b930fb72a913b6 WHIRLPOOL 6f501793227bc8e9ce1f9ad4cbcf990d3cd7c13bdfdf415ddc34ccb4d9e755912a07cd96360d1ffa7d086ced1c6b9a210f28cfa4c01badc861b7867d3a710d3d
 MISC ChangeLog 408 SHA256 666622a55bdf0b37928b178c99821c7442220fea14dc0e48065948d281d4cbba SHA512 a1c5e7b0f8fc815c0d3daa58eef0a20bcfb1a38693218c80d02a476d6f926c0b9d6c99718358c74c213167db868f8d980cf822bc8a5afc2ceb4f67cc9de13823 WHIRLPOOL 57b38b9a44cab4ce0e5dbbb4cbde62526477ca21ed0304738b02aad520fc4eee693dcffbe75b1abf2451171c51dea6a1f600fc2050d3a8f72181303122b96d59
-MISC metadata.xml 268 SHA256 d173893220e19ba6dde9cc3db513ff5fa1fe796c32a4766f36a82b2c827de26b SHA512 c86cb4aa0ba4f5ab207d70f4bf2d8f9ac18c2c6792396b45d51dc48eccc442cf9cae1be062a87b7593f9eaa811de63dc6f4598bce056e0f6d7abaf2574b89725 WHIRLPOOL 6159321569f8dfa30970ed89f3252a6193c1a34c4b6b583603e6c3349b498032f1803f210548f7c175dfb01483d42d333beabeaef1f3c10c03489bea4660b47c
+MISC metadata.xml 366 SHA256 2ea61114b6c6ef1c4024dffa5646ecd12afdbec8177cc898d04abdae37ebb13d SHA512 7ac78352c94815d30fa09b06b473dbe67bf1ff7c2c0d0ae1bed997ba3f819721d230897f89128dab298c91fd52b92e8826229a5e876214e7c59845471a13ac6b WHIRLPOOL d329358e75d96d22a77a159e1edd018f4d8832b7b2af6e9df62711adfce53535815ff46e576ead884d3f437cfec04597671f91630ae5c7c7246070e26d0a11a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVN6D9AAoJEIN+7RD5ejahAsYIAMegbs/uQm3qEQOcDychKUNK
-XOOBIObK3bKnRl50Q6SIxLo/PLSUH+dJFiwvcXtjlLRZug81hhmZ9fSXAU7d0cu2
-58I/YGJxT4RyN+W++buD2j0FCvDd4U9rjjQm4WTr8es9ZzAjblc6h5ZXeTS0y9sN
-4kzPdE/2whvuoy8Ld3VjF9Aw1oheFfJ9yHK9XlvfhB7dAbdBUhcn8rgOspIVrdAE
-kNqXipQKRt71bdg9KeKytLIJybxYLC0OccBmQp4KTzazl/Vmg7YsIFCtXkX0DZh4
-cv2Fm3a3jPU43VXSm4OcCTH6+f6P05OVEWaT61x7S8Lo+ybdLE/0xPojAnS+Sz0=
-=isx4
+iQJ8BAEBCgBmBQJVfsHQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiGdUP/2ZWox+UrhxgLS4JA9soK9bZ
+Eu+k53FIJ2LlMSDOqlC8PQqDveH9o1KCDlL8St85Vw4+kGrAqL7yQsZUZAOIASlo
+SwuyCHXJQO/5RgT2/Pi5/huXcUS3XdnEWpHSNFaBIog/HihbhEWsf+Slq6tWdTrn
+N/9eI1PZia+OBm9NsTRKYHQxDNtNOYJwXa4l4A4oyM8CH5J+j7enMlg2tA5wJTx+
+KDoT5px2ucRE2+lBGsP9fkv/EzwDWRjR7UwBqvmJOAj6wA9JmoRtm+YaUkm6aI1S
+3Kbp6bUQJAG4eVb1HQ4yEcp9RGAsO4mY6PvKcuBlTi07cywIB74/RvOuPtgMuH7M
+97LD8MiuXp9/iXxvrvHFQcnsPeCiYCYRu2Xv95Rl9WiirTTKvhj8k9w4tppWzmuw
+O++qzJXFEBFWHHG9RCqwURp+V2Lvu3osjmFvfijn49JGkez4XATS4nhzrghJ0Md4
+pcg8RFb8QCr6k32xfl7x4K48PeKdiMRqC9LR/caKrrthJj9c8mMQnRKKkcJN9RHQ
+GcccFeKC2Limtm6ujV9651+UOOX+rxNwSHo3yXlYri2bIj/JgEGSS/YweGBv/S/M
+jbF1FuS6+7+zoDohXZXHpaU9/PCKeqGpSjPWjA2tKX8qFc8Ivra891S+R38u3KfX
+bEDpYjlkuLAMatbuAc/M
+=TNb5
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-mantle/metadata.xml b/dev-vcs/git-mantle/metadata.xml
index 57aaaa1668f3..bc827ed4ac76 100644
--- a/dev-vcs/git-mantle/metadata.xml
+++ b/dev-vcs/git-mantle/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>yac@gentoo.org</email>
-<name>Jan Matejka</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>yac@gentoo.org</email>
+		<name>Jan Matejka</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mantle</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-pimp/Manifest b/dev-vcs/git-pimp/Manifest
index d1356cef64eb..bc5aaeb48610 100644
--- a/dev-vcs/git-pimp/Manifest
+++ b/dev-vcs/git-pimp/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-pimp-0.8.tar.gz 10555 SHA256 fa3778fc3c67906814a31421d5bb7c2889dca6ebaaaaf669ab9e56e744391c08 SHA512 124b61001c088685d5d9d6f848d37ca170413fda08074a273a4c1bccd233fe606028d8de82c66ae7847f42008b82a6030fa47a493ddc47b65d02b69a1acbd7df WHIRLPOOL a880d9e73ef950ec3c76ed25efbf566b5ce2468bded1ae59d3709dc9b2efeef266d7285e9cb0fd0d4db02c8a62fa4d62d3184b740e325e20eeab67f1151c5526
 EBUILD git-pimp-0.8.ebuild 606 SHA256 5136f5cf6a0323dac00e4f2a61196a34c72e1b28eee3636cffb638bb2484ed73 SHA512 848ffaa61216d0c9916d9e22209157522e93eafca3d9f1d963761dae05d50c2573183af69b3cd5c6f4f099eec144ebaad2ed711e5a904289bac3727bd1551a1a WHIRLPOOL 0c7f1a4045d0258fcef8b70d2d0db126bdcdfb7372a87bb30da61c2cc20a7b51637033d7b048d1da8dabe8b3d9eb196e49626210e34bc5972ebcc853688e47b8
 MISC ChangeLog 837 SHA256 093557773c45cbb7ed7c4a1fe2abbcd6ca7a0a8c19d8eb27b11b5eb3121c0db2 SHA512 d1779dc9363eb64b6c31fc5e9972b25de7e3b3ea3757da712cefe5855f61ed41a051f6e93e8b5a3dc8595a7b72a58c03146ca92b0118687a3df92726a05d64e4 WHIRLPOOL a4187639cb00f86531170f45f56633df4f43c6fba59e80c588450d65f588fcf4d3106e581dacb3ebf9ee54b2a5c047526785aaa3a0a9049ea0cad9a0fd13971c
-MISC metadata.xml 268 SHA256 d173893220e19ba6dde9cc3db513ff5fa1fe796c32a4766f36a82b2c827de26b SHA512 c86cb4aa0ba4f5ab207d70f4bf2d8f9ac18c2c6792396b45d51dc48eccc442cf9cae1be062a87b7593f9eaa811de63dc6f4598bce056e0f6d7abaf2574b89725 WHIRLPOOL 6159321569f8dfa30970ed89f3252a6193c1a34c4b6b583603e6c3349b498032f1803f210548f7c175dfb01483d42d333beabeaef1f3c10c03489bea4660b47c
+MISC metadata.xml 365 SHA256 55611fd321dad88dbbbcee03eb8e7abd493950a53f8d8105035d719fbba9a43e SHA512 d30e0a5ee21d92258af00647d640398fb22eec1ad167f711d767833ebf6ff44bf39922a137337b2cb682dab7f4fe8d2f69514e9cdc33ad798d878facfec19b6e WHIRLPOOL 48b2535a9650a458e91ae4225e167a49a2168265a79e7fd52de35a34ca8191b9bf17e664731820aed04da437aef53afff0624559958961b5335b09ab90c9df2d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJVVSXXAAoJEIN+7RD5ejahuj4IALMimqE0VGxG7Tgs+tceRF/4
-chN9aS1MViVR1ug37tTdL/6ghzkYlvaLSTVhNMw+DNmJTTCw312spl0/eW1IMUHw
-rlphLxhgnCJLw3YQ8TuiVaz8YvTy37EqMWkSAywOJQpE7MrOnraxMVd1V6+UrOf0
-yb5Xm7cLM3KvS/PRf4MsTaf02MW/cYHKiDTS7UvuIfwYfox4cAffFHqEkF0kR0yc
-/KYEQsWwLUEULEatLxKW8eujECWQaL2W0j8erJDTfD9qBenzz3t3CyuUqpoGJoL8
-a63IUSxg+Yb9I/fyI9EpRZPaJwQyRk0NzOAtLo1+FuANtvqz14JB9lUPy1DvkZE=
-=uMxj
+iQJ8BAEBCgBmBQJVfsHXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiV5sP/RfMp1DTQ3zeH2CDQYKQHSq2
+ooVXktq/J1GshJgnqMEAhfIp3ogsV+MXlZY5RsRZ+NdHBTq6vBXkEj0InU7vHmsb
+QZO2iDLvcoGoD4jWBvWJM5XrS20mxtwTD+U6sckggVXjtQvKUIkEdNw9rUi1GwCE
+X06Dvit7XGVg5+Ne5Jzso4noPOcxrpC08YWhiDfAbFI2MYPmZxTA38nhu1GUk8sF
+P816QIZQJDNx7AFH3mPsf840WaZpa/cjAAQ53E9GPBZ6UNksZVhjFhxWKw/7M+x9
+OsBLAeJkCO6QWeEEKnRPnCfE5xiEs+Eu2MmxpF8of3xkApH0Gbj9ZKABO86APMVw
+bYP+/w9QDHqPD+1j4Cu7hKTKHXrDQqbvPj31fO+/oDyivTJpbYCoPpfCM1UNYvoq
+41OTDAUQLjXdQHaKpE4EJfYcYgBPulji/bwjrfF8GiYO7/p5iacx2aj2tVgMrHyJ
+tjDAVu2fepbUCDK2XPOoE4/MP2X61Pe3r5+44Z2G12NcedaboPqpFvZQaIz923p2
+AeQCK8kuTeeoyvZNHTw4Jc/5CQ00k1hRLtG40vgAASDn8y9Dbm0H216aKlLuKzx+
+FWNBtjNdOhs8V5dldJFNsXqbG9tiANZiXG8HKxMQ+auAsBBPYCV4ikK1spIGyo3U
+pjzNaEdIy9Jnh8jC8cqE
+=xJd2
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-pimp/metadata.xml b/dev-vcs/git-pimp/metadata.xml
index 57aaaa1668f3..2edcc4239e88 100644
--- a/dev-vcs/git-pimp/metadata.xml
+++ b/dev-vcs/git-pimp/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>yac@gentoo.org</email>
-<name>Jan Matejka</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer>
+		<email>yac@gentoo.org</email>
+		<name>Jan Matejka</name>
+	</maintainer>
+	<longdescription lang="en">
 </longdescription>
+	<upstream>
+		<remote-id type="github">roman-neuhauser/git-mailz</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/git-sh/Manifest b/dev-vcs/git-sh/Manifest
index c235ecb5bcd3..4f01896ef50c 100644
--- a/dev-vcs/git-sh/Manifest
+++ b/dev-vcs/git-sh/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST git-sh-1.1.tar.gz 26616 SHA256 2947304d328c9db77268840e29eb19abba7252f84b98f1d5ea957c8b906638ab SHA512 c6704b7340b2da5ca1a0484461cbf6f51c2428254f036254aa6bd2577b8e492ab65dbf7b2c7b2e6c944e3f9df9f3fb8bdca768ed7ce7a26554c821bc3f231882 WHIRLPOOL 22b578c631130bf3f951daf20258b356dfed48a69595383dbf0cbe6ecd6861940a721c03763511b45cf3f25d6334df9f4b85f63b989990343f8618c715bbfcb0
 DIST git-sh-1.3.tar.gz 26757 SHA256 461848dfa52ea6dd6cd0a374c52404b632204dc637cde17c0532529107d52358 SHA512 8ab742d0ff86e8387d03e2e190eec8ffd4725b1bfa58940f6673f5eac8c749931e3b3f8f20b898d933db36f56b323f800dba47a35294f865f456512f19a7846c WHIRLPOOL 01cd40187e0fe5930c1f53fba9708bc56ed14db20a5ecda897bdef1fe8a36bcfddda317a6cddef9297deb8956592c5003f15516afe22b9175354d4f0ac9b4aa4
 EBUILD git-sh-1.1.ebuild 763 SHA256 83043517def674b65cc896082cecc6444c284a44d90fbe3c0c30a478fdc80c46 SHA512 297481fee49de8c926d6b50855a23046af800741e50cad4e04e75fd9df765f42486e440f959d7f9af3b5cd548af4056e427bf19a287c828d8b0a7cd3e691d9c1 WHIRLPOOL b646fb1210397b474fe47ee45a4c9d0bf2b5429c4b402ce98bda32e1cae1dc1a47f4889189160959eb032628125a4adb3f8dcd773c84adf1cc495c369e166231
 EBUILD git-sh-1.3.ebuild 772 SHA256 8c7949e8cf3b556bcf79a67b4326e763ed35696edf0611405e053eb542467580 SHA512 9dc5626d5d8bbd2394a9b7372aa240c156e811c1bc3fb796054894a189d4f04e7babcc0227e4becda7a169befebc474166884b7e18e883bf8e23778c14febae4 WHIRLPOOL 9639d4e26f11d869792c085e97bcdcbd50a93209a21b9021a2dae3c34a05b4f90287befb135977c26329a69e5ac5279278109553e813ba5ef51550ffd4cf6772
 MISC ChangeLog 1450 SHA256 f84e8b366849a9b5c69e34b5ef056673bc20fd46c0c8cef7d3a6bca356d4bd88 SHA512 b11caf30544cb4c3b6538acf4c3f36e20330480538a8127ca3da46a69c260d2e91adcd792a4313b366e80b9066ea29849af38f02fa58a5bb3e6d0b71f4db164d WHIRLPOOL 43358be5a0ea72b46afd867c3b648b2c16a8b94783ee68fcb52d590c2d5073127c8fb4af341b2962020ff882d221ac45be8b5e963bf4dcab9f49568f3c919ba4
-MISC metadata.xml 255 SHA256 33c2e54bd9de24eba734b196ba29c93e0e7a0acbb6085b79bd5367c97000e9e0 SHA512 1b11faebfb1c94b86564c33e4c5fbb0fa082f5a016532e1b3cd775ee7ae58117d85f3760fe40aed26dcc43493c7a7a59b41c098b7c5afdb0d923216a2098085f WHIRLPOOL 9cfbfbd0abc794eaca2e8ae806ee7ab089b187dd8bd2b120fb928b987464017d5bb918943cb58b95e39f67ea0ad15136b7629ff654b0c0903f5823ea0f67be92
+MISC metadata.xml 339 SHA256 75fb8c2539cae6c24dea9fd788b88a008ef9f560348f2f80593acc803f409483 SHA512 a5de0d1ba328de50fc943bb1d126f01582bcb9703dcea1a251acdbaf46113640a63136772eaa71b7e0d7dac392a2e57645959635c1c64db2e73e9f8acf1e1b68 WHIRLPOOL fde1c959e40610782479b6147277170ecc63766e2b0566354106a6718aaa5d1098de7bf48d14018170e4b0b5985e6f8300cdda7ca7a5fa1b3cd19bc58ec435ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlE+CmsACgkQgAnW8HDreRYxJACgoVJH/Vba0lm3HyxISj0CFWg3
-BiYAn0XygQS7sT5rtOhdMFhGFmUQbdt4
-=pcsJ
+iQJ8BAEBCgBmBQJVfsHfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiOQQAK+1nJphimhMkFEmlpNi2WRC
+i9H2LXRCWaGjwsF2SmfQjXmOK+mmkvXHC0y+Z5ETGvgembfcSyZajMl0ev0Vn7Sj
+22wkqoWRqfV9iFmWIWJ2dW+kqf6tXuxF9TC7Xd1JScMyRaXmsp+cOT76gsdcYzhe
+xuAwB3NLLMgnTUJzQNVYaOBkUXDa3Xjlu4HB5119LPmLZ6Nh7Sk1qJKB3nufApyU
+ewovvF2kze8LVs+CHuwtNlZEMsp8l36bGj8LcdE21FNdp69/BK22fVOODhiJqY6S
+C55e6sI/HYCm0dZ829orlFAxITcNO1SkrLQX5kwcj4ADdvznRgA3u0cbx8siKc1O
+LTx01NqOI8EJcAiU78VxUjPQpzWv9l6/DE9t+nR7hCeVgYNCoj6XNc4cszAoSlwd
+TzMC38E9df/JAbqtpjoFBHV2T3eI7bgGl9jG0C+V+gwdaVImdfyvUFGr1qSKUS6T
+x+p3NLFiXoPsjEe4d4crZDZM1JcMG22NxCEjdzP/kIUQQojgFTVgzGHcH5UQGi9t
+u46J9TSsa9oUaYyOy93zds5Jb0WpYNvuIdJI727FbyYI4jrglOammKZjUaLRGl4u
+EY8ROB7vZ3m05MzyMOzZzDqYDwojzimkzgr08Q8KNA81kDztb9nc8TCvvjTsBT86
+NBTml9WS12fVp+se9fdW
+=Wqw1
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-sh/metadata.xml b/dev-vcs/git-sh/metadata.xml
index b5f78d71f5d3..cca713b1b431 100644
--- a/dev-vcs/git-sh/metadata.xml
+++ b/dev-vcs/git-sh/metadata.xml
@@ -6,4 +6,7 @@
   </maintainer>
   <longdescription lang="en">
 	</longdescription>
+  <upstream>
+    <remote-id type="github">rtomayko/git-sh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
index 3126671effbf..335fe8ff9c1a 100644
--- a/dev-vcs/github-pages-publish/Manifest
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST github-pages-publish-0.1.2.tar.gz 3295 SHA256 83cf09861e064704cc3f2cd080ff0512f4df91e9b4890927741918d2e06e7be6 SHA512 3011a070c0798bc3f2853c32c6d97e20eb4711a23b4e2c2b188b4158d46d1434d89f8400bebed0806b9781cd8e13800f3e10d9e99ff2fc4e02059329fbee2658 WHIRLPOOL 0e6f72c16e0c5fe422bbd4f55fd137c406edb45ac3b3d092692958a324ccd1016d97da414fff4bfc43fb20a22a08164b818ff544e73bb5ed27b40ae44e28c853
 EBUILD github-pages-publish-0.1.2.ebuild 955 SHA256 c2b197d8f245edbb344a81df35051c60a04f9c48d2ea10e7723a2713a4dfeef7 SHA512 a44abba59cc9aeebe10cb817abf8ad061cdca4d27bac847c4c4325357a7202c4ce7085f91b6fae5b4c66aadb6711ad6def53837a045c22782fc9f6a35b767b53 WHIRLPOOL a24602f853e06d8a69d374ba8fd5a61b1a2eee48cd7ae5763c22fc9f2738b3af94cf9743a9ab98cdaf24bd2b469db34de0f566097d72f68a1124eb99a2115c20
 MISC ChangeLog 1276 SHA256 7366f50db99a16241bdce5ded5a90a22b29b9a2c3d7086b79a4b286626610437 SHA512 81fc92349ec494a1e09f0b09068d4836896688cf99b5e43b349a96d28bd3d808182e854f0d4b81946f0f8bfd3ee797d75b82c165d3a04a80f1aaee853309e4a9 WHIRLPOOL 358c235e2ea82ad1b521c7c4137d0cb0ab939ac3f89854bdf91902699572742d69cc300cf3670daa6dc1ba41434c9d66632490bf8b7c6fd2ec2d37312eb64bb9
-MISC metadata.xml 602 SHA256 b3d1f3efd753f8e060edf6dda22f007ebcf5d16a2698eb814f3ba4ed9209ddb6 SHA512 0b60d771200c3192956a795862aba72d085e3f4ba75ef327dd9daf9ddbdd329812079f1c10da8abcbc14889e63e1732ca49d5d9608e8231731c513bbeeba7e15 WHIRLPOOL d5125533261c163ebd006934d579f373e1f3b1b30da7e93e3196bbba01ea07010a5779464e1bb9138b94c908a448d287151f59bb4d6bd443b90308caa82e79e0
+MISC metadata.xml 676 SHA256 e6eaa86ea19d809ef02f202235751661d0d498645f3d760b7db336bdfdbf18df SHA512 659053bf08861f3ee2d6e14ddff71017f12f86f7e9281ae776eb929902d23638a3da096b769f4b232fd3fa90e4f68321846b2f689cf285c11a3bfc74022c4ea8 WHIRLPOOL eee468dfa4bfe5550e5a3c763634fa3af8c30f5c07d5d86f89513654c1597cff4ae49ec4a8c220fa194949e639d071996c9cf51459dca9a1d3094d93edc876c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4r8ACgkQcaHudmEf86prHwCeKI12qeF/jFvIXdeVpcOnEflM
-DgcAn1XTmonupoWMi4GafJpqmGCFg4ze
-=nGJm
+iQJ8BAEBCgBmBQJVfsHoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi31YQAJWiI2wtXzDxMoJC5hu8vmRp
+UCHYCcfYv7LVwYjmS9naOX3lOpHnn+W4IjcSFO+BckKLmoVPKSkd8jcbLDPB7G9P
+0Jv8fzBtFnxOJMqz3+HVDAdf9/r5zGugO7jTh/s0zgoUn317MpZMTyp7IMkVEsAz
+Pk77x5qr9k8Ks20CFd0As4B3iAeEysSweTX+FBMQKVnqSCIVn7EYYcyear0kow3G
+M5GcBwPQ6g3LgLaqgGRFZEv3irplnsNwvQzlLyHTWnLxwKsNrrLWFv8sFyPPTOqn
+AC2vIR04U5VAJxY9cMUn0movhyw68AxYP0fA3brxVBhBWDwDFpvGrenbQbYfQQih
+JlFM21CwuiSeNHcd7rYs2p8c8WipbqXGKBhYAxwo+hAuxkwriA1J9CIaCVdQ9JhN
+0JPnJxDVH+p/axtxfwHy2w2PK1VjJgz76a3ujRwPBETEn+865gfT1yVrQODtwdo0
+EXOmzdvMsZ3Fzeyo6x9OUvYjuStE3pWfkXMQZgEeXRoV9jMrUtmwlB8ajkPOOvmp
+I4ydDTY54QsrjMBm1jdOVpsdG+M2hLSPh8pQGBYfp8o7Y5mc3rf5JI23NUnbJnHI
+SxO0IiPfh3zxgLRCIa1bWJHaNr9dgU3VlqJydUpBERNpqxcmVFFEHchL1WKtqVBv
++3mXMMv4kampaUtJMaNA
+=vqNR
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/github-pages-publish/metadata.xml b/dev-vcs/github-pages-publish/metadata.xml
index 5af4bf893fec..883cf58eefe0 100644
--- a/dev-vcs/github-pages-publish/metadata.xml
+++ b/dev-vcs/github-pages-publish/metadata.xml
@@ -15,5 +15,6 @@
 			<name>Rafael G. Martins</name>
 		</maintainer>
 		<remote-id type="pypi">github-pages-publish</remote-id>
+		<remote-id type="github">rafaelmartins/github-pages-publish</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/gitolite/Manifest b/dev-vcs/gitolite/Manifest
index 6a21c128601f..a93938cb9b77 100644
--- a/dev-vcs/gitolite/Manifest
+++ b/dev-vcs/gitolite/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
 DIST gitolite-3.6.1.tar.gz 165506 SHA256 7ee03d715cc4d87c0b6dbca5d79daf6f50f657ab33b99da256d7ab02cefe3f6a SHA512 b568f9e96ddfa4cd482197a89cb0142fcb2717028227a0a2e9caa9864bb95379042ec464352a1d99dfd8ccff780b1211e8f926ad8de284245fc280038eda481a WHIRLPOOL 9101ba55ba1a94b53ba3e9421d170d5b650e3e72c390abb3aea186630638b4fa6b8a5d69d9553ed574444be00f263dabcfe11e63f89f2eb3787ab8765e67c4ce
 DIST gitolite-3.6.2.tar.gz 167670 SHA256 012c372b53d765558131ae0df23a590d41b042c8b88e38e952992caf52fc4fbf SHA512 f8f041fde1b7c533fcb9cc32beec99dd83bc0a81795115e7205585bbe2f25135e2347df437e123349525a0186fe702f265330b259d336389b437cecf0e894629 WHIRLPOOL 319a4d91950ad123fd9cd76c1bb0a2afc44843b42a8ff0309aef9eee0f15ae9b830286cd1040219ff7cd1c93e0818f9e0191e34b3f41037ea165a4e0d850601c
@@ -11,4 +14,23 @@ EBUILD gitolite-3.6.3.ebuild 2414 SHA256 b72f78feb2d356064d27212905ddad650501eb9
 EBUILD gitolite-3.6.ebuild 1974 SHA256 91b40fbe0def1ae972ffafb2e4f109099ba1c92b7e9daa48c55406448abbff8f SHA512 5cf48b1e6a2001bfb75d8e0e92e344e0cbb2300991c241a80d0c22c3d25d707156e5ee88c358e24816453d59a0e4599bce68662f72879aa784ecccc26b4da592 WHIRLPOOL c47fd47a2aac19f723332dbc536f0e460a71f3d0dcc228929330e392c323427211087cc77702744cd2e341d5e315abdf43736154de7d0110c42fe275b5ccefd2
 EBUILD gitolite-9999.ebuild 2413 SHA256 460d9d180a99d64b62b5f020d479d74c57d9214a941d8c670a49a1e98ef8e85d SHA512 78fcc8ddb985e0715bd9d8b47fab7bca7445f1f9c0e86f7bf85137caec963ebd8c01d3720b9f5d882b50cfae0692b529abe96e6a2e22b284d60eece0ef067bbc WHIRLPOOL f61328e8b02ce9386472edc6d461e412b83dd6162e697f969e53becd3f4af78096bfb84db24e6e871e014e4ff880e198bdc1e97591c8f87ea848853a67f7ba3d
 MISC ChangeLog 7355 SHA256 379dcf27d5def874c7fc41c77745e7041831a84c42a4213d6eb4d60d8aa1863f SHA512 8b37a20c71966afdf82838d34eb2904a76233a5a77149f7b81675c52d79c82cb3858fa6ec40279f9b36a8bf5e4761a62d941120cfe51d2a7d23d338c980f48dc WHIRLPOOL a5f5c7b9e8433680821ddd9ecb2c487b06d5f6b7a4e3b2ccc9770a5532bd55ec95644fb53fb5da4c1917eef65e0f4588d215e1cf385c7c0ae73c8da88ce539a1
-MISC metadata.xml 682 SHA256 18d0866ea7ff65085f758309dcd2d624558e5324ac754ecdb3db0a7c0153dbc7 SHA512 6ebad19229eed70cb9c53dc11ae850eb376bb7d58c0d039bd3f12d9a8d0d4ebdf749b28ee601dfefa2e6e9b9bc4d37bbed7da56b787fa87f0720ed199110f401 WHIRLPOOL 002c556a8b8276910a815ee5e387820fd7d5f575012edbc11503303d846397cad43a5cfa6e762b312728ba6cbbf2fabfc9f7251ec783f1c21272db84429b122a
+MISC metadata.xml 766 SHA256 e849577a38d060dae484e3c9249858ccf66ff93f25d488c1f5de2240dcc5b7a3 SHA512 03cff7b5e5522cccce471d2e7e49502a2fca51986c011849b45222f7579b22fd80d72ed54c493ffb3f7ccdd8170f68e5e8437f63727b4364ebed95aadac89c93 WHIRLPOOL 3179e988d3a2f8626cd33a91398be3d0f4fa915aae32b8884cbe8e9b85b4804998e9f6e21a89f8ee41b9de036d0f49d90b549e5d376ea4ba52daa7fd954f9ea3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfsHwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmikAQQAIaEft3dDTRyK5qI0dAyhL7x
+p158P2QqDVLRkZtvwu+sL4j8xGC3o9Qzgn5wiKgh4pDTSOh7GlNWMfp79XisIP9W
+3E79l7MeXqi7w7e1u4Nn0WWrEy2t3t41aGkOEIVEqm4bLeZc9Gu4DL/Hn/ZiaFnP
+qY9K5mGo/CerDUhb/dMUU9CoO21Azb9OxQXVe85V55US4yhczikJp2MRwjsHZHvO
+0AykbTmwEHbJoBKWRJbnVNRq8gPOjn8YKmVWcWWg4zuAkid3y6RXtvvjj77GZjgN
+6TqTwbN1bxHAkKSeHkiXFyHxSeivuDSX6yLDgyuxhEEVWypDSvPPzhlIiKRHj4VR
+8qpaHm7i0gg1gTpbthsmMqmkbFdNoG/To5gvOTdRC2gEfZtqCucIk+6EBvhLT0vy
+ZzsIfjNXiRGANFVqdu7UaAI3GrmIpsbUDb3m/Ewc1rcJoZYJTrvQTRvCLheo8aft
+Kt4/jST0rS1Vk91zA0a3NlfwEr7g4WSsZQnl7F5ahn8fsYVsvzuFXmjgh58bbKJP
+fFkuVauGx8CgEcC1j7QLPhpejiBxEioR4wFDziF8mAi8j/LM0ugiBA+vNOEDKSPs
+ureotahn0OynkxLOacwiTYX0+pTInjKgl5+RLqKjyclC/hKudqlACpZZSZ+d8neh
+dJd73mSZCpn24cYGeUxv
+=2bHw
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitolite/metadata.xml b/dev-vcs/gitolite/metadata.xml
index 9ea172ebd331..bc43d2c4f5ee 100644
--- a/dev-vcs/gitolite/metadata.xml
+++ b/dev-vcs/gitolite/metadata.xml
@@ -13,7 +13,9 @@
 	<use>
 		<flag name="contrib">Install user-contributed files</flag>
 		<flag name="tools">Install tools to e.g. convert a Gitosis config to
-			gitolite or one to check if your setup is gitolite >= 3.x compatible</flag>
+			gitolite or one to check if your setup is gitolite &gt;= 3.x compatible</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">sitaramc/gitolite</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-vcs/gitsh/Manifest b/dev-vcs/gitsh/Manifest
index c32baa6090ad..fcd8a05985a0 100644
--- a/dev-vcs/gitsh/Manifest
+++ b/dev-vcs/gitsh/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 DIST gitsh-0.8.tar.gz 48393 SHA256 61125105819f8b10005ed41ed334ab2ad6104a8dba799090b0827b72075b1665 SHA512 9ec115f0e71e3708245b11cef0c853446b2e774c30372b5516a239e9db03937d9cde1d1525ca1812759b5c3d59101179490691756a84478ebd8667268beeb8ae WHIRLPOOL 9b0368091ffe59191eff481073b9fa06172d39f2a14076ff03866767349daf0fb3e1de62d7d176bd88efefaceecf68eec607b0ec72a86b1709c8ae9f71f3a96e
 EBUILD gitsh-0.8.ebuild 955 SHA256 5b49dd2c1ecee4e8d8378ee0164224cc8c19b1d1a31e7e69ccbda5f2f61539be SHA512 5e3002e0e8cdfed0f3e66af0e44b96f858e778893eb9a6fbffaabb1d4b615b52b991adb9ac4482f42598339a6bef368629e87d3316c1c5ec22c362055e9d3745 WHIRLPOOL d83bc312f9e39cffd58dd55e348018327a09d9f49869e8a243f7b61a5b3cf5b8c085a447ce079416899f7a1af4001213505442b7df46cbe2d5d7d59b40031344
 MISC ChangeLog 336 SHA256 01f163b6565fb3820363c610852497611fc3954c410fa60d7ea09ae2b5e39e97 SHA512 b2d319514b5d976fd104456e98e183ce7e9384573ed6423274b5a552c3b730012f687949f633bf9dd55590e99557d6791ad05f312f2b8433408abf44da6c896a WHIRLPOOL 0b19c99c01982b6d863cc10cb545b275c289346b69742f5024c99d9f14651530bbf4a18891391fe9ac310076a703429e727de39266dbbd8258de3aed9742b0fa
-MISC metadata.xml 205 SHA256 b4660d1f4b47c8c40fc6f986791c6da3f0d7513fe4489a0d2bbb83346dcb1f5b SHA512 0e0b6e89b125b4849b4164e7cabb5297ae930c4db499c6685c3852a60e209418c26eb33e452a0a78e800c960ac5032f97d436bc3b7266a0ac76092f6f2595d11 WHIRLPOOL dc3dc7c840a6640b42e3fc981c95d0a8e43d3b5834f447a09deebc1b35dbb26e48c3d85db73725c42d2036edd9f141fb02a3a9d61522861f4e97e3e974987473
+MISC metadata.xml 290 SHA256 cd5e5bda39ab036a9e1cd1c6f5faa11a30e893251853a1a4ac5fa9396aa2a002 SHA512 8cca9bac4da25683a85699eeb37e2ac5def2945dc950049378bffe5cabb11a68e2b18b43fac3de6e71cdaa7fd57009c20b6bb5166b1e696e7ed0511a6a276887 WHIRLPOOL d1ce66846eb59b53dbd011dd98bf4371999338e674e4d700d5785c4736c5a9c915870184d6b5cacf5461a808e150a8a8b95c5a81a11a2ff49a48b4ec88278e55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUWg2dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirXF0QAJJHdCGxj2goyfCk1Q9z8Ya+
-sxmMoKVf34EpaHUOd3375lvq7AqbHig5m3iNtyPOjZ2oJ4Go54SdFbmwgNQQRCuV
-zoXSXAK1GuttPMxegTRyJwY4HbAKYwDP2Uxf0dME1JQ6Y1VWUfaFJOBy3PDcXV/F
-QBSyYkTEv+tjYmcwppfiA5z83FC/hMgNvTUQX4+XRD+g6y8WF4ObKQd2pyGtJXAI
-ywmHKhgO6SSZglxJAEW2ZJisNkZ+FIAxbPzm3Md7q6BgY1bkzUYnj9oQRYT8foHI
-5DBbfCGkK/I5j42Ur0jfgVVLExuJ/ijgpJfxpb7YK1sncYAca40hlYV3kwqZn34Z
-en9RCun0b1SVAB8Lh1MF0lviFEVLZvHloyhwsbg7X3Ad19/RATGxuxs9yB5Fn7PQ
-HTaZ9aI3lliBwVvDGBj/SH3sVEE8Nd8nJLmoYRuYdcvwAe2bszCSCsrQtyLJsAzl
-1v0lbLKen2h4M2tyiMgKB1o5BSPEfH5e3lxdOGpMxuu4P1E03chieL8Fw5BXBvDP
-LhuWtR2JmmS5YaFGvhxI6Y0czJGEwa0pDtX/uFyQ+yuDtqGj2fXTjOQCuTUgce8j
-NgIswmM+/FK1Vd5LQKLxcAV095HLJ/yslRSj2ZvD8wXwson43FaFHOkxfoL/GYWd
-NRYvKpFOANKVcSou16rm
-=jwRT
+iQJ8BAEBCgBmBQJVfsH4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivssQAKEsYG+dZg5SCNusKymBe7Cf
+pKrIizYc59l7g7EhFgcM5ibLHL3PiuYwYX6LLJzevtqOO4LPcv/q6/UPIMPdjmFo
+DsDgjuEB7hj1EUkX62rmalK/bi4i5U6ilN9PFIEt/sRQJMfE0o067mn/5OCZCq+e
+E0WOggYPSogaKvwTPu2ZZ4A4y0KbHbPSyJtrvGRGOHr0mcHtzseu3Q+CnHAIUvcq
+my1QBlZMKBnFa+ta8IkkcZtv+ljL5M2AycBMHgcFDOMgQsIUT0VS0vF9GPB1Q2qh
+ANwM0vemYNB8aIKeue7Ln+StaziObJsIvHNAPNBGoyjrEs1Zb+lMWWqZJFB0Oh5I
+ytKXaLZQvkuniTceB1CZo2dsQ5xl42NFhsRDrA8Kd4T13j0cDSrP3n4YupDZnNYv
+//fxUVRKDvqZsDI47TXgbu2IiFWnxXftE4ZYWMnqzjgpAaMicvU0vO1idSU8vYwn
+Dp3pYMDH+sQyMrdUm+eui4oU91SK0Q9goa/IvcwlMtwummD2w6FZ2Me61pkTpVC7
+7BZ9jCC+Q9u531tWnaGXQHeVIb65sPQxaJ2siFvtU6L6ERAJOPKudPKtiSbe+jnM
+mfsVeUKdiOAmeo4/Krcp0MV8jzmtxqHS6CE51zmkSMPWNvF5DG88ax165qa0aVxX
+CA1Q7t/2YU/Y0CbC7YGE
+=KkQz
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/gitsh/metadata.xml b/dev-vcs/gitsh/metadata.xml
index 4a00a64b40ae..f89100e407ee 100644
--- a/dev-vcs/gitsh/metadata.xml
+++ b/dev-vcs/gitsh/metadata.xml
@@ -4,4 +4,7 @@
   <maintainer>
     <email>jlec@gentoo.org</email>
   </maintainer>
+  <upstream>
+    <remote-id type="github">thoughtbot/gitsh</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/hg-fast-export/Manifest b/dev-vcs/hg-fast-export/Manifest
index ee8b05cef656..88ff00b35267 100644
--- a/dev-vcs/hg-fast-export/Manifest
+++ b/dev-vcs/hg-fast-export/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hg-fast-export-20140328.tar.gz 14436 SHA256 a580dcd0ab2205de8e59cd3c46a23661799e433293b5a8d52179632eead0a690 SHA512 9eb7613634a176a5f273f5f86d0cdc544b360e98743866e47cf36859e1a84e95bb88b646e7c36d8671b7c7e61a0601684c38372c95aa173d324b897d6db7a39c WHIRLPOOL 1dd863a7685713fe244d71af1d7ffcbcb45a0904fad0cd31be64b524c7e5d37bd51ad13c11205eb587e606b57148f86041f334423d808335bf3137c46be9ce31
 DIST hg-fast-export-20140706.tar.gz 14671 SHA256 cab19797e7903fc7c6aeee00317d27608d1724837554c2dea47ac531b348cd73 SHA512 1c7421f6944af822dd0a6b8ac23c31f198b15da77a16773c5fd80371c3e059e1f45c1e67e5d88cfcf130e648252a76d923badf7fa2e0e3bd1a32e561c1c8f150 WHIRLPOOL 43d96daf9a77b18c7e7e2fe5375107a00e2b92f4ee1ed303534dfff42077b0a27c52ab65b89f308e3f5bda23f58a4f073537c60c69e94fed7f191e22bb04a49c
 EBUILD hg-fast-export-20140328.ebuild 939 SHA256 c2fa30185b88b650bb5841ae320f625b473759d13d98267abeaf191b1de2e44a SHA512 d186c37b138b90a9fd01ba075432a55e21c9bac59bbcb2b16dd905f2fad4f7e804fb40e24def9b5b06dced33c1fcf75a7c0527e038a59655f9cdff73f0dd4dbb WHIRLPOOL 24fa9433ce7a8f76d760d10dc069d36680d39671c6b08a63d92a90055cc288f51357e536659406ae67125da2010fe8bdb4c79a7beb57d0fe6a2c303e7bec082f
 EBUILD hg-fast-export-20140706.ebuild 1010 SHA256 846213c5b02fee9db46d493b00ceeb0df0e2376dde6e22cf88494d06ca7278b4 SHA512 ac22a4a04a2ed9f54de458ba5bd7fdd6d5c1a9a33ff48b50a76f2110d313cd863d5e9dff89d73ad03c40c2cb136f6f12a76fe3c8145852fed6a8544473d7f4d1 WHIRLPOOL 5bd7d9a54c87be565c69d384b072e2cb064415dba4f347a90ce90f95fb2446b7312217d4bfe57dec0a9b028302646729231195e658302f2442af04221cf9368e
 MISC ChangeLog 1035 SHA256 efa5f793890384d5f5bbc65265c2a1419d5f610d3a783c8f0597f1fc57061719 SHA512 5abe0d40a79442f520e0a1fbc9e3af49af196a0393e624fe75bf6f65df60236f68bae5551b7251e5d60a79a1f0d1030bd967d21ff0b54a84d1d958f3d5f9b9a8 WHIRLPOOL 3c11d619b597703e19c7923c7cb15826379ae20711af3ddcdbc51b07bf609ffbcea945d80c7eed5ea4c73764bf4c4558e0a1b6c83f4278e29571babaae50ceaf
-MISC metadata.xml 237 SHA256 7b16ab35f387f952afdef31d1d5d20f82b69ec2e8a55bbe7215cf78ea322755d SHA512 52882e327ceb9391938e5b9fdfcb2f0d9c7380f71bed273c84357ecb0f1f0d4e704d9c53e4791dda1d7eed5df2c4c029281de182a5076849b26718fc83462cc6 WHIRLPOOL 1b5ae26efb6a0d0edd3e21494e52dbc7cfd1621316057dc8d876280444ceb302c94109b4e780982943a7837f19de8f11c85f49b137d31f41d7c79db6387dab90
+MISC metadata.xml 318 SHA256 cbab61d137dc5086bbedd1a7bcb32bc96c343a591cf114667e246dafc37f98ec SHA512 6e6c0d85999fbc1d37de971cb7ff662486e068f55ea105b5b0e948a127eddbb003c6f27426d878bd7a425e57b562babff255aac8f560d0d29fa25eb9b0225bb3 WHIRLPOOL eda99b04199c82bd297458e31cb66b44eae972720b180553bc1796f0cb6e98e69fb33dcadd1c926ae9452a0014613c7c1d4da6994494e1c9f1d19a119ee34629
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6YgP/3aV8aQiKbigGL/E8x+qVqKQ
-EEu8HeBM1yaOXTjqsjZVPTHEMgDBGTWTrLE1TeiYbTwMQjDTyDbWMmxKyGXVTJW8
-jKX/O9R+KK7VI3hZZU6Dsp2JxAHDil8UztC3s5wvPrrdC8tOhAxrlY2owWTth/NL
-Mp1WiParTsf8ef94e0gGYYbCagCD0o2X2ZQp1Z/8h1y6HGNC/wY184cTP/4NiD4q
-fXRX72a7Ctm4mGHHcbUsGLSKMsACgrGXoiG2lmIZvi9DrVBhsRP9bFMYBt7D2rT0
-rLphj75hIYao8D+9pWxGD4X6ob4uQgW0GFS4he/hE7ndoTEu5dmtF9BatFtk0Y89
-RC5R7N0JsLzSePA5ozpRuWYVSBg/RuWdyOWJJopPVaVPYqF6tkOSXyvF6N7Gl9pI
-ihAarj7hYa0eiDfuDOnmL/fg7uDpFa8EYOm+J/P47bJS3RVM965hZ8rxAktLhbYb
-MtJ9icKFD4MmE6mBwkgzJlgl6MWGq7WsfZtOCOQS+iSd3WH28MYn6hpK2Kg7ax9o
-jt0hHxf96/4GI6iV6a3rcdkCsLI/0DZPvsy4+y6ETH6Ve4WSv24rcoLtq/Xmkb8G
-BJSmGqj05nQPjM+W7ek1o9qrOpoH4YdP6L+KzOGIJO9JCDujrSvaRM+OygCfTehl
-cc9MnH2uFN7EpeAjWaMw
-=BC7y
+iQJ8BAEBCgBmBQJVfsH+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHYgP/2J59a+nkCSrkwfXIh2/KBEH
+arFdM7c8XnmH+Bz0aV7BvgNaOBUguZk/q+s32mvMQXKlTHROy9Tb3+7u5AnpWLQg
+BaS/eS3++KLjz00Ph4RPIU0/cgeoZeFb3nreDnyXvRmKmuVDKSZie/VPhfBKaqb9
+UXhxbpgbHrdvRVSAXVOQE5Is4LAJ6iS96o35Gib+H/xTe6nXvQbz0fQKLQz/dLeT
+Jtfk6G1qDjz/1Tom5g7hvUvMpd233H2ncvqVJoKkvbnawwfJhxCm0HhohrxBK3NN
+MYWiqM6uMREZ1IVORVFmAlMMmmorePtsAc0yXf1KUrMD/botLHsust6qOL2Y5Z/n
+ATuCpTVXF23AqSxJMaeE4p6TnVL3siNn5XtSxaSA/mOe8QkE1V/K5bkQaEyiB0QF
+uoOCuwUSGpP6pLePXrmGJkdaHHoZum5TqDOYm3vbsTLxUwkx5hD24r7J2nxlalOU
+NiZGDii0+M6++6XzIhb0yO5WPnevNmcsxLvdtnO0lucKL2R2ypIQeFie4OMbC7s+
+pcVMu6bCuo15IXunxOxgkp519a9YoFF5/yINqYxDR9DiiFHVSu9RbHcHNbFWFXAN
+9pBlHlOX484D8bsNlKV/33kOponhHJ+A/jby8XQZYXagrn1SALP5h+EAjKKmgGGs
+opGDrxje8FbqF/C2PKs1
+=8owM
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/hg-fast-export/metadata.xml b/dev-vcs/hg-fast-export/metadata.xml
index 745b9e1ce74b..60462d91cb20 100644
--- a/dev-vcs/hg-fast-export/metadata.xml
+++ b/dev-vcs/hg-fast-export/metadata.xml
@@ -5,4 +5,7 @@
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">frej/fast-export</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 5bec3bf8b48c..d6e01cea039c 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hgsubversion-1.4.tar.gz 133564 SHA256 e3febee217ce321d316712c4c75236dcc2f2769c329c687114e2c37d303f1c0f SHA512 23305b210e2f51cbcd866a5d87caa23f8e5d405532b3139f5700572f13f5a52c1699d937e8c87a8580274ddc1240f51b773334083ced44da98fe7bf270f006fb WHIRLPOOL 5c7b4b9a5537ce4b65f806db23ab4e0ad920b394b44a015d8144c8da9456ad3ed8f3cc8911d539a2488fbd1e446aa7cb6ad5af0c195461ad580ee497cf793a91
 DIST hgsubversion-1.6.1.tar.gz 173184 SHA256 bb2787259a5f9716fe4ff4f6a4e6170fb8109c6f74550cbd92ec314d8d4278a0 SHA512 0f8e50a7445b85ad6a4984d22b976d55ebf6e15ade85aed2ae87aaf7914bcc9fbb4bd68347b1377ca2d0d307de31cbcc5e2b3691327ab9463401a1c5eee8a6f2 WHIRLPOOL c581de56a6ae5cf98ab78c8f61e1f1f1f7df895be582ccad94e05675965770aaee7e51371a14059dd2bbbc29407697dcfe1341c564cced8377283b75e0569752
@@ -13,23 +13,23 @@ EBUILD hgsubversion-1.7.ebuild 1091 SHA256 848bbb459a8b456b173de7eac8fc60a06388d
 EBUILD hgsubversion-1.8.ebuild 1091 SHA256 da2343c51a5f3221eb3649aa2da28082a9f68197d115d5982e9a423450dd9d2e SHA512 c6c38bad9145136c58865d1d551adef89c3876333cfb04d70f5e2721de0b2837fa1d4fc7fd29928a7d378af0ccb8c01af2cbddc585df85394e19c818c59c01f9 WHIRLPOOL e74c5b8b7bfd999f9ad54cabe58b68b17bfcec5ef72ada100fdba68b66cb0e36e8a8032a6dfeb62cf7ccc7c896fe4a774d953aadeb1137c554d228aea7fc4b8a
 EBUILD hgsubversion-9999.ebuild 980 SHA256 a281d83af901e7b763277e8526b0c548f309fce16ba0c4107841bb7f3fc382f4 SHA512 e78e6ee90c00e9e7ac4bbe615bc9730b6c6110b279d7d0cf2d90e6491a89ca02ec9de0789a91f3f0dc5ee315976d91ded1bb2dcf0f8413ea3cc206aa23f7736e WHIRLPOOL 6fc3427706845a00e93d56499abe90e66e6d9df5a209662a1b86d653bae831341b2a8ce68aed5d491cdaecfa4e747eb608aea46f1ba5c6502c2713dcc9070923
 MISC ChangeLog 5549 SHA256 ee435d711a92b156e6dcb77c519af68a2d2bfbb7c5c1941fb3f7f98162d9e4a8 SHA512 1f59fe668ef1bb088842f3b1a513664386bc40082dd319b1150f0b235941c81748ab645d576bcd8a8806153b7e24e6e851fb014a2fb731ad71573ed1f22fbad3 WHIRLPOOL d5dabcfd0f5e6b671a1cb5d56a477dd10559c17ee817322bb957bf08712561fe59856dae23c2a35d7a67468d4049285fac48e8bfdeeab989bda564454ea803c4
-MISC metadata.xml 306 SHA256 9130963f969d877374851080a932988d4e1f28bf9c8848c1823cbe1ae3ef1d1a SHA512 6165bb7179c96951cb254ef6031efbf4a07bac5a4e91485493055921e50507aa77de4b85334e4b5284bb4cbeb57f2b8a784f1c2f4ed0f3a41f2e7a5c999d168a WHIRLPOOL f62ad42c8c004c6ea8586e3275453e764a7ad109f8a09a7faa07bce88e197542a16cc6f67aca617c78b1aaf16eb92786202ae9b00c97f33297b0083369e21d2e
+MISC metadata.xml 369 SHA256 56c68287162e2cd0ac46adae8d6837f64cea511341c457ef5aa43dcdade3ac65 SHA512 23bc48945b7cb73c505f716df59de0f0d7aee8de6e7322f0bbd96738952d273e65e9911876de55b7d0ca41b68ddd3752e123db7cb44e6ed7539b93acaace1656 WHIRLPOOL 79bb797402ec4379f8626f664ef9a119917e3c1b08df3261928d03dd8167c4b9035cd5f8b00267a7185e31fe923ec7b66ab3b56dfb4944fecf5cabb29a3d98c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOvGIP/1gDPtMtamvJ5XCP7wBrWx5A
-+4ChPISliKxvhNBBZv16IslGia84PtQ0nwfqWVhoVsiOCTqbwby9YWZq+/t8JqOY
-tKLda3/U1zQ2IJ9vYhg9AwBu7HEn7E1z14xPUIUGv8C0Rie9dvh2Wm1lQRVszqnF
-Ap/FoCa4BOh6E8d0zvWXEmKCTimOPKliDDOzFctxw9KGnaxkICOrCQ4Y8crfgp1y
-Ye6TTN7FCpS6S9GZu3yBcfwXXLLvrQex50tmMiA+XVKWYwlvw8+BYARMtXx6YZM/
-M3QqVhdc4txpHiVeRDx5yeic3K8x+0+5z3YJMCGlonh5GDCduXSB596C7n0BTG3l
-+pL9ysFYZ1tp+26xjeUVDa6h2ZLYXrE1JPXVJBCfqb9nLyNwp867v8iPQn+8gQgI
-I39NONdFh1CRGEH6iY+I0oHczqiSeB0ef2Iy88awTvpQBhN84mwfW+7zH/aaik0X
-5uybBiUlMOonx4gNthdDqzPgVo0cjfCCxVN0BLvWiW9MLvYcaInCjQBwon6dRwCl
-GaL2ZKFzGK8PLh3WEgQqmUXseHhtaDp+mQGLv+2cM9EDaTyVrwdb7mu1MKcOSDx6
-Dete+PsfTYuAOW34c6EWQq4Y4cd7e+8ixKKQBnIp/zTC4Pe0jHVUQwY6dCthbOLg
-oz6+pEZNNBxGAFr36+fg
-=hjnG
+iQJ8BAEBCgBmBQJVfsIHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwXUP+gPy0ZkcAiXdgulZ1qkl3nNf
+fhtOQKKZu/YuTIn5zSYN6mFqeAGckG5lZL/2AGOiIhKonxis/mlEiHOY23mmmgSH
+tTzJa5oOe/WdnVsW7lZFlasBprlhvO3uxblozvFdkl/dvs3prCth6eReiZK2VzVt
+nLRUrRtJHv2/vXj8ol7/9+v0ImAunx3+22HuhtKFd4IJdOs2yd0Ak7NHb1CFknqK
+iVmNd63cNY/G63JTmba3TfZme5DhlLrQtHk9TO2+IS6f7g2WFCfUwsvFiKZZhzZH
+jLbrpJ6AREfxAwBWHnhs/2mCxvF3vdRYuOJS+u9doXvbAye5JdVetK8ZGoo+59yV
+qvO3cDU9DhGAMrRLIA0Sjpid1l46OnIJJImphL8FLxrXacalIz/J8YyyIK95zLgF
+uk4+HFEPwH4X6g8aB2kH03YGZWn4kDitU5aWE2N+HFmSB/ocCS6q+4q1iFmep/h/
+KqRCiys2QRG1dQ8WAc7cVkqc67LBSqI7Necdup/0Ndh6KH4+KPTJrlG+K55x3Dzv
+dn8j1ULZgbWU+K+BOCJoX/Oz8Y31qzALSuyWwBV4vB/oRC6hxE6pqzNMEE5QtU/9
+hi/ivmsoyoCNnwx0YP/ssMGkkNMGP5X1wjo9QBtvWeXrszgupzy1RHuRwK6FGbMc
+QSQK20CO7JwcfTIOroSw
+=NVO8
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/hgsubversion/metadata.xml b/dev-vcs/hgsubversion/metadata.xml
index a8435d3210d3..5d9af741ef98 100644
--- a/dev-vcs/hgsubversion/metadata.xml
+++ b/dev-vcs/hgsubversion/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">hgsubversion</remote-id>
+		<remote-id type="bitbucket">durin42/hgsubversion</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/mr/Manifest b/dev-vcs/mr/Manifest
index 0ab31501edde..e741f98175cc 100644
--- a/dev-vcs/mr/Manifest
+++ b/dev-vcs/mr/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST mr-1.20140831.1.tar.gz 44706 SHA256 efb864848d3c557d913138a52e3d5a4736edcccd9f9b46bb65931060cf8548f0 SHA512 f8004c37200bf0f227371d2cb747f38c1bf37d1ff270c299b1a97ee92b22a2be039da3c8e9b31b4402adb8ee985a16764115debedad027c5b0f830ceb3a39216 WHIRLPOOL d2eff39628324c3be7996a715ff487e8cb37313eecaed4dcaa25bc320c5d96ba32cc578a85dab241b53556b297ba29def3cd9ea2b3b5a7afe5e2dac57cfd544b
 DIST mr-1.20141024.tar.gz 45032 SHA256 7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a SHA512 d39428bc9858a3d9649ff841fa688a5cb92632bf957af9101c7f7e709d2821dbc38a2ab5400d9fe31208159873156cc6d740538b5567e758c35afb01744000d6 WHIRLPOOL a806e3543b1fc4864b2581883a348cc1441a75fb8ebd4fe6ab393f8180b820e0b389c0b40123798b8257a1641409747981227b6616368eafda4f3d56e9ba39a5
 EBUILD mr-1.20140831.1.ebuild 748 SHA256 e6ebd8da57cefb7efd745b9d60a4b1a1b2a81c4fbc23ca677520167fb058a7f4 SHA512 cb6b75ac37be8f0615e615eae7358fb262808ad50c557f256612dfbab81d8e9b17254128668253caae696a910da42352a95691deb1c750122d76c571da61f7f1 WHIRLPOOL 1dd058519a10b35e3bf6481352fc20c32e14a3f19bf3462ddabbf4fe512173a06f53d9f7c3bc8f8f53ef37c39c85a94b3601774673225ac9091cb6a288225711
 EBUILD mr-1.20141024.ebuild 746 SHA256 dbf9b458a7830bce8bd575c8e8826a31454227d6529abbecc4b4d6ed158c9823 SHA512 dfeb5517d7cff406f34a0b368289e5cae3abf8f2335ff8a3faa4c1f1bd0f0ad384a571dd30ab2c2c835976fdcde655ebe9ddc290dee1bfaa33c053695201ec2a WHIRLPOOL 28677d8947690a9f25dc8edf0bb56588852aa783ea9cbd12a3c74aef30406767cd424f4b83c7bca21f3d4bd8ce47e6f7667c928578a6d49ec208701db7f75c92
 MISC ChangeLog 3666 SHA256 426659c9adb3fa2e3ed31a8c0de7fb250848ef8a50be40eb1325f4347185b8a5 SHA512 b9099c5bd2174014421440179aba40fef0e54ab566338acc00a70b65e1141f31a09388a0fbddfbb752b6d66d05c4f0037482ee1eccfdb8a634a3310ee0678e65 WHIRLPOOL 25c18b6816dcc0b272fe0ed1c215eafac774f9d0ef806930358464d50097b9c055167b8451fca4b710c6d3d27e2426b1629dc8918f3e382444bb4d6ff1477620
-MISC metadata.xml 1275 SHA256 3bc4f31328f4effcc78cdb4c488775cd8c5d857fc705d1847f51317b317f54af SHA512 457d1c3cb9a164110e83210e9cf41262aa8d16a04ac11d84578b7cdd7b9c3edcbac9583b58e7a570b44503e4126ffec129a5de89e1648385a368b2dc708f5c5a WHIRLPOOL e7d54122a9ab567743336e9b0f548c20b19bd08e825594bf38436a0e90d7e87602139e81dc93c725716bce56e2fcee7cc01df9763634c8956b5f322427cd7c5b
+MISC metadata.xml 1353 SHA256 e25fc7ffbc822acb234ceff48b763591d71948d73eaf00572da7f11410c63f4b SHA512 2a374a93eaa4e41c34e28b18279c09fb5f7704d273ab3d373a9ff720f1d569dfb6f52fb52a7a1d28f9bb5c398da31d2631ae8e3ec8cd55a381e7801867e5326d WHIRLPOOL 35e40da959e80b8acb639092dbc11fa3592c4d94c3d1c1e40ff24f1ae80e8b6b8e90cb2fea89b6cf7e9899540c2da99849b30c168fa1ef01ad193a7c05ba0856
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUxhonAAoJELp701BxlEWfMrQQAMAhJYau2rOmE97gdhB+EY5F
-kMcF2Zqx6Qc88N1nd5/MDFnjpze+4iSw2dE6RYUJLsnjr/Q1B8Hj5HcewkaUvqKV
-3fumDaMECczV3szDbwtH0x3GaADkeXpqGXMr2EkD28OQBguKAI2BEqw8+jIiosST
-hM7hVpOYpd9RQWY23YKGyAwr0Ocpq5yqJA9ZeuChpVv2cQr6C8BKHypu5ShCVjAq
-DEfgxksJn0/o/LTGDBAXf2/drzGs+Qs2FO8N1KGoySKMc4LyLspRE2ZNG03oNazv
-KsVMnC8heB3cX3bxZ208jPUc3rLc9BWWDAZ2IwMw3l5OE6XEVEMAYUDdWlcQQ90+
-S1ALEUD0K/VMe0FjeV0Idgg811E1UbP3np2VdHTIB47alAui96zxM2Dypu7MEvzr
-aTmwqckMo2IF5vMLOBOxUBAi/77D++egmTCbJ8LGE6dyCL/k5EeyrkklxG+9E7Ws
-ycGuVtJO2Hn5GkHDAlSmdK4y7zdb0d51bcaqmpufjGylVBZZxF4X/YRFAOK+5k+p
-V921wOp2qyst8BamU50jn8ARTIigO5I9Jzp9mT9VACghfCxv7r/z5cA8bJom6EEH
-JtPbhay8A6ZJSGO8QQ9klyC8OqrYHVp9kYruxjV0Km290xWwewMU2kSSCbU/NHv2
-23cUxMr45FfrkZsnj8Vq
-=HtVc
+iQJ8BAEBCgBmBQJVfsIPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/OIP+wYTjWTImlZyvl0JnPHO70IP
+f8ImreBY5J02q6ToI9t+rRmAmlt5Hh077JvmOKgjjZdLU83NWRp+Nml15snojAKu
+Ht2NynRmv7pqBOqumwauieYWUDTeey2Cbs1H7ktD345I8G3gyoPLK4bFMf6VRFa2
+UStx/wMGh4DaASjuPpFUljd+UcWb1fq8NJqt7EngSjbvAZB414rR6rqAqBWin95G
+OQYMqWPE4NbKC7Ghpb6Wp4koEFVT7jxZaQuzsM4mdPsad0RftirvZ34MSB716nYW
+IF1z2EdP80la1lOWU0g9Vz+7viI3KjfLBUSm9mUKur3bFBJSXVICTCh+crCIjPVo
+sFlNyGLz1oVTT9tQ0CxMUu64r0JiAC8egNJ4oMGtkN3+9MmgSq96omgIfT+lYzp7
+bX6bhEuGD6eyPeUj2OVdoowUrp4Y5GUGVI8Hhil8Qx676bjmsRx26IcgqUbwzzpl
+vqYqKZw+sTQES2z7K/h1DczoPKk5O12iBljhszs/7d4+guK0yolHQUlekx4xcZAy
+7UbkOUBbCn7fEkXKSiitrBB+/ZTvZchT7ocRmF0PLi4s1HUFbpsWD6pyumQeQFde
+RHyAUbLPUyYfXsj2ZsD/l8fhBgrYiALTL9KBSPCFv20CRaw6WTQY/Fag+ceLg1P0
+XMdHAKWtPAamOp1mIJzu
+=OM2H
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/mr/metadata.xml b/dev-vcs/mr/metadata.xml
index 93c5c5c4cc05..9e6151942610 100644
--- a/dev-vcs/mr/metadata.xml
+++ b/dev-vcs/mr/metadata.xml
@@ -27,4 +27,7 @@
 
 		This package also includes the webcheckout command.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">joeyh/myrepos</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/notify-webhook/Manifest b/dev-vcs/notify-webhook/Manifest
index 468faa8bf8d7..b1975b073310 100644
--- a/dev-vcs/notify-webhook/Manifest
+++ b/dev-vcs/notify-webhook/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST notify-webhook-20140805.tar.gz 15078 SHA256 479d71c7ab9ba772a0b621638e80a14cbe6f34e8fbe851d8db93b118d4567e3f SHA512 8e10994ad26d6de86e7930a2299a8701bed0f04299f2ca14b070f00543368015628b89fd4cbf351f3e42e85cf98e7465dd94517243d1beb71b645d91a637e6d2 WHIRLPOOL 533e2118941edc2f9db4412477a76332fe27475ebc882eb8f567d39a846bf04c95cc693230ae32bc1c10bf24301117b7d6e04c08e45e0fe7cf181fe454504a4b
 DIST notify-webhook-20150308-1ff3985...BCLibCoop:ee038b5.patch 8581 SHA256 c6167fd81e88fcb8de6c37bb2c5259f1c09e6e3a7f0b61d6b58f5f5e478e585c SHA512 c72b03cbea34884c089968e67b61e654a9d365e6b2a338363b6405ab1950aaa5a1c4f8ece73181003571a88f1983458c2e9194d6b26aa103c95c1ceed8e0dd4c WHIRLPOOL 3f4be9d58f5d1a4dff2a7978d067afb0e8fb739b6836709964dec17cc386890eb1d97b0652323acaefc7ca5bc5ae25c46f1f222323d471529e92a5640541bcae
 DIST notify-webhook-20150308.tar.gz 16347 SHA256 cb9d2687eea5ab4f32f6fbc9bdb05a24c8b7755193b312a574172f6aaaca857e SHA512 7a82418d16e6cfd58b9bccaf1700c5a9258601a45a823f1b8307ee3b3c6e90ad52424421836468e34b400b07100a291fd514450a2e1b3c2d1c8dff99ee409557 WHIRLPOOL 523578237483d74d2bd4fa9f4f87277b9103c67c415fbb383629211ea91403fc11debfed70fa94069e9bd8e87a1c9e799929aa1c376244e1a2dde656609a10d8
 EBUILD notify-webhook-20140805.ebuild 745 SHA256 9a31fdb518ec89965597b04219a5035f4df6a2951ff2e2d272cd2d9917c905d2 SHA512 245997b5ff8f35056029bbf2ba8009ec5ada1f3f55cb6163843092bfeba530f2cca9ef898772bd15cf90935d4c8203996f79b05cf92f4839508892a872307024 WHIRLPOOL f57baba074a36d4453d83e6733cab47c5914bf7e28b67c54f600b374e578a8217b0d8ca15a2eb729d72a6e34d49b9658ffeb6adf6fafe2b18f5814467bc58ab0
 EBUILD notify-webhook-20150308.ebuild 1669 SHA256 73d752376358cb6943b064362864f53f3c49a6392536784809a3657fc100fdf2 SHA512 a51e483ffc927f266bd5654885fb8c026d99eed6301adf29ff73b2c6ba6ce7de15c546128f3315ec50ec2f41d65a2d2a406ffedce663f152f99c0cbf35f9b394 WHIRLPOOL 86ebb7022aa5ed0ba0471271d1d5bcaeaa6aaba45453823b7841b6553140b32f316168efce0eac1b47936d8c7fcc944bf5670ecd531da8c8904a137f58eed94b
 MISC ChangeLog 598 SHA256 6a038251bbfc41b5a1e86c13a1dc3984386606ee8baef541afc285a6500afd09 SHA512 3719c33fecbf69fdaf22e97a2bae6bdf04753388b0ace7c6b6514e89e51d72c656637b215134f6b653b3c3649e3eef004954f240d3ce36b344cf5bea73c0bea1 WHIRLPOOL d3e8ad4247c1861362f25f51ba62f57c7c8fc604b8929a13f21fcca5e1a990a0a25dd550d234015a17084a139dbf8025d954ebe43eda9c4ca8bcb423a503076e
-MISC metadata.xml 490 SHA256 04a6d07d3cb2a88198e5376b019adabb1ed96ab22d87725bf1f5018c066e0953 SHA512 20a466ef0dd02c9b4bb51d58939c2dd9dffdc1603c65e92688430152ef8cdea8c65b13a3208ca13fd506b8a74b4614e83b5c41f7efb7398ab978b236b1084ee8 WHIRLPOOL e60f571e4d3ca4519a04a63658e0e45462cef14393fc4d8b664e2b944b63e12884677dabea26bab0cc797b88ffb1d89a7473d168f975bcb36919b0ddd1f70bfc
+MISC metadata.xml 590 SHA256 803a7c7d2d95552f3960247b243859ee2f2d32f1c6848bf1553b8f288c00fa6b SHA512 80b9f7c04f71e6901d6d094c4795bc0200ec1667fbfda22686dd44e1681c1191a25955f0970066bdce47efd606c63adcf0bf56e48fc7c8022a4ee2866215713e WHIRLPOOL 53bb92910eb7872a53bafb4cc8cee4bf5d1933d60bfdb882e77eb630e05958d59eedd62d1d3bfa82a13e683fb4423c89cc42eb58f493efd3b92850d14eefb393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfsIXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJgAP/i9ptmmcMbHj2O6n3L2codtC
+k/C9cPGbK2DDyHa+S3CqS8AIGFtRXCpZ+yGOGr9MDYyew3vreOlj4T4YCjxWEmSt
+lNum3UBqoFYpjb80+63ko2RNiLCBuS6Yj5J7CEgUoTys241D+udXvDR1uxCfAX6C
+s5xqCdnSoc+QWJKQKaZ5QN4N0i3cj+n6flUt7XD4rKtU+C6K1p7Jr3WMqeBe3hDq
+TKIzqjnelqE1JOnQ+0R4xkcC7jZjtEkXPkwIHrGmv50ljcI9N42J21YEg2ErA0vo
+nsYhZNyc9OH7WBf26npcqmCZkjc+oIjDS5h/ePAyYG18gD41z1r9aauBTSxCPDIz
+c5UmSFAt/5DTKNilzINl4dn7NS4HQM0phD9ZMrkUxut/IE3Zx7+voKAfxE9kf8Iy
+OO9LqcNgcxT0aA/ftWcGhDRrBbHuq18JDuMt/X93Lt51kSIWnJjP0wj4Qhw02M5h
+c65wVRXZkbaUHKj5LsYsdd10QTvT8kgo3imTxjKuASbaT/fZbbXYzWhlb6VRSCFY
+Ohjawu3T+yt3zQaNraLQhZvu2OxYcdkESkJkZMzlD22qMGiE8h4e0bM49WdQ0jMT
+5GvVMn9kCB2jhg6hcQzHNLzu73aV/1/sJ22RwF4MTP0gr0HgCNr5wo5furNlT3fz
+pKwQlE75qJE8JNyp+Sgx
+=iZBU
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/notify-webhook/metadata.xml b/dev-vcs/notify-webhook/metadata.xml
index be611320454c..4ff0a821841e 100644
--- a/dev-vcs/notify-webhook/metadata.xml
+++ b/dev-vcs/notify-webhook/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+  <maintainer>
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
 	notify-webhook is a git post-receive hook script that posts JSON data to a
 	webhook capable server.
 
 	This implements the GitHub Web hooks API as closely as possible. It allows
 	arbitrary git repositories to use webhook capable services.
   </longdescription>
+  <upstream>
+    <remote-id type="github">metajack/notify-webhook</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/qbzr/Manifest b/dev-vcs/qbzr/Manifest
index 5ee34b4b3ed7..e612656250bc 100644
--- a/dev-vcs/qbzr/Manifest
+++ b/dev-vcs/qbzr/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST qbzr-0.23.0.tar.gz 808036 SHA256 7e66f2cdb3b38e83ecb99ae2934fe42e9c137273a06d54f66aa76da8a06bef58 SHA512 c1f26ef0db8db48e5b05cb6164bac08f33746983df85dba9e359a78dffbf05f18f67788f0d0e7b42deb530cf5a31cd9284752946ee00731c1e7559a0dcc4a071 WHIRLPOOL f925a7d49fc6f8702a921731090abd44192ab88a9a1c28d1e37d7ea94fc1550a13c0c7204f0328225bd71c481653afd7846e2b92401e2de246f7b2753baffa81
 DIST qbzr-0.23.1.tar.gz 817769 SHA256 3211adef11c975dfbb6c80285651e2e6f3bfa99f1baa1a95371e8490ea8ff441 SHA512 05d05c2cf5e94d4a58d88d04bd3dd4ff13d977126d728683273990801733bc0dfb07388838e466117961a83c6e08454b7a8bdaca975ca19f7ecff729d97b4bd2 WHIRLPOOL 359f23ccaee972652c535ca238e7ee1a6781b5bc348aa291105bc1bb1211c98b2ebdf78d81d89659d6ff8c523ee3fcea9102a3a83f18c3e0a5b677b304a739b2
 EBUILD qbzr-0.23.0.ebuild 1335 SHA256 0dfd52a8709c94ccf8ed9eedcd2ebe1f0729c709fdd38af7cffe3e8e56917f35 SHA512 275a7757b7f32af8ca1cdf9d757be1ba00e809dacdc2e6835cf6f57548533640fe59e6db67d1466f19381ac4f75e8dc015a7dc8ce01c2fb3266a98e48af9ae8e WHIRLPOOL 8ad444c30c190840d2d0cc3ed8972ea1f0d9ac992f65cd090c4248cf16edb6dae3054ee0362f87aa0c875710bbf1b536320fb9f076bd960a9c8193c85ed27bf7
 EBUILD qbzr-0.23.1.ebuild 1269 SHA256 6e5433ea0489b080c8e76227343a431bb4dd78454c160643a923c955035d44d8 SHA512 987d98aab82cce3dfab3ee06cddc344264a4eb6887b5a6bf91f1046e289af43cc436e1bf9d3e10d4f4f32acb7b17ab5158e27b10bb2484c8df539a60d39c84df WHIRLPOOL c34b90c4aee7f75585356b3b37f8888f4538f88e794815fb62750c69bac4e1b05700b7d9d30a1b191cfe91ac6b2adf265fd419527eb61c5437a52107595cf94c
 MISC ChangeLog 8490 SHA256 5759727d15b55dd2a20398939b1259d7ee229f17bf6669462a5b860e832f1a70 SHA512 21c147d7384b88e77c76cdf8eab0fcd6be33870e49d23dc780914ddb968ac794ed9a44a6c3301e6014d4c243421a8ac5112ca2636d576c5b7d21ca72290d2cf2 WHIRLPOOL edabb84f5c96588af858051e8dd35a70dea2f7a186e8f54140bce024f0fda6ef299ac68ff66ea72cbcba2868dd920b503bdad2a47006737a63ee7e2f5d89e582
-MISC metadata.xml 159 SHA256 1959822db6330209a15360e902c1f2289a6892ba4c9aa2f9a49d719c1bcad0b1 SHA512 3dbf4954826a600a45ef4861e8702e8107f2b69d03bc77ad7e4cff15b869a58cec803484219e562dd2bf16ea1b189a8a85313158d22ea808108483c30fb2eee9 WHIRLPOOL 179fe2a9e7958517df24bdb0fa455774bbb7b3984eecdc9480a54c445bab2a21ed54a40c483b9747d8151b7108a88818b60dbe6fdfbbc1261e0111a0957c711b
+MISC metadata.xml 232 SHA256 ffc9f41f336e71973de9ba7ea169a372db1656d160bb4cabc4b1b6a36ca93c83 SHA512 3eefae7e4ed2cd6c7bc3e8c7bb24bc95ea20878c0e980f3fdafde230e242903e9ed395b5f9a973c41a43e4f9babefcae8d99a39fb5ad090280bce1b85e5ad5e7 WHIRLPOOL 26a81dc8e08207f8863fc7537a6181b35c12121baf9352764ac46cd37ac797e00937ebe13bd8e83ea97324ac5aba85ac00eb7a40610a937672bc22418bb26790
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVJWsSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOXzsQAIhEmA0lNL9J1kVWwMB1pvxm
-+dMGfrloHeBXjvRN0QDdGSwbnxpWocDkBEgitmsx1DNNxO6rSkMlnE4sWBVur260
-wsJNSJTYJpzrxP0ROkBJCWQYibPZG9RoylGSWcAiVvFuiE8jj9LGpT2JRpOqWSEf
-5Fsy8ivDaRtQ9413SGYoFkkBSFq30RK2gKaajld4XARMGFcjFc2nHB8OLzuFtli1
-bmbGIhTHmDOs73OZh953W0tKQCufncMG4rrWr4SG7g3yVS0IXJNDgY+AJBnCJ6+Y
-ZDBzMItSPkleTGhdVNQvwmpNtMttig1lCm0Sz4ZJVcC1Cm5pKYVnOI7i0dE7WYBk
-39CTiOJ5VaE3452iPFMieBbBB0RHB+NhE919ECkGDEKUhpFXxOdq4gOL1obpej0p
-fKoiQ60SDEqkqgRKQqnXOUkK4tBcB3HIPrGuo5AcKL05uU3AdDSeHNAZR/r3WyMD
-VCQZm51svJ1QfvK9PoW6y/goMLJi5cpw/A0OT0Je+IZLZQVDs6HBOgCbKQDCepjI
-8KuYP4nO2cS3lmo1bVhwqy6KHOYI7kJsRmNG+Gp0V5585PZ7fh7d0tuhF37b33DO
-cphvRxbecQTaZdjamhi93DeWuu1td6GatBGdlnZpYFYcoJbpNbFbSF7ZOjH3iYwa
-5CzQ3pgtMSZEzgB28J/5
-=B5NQ
+iQJ8BAEBCgBmBQJVfsIiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi4UoQAIc6Scuo/QxJmARZPyd+t6Ko
+1iYaBaObABtry/X2ttBHB0VtHAg5SnfgoE2HGz5rNyedzH9A+dGK9G4EmtNBuxhf
+kw3sb+ZUavyaH5YyyjcoWI3iyywDa9cgGwboA2SM6qaYMJoM2KvK97TCb+3+8nof
+wCbqlM9Z3LA8FF/6ps6jLOJSfKwHeQ7FquObzwZ8cnR5euj5PIYZMIR8j56DL1Dg
+Xt8d3wat+XQnTe4nyZ9IWIM5YAyWNoHugj2nIM15WJOSaJ+cHcBxsTQs4j0Nv49I
+TENgx0n60CgmQ8hxjG7xMdK9Jmk3mup4DQANpgUpLc3A2DS3DUGQmizY8GtN8zc/
+5pxNIlgU4YjCutv3qvUnTKXNbMS4vJmLdrIse8MFNXS/2v2sWxMW75ZsHZl816/Y
+vF5Qs6ZZzXXyGnt1krwuoJbJWCndhPjIBsj6LY9fVA3AAV/fO0FjgM5OaGHDq8r1
+cWrz2gWJSz07ybqMWgzJTrog5IgVWL2wF2Id+dDUYpxglBjm6lOCJ7wrQPNBiTyH
+TIkAyQxRgUx8L/mAc0wKsrmI20sY3sVlQdTnO/PN4R6+60QApOEX7u1h1QlU12Qp
+TeYV5FBQPqn8Or4PgG8jNFvdoo4UypdXF/ZTDn846QMVAkwGGctDA9DltsV0xYz7
+tovowUaLdJ3gEZe1s6vM
+=3QvP
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/qbzr/metadata.xml b/dev-vcs/qbzr/metadata.xml
index ea3f3738f618..b5b93b4d45d9 100644
--- a/dev-vcs/qbzr/metadata.xml
+++ b/dev-vcs/qbzr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bazaar</herd>
+	<herd>bazaar</herd>
+	<upstream>
+		<remote-id type="launchpad">qbzr</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rabbitvcs/Manifest b/dev-vcs/rabbitvcs/Manifest
index e5298c257ede..17aebd343493 100644
--- a/dev-vcs/rabbitvcs/Manifest
+++ b/dev-vcs/rabbitvcs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST rabbitvcs-0.15.2.tar.bz2 1166612 SHA256 252edcc934705c59365ebbee35868de2bbb32ee9e173ef3f7245efb2653762e8 SHA512 4509261cd8e138c74388d3488c54a6dff82505d19498d557f9add6445f351e76d28d012ecdefe24d082464e634259f3f917c4374b08106131023115b1c22b393 WHIRLPOOL a575f275843775743e85f573a84504192b34628a34deb89deea067c09fb2ebd3f9abaa33478b325593f3114879f0db3b2f313c46bcf39be36961c844ac9fd483
 DIST rabbitvcs-0.15.3.tar.bz2 1585107 SHA256 93838f15575e72a153078d63cc9fc6c91b136372ba08f1db56d4f712ee901297 SHA512 35e0eabf9590b56ca57f4c0b70009e8cdd034ce5d3bb6eb1fa22366fdda49ddd1cd8b1d36fcca160c40599d58ff38b3ec4f6b46dc026de16fd313b557b63aa34 WHIRLPOOL da18e3d571e353f81f749e31dd0d92a76c57b3f0a33cb7143866524d0c3eb0eec836b889ba1c23624d0b35d807d30940c5d1b4db09bab6266fd742dff6eafc0b
@@ -8,21 +8,23 @@ EBUILD rabbitvcs-0.15.2.ebuild 2479 SHA256 8e840f964a6000c6e0a7c206f1ed84db821ac
 EBUILD rabbitvcs-0.15.3.ebuild 2479 SHA256 8f77148c21f1539d0396ca9f0dfb76e282aaa18e56b01fb3b9f852e5a1045cab SHA512 a25422b0b3ae0ef3c60d43e2f04b534bf3f91af25797e5dbe55f80dd29bf63a2376db08c713bd2224686d5f75db28302dc695387f9868da4df924257f7c736fa WHIRLPOOL 0df23eac264f2909f090ae6905f899f656b760a83b87e9166749b644d812d9ed2614aa7797b2e9b4e96246152a0ac2f98b9e1c8e3c9407c478a588cfaf8ffc6d
 EBUILD rabbitvcs-0.16.ebuild 2736 SHA256 fad2c4dd2b7fc7bddc3f52b4cad2a3bd6e5204818139b1f18ea20b7c2504ccb5 SHA512 69ced2a2aa70171f624f22c14972b50f994e15929a6ed918ac64d54b5b6554dc7c93c6fa2402d82fda0f0f5ecffc8fc6fa3acf1b1b3a7ac5f27484fd8772eb10 WHIRLPOOL 1c7bc49f868a93f756488151600feaf845a5b2374a95f1e1d078b18a515128e4c59c5eda295b3d89ded9a3c19e056b434683ebcd76142ad4dcaa3b01fbcdb0a3
 MISC ChangeLog 3044 SHA256 cc9f11ed57b25874f4e97876e8f3808c027f174a3fe48d0e93adee0885dd303d SHA512 ab9e32f4e815fa3a62a93a16d5499154dada6767aae3445e8d35bc64f6f16c4023f37d65e181931125821f3dfa25e8f215d6167d08e17daecc89d067516f38de WHIRLPOOL bc174896ae61823a4ae0d36b29d9c7169bce15e51b77d25afae1ddb1cfd875e943b95d059a4005acf05665b82ffd98347e53fbc6dc195caf9f6e135b2e9ae7d9
-MISC metadata.xml 882 SHA256 bd7535d34f3cb17a36534275ef2aa9b08f1f3f3933a36ecba45bccc67a5d232a SHA512 42a87d798f4e2e51978f607beb1b813c97b0a2106394ff5bedce1c9c1ce920b7d4a99fed3f191a442ea29f0522f16e28a290222f9620c3007d19737ae929dd11 WHIRLPOOL 270c01ecbbe2ce407b97f5934a157d99730804ab8b34a9e4d4e7287e3a2e65d5b0a491242174a689826e942a36e566604497d084e493a41a867a33656caa1d23
+MISC metadata.xml 985 SHA256 2efba722c01822d6f3e7c4f676ddde4091c9ec3a5deaf0073b77a48b3d2a14b6 SHA512 7dc73391b55b941af5f24b74705170a181c96b0370f04af532134c155086b507153c61242dfac380a39cb7524efc2d2665a113b1fed9317e6528afa84c09b92e WHIRLPOOL c3cb7a3ee6e036f951b1f89e288c29ddaacdf195254a87f28b35e645c70a73d148fb4306f676999663e73f2b7a6fdc041def3a6c43d481b3d3b7177233b02488
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU+fO4AAoJEKXdFCfdEflKptEQAKhox9cPnALK33ixXw6V7NoE
-VJ/N3Um/1dSpf5r4mGLqn20vkIaT5cMCCxlM6KpYc6VPWB5NVGqCqQAU11L5k33R
-EtITCetQcbFRlfXqYzuaVhR7tX8KXqnreKCofd6fw/lrFp5qpVSaV/VY/3T5YYhb
-QG7OjN+4LA03nIKXe1LKv7tHrTdZ41N1+uVBC795NQicJzFOJZOz9Q6ciqKyv4MX
-o+btjb1JMGRYpQxxf5Wmg4w38ry3HB51HCiC4Lx2+6GWyjS75MB3FN+T1SJJoIBX
-zyOnvMKlQPpm3D2SFY4LbFR94gKAJEoVaQ9uU7labWd181ZzplLMImMkFDKiyRG2
-YN9d9zGOjmsqJjVkbEwa28JJfYCQVjuZDDYIR/io/pvSg7I8HABU7DNSGVmLj8nn
-wVZWibzJiTzjJ84LP/Arm3Yv/OF3E0y2AKR5o5FvPb7obmGS7gE+Qs4g+wAnGasY
-XdEebv2hXr1BO75V6S4wzJP3L+TV0DfxAsAM3zAKJ7kz3+IPsbCpCvjMeI7FTGbf
-dmuCRien/ZwMOq3qdgyU03XkY5WkdkzvFkojzsyjmNso0ChutiSeAyePldWn5Mof
-Fa/FhO6p8YUAAR0EMX93a0CUn2KKryjMTkc3pmhuce9lmES5S7COloL+S5slTUrK
-MaJiBk2HAEiicAohvpp3
-=Btry
+iQJ8BAEBCgBmBQJVfsIqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiO1AP/Ar5D7GvURke3M+M4QvFeoDd
+RpRsMlHD2qmlNuObUpZinun79Gn5De+zaHwrMXQnRBV/CXuRQ625R97dsltPWMFa
+D2r3V8JqpZF1UlPTL2h+tjrvdw+EHfU4AwYWKlUHvCg3pqsldSeTy6yQetLX4Man
+QS/qVEltPmybqFrl0khaQqmeflnHF6Rad5MV8fBDWPhzLRJnBXFNm2rRmQ52DuuY
+3Pxdu2P22zUKuFk6Nf+cCQBKwM70Nzg9Igmb/CZ9TL6QRdoezxW7TUF0bIJJlv5W
+04K/FETCWVTOeVTj76U5XLqd1/GrSD0z5dYKBoRCcIywHgEFrDGB6ntOeUdxtNuv
+6OaUc5CSyhAqhX6A6rEhjS9NAOojs8mK0+A49jff6As5/lR6H8PErYvoaHnEhhMJ
+Nnjtgafnq2q/MmnYu4URUmwTsdDAaEK8QgTwfP0uN9+oyvy0jCEPbzupNMFngKSa
+LFEtBtqRgGGLp14cT8k4AQbqZyfe9LHFOdrvFFJ1Hca7xkv5A9VTEVe1PUDzOS49
+iR+hWTeufnqs1FCKXqQ64VVscICgcjxT5EISaCk417oqYUoIxLmv4kRSXom3qGrr
+88qiktOFSN3fD/lYUicX6Lmp5JzdMLdPVp2SvR7FDhpAtSErKL+kKdEBb/PAt06X
+OvopT1P7A/nJDIusDYMQ
+=IobV
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
index b5f8073f396d..87a2ebb5baf0 100644
--- a/dev-vcs/rabbitvcs/metadata.xml
+++ b/dev-vcs/rabbitvcs/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
- <longdescription>RabbitVCS is a set of graphical tools written to provide
+	<maintainer>
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>RabbitVCS is a set of graphical tools written to provide
  simple and straightforward access to the version control systems you use.
- RabbitVCS is inspired by TortoiseSVN and others.</longdescription> 
-<use>
-<flag name='caja'>Enable extension for <pkg>mate-base/caja</pkg></flag>
-<flag name='cli'>Eanble console based frontend</flag>
-<flag name='diff'>Use for diff command <pkg>dev-util/meld</pkg></flag>
-<flag name='gedit'>Enable plugin for <pkg>app-editors/gedit</pkg></flag>
-<flag name='nautilus'>Enable extension for <pkg>gnome-base/nautilus</pkg></flag>
-<flag name='thunar'>Enable extension for <pkg>xfce-base/thunar</pkg></flag>
-</use>
+ RabbitVCS is inspired by TortoiseSVN and others.</longdescription>
+	<use>
+		<flag name="caja">Enable extension for <pkg>mate-base/caja</pkg></flag>
+		<flag name="cli">Eanble console based frontend</flag>
+		<flag name="diff">Use for diff command <pkg>dev-util/meld</pkg></flag>
+		<flag name="gedit">Enable plugin for <pkg>app-editors/gedit</pkg></flag>
+		<flag name="nautilus">Enable extension for <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="thunar">Enable extension for <pkg>xfce-base/thunar</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">rabbitvcs/rabbitvcs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index 61300b3b55aa..74e788b2a8bb 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX rsvndump-0.5.6-compile-flags.patch 647 SHA256 13a873923c4a78eb8034b736de9cdb42d2d46ef6fca964ba9ee9e24bbeb1abbd SHA512 f50e59367a3b4ba8a332a3c2998fd8fd4e876d63910427d10cc208c6ae6488fa4a990b5284922e83817304fefc83bde849c5ff77990e31ff15a576322bf5beb7 WHIRLPOOL b5d83e659ca7051504092ec8eda640203942777760c6305e5e5a00a1783eadc6c169be81698a818a9134a83b272fda4b06c39f8909550d208869fbdda6e3478f
 AUX rsvndump-disable-man.patch 594 SHA256 55d9998de4a6e3fc3d49034507b2b64c38f2a4a78bf885a6d21582a5f03530a7 SHA512 1b6a4321a8dca1e174c0ed762cc18b705bedc0b0e4d7db7622af55fa3cc65a5b5efeba52f00735acc375dbc3d7e8408ff7a4b839db008fb6c7d8982e70b14543 WHIRLPOOL 69919de8c1bc42cf55b9d4e758b851917da3ee2d24e65691c577075305d3f62e95a7e54929b8a328669b3ce940c813754f9b562b89122033e84520b537fd0178
 DIST rsvndump-0.6.tar.bz2 220891 SHA256 06512e1fb7bc847d6607cf1ab0339723ef2aa03836c1968eee3440a289327263 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120 WHIRLPOOL 3f2ce2e5ec482d286a4208deed769e910c859fea741678cb5e882d12608b4801e317dc024bbe39c05f1db547341e53bd815025561ace9b90a40f2e2f1b0ec53a
 EBUILD rsvndump-0.6.ebuild 872 SHA256 9974b8261cb4419fdab046319816aeef38230c8c46bb4753bd3cc29618f9e576 SHA512 50debad7b9d12d7ee3a694a32e022aea39b33cb06d1d3d8673b2fa59df781145a3198f4e01eb192a4351563dde560f59f1d55102d26e8c1b41ee71098db82500 WHIRLPOOL 18e69953e12ea1affa430fbdd323d2fee9b8b365a16722d73ec30c794053853b3c8c6527cd52a6f9ef7f2fc9ca75db17f59504a4797f3eb16ffbc3cf8a424d52
 MISC ChangeLog 2610 SHA256 3525b497ebf7cc39a89d53f67e184f09b18cf108b7f5bfd8c8a5feb1213de45c SHA512 1109006768962de7beaf33e7edf116f9b0338f05b110b65f73732c98a1992a3f86b2abb4498e7cc16666e1917a877883b2d8037966f2c31508e88f7549458087 WHIRLPOOL 46ebe0f279abcbeab8181b60caafe035027924c58e146493b77c44b6edaa8299ddd3776c93e518fbf7b167ef52e6aa634c6e92ac74aa825bba233c56e487938c
-MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364
+MISC metadata.xml 313 SHA256 57c4eb54608baad4f77c8674cbab002f99d9f9079c4aeb99f5e64a3af63f362e SHA512 b1c1a55bc2d9edbbd8a9dd4c2ff353eb9ed33046758e0cd04c258556c905cbd046efcfe1f405c5d516fa3861dae7d3922ada3eb920aa94f5801124586d910a9a WHIRLPOOL 9951782d38a228a875e18ae6cb4ecccd03dc3dad6516f67897196393fa1c63e7ad47ce786b6cdb32da766f01c5acf4a497cadc827bf04fd66b7f1941187b792d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVfsIxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiw00P/15TZZYDlNpEfqP3kXw+WUm9
+eASyASjvG/T7ULY4YewytJFk2cO41RGQ7lJsZDz3KHIw5uxwb6Icfaonqi7j55H1
+iEm22V9jKhr6lHZIJt+EQKTL3WDziYqGvyhsa1KT7gJVsDUmwneOFL30r1ZYQeg5
+I/MeERxGShI0qgbwa+3kjd0RMyqSPMk4Ft/v9T7rAtFK1pkimbeUnF/1TSp79uT8
+ifcVC+kfEJyFSJ4k1S/MxWtnHxg6+ghNdSSrxPuYHc4M1YnWMTGlXT4qeRixuL/x
+2p5ou0e2nxrrzcbWCsAdjTVV5hUHztDr+K2n7ubdAbbVdYwcjSiwyuTqKodAWBbI
+sAg6PvKjmDWdhw85gNDCGavfUFpsg7J9ZeahT1dBLea/478+CgCK+kGTO/KaMzVS
+jBhxnx1R5OluOWxhlHDXa/6LFZ0AeeCAdu3J+rb4SK/999w5iiE57tWnxOYg5BNK
+Iyd6j4mqQ381q3+evbXA6Z7Qqx2s69Ij0ppHa2RTB9UgzfkDanlKqvZ3DIrI1iZY
+k7AhvJwUyhlb6DyrWWTBIePEpWSonMaoVy4xgGmeJttelcRBJRS6twAZu4GHI8t0
+1A1An8wDjxcWKLD5NLBUuRlikUj2CP0YPJEX3Pfw6Sxnpw72b3Q/rgoWZo05lQIE
+3W/i0RgTDJL9x7+bgpsT
+=qzlL
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/rsvndump/metadata.xml b/dev-vcs/rsvndump/metadata.xml
index 16bcc9f800a2..380bc2359bbb 100644
--- a/dev-vcs/rsvndump/metadata.xml
+++ b/dev-vcs/rsvndump/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rsvndump</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/statcvs/Manifest b/dev-vcs/statcvs/Manifest
index 2e8e904be2fb..b941f29cd33c 100644
--- a/dev-vcs/statcvs/Manifest
+++ b/dev-vcs/statcvs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX statcvs-0.4.0-build.xml.patch 687 SHA256 a7fb86f3eea8d2be4c7f3555f4cef54b1ce40a85668c702d29102ea8725177c3 SHA512 501bdf5237bd09849c622a8db054b904fd290298cf0969022b116bb8eb8a4130e59aaab936f4cf16b153f335a729260d406ab20ee3924aba0d2a01b85be9821d WHIRLPOOL 50f5834ba84820255f399372fc300e92a7989441a806ccb0c6299e07e22de7fd4fe351ab08b67d2e14c060c4c1f2a710b8c4d052a971190153b7b80fa5663433
 AUX statcvs-0.4.0-external-jtreemap.patch 2283 SHA256 260527e5bd8d584888d30c8b9671342a941e671750aaee2a0e6bfe77b00653ea SHA512 8dd595f3b89d29ecb0e5687daf074cd042d719c4df56cb8e69cd1971e829969d1735aaef0d911153978de4875397ffcd510d264a78ed67b55a45181d6fb870a0 WHIRLPOOL c4925c36a4d352a114a30bad409d9a0c5e5c0734599053fffec130521ff257b8a4d1eb12a6f62d244bcc445684138bd6698241674f6f81d328be6ce63e9a116e
@@ -8,11 +8,23 @@ AUX statcvs-0.5.0-build.xml.patch 1004 SHA256 306e0419163deb2cd352ec5f7d055a509a
 DIST statcvs-0.5.0-source.zip 7720283 SHA256 3f41f6a0fd0948a5c9096a6aa040d56da784e98a6657f4911c5f78817e6985be SHA512 4b711285b5a5d505ca1b63ebfb801ecd1a79339bc98f001ce71f5d8a454303a4dc0b7f5069ec53dcd42b2424bbf718efeca1f7369becf330a1207c49340ce204 WHIRLPOOL 3b9d82add805cf6b1393116ef6432e7064725c68cf0314c5e9f73fa044c7f2f85ef4388e13a88406dbd109a39ec28acf1cac378a9e02c5197b2812083f58c177
 EBUILD statcvs-0.5.0.ebuild 1759 SHA256 e1c1aeb3ca54cffa01c7e32d5dd3ebb510e0bc1c049fe48227225f767a41578f SHA512 5f6d4783cc14c253971072630544231f3b5c70fe9e35d1ad66260c521a156719e3bd073431c1293ec05b40584c69759961eda9dc4892a7593bf676390ec2c06d WHIRLPOOL 904f4958cc192438cf7a8862d6702c59ee0a54b9afc0998fbd62fcaba10ad96e2284c790131890cb52999cb7c6b1b65d24468fa2c85ff5548e518c65a220b0ae
 MISC ChangeLog 1942 SHA256 073a504e9ab6e523d3d6add773837290e5ecaca0e827b91d732221473e51df05 SHA512 99ee59f2ad201b9fa1c1ca2b4e0bb7a3f04f19d8817342cd49ea09d5693821ae258267ee974513b578ff7efc7e7155e5a91997d64fce6704fe22c573ade6c2dc WHIRLPOOL 78f5437cec878a7b349e1d0e2acf232de1f3a9a9688856705cc5635e8667c6fa92992054cf50ccc1b0b69d76dcc0bfe2d5f6eb16a88980357fded6bb13d695c6
-MISC metadata.xml 217 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 SHA512 c831b55f48fe5072b2af6e2e4731462838edc100a568248719a12de95fe7716198d12e159aa3025294040c26841607e04ccc87451be220e667fdc1146f4656f8 WHIRLPOOL 0d6782469b5a96acc07542adcdc15ac99674231aa8f6384bad12fd50cfd7994afeebef4cae6269599588193aa8bbcbd9d986579baa5a33581d89edad6de8634c
+MISC metadata.xml 306 SHA256 f74efee8c06d1cadb141679c5279736c18804f337abe2806a576eeb9a2d67b5a SHA512 7377b7ca4a8f5a8aeccdc170354ce894c300be603964e8c7e8ddb07a395b4f623b0eed64bbd353ab6a5946e5c36ff5410d16b894f19d33287b62f36c8996a08e WHIRLPOOL 3c09d33889445fcaacceb444a86e4feff6b07ff086ff2f7e5e5458439946b931a606911a5e85f91bebdb6fc63076ca50f059a171b791185904e3f9b9c5edd42b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4tUACgkQcaHudmEf86qPcgCfcA9y2m2vtO3176Pw1tm1otOX
-dN8An1pKc1UQAwxZYaVtaV5qHLV7v6J3
-=BkOW
+iQJ8BAEBCgBmBQJVfsI6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmix94P/2mhk83TJIbpC3EastIbCXmN
+PG6/NwkZVKQUxSGCMJ3m0CmR64PHi6bSEVaVYUYlqTj8I83VzxeSAdGIJwHiGX2J
+iqlSrGrq5aU94haZ+r6LPUSNb8LsJC5K1l1Ufvfl30JWkyc3j2+oSSS0raso3JJm
+M1OEIyb6ZoJVPqTt2h8qQf5LlqWpgr02994tfL7tqE36sVGrxoeP1vpCtewDm8By
+dqUPDWVNJ+ZJxjZf0M6CMZ0jvyOs5V77OjhYgpq2sjnWQGVlqF2ttfXDNFS5ZnvI
+ENp/QKQcxfGNlQuUiTWx+oF8+lraRuxPoFwJIdPugiPIsHNJCrSmIsangfQuZhaQ
+XRqZjqsR5D6A+0jCFaFdgs9z1Q/anlvpt1pesQrm01lgknJQCd+wwkZVruBO3JSl
+Mows2J8eFY8FCC85EBz4BlZVW4JSLLSbMzksmQJWxhAzXUX4yFM2bv3m7s0CGUeN
+AjEmbWjfSIyRkCVW4YmfAsu7HPk8I0ikTS1SAFCxOvAuIS4JNHVULPedeX2yi0AV
+Ln2GqQWMBz6tSMbLT20IZTKfoJhc6mlsfMM0J/SrEgGh/fBLGrwHFlcMcebmG0Af
+iaBqT2Fl8OSpni+kSGDsOVM57IdDwoYMyBnIs+d2w3QAmSfxdzMkr4Mfh+HPewXp
+HEZrEr5Al4kIPuBPXGDm
+=SlxV
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/statcvs/metadata.xml b/dev-vcs/statcvs/metadata.xml
index 407583277d87..064ac2bacdfc 100644
--- a/dev-vcs/statcvs/metadata.xml
+++ b/dev-vcs/statcvs/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-  <email>java@gentoo.org</email>
-</maintainer>
+  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">statcvs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/statsvn/Manifest b/dev-vcs/statsvn/Manifest
index adc01b235365..9267a634e020 100644
--- a/dev-vcs/statsvn/Manifest
+++ b/dev-vcs/statsvn/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX statsvn-0.4.1-build.xml.patch 783 SHA256 2d90851c44ceff1731965ebf696905d925e22477f0e2e5b9d9f11601d79a4c89 SHA512 479db66987e26fb53da5be49377d8424fd7537bc7e7d9f078624fcbeb6c1c9d089f5234b5ceaeaec0f2c55603d94b21fcefede157c338b9be061592871ae8c7a WHIRLPOOL 57a817c870da72249f9070165722d2ca8e26db6d007ff3fbbe63b619d4b3208cb4ae352e5c2440a331e61040031e08cfdf9a3c4adfeb80e92393314fb2369737
 DIST statsvn-0.5.0-source.zip 14686488 SHA256 af9f36d364a6a348b50ffc5f248fafee5292cde1e39eccc08b8f1b038736e275 SHA512 0f723659ede09ca3770354c8da7ca94237e01068e7743b4bfa3dfcf50d21d04130ad219b0a40f2fcffece85c2c9e9444d7b2e9de7f2048b935223c09864d3cbf WHIRLPOOL 5206d6d946e4d33a6df082f5f527d3af289757e9e970773f537d279f0f610b20f3e789c27e396e93a99917b7aa9ca3c848e6baa8e8e92fe85cdb4e5b1b54c4eb
 EBUILD statsvn-0.5.0.ebuild 2202 SHA256 fef094e85485d8a92f617ac575d1323c67a2b944aa2f99e86153bfd157166d6a SHA512 303adf66574f321c2821c8112343287cf42fed2f636100d0e1a776d2d46c0089b7f74d9b91989cc9a4ee935a9662e6812c41158c332868221cd697713f6992d3 WHIRLPOOL aa1e4ca4b484ab6cb7131bd1ba37e1ea843fb62a6cbf234f2ce79e86fdda53ea21688b51c84fcb88cba74a71ee4819438c20898440aa83960052bc3150c69f4a
 MISC ChangeLog 1656 SHA256 cd6d75b15427aa55d49a9efa7be2e14ea63a2bbdef6758177c8771db90e2eb33 SHA512 064abbc3f5fcd83270f4382b1a005d6bbbb3ef07ff780cf93971e9937d0dd544eb05464667c8f45efb696c9ce1e476b39ed0dc67e4b6c159d04b020e8e4625bc WHIRLPOOL 3a328aedaed48bc48d3ad1c420d31b6c51ea3210c9f1ff811bdeca179cf02e76f96e5e4ae0027df3d8ef86844a67dcba06c5045b283fabab8b1af1e424834485
-MISC metadata.xml 217 SHA256 00a5772b0da0819b665dba21d321e4e2393c818907d38678d179cafd5036c7f2 SHA512 c831b55f48fe5072b2af6e2e4731462838edc100a568248719a12de95fe7716198d12e159aa3025294040c26841607e04ccc87451be220e667fdc1146f4656f8 WHIRLPOOL 0d6782469b5a96acc07542adcdc15ac99674231aa8f6384bad12fd50cfd7994afeebef4cae6269599588193aa8bbcbd9d986579baa5a33581d89edad6de8634c
+MISC metadata.xml 306 SHA256 97c09b4559c15fadde14bcee2d5ba825a13b06cfa2488540d6462a2db5d5d834 SHA512 f16f8d923078def83654220b0b5cdadde09558b9fc7210faa370995f61bd51b6da2618f2842709553a0291c0e5ea46a0763afc9eaf5a50b202fad4739256d8ae WHIRLPOOL bd36cba51426692d9ecfe6b5fe4547e309d873bc18191689ae6a4c5fcc8ff116df38fd3b08430bc6b51d048804a07083f57154dd5b50dcb918d497a68a45efe3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn4tsACgkQcaHudmEf86pDzgCePQQKS/QJCx+t4CcTwVqjQj15
-8jMAn2OnIivYDiBSgAM9+pMoNJwPgzer
-=Q6CH
+iQJ8BAEBCgBmBQJVfsJCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOHEP/33QwrvDc9FsXceFgKq8qJjE
+pDWhA5d6gZ88JGUU+8n/+BFihLQ1gfODeCwWR2Ba11znYAzNdxolqMCecPfWcxYL
+1A6P7QxiWewwtasLKr7x8B8jvXy1nQPmI9q0M7gmr77kydY7WDqgnn7/hy/kyqJm
+zpGRXyM0Ahs2yzcjtraDTIwm5ZFM5EGL2YImfUuaRQ4WWfDdtG3k1roaKUjF3Fi9
+H0xXoRqd+ADkHfBjgYTCQeCWxFI1PCXqwH41jx2oEettCY8I8z1R7divZtZaO0Xy
+GLndelatJnbfvlhz/8d4R5tXpww1C3vQHd4apBanhciLDNnSM0HVNy67jAUZU/E6
+Z45RPP6oA80uk771ZFPnqrRV82BeYAt9aJNEMicfwjhkYVcPq52GlKjD94mSYSLh
+QQZguapHKKuKtZyaUioGTfsuJCbflWJ/s09jRtGq7NO+IqpfE2LOBDYsQhE+SI2u
+//RzfzqjxUuUmK4JTDCrp2IfSFCmeqGvq/CnMycvn01Ud5XQNB3sARGAjKs7+BWs
+8NhYg+tc6Iu1KCfmLGhLCAjvSZsimDLINoeu7eEq7DclV5/eMkm7Rc8LO5+t6AXH
+e1joQ4bFytnwBnt8ihx7YY720zOZjriq+zyjcse5z0xqWshF3wU9ji9389HWCwfV
+qofjy+6rY8qwxDLnkl6H
+=JvlY
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/statsvn/metadata.xml b/dev-vcs/statsvn/metadata.xml
index 407583277d87..e927a7d48597 100644
--- a/dev-vcs/statsvn/metadata.xml
+++ b/dev-vcs/statsvn/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-  <email>java@gentoo.org</email>
-</maintainer>
+  <herd>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">statsvn</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 46542e9a270c..b78dc06d2f23 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX svn2git-1.0.10-version.patch 900 SHA256 00d0711b57e4d95080297300d0519b3f6b201ce1325ac5b79b3dd34e3667b111 SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03 WHIRLPOOL dff29ea7f6cbe965cc7e63887e006ccb7968658b6111aab6fdf899c11d0e268cc180086486c28bf36a2a9b3e4127bf91d042efea47be3e412df8ab20971cf40c
 AUX svn2git-1.0.2.1-include-path.patch 637 SHA256 69edb7f9008abaef4603f03c467df47f6ce21505ee235d5f23a9e9b59dc479d8 SHA512 1711a6281622bfe781fdf05df3644073ff6d2240cba1744540bf28b9f8732482002cc4769e040db93f08b0f8378e4cd9b4288f8bf7db4ee759d5c5c1770b3fe3 WHIRLPOOL 8d01a8b36aff11c8bdc42a4cb4edd821e5acea6e8a45dc53ca8f17a11794cae969a4c939986a0be54c46f5808e0fe491c1af85746d36364ce5feecc60b2e40f0
@@ -38,11 +38,23 @@ EBUILD svn2git-1.0.6.ebuild 1175 SHA256 4c0fcd46e1bce07d0ccd3b4e6eacdd99a6bf68ee
 EBUILD svn2git-1.0.8-r1.ebuild 1270 SHA256 8349ac210987eb8174014d1a9d68a8e526e26ed0626e06b7f5db3ddfe7fd2ce4 SHA512 a51820f31f67d2664631f2b17fbc03f8c77f4e2d24bbb6443cc915231d2b23c8f2d1b19d240659e78f113d6dc393eaaaee7fa274f20aa16081d96e268f3d8427 WHIRLPOOL d4069125eeb4bf5637f92ea570e810aace4a2333a78b3033b83992002573e9b1eba9f7260f05d48278a27fc30fa37747ca9548a574b7a54ff7e37b6837fc6cd9
 EBUILD svn2git-9999.ebuild 1177 SHA256 ab571eb59fdc1667a066506881a526d4a4f36c0fdcc8cd458682528aea222727 SHA512 e69ad89d4d1ad380334921c0e6305afed76dd7585ee1572798e41af817566ee079877c478d152dd41a7dd6bb6294d24b859397318836f936c9a080ddcf423275 WHIRLPOOL 6a233dce374710328df692856f20fa8247dc5d25c9582a1dcd8f69fa832dcdb4d6ebf2e31d1e087ab0c1054defa59ad6b19c803dd4b9e92bfa8d634b37c43f5a
 MISC ChangeLog 5872 SHA256 b59c7e95bfe8f30d1f119b0b07f508c2ddbea697a116323c5845352467ad56b9 SHA512 0201c269f1bdf6df2a0999c605f1186a140fd16eea5e9a842b07f0fbcf02e8324415073649ebfd188c1832240287a1716092b660a6c580ea21ff7efa0bf6658a WHIRLPOOL 3b4e2fc2824fd71687dcc788988243b62351d45cadfe0dcd7af2a98accab6c0c67031b7370722935b1dd90c1717cc1c95a39ce2d0cfddd0d631f2152185b681e
-MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364
+MISC metadata.xml 327 SHA256 d2419ae9130ab414607ea03edefb091548a888f7928242e65739399da69819b0 SHA512 f1ec7fecf26f65e04a07152afdd39254d3d3383b58ec1575f1a6a425ac3d8ec912c5b0f847b7e82c219d2b66baae976aa7ecb990840af711bbb0cf523f738db9 WHIRLPOOL 94f6d08bf3dd9992b6fcb0db020c61b0a99b362a7c12fc28a1187748fe5494e5fd3af75a4997a69de4be35810bba0a9501165233c4c41d043ca5882870d7846a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlUZoXwACgkQsAvGakAaFgAwcACgsGGwdnQWX2jS4l1QzKYwkOpv
-mJEAnicn51SIVK131QJMDzmXE82s7X06
-=8UbQ
+iQJ8BAEBCgBmBQJVfsJLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmin9oQAL7iiTk3SEpHOaC6cjWgvYwL
+OLM8ttZakhrEmpAk9Wi3ULRXXv1ZSOM8A9nPb8gaTIK4ltDz0iMxRCECoqsw8HXr
+tTLHxf4tDRGYzjP4MmgqDGuE7vn1P2PWlxF3zXjWwh/jcS7oJ5zn8bfUrqZt2LbD
+EaOyZI2HfSoCNj0W+YT2Gf/ebJAVgkUYya1tVziH6GEd550z/BcUVskcY2eyTk14
+4TiWA0z1K5AaJ+tmPH0R7hIjq2MK2PmopNrq7ZTZvDRkGE3ILRQct67aDfKcwuPe
+N42lRJAsCYUsZVCFErofUYezMDRcpmhFyZdCozCJsw7fNbmSbSTvvp2DsEpgXAZr
+QqlSEZJvUaNUgf37E9L20jeM6bTGOw4YZyQo69q0j7l5KIhJj1oIzj6O/JBVr6AZ
+A280zS5UoqWXpnLtxnx+xHOMn2yU/oAvWiIoaEWH8lYj8G35fKkCfycMLZQ4k9kh
+e4cHatxK06dyXVLYNH5eEk+U6KPoY4sC5AC/Czo8sDAtH77VR1G+uvPXCDH8CkT4
+ZjKLbX0MQEQFtQXkAFzxiIUXrKb9hfa+KiyrpAdQqZ1NLVhmy/qtJ1Q6px8Gaj7q
+qF8qgefwcS94L0mPmEeE+HvIAMx0YKa7eSbJ9U4sgsmts7lpd7BWDeMSQa2Qtqz2
+fXGFTaa20vlLIE8HRhW5
+=RWTd
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/svn2git/metadata.xml b/dev-vcs/svn2git/metadata.xml
index 16bcc9f800a2..7d845b67aac8 100644
--- a/dev-vcs/svn2git/metadata.xml
+++ b/dev-vcs/svn2git/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">svn-all-fast-export/svn2git</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/svneverever/Manifest b/dev-vcs/svneverever/Manifest
index a71b51010559..ba919e1504a0 100644
--- a/dev-vcs/svneverever/Manifest
+++ b/dev-vcs/svneverever/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST svneverever-1.2.2.tar.gz 3920 SHA256 a0c9904f7f53c17192e3ee34c5b23f79eb940670d13e22301fe2452668ed2bdb SHA512 b77c258b2846663cd108bd7a7f3b763693e40b15210ba0908138b039702accab22c2575c7dbe330451043488b2ad69ca0230ccf39716055d1d0fc93cfa1cc6f3 WHIRLPOOL 558f3f2f7734c16ce25ec0ec1646fd8cf54d19ece2994e7e3f972b5c32bb14b2569fb5644e8858e61ace629ac70b7b9914b02cb470e93d1f3fbd46f1f27ff695
 DIST svneverever-1.3.0.tar.gz 6006 SHA256 3542d4ca06fb80e3927e3cb0719ea86eef64d4fa637cd3350a610462a30617d4 SHA512 dfc5f8e96808d95ce387b2c0d2ea34c4cae81851dc5813b05eeec719ae7cbfb69ff33f38a88429b1caab2873af676072ce3d76592d8fac5dd186f18454bade10 WHIRLPOOL 075baecc430890b5802849f30980dd80a7311305023be341e83710fd7dbd3f1c56db8467ebbd586add6eff350b63912921044d8827371b0cfe0cf5cf13c9d571
 EBUILD svneverever-1.2.2-r1.ebuild 579 SHA256 ab7f8d990e52a877a0a3ff7cc5b0f2b52ad9acd644410af5f6d99e12786d452a SHA512 1358b2773f824f352fdeef2812bfcdd097a45c01a68e05f9ed570b258fb2ab4d695adf799b454eadc06f3678230dfc49529f978068e44e7e5ea0939d913a14e9 WHIRLPOOL b84650591950823b4364731c53c9d88947120dd763253758e3668f72b13c0ae49947b58d363a6670812c878554e5816b3d2adbd306b8b6d017ae1c1f7969dbf0
 EBUILD svneverever-1.3.0.ebuild 610 SHA256 05b07f576e696bf53d8af00a8967f02b0c7b2eea9377a85247f991446c047d5a SHA512 e7e64ba831eda412e7299f28e63ed1283d01646bb462866c22206264ce8b822a5ea99c580bc8f125f85d08910a4b42a7fce90687523d33dd6152503641f0ca12 WHIRLPOOL 4e26cf0b034841715d07cf27e44a518306066cd64b6aa096a5b43e3effeff308ba76e5d0a80b0f2ae44d4d6f717219e62132fd101e9ef5e2578493109506c8d1
 MISC ChangeLog 2570 SHA256 38590be29a6557d72160a0652093b6be168845545aba9fa09e6ee9d23095c4f1 SHA512 2f533b66fede1d51e1f587fc20d789b22e3ba0d9f3d0919600133cd9eb0d83cb197aa51e90cb6988b4424c0dd3795103b5e92c9db40dc62bf634bb71397c9404 WHIRLPOOL 19a8bd717044e68a9e2f0bcf318bd09969fcc1ab361e1da13d03e00954c896e37d33e22bc8cf8e7ac366c55694126e6d383fbcf6c479fd55eead8b467c03e0b1
-MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364
+MISC metadata.xml 320 SHA256 19f1420c457db8f75cfa89a8b32d5503f1f2c933bf7c1819d9dfddd070260550 SHA512 cf5ca85065f20defb0ff11972f2693275a21e791c51e816648018b7842b10d8ffc063a62f52d4c9ea48738ad7a00beb8c34bc38ddbfb1215c677a0c07470fb90 WHIRLPOOL 5af43961f97cef0c2635135724b337271840dfa662aa68d3f1f7d1b52e0308b3e56ce5ca154d13855ed0c5fd02e09ed9cdaaae2e27f1451e1f21ed50b9f6906b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVPi2gACgkQsAvGakAaFgAxnQCg2dHkxFBMUFSjBWwJCdmxnaWT
-O1gAoIp605ptk+W1Xp0rs6Wr2J+Ge55K
-=rVRa
+iQJ8BAEBCgBmBQJVfsJTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiXbgP/0aIEvo/6nT+L23PplkcMKPG
+sPOn6hj2b7ZX/D4FGQou9EZQz5L/XNoN34kT2bmC8xe0bMeF9dkERwdNH/WScyeY
+27DrC/9ZiEGZU9+0B/iiT7LDXh3JsZni8qvNxe3+Sci+IEr23aEv9LZ4hhRRUTKc
+hr4x767bRU4QykAyPfh++iOyWcl3KaQGShxoN27cfWistBcQWwbh9GA7kbc1Kjl/
+D1/jjVFYym9UjNwpyroArC4rKBDYdZ4ZJZEaf1pXpjticNMQp3usznC5JDH17BVS
+tdy+aUIsFZ3P1GForz+l/7ci4TU54coC7kbT8759DYtDYxAx6/bsymWlpe8Bcl7G
+IqbSbbWlYd/kBJ/vTJehxKeMhKFn3EBCJAcT1m4bbN6FBa8qZS1L6L9EiOpVPBZo
+yJD7EX5AdHnKnOcU1k/mxWzb7Qjw5jrQgg51U9gOmCE+DdatMkpQR5nGnc+daZ3n
+nQcMYvJDr8jOfAPgPc0/2XPKDPvzuh3qGj5l+HCk6LRFd3qfPDRQoA0VDfVC9C1Y
+8nOZyEO9AymMXLV3Ph4d7QO0rXkC99bjlB1fUv+EQ8esL+wMEvlV8oFX2ubIHQ8T
+nwiRwFhHGwHNQfpJqodhnHMegyWk/jxi8k+JdlUlAvPbAovbUyl5gnD5OgAd9cKC
+oUn7eWpm9Sa1rHc/UDYz
+=Mxpj
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/svneverever/metadata.xml b/dev-vcs/svneverever/metadata.xml
index 16bcc9f800a2..ca154c757e21 100644
--- a/dev-vcs/svneverever/metadata.xml
+++ b/dev-vcs/svneverever/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hartwork/svneverever</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/topgit/Manifest b/dev-vcs/topgit/Manifest
index ec042f940af2..5329322b3923 100644
--- a/dev-vcs/topgit/Manifest
+++ b/dev-vcs/topgit/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST topgit-0.9.tar.gz 37025 SHA256 24b55f666e8d88ebf092a1df365492a659210a750c0793acb0c8560694203dfd SHA512 15b4ec44fb1711273155350924806f9ddce330251d3f300f5d2ecf445f4822c40b5c7309429876746ed8226c00f74292956f51f9126c8c359c3f4d589c73791c WHIRLPOOL 4a281723d518d5ea7326703187401870dc05a8fb84d23ab5cebf9b1edc70f0bf5770a9d032f5df67ff55c645750d848763aab503eec6dd9cd6d4c23f1cc8ec69
 EBUILD topgit-0.9.ebuild 803 SHA256 5d32a4f4dd49cfce97afbd42b70ffc2672a35e976f1202404602ab000182fc55 SHA512 67f54d7ecac19523ec8dc01e69249ed866b058b8e057bc9a86df8cd5e3baf682b0ebcfac1d324ae3da43531e76009e92661105fb22e08b959fecd4633534b86e WHIRLPOOL 94730eea2f32442c1bb26705eb43544dc566dd347bfdb9a91611a9922d1981398b96eb450993dcb7c3c8c2ac490c07f8dd830e897480bd3f07b8cd0a78299b97
 MISC ChangeLog 1405 SHA256 7f41e743125657ce105776146f4d8f7778863ef6d052d47dd79a7a783b31709b SHA512 317934046d265bb4351953fbb3ae15ff934928fb2f0293b0f5163b8297465b5d591fe8923d2298ca93d5b2e365c5000ed7f49e830829f6d5443b555fdb5d7f09 WHIRLPOOL c2f5afa2d25de6745c5bd82def9c54fdd0ae35699212b63c086b4d75b007ba40b58ad53f134dd4c81e41b04d9b2fc5d498495ecf9da6fee1c58e93f123dbedf6
-MISC metadata.xml 235 SHA256 b8869c93feb961be451885770fc43a86d606a5076b21842efe9046773be72991 SHA512 0f45c3328380643ee0ef6bccc13ca318f26525fbcf9669527745a51e5c910532f1b5aef64247f5cf019a7515df659909427a76e3691edb878f5c31b172d9b4e1 WHIRLPOOL 0b2b4c1e5917851d05a390f05eaad3cd094439b542857e42fc6c4183cf65664b2f8b153d2d11b465494523925bcaf1215c4d485a63f4c9443df769e05c0a9e9d
+MISC metadata.xml 314 SHA256 8777e222aa60d658770f55e546cbff35f4001216a65ee5641ed29c22fb680c54 SHA512 679bc814ec02627bac94e193ad763b3a04efef4a92fa5218aa8dfdfd4f4083a7cd78bf7b7ae38c4d271fb12e4c46cb2d7712a2d900437f2b8080e694cd136b88 WHIRLPOOL 36361dfc4b6f9e7a0c779bc2f8b187617a1226bf28833e28fce3d27d8bb2a208cab0b2fa23e6e3fabf80d7a345ca211eb8b574a6d69e1fcc2d2a94142247953c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUpx9xXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOm7oQAJo/NCCVkLFb7AowZKYxM//W
-xRJFXI9CKttc5RbZC88Pmezk7WsKz2r2k9JClswaum3ie1BdJjas+UMz/fOhaNif
-tvpSnG7gVigkBMzHpHFsE0Gv17sHhoAqit/w9PeJlywf1UqzcYU1cyXpB5La9QKN
-rpibf6zuxt32UZ2bE9ay9x7kMP6jeieLMSoP30MxLtcBSpCiBJyw6rjcvGciZGNZ
-2DbN8X8EZ2j4w4zyfAO/9YjiSFD+E21+b9fXYkLFzJZ1vuXNVF+6wjQSEtKyeVp4
-Q+0tLsTBVTGjYEVtZcFILXE6opFBuQ4V8+gWYbIOxGPVcZLW+3bOt7wBCM8d/qmh
-4YI3KlhgXRG1Kt1Wf7/FJeNrAqgTWWtO9w9Oqu0qaAXN0lbppeqRXbiDrTRh9dA0
-/Nynd6ZV6mMehDzE3qnOycY9hLQ6Xvaaynwe9Jh/96IsJaI1k30VsFS+Wazz5Uy3
-ZHWnnLHx0cXwY0F56SsCxpvaxL6fDECzY5xmh0yAz8jcDukIz1T/FD6Rs+xkJQfg
-dsxotqAdbGdkkBTwTPOZGRJFqbTwNo14mIrCBknGovc5xWy932RmE+0h3YW/qZ5O
-QdALUL9ArrCY3lskdNGRrguTT9EqKxL7V69oLYJfXS3DJsXdS5SzXDFaFKIFtsvQ
-p/GrTxKntBAhB8yGlpR8
-=CjnS
+iQJ8BAEBCgBmBQJVfsJaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiYeQP/Ry8KGTFwhE0Y11mmYMJh8z9
+0tEOtkgZbwL5tIelEA9SVgtd/KlO9u3V1TKo545cN8DGysEnxcvJAwuehi5kUbEW
+j4PiNToZRr6Nc8MeMlXo+rMSnb6X8pw/d3pm8hBeDHI4DLM3fGwu8gUT2eB+cZUI
+2xfEuiyBoVrZbrjn6jeUty42tOoAKfdf8QegtOg2/QHn+kKOKQ9+/JmPvl6Az5PX
+Z0ll6lcBgresABHKRx3yFpdACETvIzyOS3sEIRvC3h6pXIel4JnkziAwsMFxXlUS
+yAMQRpUjCcgJTb/h4qraPLiL4OY8ycQpItrDvweGKPjeyFRs/AiInsLCNIFQrq1n
+APIrbqxJfnKZtGUlT0H4I6dAAdaoJ80BUV7lxWWRfUEh73jwPsIpv4t9UsJS/M39
+DYtQ8Opkq3+/uqm7K4Ks8Tyb7J2Rn7fo/LOCVe+7C0TzeIKmoeAWczaQcoCGoKYF
+k6lEF19J1tY53i69O14395JkOwXvjQSOJ9GaWHHsGzx8cHNtSmgvKlCfoJ+vL3g9
+/A7AS/lNUGBTyEQPI35SoaYb29Oq0NCxd3ZlxVnlCo4eF4aurSkk3wuR5zNAJPox
+VOctopez2PfSl3xunlxRfQlk0f8xy8utteE/UiMnvpzfovFBM1rhdWqOAVKLlSdT
+VSKqGCTEC7cjQ2jzZnC6
+=avYS
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/topgit/metadata.xml b/dev-vcs/topgit/metadata.xml
index b71a8a2e034d..182cfab3c7a7 100644
--- a/dev-vcs/topgit/metadata.xml
+++ b/dev-vcs/topgit/metadata.xml
@@ -5,4 +5,7 @@
 		<email>idl0r@gentoo.org</email>
 		<name>Christian Ruppert</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">greenrd/topgit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/vcsh/Manifest b/dev-vcs/vcsh/Manifest
index dd8be282c361..b39cd3dcc261 100644
--- a/dev-vcs/vcsh/Manifest
+++ b/dev-vcs/vcsh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST vcsh-1.20140508-manpage-static.tar.gz 28573 SHA256 1d4d9fe459071da3fffa392c7e62ce1386bc4b24a641e23633494dc2299598e3 SHA512 d9f5ba701e05f14d63c6e3ceebb75190fe30c663d12b5346d7cf19ed0b3e75e96a2676fdca3b86e59516efd21da383ea99ba783a77c0531cd9c980f63ee802ca WHIRLPOOL 8a49b63acbfbe99272e2169613fa3e5564b6b55077b775a43f3d77f212c44d79858889144cc890d10f1bfebab3e9c107ada7565469c7785abe3e61f943415d7b
 DIST vcsh-1.20141026-manpage-static.tar.gz 32248 SHA256 07737a52b7a4165981e05e07ecbc4023fe07a964247f177f6a2aa39f823d15a2 SHA512 7358fe738cbacb5a0bf1709a62422b7722c324c5fe9792a4f2266484b17aa70566ec0606227142eb5645e27fa3bf5d84d1551f8ffccf168b7944a8e552137803 WHIRLPOOL 32ea56edeed05e9ca5b33678d695b8366a676fa44a1deaa8a82c3513f4f41c632151afc47278b561a4a20186a01a71169c7548f4e597e160097a848fd72983e6
@@ -8,21 +8,23 @@ EBUILD vcsh-1.20140508-r2.ebuild 833 SHA256 9d28137cd7d60c08412eed9ad3611fad1766
 EBUILD vcsh-1.20141026.ebuild 828 SHA256 7624b4c9cd1bb632077d524135b2ab3e3c7a06d19fcd5128b3e1fa37a0306d40 SHA512 416db4d601ed48edce462a1b003911016f214633e313a470ed7ea9cf3d45533973bfa8d277aeeafcb84aec2094fda9561dbf13dd4060412be59d48316efd4dc7 WHIRLPOOL 3fa3bf5a01ce48beb1a5c340151cda8482b702f5e6c0b79a87e458a66ea9c14569a7b61250125342b1eaa3331009acba404a01a9142023dba1f43174615b5ae1
 EBUILD vcsh-1.20150502.ebuild 912 SHA256 cd5d1f9d7c0b9b3475b3b722e4b84009d3aa979b84d9526a286d6471cf23c419 SHA512 2250e8088c59a91c3fa0f22ff71c5c904919b07b09d38cde4476bd8b9f229d68afb846a0500c382f14b1e19db1a4d800b9378b09f03455a1c84bde52c522f8ea WHIRLPOOL 81b8734f2492692f57de1b89aae5e514fdf987ba0e62e8f3f3b44b0baaf34dbb349b1a3ba7a88f98d6b65d54ad5b67ff5119e5eead1cf707062fefbc9f29025f
 MISC ChangeLog 1869 SHA256 f9f14ad11147f9c8638926a9b71ae262d67ecfd9384e327592904460094e3dae SHA512 279ec36acf8dba45af993e4615107079637b76a567f3f035c7ac2f35083a3d22374a81f0f1450d6dd6a0a3dd115423cc268c66bf91cb4d1f74a4900c79ca5375 WHIRLPOOL 7e5dc75ab2e79fe48d127c413ab3f628d42408436fff7085097773950430e5408dda4f95c322c279ee631bea0f0c2c5c1e182d2f30d2f0d04388997265145178
-MISC metadata.xml 233 SHA256 d64cebfa2fb894c77a0c67db5c7cbcc88258adac7794d011e229cb11f7d7f03f SHA512 7610bd96a337bf75ed3b59df584cd646ad93ff2c5f4829cf2775a5d09a6d19f573492de2308552f454846f02d35420242906a1357a4b19550ea7028d995fba52 WHIRLPOOL cd1155f0cc26bd5f117666c7920ddf31105f84aec93b0b6e8015e6c659b8ec91910199bb0fa9718f551c5bcf1f15f708011b8f9f7095a2d4e44389cce7cbb543
+MISC metadata.xml 309 SHA256 998d90965c147a4a921cf37d346be6a142d2db4c9dd23f9fad3a654f2d11182c SHA512 2c06654a9562e44b6a69b3fd486c4ec7026db48212d66c5182ba6259f266a46db6b2594c00887a028eb4001d57f6b265c63210483e078cc58fb49f29e49e3ee6 WHIRLPOOL 550f43ecc39f679d90ba3e2f76fd2e3ba4364f64a855520ecbd2d4fc86e9e19d87fc9c55597ff7aebc39e7ef83ec1a00529c6c2a23d28ae7bb242a9e8935b393
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVTzEwAAoJELhOzYlK7nn//vkQAM+FcCK3axEmNB4sgl+HWMyP
-oAWjgQPo7wCTpyM4setog/LqRWOQ2UXgVKANTEiCrekBhJedbzttvltddwWQOOZl
-FM3AE6wVEqCgdE2FF2E9/tbvrjvgY1pXhEJcjRhUGVHlnJm5k3DV87thy/59K+mF
-b6ORZTkwAvXfq4JN376fJQr16PbUJh8BBwzTIRBcxdh8tbMehi1Zyy8nrL2DSFlt
-cLxNLlc7rT8vZUhP2bD6sXlMY9l81sGzeaDKlaHetaJcDvng4jfFvdUYMT5BerGw
-Bo7pt1sdr64Rr1xr8hrFaNMcGVWWPjweMg9reybER1QG3X48APB9cVYRx3qByovX
-jmlaNp15GGKLB6bvpJvN4KKanuhbthUYANtfVBLPP81XYrQQ0Vf2XFrIpkbNG01x
-DFKQHT/04nJUbXRkkITPqcjnrlfFQpgsUtpIYtIhb1YmoKB2m2OiJVviki1ZwcA4
-NCafdOU/b814Hhqk4Wbb8tal6wu+RQdieoZb16QjroBAOIHIF1sGUuy/MMhtciZ/
-FNv+vpnUsZ3Y+Zo/yrW54THEh2FLQov4nNUkDN+iajusP0QNsgic0HM3duG9mdF8
-vTW++77pVA9K26YzbVG4BZP5NzKwP+mEawKmIeLpAizdqZZMKnCZ+yvPGFEApodP
-UwBJ8YHdbKni19+/4wx1
-=zzC/
+iQJ8BAEBCgBmBQJVfsJhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHCAQAKkwTsd/Mi9ABlywQ6c8pH9t
+y49AV8S1ORBLdUUqw/WZdNlG3DaN95bFdmz0xtiOC3n7+8IcmoPXXsovNyH8MHlx
+rsl24isq8Qw+i3jGdv9SRhkl8AYXgqjgh0Mc794w1gdsIcjSR6jngwcOEHC5t+4V
+JUmwYxGUFxKya7fO+4WsZj0WJeeMENA6tL/dsgKBbVkr9UGKb8gOt/L8tM9yIHDJ
+fjHn2HBvjNPiAB/PbxjCJGrhUheuqD4gKn3Mmg61kh8PpttwHasWkcuhZsOQ3268
+SytIovarAhRVB31VkZRlPpNIcziU8/FuHSNReG66uDZu52KyUMycUpbgyWtHr/Qs
+PcePlFC+vXUyhj9zzcWbD9/CyqavwL4IaFfiFwhWkvLvq42hoXIJVT0ktJSK/px3
+AbBuyg/SKkHzOAys02unreq+chwF8wlAvSLtx5vanVncKls8yhH2e9/n1XLbWCSa
+Cr6i6MJT/2ZpfqL7V92LX3J3azoF9212MIx1SMzafEMDDvnzDEQ87800gRmPFSxk
+1jWrw4IDcmdC6+X2ZgrndEeAYPLmlYMUTR7lOpPmQUy3umC3LggvV2i4o2GXeB6s
+Jz60QXosGDaYZpo062R0dcf9MI77pikMNO6Jo5t6lhxSWyd3d+L3/iQKgLmEwCwa
+1f9w4E/Fk7F96d6ylnRq
+=HVOl
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/vcsh/metadata.xml b/dev-vcs/vcsh/metadata.xml
index 2702f26660bf..6114ad489fd0 100644
--- a/dev-vcs/vcsh/metadata.xml
+++ b/dev-vcs/vcsh/metadata.xml
@@ -5,4 +5,7 @@
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">RichiH/vcsh</remote-id>
+	</upstream>
 </pkgmetadata>