Add github to remote-id in metadata.xml

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

21 files changed, 184 insertions, 94 deletions

diff --git a/dev-haskell/semigroupoid-extras/ChangeLog b/dev-haskell/semigroupoid-extras/ChangeLog
index 3e6f12cb49c0..9551239359cd 100644
--- a/dev-haskell/semigroupoid-extras/ChangeLog
+++ b/dev-haskell/semigroupoid-extras/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/semigroupoid-extras
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroupoid-extras/ChangeLog,v 1.3 2014/07/25 08:59:21 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroupoid-extras/ChangeLog,v 1.4 2015/06/06 16:29:43 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
   Drop redundant '<maintainer>' field, leave only '<herd>'.
diff --git a/dev-haskell/semigroupoid-extras/Manifest b/dev-haskell/semigroupoid-extras/Manifest
index 5deb4dc38469..919540b97aea 100644
--- a/dev-haskell/semigroupoid-extras/Manifest
+++ b/dev-haskell/semigroupoid-extras/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST semigroupoid-extras-3.0.1.tar.gz 5284 SHA256 ed762d6c59ca75abc6fe0a7ed0119757588daca25d0ebc1681612be96bead1ac SHA512 4794258e662b170db10499888aeaca5f4c31057227279befd173aaa412d45efdd7c6fa60398fb47addc382920f1c27da0fb30e4319d2395b20db756cf4315fd5 WHIRLPOOL 31006d4284eb634f5c3543946a9b85fd4b5465e975d88f51bd932b04bf3a868b21e84e4865ccbf0328dcd849eb29d785296ad79e862149aafe09e6e7a6a8c873
 DIST semigroupoid-extras-4.0.tar.gz 2052 SHA256 6f54b62203043fca77b13a2105bb2f82fa5cd90d6b20ac6bba99716fc93f4a1d SHA512 b439733eaadf41181e2bd4ef38ec4fc1bdeb8bf2ec9b13bf03217b14f31ad9bd08c2ed45dff3aa6e6ba046c0f675cdd5f047d4ddf010557947f5a384a4f979c9 WHIRLPOOL ed4915f1cd5553d416dac50ad3a6bfc85e2862e41abeefceb39669b81029a117ec375293ea2f972bf6b68030155d23d4cd5e51ee895169fa9d21209a94ee90e2
 EBUILD semigroupoid-extras-3.0.1.ebuild 866 SHA256 0f904866d2baa7cd8ceda1cab2cfc5b528021766ef24865f11890614acba3deb SHA512 1cf70c19f893b9ca834019db8019bbbcd2485a48febac04782133a614cd8f3a20cd8a852fbe8d3f1fcd5be5dc7ba0d783b2dcb0e0a6daafe2a9b721248b83a0b WHIRLPOOL 6b58fee58a9dfcb8e79d1f17cd2658115cbc7accdb0b88f3bd1928a4f11273127cd8ed73a3f0775e4cd05acb71f41dce7ebd44e1be9ec4bdf2ba464407e40430
 EBUILD semigroupoid-extras-4.0.ebuild 732 SHA256 dfb993d37ed3c1c6a242febc5e129f2b150740a64e66aeff55209b7ce3472998 SHA512 5d44ddfce24b016bcf987d2f6810e9baf2a7244533308f297205792ebb889d0a3b83d46455ea533d902d7c5f40d5827125fcdeb25aeb7956cf7d1c0beecd5a21 WHIRLPOOL 79977a5f2abe00fa0991d258fec993be155b76687a5e84edaef23d4448ade6bee5701ec088659c27618b30b9c4c832e2e808584a0f069dcf6b4338bf49bf6f0f
-MISC ChangeLog 718 SHA256 f3b77b7bbabf9f3f7bcf96d6a39aba29bcc4d10304b98ea88fd644e51126a3fb SHA512 71ed570d500f56abb1f4ee19b796a9f311323de33c85703dbb4a31a552ec00e96f733575ce7be8423b013f3d2faa3959c83d27dd7da198d495f078954f344cd0 WHIRLPOOL b202fff64dc1bf0b15048ed620edbc48e4a60732677f8e20fe7bce5e78b73cf546f12c88360592434ff50c827feda65adef5c9efd5115ca4f4b561f5706b9b5e
-MISC metadata.xml 273 SHA256 2d33f6253c6d839890c3c78f7361af86dfdebe739f73351c0db2fca93da0a6af SHA512 52677417dd24cf37e09d7b4d0b3003e6ca915f1e733860ebb9d94cbfc39ae26a7498dca26113d5321a7425979d96e2a132221708a51e9df546c5dd8d2f230f6f WHIRLPOOL a18b44a78cb075dce7afed1e3f69261fd573213f1dc350ec5e08c9a7fd5cc6b339e4ac001f396b7a98a0c3b3d9b1368a1945a7ab8d98117861049ee8aa27f3b9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlPSHJEACgkQcaHudmEf86pzkACfdgWGXSbwta0rBsR7hBES3Hs5
-VJUAn0qke3+ODpZW4IBZog0iENc2CIpa
-=Qlhg
------END PGP SIGNATURE-----
+MISC ChangeLog 820 SHA256 c7537306dce60cd51952fd71aaf75fd9b754158f2f4be0ab8f82f3ac17d37888 SHA512 f35883cb267c1536d41a1881b3c5cffc9858837c2755b724f80f1fcc58d5051dcaba780add6aa90f53039af2c8628af5cd0db58ea14a4bff11d5e6d55d2b8d83 WHIRLPOOL edb16ce2bacfeef0c501c44839138a28ac118d26a440bf8561a42b36baae54a6d0f4a64bb445bd10f2d5a7cd7ca2f6f363a178a0f3a2da60b404a8b3ba216ccf
+MISC metadata.xml 364 SHA256 3ab3dfefdbd9eb994dd4e828a37489156b509c4423a13de4e21d100c14ff71c4 SHA512 8e4a7343dd03294913cb873d578431856c91dba0742f85f064fbae234d794b8d43ab26dd06826d49ec1880057d63898876caba0a9fa507a73d2fe733e5608303 WHIRLPOOL bc1c4c2d4f819622fcb590fcf1fb37148a660ded9cd26aef8c4bdd7f9e70382d2d52932963da042cbb36c331f5f7b22ce6ef466104eadb9681f56a6ac07d96a4
diff --git a/dev-haskell/semigroupoid-extras/metadata.xml b/dev-haskell/semigroupoid-extras/metadata.xml
index e102bd2a3d2e..5b06bf55cd71 100644
--- a/dev-haskell/semigroupoid-extras/metadata.xml
+++ b/dev-haskell/semigroupoid-extras/metadata.xml
@@ -5,4 +5,7 @@
 	<longdescription>
 		Semigroupoids and semigroupoid operations requiring Haskell extensions
 	</longdescription>
+	<upstream>
+		<remote-id type="github">ekmett/semigroupoid-extras</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/semigroupoids/ChangeLog b/dev-haskell/semigroupoids/ChangeLog
index 71bb07e6ef1c..8ed2f56e6dff 100644
--- a/dev-haskell/semigroupoids/ChangeLog
+++ b/dev-haskell/semigroupoids/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/semigroupoids
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroupoids/ChangeLog,v 1.6 2015/04/03 13:22:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroupoids/ChangeLog,v 1.7 2015/06/06 16:32:14 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *semigroupoids-4.3 (03 Apr 2015)
 
diff --git a/dev-haskell/semigroupoids/Manifest b/dev-haskell/semigroupoids/Manifest
index 5b47a28300f2..b2372bb20723 100644
--- a/dev-haskell/semigroupoids/Manifest
+++ b/dev-haskell/semigroupoids/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST semigroupoids-3.1.tar.gz 12317 SHA256 2f5dbfa67c314d69395480f4aaef9b69cefa5f527d2db9a74fcc6f6b813f2408 SHA512 915425feb2f0d2c4c30a19b5823dd3377598b321835058202e623fe5f817f37d646ac1812192e570cd494ada5fb9df5784fa23bc38d39f95d8ed19b16f633755 WHIRLPOOL edce1b11bdca06bf8e33314449d2185ad57206d969fa84f2b8ca2013217b7b0f69c19cf9126cf3b814707f4c6b30dc90c59b624e680bc76005da029c30932d5d
 DIST semigroupoids-4.0.2.1.tar.gz 15805 SHA256 6169ab2c604d397748c29c41ab9ea20fa536d7e0f21f48e499966fbbae26ea01 SHA512 9fe6c9b31013763d0581539f768ea608aa6990625a81307e4a665e1e9cdf47a225efa319489ac4a51c0237fab772bdd318fcc9f3d0d97221563bb8a885433815 WHIRLPOOL 954f9c952b39e49ed26196e390e5b7a60937bd11bbd2c338b406ad9117cea77f40c73c932653f02d89f859368cf1c7868f5e1e7fd0c00d8be47238bcff93a292
@@ -11,12 +11,24 @@ EBUILD semigroupoids-4.0.2.1.ebuild 1088 SHA256 7e87e63b29c6273a2e242bbe2f5658ce
 EBUILD semigroupoids-4.0.ebuild 1084 SHA256 7e59cd959b3adc721668b42b290b7659ffc3c7642f0582108b22a53752866adc SHA512 c791e7047073b8cdd101f14e474d87577ca660cd35d4286f16aee1e2ca7490afc08a11000f9029d6c3005c8f1bf36955990f12ed7460da8cb8bf002b5c5c45fa WHIRLPOOL 54822187f24c0bd513297d4d81cfa99c2451f75c46f4ecd2dcf108142e3a047d2a5f912ac2393ff22eb4db9a468d40ff302fd119483b7fee1739fb4e38703ce7
 EBUILD semigroupoids-4.2.ebuild 1397 SHA256 83642cc409ed95b04d5fe9cea2bc15e0cf7fe49af8556ac3fe21e6e8dbef68f3 SHA512 19faf4cae634fff49c2f64614ee110dda570c96e007837f0358e5365dd3d5110edf551163924e9934624e62f36cccd07a0494f4f8466eb90c096fe2a7dae8ea0 WHIRLPOOL b093041c3d2a6d844dee9e231f7dfccf198d05a1699ea63101427ef8484c49fb597476647754c2c0f4f640a0a282495e4aec8fa089594021850b01bf9180cee3
 EBUILD semigroupoids-4.3.ebuild 1519 SHA256 be19a2c946f6195a444daafe2750a964142a216e4ddb962603b33d4edf58e497 SHA512 48123a1a77766a4b0da47a51b585c666c10cafd68867ac46ed3e4e6f5c92a8f6526af01fa5f5e8a744ca70e2dcbdca307ae743cae37db1e2f599dfe21be7f373 WHIRLPOOL cc8274090d6e503baa469323c4e32865bed13d97bec59d4a8fcb0ffe2ed9403f87e1eacc4b0732908028a43297ca871be6eb2039baefa5bc809f0059e645adf2
-MISC ChangeLog 1105 SHA256 c9cab983d8464ba67fec9271ac8377037698e255a9e51f587099c837677ed766 SHA512 90c2e326d4411787fc5a172a542081051cd033772dd7c3f94f48f8e245f043d219641986b565d69eb368c75541ee326abb8de076ca2ef84980b6bb2208703119 WHIRLPOOL 8907a76206240524e3fb38ff48e0a151935cd681fe4d6739a9add7dd77f8d998bf967a707ae790cee4dab389b454825302b3adec09d8279ad448cd55a1418b73
-MISC metadata.xml 3524 SHA256 750fbcac756e26bcb130485c6ed54ca2d7ce7489144d33038b9f2a35b75c96a2 SHA512 780346fb6fcf31eb4e74addb7e264b893d7f92d6e938698809fe5533d2a142aba48e188e3dda1ca53caa72b708004be085ef68eb70626ae4b27918b36d26605b WHIRLPOOL b93727a952c001e8ac4a3cc282f2a51554a9afb2107c0e924930c51188e711662045d43704458cf84c989bee73d38e9bee3426d6d04fc9d07f18c15c9eadc556
+MISC ChangeLog 1207 SHA256 6000d141faf52ea92a0d9bfca0586bce455c1dc280733bcb9cb9aadd677207e7 SHA512 e251f071a4192d16df954bce3385bc11393f29b34e64efbfca641460cc63c54a4d7db58e3c0fc3d222d938f15c4dc9c0a82f4ab3bfd52a21f4d653be45b4ce98 WHIRLPOOL 0d44b285eab8020aca8ced95be84091e098a1ee0d9ffe6ca0299f963740a9022407cc77c342b4a968098b35a21b8417fb5d82f32a62676805bfe49c53656b3bc
+MISC metadata.xml 3557 SHA256 117d62d75e504b112e131ef97d2b78b104e6a28e4c6d7a18d84d37ea9fcfab0d SHA512 42ab0f410963e0165b0f6c0e4db002ed24378ef3b2a00e6bf3349b422733a0effc84b688432d823313a4cd045405654658999d2421092a88f64d5996c41a871d WHIRLPOOL 64361d788a7b03e9fa35efc9ccc21f15774653da692e363a976f8b4e43e5cf68b5df92e117a2f4bf54d72aefc2fb05e1e03e77ca58c9a9d5cff96decaea44996
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUek/8ACgkQoBEVQmGOlx+PogD+IXCZHhJklv3FzmYHATeQdW4d
-ts2dwOp2cMJP8DheMJsA/1ZM6lvQlxUmLiXh1YGNWdOb86FXcCRpJgQBgWKZTHG6
-=/H81
+iQJ8BAEBCgBmBQJVcyCUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmitEAP/1JCfYHJ5vGfGRDyEpzXTEHd
+Lv3TRWhbcqlA+5McVW76yW7Dho4VoEQ6LTiFzUlOoACyk7ZoGGgaNG5VwqMYBKD7
++8HAgF47qoDvBWrEKsOKGbeOWpymly7C8rvraiY0UucFWKfp4rStH2XVq4Y7vq66
+BJVQNiITMMh7KpR7KgTTqEjZFibi8muEsRb6GqDmbf8uB7qqX9yl2f+oPj3gGZwZ
+F/fWOVlmQ3+myzfDsjgGeRXo1PuTMXYP5YDjUtBm5gWmdYdNo83pcNpDaSa+DJnq
+MpV4omJz1Xre2TQ28/QArbp2vkSdpEfNqWw3KYZB+ECG6SWnT+37Yb/mT04pOhmD
+5lLEUDfOlLMuYr/5seRYl8t7jTyH1yqS3sNg8zIItdR7VB5Fol1XFT2Wm8oNBVin
+XCjk9OIRFPgyEOE3cjilQFlBdlrQAfFarX9g6BPAVeXbjH/SnJuJFx3XcyFB8uiq
+Ox8kanLkoEZTqmmT8byXPT8wGzKBnYgBa9pTwoml509Oc/9aQVvBMj6JY1k/rUMe
+AOBQ5LDIstO+CPs3Hnr/V1bGHM4Ywo6syVieZFdS4JHK6CbzLLDvznv0xU8E4N7E
+TqBlvWpCu7HYJs1IkRKNBU2oZS1OG2jKsR3aEiXRFfBoTipLLQobjkyU9ZtsAmJr
+Cf2VsT1yKYzgHv3k9x5e
+=EEwF
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/semigroupoids/metadata.xml b/dev-haskell/semigroupoids/metadata.xml
index 8298b3e51ffc..e4854d8ae7bb 100644
--- a/dev-haskell/semigroupoids/metadata.xml
+++ b/dev-haskell/semigroupoids/metadata.xml
@@ -8,10 +8,10 @@
 		A Semigroupoid is a Category without the requirement of identity arrows for every object in the category.
 		
 		When working with comonads you often have the @\&lt;*\&gt;@ portion of an @Applicative@, but
-		not the @pure@. This was captured in Uustalu and Vene&#39;s \&quot;Essence of Dataflow Programming\&quot;
+		not the @pure@. This was captured in Uustalu and Vene's \"Essence of Dataflow Programming\"
 		in the form of the @ComonadZip@ class in the days before @Applicative@. Apply provides a weaker invariant, but for the comonads used for data flow programming (found in the streams package), this invariant is preserved. Applicative function composition forms a semigroupoid.
 		
-		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable &#39;extend&#39; operation in the form of &#39;tails&#39;, but do not always contain a value.
+		Similarly many structures are nearly a comonad, but not quite, for instance lists provide a reasonable 'extend' operation in the form of 'tails', but do not always contain a value.
 		
 		
 		Ideally the following relationships would hold:
@@ -31,24 +31,27 @@
 		as in many cases the binding operation or @\&lt;*\&gt;@ operation does not require them.
 		
 		Finally, to work with these weaker structures it is beneficial to have containers
-		that can provide stronger guarantees about their contents, so versions of &#39;Traversable&#39;
-		and &#39;Foldable&#39; that can be folded with just a &#39;Semigroup&#39; are added.
+		that can provide stronger guarantees about their contents, so versions of 'Traversable'
+		and 'Foldable' that can be folded with just a 'Semigroup' are added.
 	</longdescription>
-<use>
-  <flag name='comonad'>You can disable the use of the `comonad` package using
+	<use>
+		<flag name="comonad">You can disable the use of the `comonad` package using
   `-f-comonad`. Disabling this is an unsupported configuration, but it may be
   useful for accelerating builds in sandboxes for expert users. If disabled we
   will not supply instances of `Comonad`</flag>
-  <flag name='containers'>You can disable the use of the `containers` package
+		<flag name="containers">You can disable the use of the `containers` package
   using `-f-containers`. Disabing this is an unsupported configuration, but it
   may be useful for accelerating builds in sandboxes for expert users.</flag>
-  <flag name='contravariant'>You can disable the use of the `contravariant`
+		<flag name="contravariant">You can disable the use of the `contravariant`
   package using `-f-contravariant`. Disabling this is an unsupported
   configuration, but it may be useful for accelerating builds in sandboxes for
   expert users. If disabled we will not supply instances of `Contravariant`</flag>
-  <flag name='distributive'>You can disable the use of the `distributive`
+		<flag name="distributive">You can disable the use of the `distributive`
   package using `-f-distributive`. Disabling this is an unsupported
   configuration, but it may be useful for accelerating builds in sandboxes for
   expert users. If disabled we will not supply instances of `Distributive`</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="github">ekmett/semigroupoids</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/semigroups/ChangeLog b/dev-haskell/semigroups/ChangeLog
index 08bb82ae2c1b..c86ccd6ad077 100644
--- a/dev-haskell/semigroups/ChangeLog
+++ b/dev-haskell/semigroups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/semigroups
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroups/ChangeLog,v 1.13 2015/04/03 13:29:03 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/semigroups/ChangeLog,v 1.14 2015/06/06 16:35:58 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *semigroups-0.16.2.2 (03 Apr 2015)
 
diff --git a/dev-haskell/semigroups/Manifest b/dev-haskell/semigroups/Manifest
index 2c701840470d..d0cf527a7a36 100644
--- a/dev-haskell/semigroups/Manifest
+++ b/dev-haskell/semigroups/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST semigroups-0.11.tar.gz 10152 SHA256 feb3f4b0d8113df6fa9bc05b0b85f4f0159bd6f9700c8def5d170919c8550171 SHA512 56eea20181fda3480c562230ff07e73dc5a1e163fb1da87717971cf95c672afc8c3e52fc9b6fbc98c29772f44245d2cd78d0bdf368bbefa84cefdbfe73c4f8e4 WHIRLPOOL 42f7f7b0729def959df721a3a1a72f8dd1c8a5ca08f8e8cd38f7f969d3a7dd26f249b48e05c886bb492b245401ab8cfbdc775e416be3564f2479869576a8b930
 DIST semigroups-0.12.1.tar.gz 10541 SHA256 9818c289a7094362a56bfb94b5e031655378bfda5d791ec4612ca5761069af4b SHA512 309729b99d7912e8a07ef4d57c433e46233e77828c84a3c9ecabe6d17ed5ab28d7b23111c5d55f7324bbedfe512b1cd4a7e698b8177f631629159f6e72f9d4ca WHIRLPOOL 1b043fcbad14776ed03827ceff6d31dd080d1ceb0ec275ffdb132594e78a609a7744f6624d9439af4471a593f3b64a5a9588657fee163cae48ee95b0ac8b3d7a
@@ -17,12 +17,24 @@ EBUILD semigroups-0.16.0.1.ebuild 1384 SHA256 243b701b1e9499133bd6ee72c306196daa
 EBUILD semigroups-0.16.2.2.ebuild 1384 SHA256 2678995cf594763ccfb693524315c5eea00372c27786f3c0e8d30194f883b4ce SHA512 695e4dcd5bf5660c7f0a089435a22fa3ac683cc028579815ad142e41247a207f691b403fe1795bd97078c14b551327ba6fd6c454996bf45501322906dbba2a05 WHIRLPOOL 99036a55b282aab325299705fe6bf92b6f3e969a5951199505241afd9e344764ba4877fe4e6695b1ea0aa6dec9d5e97e25b1e3ec92a3159902f55598f77b5dbd
 EBUILD semigroups-0.16.ebuild 1380 SHA256 d0444176015c3e916043c4e96e27d10e9ddac99bf7a682d1ae90c828cf8a10c0 SHA512 bc464c2d3b9b056acd269a8f3cd97c82b861b84894e5658b06c5ad65626f1751bf85ca96d0c139d79da45fd3af4fffe0d0d5dacc680e8027270271d58abf00a5 WHIRLPOOL b832795ddc49d44f9ac6d5b8d94cc035aa4dd82b801af50d4c4441b60679144695ae9fc8f2ba5cf1a16344636bafa988b7349e6c80a34ed60b8fa3facfdd5b1a
 EBUILD semigroups-0.9.2.ebuild 688 SHA256 3bb1b0ed58e0df79c5507a6b9089beeaf6b7727d77d426300f9f6204d90986d8 SHA512 afddc7ec4df6aa79fc3db885fc8407036a1ea9aa83fce8507d077bfb91d68f1ed2a00ed457ee48fbae817ad3fbfb0f18b38e36abbf3dd91591759a2d67a96656 WHIRLPOOL 8baefbc3774f567944fd6ba09225fb9f60029914c23c43e40200c21252a50c4ec13b15c0c8c6ed028b3846e25862f9cba10a97ba4586dc0815a20609b3b0fda4
-MISC ChangeLog 1988 SHA256 37c8bf49ee3ada7b911b0af045c1577a5f357e57b2ba84475d52cdf9d0496054 SHA512 e8f5535a3a1a7124e697af3a8e995e5f27dfe8d88add1dd4d870e4c846ad14712c157fa51c897a28d945b47df5dabab9fdbf535cef68c71167bce547de75703f WHIRLPOOL fede051008a9add2cfdf4a081c95620bf1d98685910db88c1d6ab39fd2897f7da5f85ad28c0ffc82ee08963af56a7c99fb65acbd06d0ae705569b86ce3ce848d
-MISC metadata.xml 2099 SHA256 38a846c4108e3b957669a7f149289dde4bed2d658d1e726ae26888390a7f1085 SHA512 d3417b334ba659677c122928cf27f2c0bf9b4d0e533ec0fafb4f8cdc184221dfd186a482d5a5ba5497d29e61c8a3493fcc73bf36532eb2ca9887fc46172cf14e WHIRLPOOL 8ef11cb5bd4406c6780b6c323469db216754b4b7354e70768b4086fcf2027748b395bf955265f272d1739d7bd6065b002a03ac25066ab64b84ebe33be3f83a69
+MISC ChangeLog 2090 SHA256 abab1d62ee6933c47443f6c1437a88ad2fcc630119d995f869105ae17f5453ee SHA512 d7f0eaaa4beee5117a301aae39ef8fa955f28f19c35ac48d2eeda80eadf183b09b728dd2a11a9665f771b8a1624a361dc610bf7de1cd7508d885851ed6c0cb75 WHIRLPOOL a3a7ce02e6eb308fabf913e17e19cac3559cb2346396f8357f57138dbefaf84f429c74b4d3b0ef87e2277790848de2d3d45897119f8c5f8769cdb4c2fdd011aa
+MISC metadata.xml 2181 SHA256 b4b31d940f92c633fff4834837bef8077f94ef41e24dbaa338c03d671c93dd85 SHA512 0d7e91c98d54f07f88c7ed5e5a890af2023661341c773e8e28429fdd4c51f3f6a87f715cf00adfff6dfb1b29105df1474938f6809d10c538ef63f3b967fa3d50 WHIRLPOOL de24c392ca3b0be76feac9e732682826b93cf143bd08c64864eebf5da14444e9c111e37e536ab7e8cc237995a076e06ad93087edec027bb3e3b07c58cab83556
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUelaQACgkQoBEVQmGOlx/aLwEAlWVc3U33uemsYgTMPAzN6rxu
-W/xpfJmLuOg327few38BAKsxUt3kT+B/usdOf3apn3NXzEI/dmhq+r8ZtNrJEATB
-=0QYo
+iQJ8BAEBCgBmBQJVcyFvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi0KQP/j67oDaD489hv+boDDVtFlop
+W7f3oOfx2QAKZ/puudb0yBcOL1g3VE326qQdwh90IDbPJDlBp8ydW9LJqAU0yQUI
+1SHuLmKQ5iXs/Q1M5KS9dAc0EovP3HDTRxSHPTdw+xDVrzzymKkrtOH+z1pBbYAA
+ysUbmElu5bya1Qzhb4zXadH1ywbgCvVrMZzDWGUVgGEG3RdyMhgbx4JXQCg9KjVO
+8hm5ieP+O/DoLNp7NqSsyFWiW1e5hp+iv5tyLtYOf6clKJPAH6fWTmfbYllJARRs
+prItn1BbF5KwZE6yufo2YKHiEKInaqhKcJYo4F327qgA+xIEBjSYzbarIQG0sgPg
+ayZpFtS2y0r16FGX21OMRKjXWoPhOusW4+vJ1YmE1AXnGdj7cw7jOhxL+TTvubSM
+6BOHsO3j31o1JqpClBWO/kSbIL0kkxXNXco73DoSuYuGNKJaA+p5HYWPS2Oth+3A
+kZsh6GsspclwnqmUZ5GCiV+X44jbh/JgQn11SWg0fQne2Z+Q05oVpkihOzCKN/0X
+KiersVX8bAb1FhbLRHvO+Vo05iC2bu2AlmWSoCSko26EYEC/9QAE8KUJ3pICkcB/
+cgaZhzmyK7ajvF7c13fnbXgYbxSR0+YwT0JQDmxpNQzTF6AnfbFT6IGHKe16220h
+dS25nsn8beKK8lmibT0n
+=cnAB
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/semigroups/metadata.xml b/dev-haskell/semigroups/metadata.xml
index a3dbdb0414f2..587c9e992173 100644
--- a/dev-haskell/semigroups/metadata.xml
+++ b/dev-haskell/semigroups/metadata.xml
@@ -41,4 +41,7 @@
 		configuration, but it may be useful for accelerating builds in
 		sandboxes for expert users.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">ekmett/semigroups</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/shelly/ChangeLog b/dev-haskell/shelly/ChangeLog
index 17e79b9a854e..03ecbcdba502 100644
--- a/dev-haskell/shelly/ChangeLog
+++ b/dev-haskell/shelly/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/shelly
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shelly/ChangeLog,v 1.5 2015/04/04 12:16:58 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/shelly/ChangeLog,v 1.6 2015/06/06 16:36:20 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *shelly-1.6.1.2 (04 Apr 2015)
 
diff --git a/dev-haskell/shelly/Manifest b/dev-haskell/shelly/Manifest
index d8d334059209..cc5c33588e9c 100644
--- a/dev-haskell/shelly/Manifest
+++ b/dev-haskell/shelly/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX shelly-1.5.6-monad-control-1.1.patch 2847 SHA256 2445e1d7288fada39bd4a595f401f0eeca80387b9d6260407cf3c0f5c3d062e6 SHA512 f2a386defa742076f4a0062597113f86706eccfcacfe62483536bbffe410d5c752b8c59c365c89a39f99dbb83c88cf2c3a4f76e4d5132858f254be5cad420e00 WHIRLPOOL 0aaa2fe541a7be429ab1623f8a0ab07595d6c800f613d4ec8c7e18fd98c3629d53f33ad931770a5104fbd1735db9d64fbca0a2e8fb2573a41ffa0bdd5b71f695
 DIST shelly-1.5.4.1.tar.gz 27926 SHA256 62dd57cfa5ffb5280cbb9c77ec3307bcc8b622f7be65d58f6c4dbd36b7916840 SHA512 8c8519a8a1ac9f02e51211ce8c70aa60590cb6edb5a8de376cf3da2deb8e429ff7e4d31321971660b71f0778a7037fde4f9506efd028de6d8581fbc6b5afe310 WHIRLPOOL 04b6b128dff61e2c3ca8986509bab69a519bdc6a7e1f598c446460fd0922ba26fb5860bd28dcc23e2c69d178d22db2ac273f307f7d7786e4bedefb6e159b1466
@@ -9,12 +9,24 @@ EBUILD shelly-1.5.4.1.ebuild 1314 SHA256 973db0d39b5941f2439f056d65992fcd438b0a8
 EBUILD shelly-1.5.6-r1.ebuild 1381 SHA256 a91329485c1df918f97136a0bc146aa3957007d8ee1b75c2fad2a1235597cbbe SHA512 44000216989c3b2951220e005c2bfe03145feaba35a94f4676f6601ece934b10ce6bd38afd8909c53b9e841d9d1322069f63d342a13bcb5e29ce4b401ac6fa8f WHIRLPOOL acb37875d7bed3a7760824cd028f9c7b3425d20c2f4920207e2524c14df6aaf608ac78d3e490569215a6f64d4f4681b00537e74d7712fd965b8b25217fbaac21
 EBUILD shelly-1.5.6.ebuild 1312 SHA256 c72aea3ce362128366413a62ba667b08c5ef3e97b0333fe687f43dc19c760094 SHA512 6bbc955d5919a14fcc85bd17cbd0e2680e97c02b0691c5a37072bf76487ec32200ef3efd29b1d3d8864b541be36ba6b5de84c82f51d3ac9b8d02a4cde1892b44 WHIRLPOOL dadcb0fdae3dee8cfc2555461449e46e66144877a965df598cfdc1f511187bea58ac608c85f24eb83aa6828ada959139cf2e9201a419d52320cb6526863ab9fe
 EBUILD shelly-1.6.1.2.ebuild 1309 SHA256 65f12bc747d306bbbefab60892929094eb418c3c9653777822fb0a490995dd81 SHA512 4ceadc2ba915fd8526052412323290065f3f1c575e62df2906f90ea5de19e0880cf881a722cce219ec5a49084dcf457c0bd8385fb85b65e8b64e553335a13452 WHIRLPOOL 205a3a944e6447d51a9e237dcf2c465a9ebec575cda665baef6d7d4cb811672b4eda4743a98dda081379dd79e9bf720e0f21802def2cb5f3f3a27ba1fbfaa1cd
-MISC ChangeLog 971 SHA256 08390d3eaf750a3021f6d948a3d9bb520c4236535df53800a3dad448c18c3cc8 SHA512 fdf02decd33b5687462a0aa3d2439c45b47cc1818cc1295ef99666ae7cfc23f2660b09450aa4d4985f1db19d3265d3018129a2999d0347ae17e05cb8caacacd2 WHIRLPOOL 944931e1c4915b3fbf268467f6ae0abc941c817915d7219e3d24285e8a0e44a1deb53ad0c50ecb0e30097afcdc3bbc09483390a6b92a2087ec684a27ee13d614
-MISC metadata.xml 817 SHA256 84b021e76ab21e56151435ee5cc1e54fbf40349b822c79cfb6015f4184805807 SHA512 ac2f00a98a65e277fc76dcfa5933af6cea49e274256fd5001c73de1413b444b7c5b6f3fea765fc05d13802dbceb395e413facf2f4bfa9a93d905f6bb8270b4bd WHIRLPOOL 767a90a08d357db89371343a5ab1a7472eee56588f5d132f0d1855e14d311912780a15216b5c35886b4b290424b537f716b5d3880358b76716196eabac854655
+MISC ChangeLog 1073 SHA256 6d2ac521a32e12fa6166ca823010187f2893796dde48be2f6acfd2f8bbeee832 SHA512 b2d8557f236352c9a8621a61c3cbbfff6a5b9067bcd94c5d32db804ea2b489e4a8910c02de96c9565644c607d8b7836868633e2c2d3000badcdae94f84f72d9c WHIRLPOOL 40df85573605dcfa370e85df9994ba11ff9105e2b0c4e9b8166cfc91b7c1957b186d06ffe9479c2d2dc40c73b5ce0e7c108e46cf325c1915b8d1f10dcc91964a
+MISC metadata.xml 900 SHA256 3c21cb715372826d8c25c1bc269b8442a51900613809d4454590e7c4400bde2c SHA512 8b6b693d5c6e987d6b6b24fceecef32ce968fcdee053732bf77209cb20b4495e6422d366675968fe03191811ffd5a1c789d7a1f1e3ead63babd24495f0b55303 WHIRLPOOL 7fb3044697b53b2413df19ef3ce3c89aad885284748e08e484fee3182f49da16800462365cb5f1706736e8083c46568bd8979b7fb5939e1d820e2bbd663230ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlUf1kQACgkQoBEVQmGOlx9BKAD+NqZxaWlHpTreQJMCNSZP4Aao
-q0sHw/bi2iKeCE5Qhx0BALX5/1zWjrARIhzum2jIiibghHtltm3ZYojHPHiIw6P6
-=0P1q
+iQJ8BAEBCgBmBQJVcyGFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiReYQAL34BXKeCpKWNvx+83zGJ5hw
+qyH2WokXS3rjRsXI9xzHssqHhIRmwCxjah0+Sye54yy/W55v9efHRZa8a2sUK3Zh
+6T9+jn7AtyOzR9Smh0sd9Om5ML9ZHmaBNXREwo7RCr3FN3A29RIXunio/fJspoYQ
+Q1j3GphHcPndKAyV0a5/mIIZ6OgigaW/Z9SYOweMWkGXSwtWCQug3GDox06r6afm
+lB+ZblGNPLifA82aZhVdfrkZTj8/eyZhGW7iFHDDfmtFsXoX+ZWmXZ8Vm9cZVQOx
+/JFoPDmW0FlRMcqW+PVVrtcQs5iGbsV5nRFfOspgehJVoz+e//FH4HCE6z4U82MY
+2jHMsJeeGBYDDM5ewMlnjTeZKAihPuHUFadGzTJeoYJWhIDlFaLSAT3rPVZtM7/R
+auxR8GZ96DTxhD8bakWD47qPuQ9thBE0NJCaYmSIEH/91SQr2UgbEDcwwYG4+xqb
+t3StwGCy3BpyFVfk+CxdVeWM/rc04v8Cuvv2hG/RBN9C1XwSSUcBnyNSxNuh0LgE
+4VZRFlseX2hV3JLCgyeROKi/hnzBLOxVklVz4gQFx/3NnHsJcn5Dg8DhblJSsHoz
+Rh0eYQAiT019OqUTzJy7fzpSEI0naaBvRGjqRwXGJenIz/W4VKG9GSxbyDSZUmmT
+woHmJv5yYtedE0aqj5d0
+=amim
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 9df735714ce9..030fe40ec532 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -21,4 +21,7 @@
 		
 		An overview is available in the README: &lt;https://github.com/yesodweb/Shelly.hs/blob/master/README.md&gt;
 	</longdescription>
+	<upstream>
+		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/silently/ChangeLog b/dev-haskell/silently/ChangeLog
index 3934e6f10a27..d4a23b805378 100644
--- a/dev-haskell/silently/ChangeLog
+++ b/dev-haskell/silently/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/silently
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/silently/ChangeLog,v 1.6 2014/12/27 11:08:45 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/silently/ChangeLog,v 1.7 2015/06/06 16:36:57 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *silently-1.2.4.1-r1 (27 Dec 2014)
 
diff --git a/dev-haskell/silently/Manifest b/dev-haskell/silently/Manifest
index 51331f17837c..702be515e177 100644
--- a/dev-haskell/silently/Manifest
+++ b/dev-haskell/silently/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST silently-1.2.4.1.tar.gz 3199 SHA256 a2b8f53e7e7bc0272852852c49d8b27ff250accc73e25cbe9f1e20f3fee0ad0c SHA512 ab8fea9c15a2061e3c3fd6970422a2cdea67aac3614991a8135f19a2f075de52f923fd0e78b5a45a91f2523f6263eb626efea2e89ed94277e03a132410862e19 WHIRLPOOL 8181fa796fcc7b2f0abfb48c481a1bbc19a5ffca9bd1f318ad5d42521dc84c2b48af64dd51304070dc3cb18ff2894bd338e11943ae606d9f2fcd654dde4f37db
 EBUILD silently-1.2.4.1-r1.ebuild 726 SHA256 d01bc7a877cecfd009263d8ee10b942c8551043229fab66f5e1f9f05e4a92941 SHA512 9f5fd8e1c88b2ffb1a35ca1650803770e0698eb6b399fb7cc162ad74c2ae2508b7b9ce864d968366405101cd3cb1ded2ce79ab700dbb239d441d17ab024956aa WHIRLPOOL b0131cb1ee639318fbd0a9d28349cd13145b28414066cb6115b772533d09f096cca73079861ff1ff4651a32ba042f977f2aa0cb5fd93936562ca95fc9a746efc
 EBUILD silently-1.2.4.1.ebuild 758 SHA256 7283411efabdce048f26d9b2d431755071f6d632913b3c01423c0cfbf77b3d18 SHA512 a7159e0e5e39cb804e2a534491a673dd5f0e00b4b5a180b0674682b8e8d293d3ea4793a0b57e1f5c6185e46135f34f000f0d863502d1525b6cfb25b1c3ff438a WHIRLPOOL 1e71bbb7d1b62521568a78a5f7c58ad4479841e134692d15610b6d5e8131520943dea433fd210b1959b6bcf9717925e2092095c407619350c2932e98b832c60c
-MISC ChangeLog 1068 SHA256 5b12ff0e93be3b97877556e88f5e9b87f6218b2ff42a9184d081213cc32f098d SHA512 990d14e09fa2026b9066ad4485e710a91f1ead47107f9c6dfe59208ff95efc7db6537ecb17b39c9a0dc3e1661b64bf6154582d5e84ec89a6435982a4aadba1f0 WHIRLPOOL 1372a5b3ea6687e6079a8f88a8cec623f60738df0603682b4b939c08216c4dd52f5c37eba66b1e05bff914c52fa16331d48f2ac826d1a02a70edbd738258e7b6
-MISC metadata.xml 258 SHA256 19a1e8048961fe9aa05f15c17c89acf76321e34a30e7d70c00f14e04b2a7de40 SHA512 27e35642e061da95e699be99a5eeda8662c0a25468ea560c7e4b2d2224aec3aacc0197bc8afe05b07ff7e69be20990082a748094d5a92b21cfcf4c44b0f5d0af WHIRLPOOL b7294de81a90e65b2033a4cdf25158c41ea1ad7a3567af879501dc5a7fcf5faa88dc16f1e74f24f133d3bbabebc923a332f7ba4c72594b149e825ab4446772ba
+MISC ChangeLog 1170 SHA256 fb427da6ed4baf0a8e9b6f42b4db32b9c7fddb73cc38bf5590c7bfff5b5ef743 SHA512 553d2a10f4fd0760b217ee1e26289b3ed3981fac05d3b05a6a50d444f4c98e2d8ab6a71bdd11fe7d9f66ccda1faecf65a09fcbebc5faab899e050aa3e81a4fb6 WHIRLPOOL 2d051628e54aa76a6292757383ca856fa14c3121d6142a2e97796e3916060bcd2380924c62a686ce18b33648f20016a058fbf0fdb60d0b489ae776f5bcb944f4
+MISC metadata.xml 339 SHA256 2593d57fbaed8224e1b46af1c2ac6628d6dc07a21700b45005bf4efcd7d0adeb SHA512 f5776ff2442477f345876c138a1fd330264376d861e0883066c4525fdb74a73ca8178da705b8d543bfb3cac20b59c82cdaff718ae8d6542492c169830eeb293d WHIRLPOOL 5c140d68b6b52f49d3acedcb9e4c7a869a687d7aafb1bafbdb2075a9b44293816c54236875f1bfca6d32edb8bc8f6f20f5082f5216388b6a9d4c3b741740deff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSekz4ACgkQcaHudmEf86ofiwCfU6yW9SbiTQ6mJnLtDKcS0gq8
-jnYAni+XUXbpPoKCTRQ4IOGrOAv4OSNK
-=94mS
+iQJ8BAEBCgBmBQJVcyGqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwQ8QAJNvmWLkcWm1pHGtI3cHYsp3
+Ny0EIWFoYFMzFKLl/hSpaJtCXSc5NjLzNnQkRqGzHBAVPEXURecrMBBDosz4MHX2
+owFuex1miNtdRqEhy+alCIDoV4HMqGS1ruxalm6/wY+v6DTUE9Ck9i3YNpV4z2Ua
+RSDj6+1fBN/UX8a94NgESluil0uLnCch4xwW01iKDl62aYjf6Nq/rkP3Nmb+DWwG
+WrwOQw67tOwsQd1ju3HlhueqPFL+SYo0FLgFbGM30Eud0zjnSEl2FQelsIWRV+eg
+eKU3nwmjm4s25jv7NusJt/jfwis8KAg91Ooq0GBNwEgzSFzIGpGPJisOv7dWQ53K
+zDQYmjld3VoD/OI/TroLXnAP90ujHln0JIvgK0FViZ1WheGN3toPGyGv+KYxpML0
+ywX4kvIixADNEO+Jpk8sgxV2o94nFqh6RtrUrldQB1z80UlEY2pVfgXjDffpgWB0
+NTaGsXxSfLEVX+1mXgO2iP2AeLb/x9eR/XrST2GNsZ9NTfZiq+RelyI1N+8VDl58
+cieplxHvgQIOW7mWNZbfDIwDq2uEe6MT47lJuj3fJnuNTfFxwLDt6CsjlpFg8iQ5
+lscWJT9HST9nwM2daUxOZ8vfzJydHggWV6fdp+NVRqIgRZEQhjgQn1NtswYfESXR
+RbFMTzaJXe26mAlaOrSV
+=yTiw
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/silently/metadata.xml b/dev-haskell/silently/metadata.xml
index 017ddfbc5e5c..702b8254b56b 100644
--- a/dev-haskell/silently/metadata.xml
+++ b/dev-haskell/silently/metadata.xml
@@ -5,4 +5,7 @@
 	<longdescription>
 		Prevent or capture writing to stdout and other handles.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">trystan/silently</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/skein/ChangeLog b/dev-haskell/skein/ChangeLog
index 2518acf420ba..f7e44b5ca6cd 100644
--- a/dev-haskell/skein/ChangeLog
+++ b/dev-haskell/skein/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/skein
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/skein/ChangeLog,v 1.8 2015/02/07 21:37:15 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/skein/ChangeLog,v 1.9 2015/06/06 16:37:37 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   07 Feb 2015; Alexander Vershilov <qnikst@gentoo.org> -skein-1.0.3.ebuild,
   -skein-1.0.6-r1.ebuild, -skein-1.0.8.ebuild, -skein-1.0.9.ebuild:
diff --git a/dev-haskell/skein/Manifest b/dev-haskell/skein/Manifest
index 2cc980c540f9..1937d1b15e90 100644
--- a/dev-haskell/skein/Manifest
+++ b/dev-haskell/skein/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST skein-1.0.9.2.tar.gz 119484 SHA256 fc85e895caf22fc70f12982132a1ef663790c578226cb230693be5222a860bc9 SHA512 dc92781a9deca938e635c6027cdab0c113b5c657e0af7ceaeb50d81301e17e446ec87a1eef6599e610f8a63062504eff653d50cc48c5f8459af6d8b1abd5e057 WHIRLPOOL 0b57048d238cfefcbdc7dadabae19a31de0b6d5189bbc46d69c18d1eb539c244398c7fd0871719d1a43d8e641b74735b5b9b7d07a07b60256bf44a57d68e4155
 EBUILD skein-1.0.9.2.ebuild 1189 SHA256 cc6854cee5a7a34230d983cbce95340ad1f7b1a56f014fa9d17ee3c5bec48923 SHA512 9e49cd34e738447dd30050a66b2444e1d13fb3a411376f5b5339c9392482e7e5f9a6214b5f39312235c667b561500b324b3d6b40dc2ee5ee8eb2e7ee2d6173c3 WHIRLPOOL 2a0a6864d48ff197dd4e05ed8c7539b2db12d0dd6bf955dad481d75c59ce403ac8202b8a47f616615989bc63c295c623b023d6a71e9b4d9f23781b30761c0276
-MISC ChangeLog 1324 SHA256 60a5eebc11230e5736b3808615507d541f6908c13c2a9f07740832217afe631d SHA512 9157936d087d9704e7528f3222b7666b9133406f4e699925ecc84803bead27662a96a894365a51c291c5aeafe7a0666d92c8ef294c0dd403c99b0360e9327d6a WHIRLPOOL 64287f0ad444913e66901cba31791c5affd4c2642122bc87d48f9e359eb0780370938647f959a3bd79a9b0d4bb5b5c10e873adcbd4ac3cdbe7fbdfd9f2332221
-MISC metadata.xml 1386 SHA256 86d57c80df10daf7db5b6781c2cba46fa8f216161e525af3b1550971e932f220 SHA512 a871f3990f1e46d63062e46b87e736153f98e3b4cb1e78e5917ff3f9706272d3211a62dc1de49a3d791336570901e6a31312ade6d13ecd05165eb778b2d7a2bb WHIRLPOOL 6621b14d0dff954020c28d156ffcde79c8006e82d4302a5f7a58974e07c9bd13795f245b29aec948e26f6ae255ba794dcbd9b28f96d15b78928aa60a4f27ac0b
+MISC ChangeLog 1426 SHA256 246057008b6e543f6896dd50fbc642a9d880aa6d36d955d37e0b310f17452466 SHA512 83e5405fd5585212e8bf01637c99652a13ce9ba99ec7e81ef464d101f1924f5c29e2c6413a82dd130b0d83ed8e14e3e490f5ded85a883737c4d61e24543c70fa WHIRLPOOL c4c1f3e459f673bf7b4b41d6836d7c1e4cd793d6d379d94337f7f71dc6b9523d3fbd8f07c5e7720622f521bfb10341df7dca22d739cbd68d4b0bd01cb80d8caa
+MISC metadata.xml 1427 SHA256 3f0bf137a22d2900f8f0c9103fc83e559a81f4a1ced2556f0f8600161cea83b8 SHA512 2385bb2f6bde898da404067f4fd1e4b11798ba03a268f625de669634230ed6b4f29b7ef0632775534b67891bbfd6b083ebb250e75ee6114fe75ce483fa01de02 WHIRLPOOL a579ab1a201e8df2e9d64a26e78bbf136f1bf836debecfcdf7b002c73223b6bdb958b3f57c1e1adb3ef0638c5f0557ae958b0a25d1361125286cedc8a9c4861f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJU1oWPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNUIwNzhGMTk3NjE4NjBCQTA0QTQyNjM3
-NjUxMkJCQTA5REQzRDUzAAoJEHZRK7oJ3T1TcEwP/2DLiWSdi6BcChRlZJeCIztZ
-oOJLXqF4o/9J8zZSdSGUchhAFFSi9ukafQxNlfZi1NKWTJ+zWVy8pM+gtmdEY8ah
-2z88lkCyG5sziZ1sfICH45oTiHP/XT/KtM0YEl75xuiVrEdiS0Yck/+tNEIXCrow
-qaMEujUCYbGbqKBuQKqoUahnTBEvLth4inrBkI+DpkIY6i1B7E+IFW+lDghcHHk2
-fcrNAH4xXjQ2HbLpam+cTlGO4/1nbMHycRarnJ+BeVaBj5xRUjWBKDPD3jXsYp9y
-XgcH4XazIeCq9W9MwqKGoudPQ3o4dU+4Jw0oi/L820BhCi2k1Z8EqfggKpZ2xmrS
-ynJJnWFInXDlAQ9ynlQHbqt/g6Nt6HAkyRLV2AEe2S6VHEaZ42bl3mOrKwYFU8VD
-vfRM7yTgVH9k97o8vAspjQUGCtq7EFrBy1A5K11QzCDliH6FFbTnyCZRQk3InIzo
-GFHUpYuKY4UylTVLKl9nqZAQQgGWOtpf72QkUgVUptHq1l+txgN3tktA+40KO6KX
-FAluxFZl2XVtsEh+XBVB8hW9DEOP0j6XIeZ+nfRCPqJlsL7nDjXSikm/gCdK9w0Q
-Cubjp592EPd0mLQZDc+9nns2R5mDpboaZU7dRIKD72i/64ZFfdvsKKh7OW/pfug7
-nfwlqSMZ8q2HQdaLlsjV
-=RGdv
+iQJ8BAEBCgBmBQJVcyHSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiM9gP/3Ta6gBiNAOQ2ZS+l4HKrky7
+YHSaOAQo0eH39I3t+cg8a2+nQe58Ndf1VviHJkyKZ3gLjuI/1jgrOWmHEmHYVr3f
+s+pTTFiXB15+460D7as8OqHdDZYlLOzBE9TTgbW1mHWIDcGzWKhE8mquJyiYF1gv
+/uViA+52n7trV8JtW+08f+87hRFnYPOvO+8clhkE+Avy3mvdhEBEGpZa89R8glcd
+Hc3XhFLUa0IUn5cl7d41e5AAMREvRpe/d/Unf4E04AcAIyjIILpFXtYEVyQwmHRP
+IF3QuAROuiDxsLcKAIo5wcc/GlZy0JhluMUZZPBPDN3NcxzekmBySBwlT4Hnh5gX
+d76fzQjlXu8f/TZXCNDzQ0fAN5urHO1fFi5BhkC/rXPf7fVxac6IUOGgvldv26A3
+VWUUbF5ZwlOFWQQzjWEFVBMwdXEBN6HPjlujVsO0JuNaTbzBVIaAqW8/Zwy2SAtD
+aXetG8KmdAsY1gdvUQYwP2Xj4wAEl9he/mb/xyKZAclNsec8VnEw7c7B1EjlRHz1
+ii6zsiZanHi6RwcxygQiTPo27l/6ptqCpcqxTwSgqBBQFQshX4XtsqGSuKdFv3E7
+NI0Rit9Kl6WXGYoCXtV+y4suV6NC4Qj9PmgDaf7wStRAoS8xBQwC/TjgxNmjB2kx
+RLNmy+8oDSFOsgeC5ZTP
+=HLSa
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/skein/metadata.xml b/dev-haskell/skein/metadata.xml
index 44acb75770e1..02c87685459b 100644
--- a/dev-haskell/skein/metadata.xml
+++ b/dev-haskell/skein/metadata.xml
@@ -10,24 +10,25 @@
 		
 		This package uses bindings to the optimized C implementation
 		of Skein.  We provide a high-level interface (see module
-		&quot;Crypto.Skein&quot;) to some of the Skein use cases.  We also
+		"Crypto.Skein") to some of the Skein use cases.  We also
 		provide a low-level interface (see module
-		&quot;Crypto.Skein.Internal&quot;) should you need to use Skein in a
+		"Crypto.Skein.Internal") should you need to use Skein in a
 		different way.
 		
 		Currently we have support for Skein as cryptographic hash
 		function as Skein as a message authentication code
 		(Skein-MAC).  For examples of how to use this package, see
-		&quot;Crypto.Skein&quot; module documentation.
+		"Crypto.Skein" module documentation.
 	</longdescription>
 	<use>
-		<flag name='big-endian'>When manually selecting the
+		<flag name="big-endian">When manually selecting the
                 endianness, use big-endian (default is little-endian).</flag>
-		<flag name='force-endianness'>Use a manually selected endian
+		<flag name="force-endianness">Use a manually selected endian
                 when compiling (see flag 'big-endian').</flag>
-		<flag name='reference'>Use the reference implementation
+		<flag name="reference">Use the reference implementation
                 instead of the optimized one.</flag>
-        </use>
-
-
+	</use>
+	<upstream>
+		<remote-id type="github">meteficha/skein</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/smallcheck/ChangeLog b/dev-haskell/smallcheck/ChangeLog
index 0b4ffcef3f7e..2905ff3bd39a 100644
--- a/dev-haskell/smallcheck/ChangeLog
+++ b/dev-haskell/smallcheck/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/smallcheck
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/smallcheck/ChangeLog,v 1.3 2014/07/25 08:59:17 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/smallcheck/ChangeLog,v 1.4 2015/06/06 16:38:47 jlec Exp $
+
+  06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> metadata.xml:
   Drop redundant '<maintainer>' field, leave only '<herd>'.
diff --git a/dev-haskell/smallcheck/Manifest b/dev-haskell/smallcheck/Manifest
index 1b7fbad4c1f9..6f1055c0dfbb 100644
--- a/dev-haskell/smallcheck/Manifest
+++ b/dev-haskell/smallcheck/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST smallcheck-1.0.4.tar.gz 14200 SHA256 fff411375b39e1806e8a342371bc4846e178891b5ab74e437c679a920fd71a7f SHA512 5184ed016acd0c3f5b6c067cbb1a935188f1818f20652fce8c2730e7deadb00fa2cd64b5b71613a3d252fe0571e77cdf51288244899c08eb63ff2b1880d2b1bf WHIRLPOOL e13b1e07fcbc730ceda34a0cf73869e3a661c0863c367bb61c771ace5ac406dc0c88e5950022efb26d3e3dd5b8f7027335bac10b599be1eb7a73d873108c2ca1
 DIST smallcheck-1.1.1.tar.gz 15202 SHA256 4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9 SHA512 09aa5dcfca2bece6ac91803d38f2591d415c6e312c76cacb33d2e93e40e949acb788bc89ba6a4beb9dc60815e1f554cda4f68195269eedbfb45228415f1bca64 WHIRLPOOL edf7339615602eb61b5df3678c08959bdb8e78c8fcf7fa33539021d0751b3c37f2e79c8e2b3fbfca55967e1b76c1162ed194a946a1e96969b16e9eed4895237d
 EBUILD smallcheck-1.0.4.ebuild 746 SHA256 899a7befaa35d291981b00710fb5d31715bf02fa91f140a455139be5f3d4f3bf SHA512 c0e05d5e021bdd382d6af20fbb3ad9799530141cd1f95f73733d77a56d0ad061cadf5b3ef785a8d4e74e8a160799b8f0a9a972927a664dbe9a44143ea0191aeb WHIRLPOOL 3af8aeeb6198d88341adf11d1f4decd16b827182952b0cf92f2ba091fb3acb31e8a69ff6ae930ca93363c0de02488e81562af3c90528a924fc5eb2db3ba511b3
 EBUILD smallcheck-1.1.1.ebuild 749 SHA256 0460a62a509c797575abd693f3eb972a6095e7854a6a45d38c9505b5de8cbf3d SHA512 ac6ed44238560a8aec579caa518953d1d03ce1c76600201ec7989f4d64e5ce574ec17d95336d28882d1757473f187d5fcdad7821d3d5731395151a1250ab5d0d WHIRLPOOL 646ff50b5ed141392626ea358c3b6268610887b2e0c3e34834648ff69c1a0f437576fe0280c9eabf6c0d4135530db7963ab8f256096485be0565bec726daf730
-MISC ChangeLog 620 SHA256 734d1dec9493b56f1199f2c26dd1a43fc7aabc0e2c196ed4c8989f14df15213b SHA512 6455ecf68fbbbb88eb37418389c499921a0aa92c5cb3b4d981d69965a873193d3842f507f71902faf714e525d754aca313c1fcb01875990a4442dd17adbe74f2 WHIRLPOOL e8bbe4adc8bc9d54e339000255bf4b5652e02356c67e5f19f9fbc99eab5a05527a47412e59ecdbe822ee476920be18918184062f15dc7d73fd7bb12fe69c3b2c
-MISC metadata.xml 458 SHA256 8359091cb4eaeb329f48dcfabe144894b81b998d90285a5aeaafaa2c9a6a8fa4 SHA512 84d595aeb22385b67bf19650d68fd89288a97f72606629f61d766d2957367887205a5d3f701f234da0788eea545d39aa7976535e320aeed0f4917b2ec426e758 WHIRLPOOL 5335a8ba0c1f8d1256f4e5661e2d0499cfb671e589321e8874bc2243f496501793789d37680773cb38d2b870347ee0bc9aeb86cf2959e6dca4b8198011cd5eed
+MISC ChangeLog 722 SHA256 c9e025d2e289a7f066831c9bff9b4e8d54d12b1e3b23d4f952eab1ec4ec902f2 SHA512 6fc15446ec1e2d9452b9f597c987514dbca95804e0f5506a98a3e894d5c536373bb165b08c054f3e821562d5caf8cb0027bc7a336aba4e3c9a9acb83321639b0 WHIRLPOOL cbd9c64697d68aabfea126aefa7fee33a3c27fa74ef2e380432ad858422cd2796778f53f71cf8d980cd10255a8524361378c6fcf48728b5b17eb35eb23f596e2
+MISC metadata.xml 543 SHA256 59e8485f0e00c00610ecd3261dcf97f61e2c3e8eb1e8d1e70fe90dca25e727b4 SHA512 6cd03303f252bfeb3044e851e34ca060a4933f6705d6c46a940ff3148c31308dfbf74acf0891ec87112adffd2f8ba3d220dc61f0b8a552c1c97792b9b9c0874d WHIRLPOOL f0991c33ca5339412b877dad8a4e56b4a9effcb324c9f558e37d35a234d75a45453a3bb1d1f9cc3df96fc2e92e696ce8584e8b1a7896ea38c7a1f86cd6aad831
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPSHJIACgkQcaHudmEf86qgOACcCKXbodoIUk3433Fab35rtx/b
-An8An3dU1Xo00iQ17hKb/TKtvFK7j6GS
-=8Osj
+iQJ8BAEBCgBmBQJVcyIYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5G0QAJiJXjMFebsIWjx8xrN0zsck
+h+oOdqXjES2BlegfrTJz6ViQcK0XJ1xH4MH3h7V17A1ZuVgbCIWbSE+lf0rOEErt
+qy8yV4pI4idTogoeetQiAEu85lwYZfohv8+kM1yGtEnpW3Nli9joft4Kp67vgY87
+K1FhNshyH9Fm3A8T1Cgm95l+pJ6tDdg8o7BQ+5CQ48JTQbTnrT8S6K2owCfrIs9q
+GEPyREjvRqFyhiq9weINE62KpnSgmJIYz8EkbmHsW3isO6Wm0JqhiUJ/H9Cia1rN
+iMo6Iot0fip0LhHTTfV3D/xudB3ElHVURdxMmXv1Ac5XGfFpbhvzfsZ25vMoWymW
+FXdl2U1swd2W7zCcU30fDSGuwY1faea+Mwe2ZES35I/LbxBg6uN03QkXObQRQ9uV
+VS9FrZB+VArrEIM8llRGRi3XJX7EF8FILLBTX9kElgU9FZd+vAeP1LwN4JTmr+Im
+kHd7uLyaXYVFitIgjGDIiQ16N2wnxrbAO7Djd2lvUE2uQcoI2R8GvfpUj4wxtXdt
+5tn647SKi1o8yx3Xc3Lsd/co7js2YtpyLBimZcQdlQF6vOLJlYfcvyD2PZKc2xvq
+EGyYoIGbAeRWfZ8tmvyCsodR0wZbktx/+Qd7Ksc1Q9D5JryWRrupmIPsMxCrSFgc
+yyf1vosE+itjyyMRwNPr
+=OQVu
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/smallcheck/metadata.xml b/dev-haskell/smallcheck/metadata.xml
index db7cb87451bf..48f179deb48f 100644
--- a/dev-haskell/smallcheck/metadata.xml
+++ b/dev-haskell/smallcheck/metadata.xml
@@ -8,4 +8,7 @@
 		tests properties for all the finitely many values up to some depth,
 		progressively increasing the depth used.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">feuerbach/smallcheck</remote-id>
+	</upstream>
 </pkgmetadata>