Add github to remote-id in metadata.xml

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

18 files changed, 204 insertions, 145 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index e05500af4ac4..e485a72fba91 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.46 2015/05/08 17:27:58 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.47 2015/06/07 07:53:46 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   08 May 2015; Kacper Kowalik <xarthisius@gentoo.org> -docker-1.5.0.ebuild:
   drop old wrt #548884
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 3dff11dc7170..236e41dcb62b 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,27 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850c4391ebd59df0b4 SHA512 5838270ff9ce7b9a562b2449ba5f4ad72db956dd03f6a1b006c8019ff43fea1c4ae1e2a4818fb092b6096cff6bd9ce539b05b7940412c55b3bb3e30c356da944 WHIRLPOOL a8e3759b6c86855afa7e784d50a7926fc888d50ec03dc2d9dcd70c3f2dd11caf6670196d91f383cab1d603f32a968bed4b3a0668ec1a38d41dc1142ec92235cc
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 DIST docker-1.6.1.tar.gz 5713944 SHA256 aa3534277d11b32bc3564b801aeed0502f067317e7e111bd91ce2d989d34c51e SHA512 d2647f191fd295c8a9326e11ddbf6e77f33b70f14e3ebd37db3c9fa1f4946e0e3f426078ee847f52d7c57fc7783d26afe3e5d2e7ff17d8e6bb4f71609e8f5ef2 WHIRLPOOL e12c799ef63a0646f7393b00b6c1e200f350f7089445c58819ae5b53d66d18d985cb9f8fde1cd3ecfa55c2f0186064fc7080b7ebba132404aa15502029881602
 EBUILD docker-1.6.1.ebuild 7037 SHA256 30ec6658d6e919af06245eb246ce78ff705864276ee13e27c7575ddca5919f74 SHA512 1f9b2e51ab3e0f324caedce55a91ba10d1fb0b966b17d12db088d96fe7db911de21029cdc59870c95c4a8e3c4d43378b26be485604f38ae31bf3545e30a2fde1 WHIRLPOOL 1d1675fa48cf8eeed05e862bf606ce544bd71f618233be559028c1dac8abb7fb6558d336466ac7ca0784d65ff3b96c7188d19a93c6e53abee948e6c8d2f15a55
-MISC ChangeLog 7586 SHA256 ac813f260882476fdbb96b43eea3ec505e7db81e855c3b247c615068d8b798db SHA512 55dd6800ac0b3bb10373061a4bde6b818130b1a6a811d19723ce4c73195d8e0fceee3dd99578ec816fa6d431d2e8a0409d03e720fdc451267ba9ed1c91538c0e WHIRLPOOL 31ba8ee7b0afb8b5c473a357d344e07cdecb6d632322bb8a0b89e98a4599295e0a9a121200a6d672f64e57b90faa0d33eac535066c600529f485f92037302a50
-MISC metadata.xml 1404 SHA256 47b10fac828cc7c80f752c786452104d924bee553c0e6f95e8de5de585ef832d SHA512 e88b6183842f53cec880671f2c9785b1690917f4214f13f521747cc968f6be9cad0a5b09ca36705b69a168b8c4db4271f754c345f4042f5baccbd249e80eaed1 WHIRLPOOL 8c9dc0c496e788fed2fcffb826cbadbd8d4646fcfff5e807dc0946b360b15a833fbdb4d2bf45cd54e771d783ddd747f4ded575ee2e3e99998da774505e39e596
+MISC ChangeLog 7684 SHA256 2c6a5ebfc868178238c358a3ea6ba0e73acfaedfa881b45bb52c3c3e3f2349e5 SHA512 d8f0845257d4ef8511a38bb7b281b4b17adf412ce1aa262aeba39d42a61e47cb4fb39c3abf72be741b9b26d8bf4b311b6dc4f00becb4b1525ff6654a81af1725 WHIRLPOOL bd91a1b30156ffa65b883f06d91114eaa3b9102111aa21062080d9d4c785631feea753599781aab2170f8530a0119c38be921dbaf8fe7891c9c2af7be2c76714
+MISC metadata.xml 1482 SHA256 07fcf4f6b2bdd7721a3c0731f91260350610c94aecca6ae7aeb9f403759c4229 SHA512 479932216f145a9b77f2efeffe6f12c632aace7e01289af0ea62c7423980535e311f69092a1c0a1497404fae877454c967e7107e4362e44f2c41863c855ead7a WHIRLPOOL c52410fa07aa6f8c9533fbd82c11bb874adcba8397a171db82762f6bf6a281e6254ec32e41ae731422f55590fe02c1920a685fba4c8662d7bd4cd656e39fdbe9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVTPIfAAoJEF0huFKJUZL5kNIQAJDX2LvLsZL1iSIX+Yg7v1to
-8OQUzVUJL899wrZpsi89lpbGxPUiZQO6/bjsPYoXo+15Aobzxln1mHKF0y89vTg4
-ixnurxTIMQ87bA7rBKVhPvnnDHzAvyFgUDU8pk90U792nYJ8yEgTKWLKcLu4cFyn
-pUjwm3wTPVCIpGIeG3itnb4rHsL33nS6BqNS5fWbGRs5upPNDelUGsX5VKxEO59m
-DSaUMq9yMCid0sHwKfgG3R3oLkTcgiMV8LOytYSXSEAbY5gu384iF40Pa4z5uCeU
-GC6S0/Yi8Tq1sYzKYrQrp1Bk2HJt9sDUJSMfY2FeerW2DtXwrMlVHOwTkco/sm4T
-ztyNvTobryibHnoLBLq/7aVX+eYifghub8gWNvd1WAl+1qtXZLTe3I7iOMddeVne
-mLxM5BuQBLnw1U66KE3bZGEXu/wieiE/Wtk4ZxD0+7s0ploqwY1JcBPj0EvCwfCS
-Fi7cdDOPzje6rMoM3feRo785UpdMhoU6j0lQzIe4Wq/fxMrRGqz05qb0OvvaclSL
-wDJCfgZXUabob7tsLkszA0njezfMP7ts/QNsmICZy1LxbQC789QBudZdw9I35XuF
-azcpvIyDaJEIEcLpPP+7/ApQXtgosBblwNN3ivdsaSuPI3jUjTB2/vMVuDHXCbpK
-p0nuDJansVkVqx+vYA9f
-=hJr8
+iQJ8BAEBCgBmBQJVc/iLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJDsP/3iCaE5I7HRHU197XCjae5vP
+r9TqExs+dEKGlUfmq6OBh8VdDte6IunSZqGG8LUfYTK3iQ2U0+gx/OxGwb4ee48K
+WYhmR7eas+7OjRJEgGPhkPQNEsUi7qHWfQuHSDKQbjtUb5XSVoZRo5T0kYvIRYmb
+Gv8keYAJHdI3CrjkaH4ZETZm6x9pr7zVwtOOdNdaf/33qvBs4UBpN8/1vRKOTT9k
+Mvc/RYLs2f0O11TMluUySMPFJMD0cczS4eX/hkerRSdriM33IkYP1L+80jW+XvSN
+XuXLcMNB6I327Gd1e51HwXL/iDLoV/xlhX4JR24RgZhp8/mGIop/M3SuPPOIGjTD
+vueuEMeOBen/j6u9bn+m6W6LmfquQPSuNjZIyCy9LQ8ge90bpShZMlR2VCVHoHkz
+D8n7woJgD2JOnrntjD8Lkr8JncHmc2RK4v7x3cijRWb+0l5QFWnrm1l1SyKro/dx
+pmnnMvwU6yafT37eOM3L1CuI7kXc+fnVbh/6akuk2pF8DwOobOp+Kaa8SnAPKt2b
+mzaJB6XKegn4gTD/N4e1M1pTQUZzfYfO8cxBvFX5kGBug7NjUo5wPmAK4EZ2RjlU
+N3j8YzWMX+mtMoEUVy0vbvv14dFbs5wxxmp7KeajTUUgF204PspJZGA6occIJheh
+iyzSf4ZoYsiMgHf+s8Ph
+=jVyv
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index aea61549240b..116abd2e4f78 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -41,4 +41,7 @@
 			Enables dependencies for the "lxc" execution driver.
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">docker/docker</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog
index 06340303c937..14dde883f55c 100644
--- a/app-emulation/lxc/ChangeLog
+++ b/app-emulation/lxc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/lxc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.76 2015/04/23 16:31:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.77 2015/06/07 07:54:26 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *lxc-1.1.2 (23 Apr 2015)
 
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index a909d7ac0f5b..94d3040624a6 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX lxc-1.0.6-bash-completion.patch 1341 SHA256 ddac7cc033a4029f8264d06978321bb33ef7c4fd34c9a44bb1acaaaf1c85d302 SHA512 56b00f77812c0600a8ff7557ef0acf7f50d37bb9f6e5b3641c9a218a53ac64a59785430d0775c1c7980ac39120a2544fd7c28cf39fefc07e7f1558f88b9b5917 WHIRLPOOL b3ff9a377d7d29fa76b6d547f2d1b1621c5ab52e972a9b52389c269f26ba9f43eae6a414db46135be84f1ed91ebea9d6d24cc25da11f493dc86fee088e90bfb4
 AUX lxc-1.1.0-fix-gentoo-template.patch 1375 SHA256 f0b765d1b150b18adc3c67fdff6d80e2ab81f7d48ddafbd9cd95fef3d4d6243e SHA512 17f21b9a0ce45de5d184ae0421666f2b1193ac0da0fec39d12fe463054669ca7b55636794e0ab747058a7b9d79ae68a68e3f5e2d3e3d05854ea3d6e49bf536dd WHIRLPOOL 3858155a567c6efde97368dd1c39173d39d7f3635ab46a14238726ca60be7e45b82d96c58e33e48d46042eeb81664ce78f3d272bb5e632da15484c33a25422c0
@@ -17,24 +17,24 @@ EBUILD lxc-1.0.7.ebuild 5920 SHA256 7664d07f7d41ee3798e02e5623bbc3b7365aa6120fea
 EBUILD lxc-1.1.0-r6.ebuild 6063 SHA256 fff832a37bdaebaf2ad646909a2a6d8c12f3aa82a20bd334abab1d8bf6c6feb3 SHA512 39f049953c570aefe3f18db9cb496bfac3116166474b3995ae38553bb4de3f5f2c65914896c702cfc47d02f1e370b962997c9f0a99db4757a61ebb9e32f96975 WHIRLPOOL 005dd22df8b2358b9e2bb1b488f4ba6f325d8e34a25d93d155b2b3e9388286940fb42cd18324915991fe13c7188137710eb799d2f78e28f9c097f73387ad05d7
 EBUILD lxc-1.1.1-r1.ebuild 6112 SHA256 520627a234245d3e0796574e7747a34e9cf02f3d2b3e79f918a60604bb09399d SHA512 45adfd3d6f51e632a6c5cb75f5186c1f0acd092df87285921e7bbac2704ce5e5ee8df8c83c303ed862af024b82b19f869cdf500def90c05081c871f19fa89cce WHIRLPOOL 80c816803f976e7510449d2e5c1e841330882492773e0c05cb06ed321e23386f0634bf999ef70006611693723852c1fd4130d1babac01f310c89886bade66db9
 EBUILD lxc-1.1.2.ebuild 6015 SHA256 87265023b5bc5a156e2f4e47a9161e04b5dde6926448eaf1f9c01fbf36b4bdf6 SHA512 1a58a11140f90031379bbbf603e443befbd2a1706914ffaa5122e30bebe28ead4e2beec1687b7f4deace04fdc379108249b4d8c86e1e07c52b2a3a76f9b3fa85 WHIRLPOOL a4cdb2d82dccd767121574c8b13a153a57846ba2be196d6a1bd565ef7b1865a82b1976c95667c1bbb1fe5662673f9875663cb8fd3017d08234817c7e8e052287
-MISC ChangeLog 15532 SHA256 e8adcf7190c97dfc010eaf67a188754852ce2ad3fc19db039ea93e3ec3271684 SHA512 92924619402048ee974db1f06ea95f0c255a5a8050d4a1194eb9f1a9fcbceddd772291d5bd2de6bf429eaf8ccdda6d314c4b64ab4652b10f7d1569e28545280e WHIRLPOOL 3ae7eeace926cabaf7977f1d653b51508490e9e6864f8f10877cbc2d4b861700fa66a15efae1502db7946b01e8e26b5f8bc51c6f39f668b8a9319f19c149b6a7
-MISC metadata.xml 505 SHA256 b73ca71fcfe6d4f1e60053cbb74193f42175f9679f9a6126b656a5723c8bc45b SHA512 217f2d296d2d23b6c5c8462e74554b7ba3c57d76eb363b4f69be2f47173caee45878b0cea98d024ff4c6cf5e1ba2e9b0de3882ab12efb5b6357598a337af0c78 WHIRLPOOL 174c2bad87f51a5fd8cdaed0e068a8f26998b9a4b9959ad2192f4b14b5253c41ffcf9c0baa04233f1cd74dcf6198fe8fa40e12a4f6c13fd4cb70638e1bc6e0a9
+MISC ChangeLog 15632 SHA256 a45b56f65e82ca686e48c2e366e76af6202e0298946b8c315abc8be13a7d674c SHA512 b549991daad1100565ea3ee4fafe6f3fb4e1ce5dfa0030dae88c0dd0ac62423526dd3e19f5872d055025148c59ebf0cc69fedf43e7766dcfb40bc32e6241494a WHIRLPOOL ffa1561891d4e9f9b2f959a79f2333682401d56b3e9174ffdf6b637f9ee20a3db125b84f786e9b396756a23a790567b9455fc05ffa9a7fe83f93ffe46dcf6cfa
+MISC metadata.xml 581 SHA256 1346e876483a9e2188cd367e6e990d83d145fb4efd81d73e7a2a5a5c6183d69f SHA512 8f55511b8ca270dc05444d159d35572a09e965852a537dcb159cb3de2f0581191133e47bf2b5cc87e7a3acca075c4f8ee89f7e6f37ff8fc78ce8d1f3054bc2e5 WHIRLPOOL 1ba29f9ecee0b57bd00952e216f08e1ceeb7d49508962755fc6f437b1da062c1c9da7f66d285f2294161635f97d742c08fc05912576165fa675f8d2a526e71a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVOR5vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88JaUQAMUA7ZJYsAKOcxTreVvceZ87
-tyyVbG+Um7Vb0xAgeqTfqVsu5yy1l18c32YVRkozCrQZnXKWgD7U7qerMZvFVZQF
-rInvSqo0JM7k67S8b9i1OYdRxdSv7zWrHHWSpeAirudactA0xYfPFmoI5af4tTVk
-fylyDtc2l1+FRMYfjAdnwd4j21CdrQl1WzbHf3EnAsRytNxNOYmoHSmknki4X8MT
-qmrayXLWUEQxIqDg0yr6wQ7eWE6JTH7BxFb7XrFb2fC3JQfinHHr+8pXjPZf+lvc
-cQUS1fa6RW+9lVEnZFt9XF6qumJH/rK/3yKS5zeHde7rQoDyJUXzMZ7/tCBGLQED
-emAam4gytU1RjYkHpCqcnqXUDiD0Xzqk4yQWQBGtdv+a8jxjVVyHa77xL2iRRD+y
-lvNwtW3zsrwYeK9ou8stoj9HYr3aH23q4YTg1QSxtoQ+zGfA4YMqce9/JEHHX27J
-hwNXzoBbiC0GcwLUoV0xHbsVRp7MYv3XAMraV+7H68TmQzdy5M7b/SgI4W25BZtH
-3OyPBLUHWVVrD99i8DOWc7clX1qy79bopekEo7afZix+UrePIRwTZ5DucqbI675U
-dUuNkIYX+a4VxLtcw/5iPAIHd0D9oHOtmu1HNo48tLEue/nIRwUnF4SUeoxGUho1
-0HrtOPiLPZbwdmzHsUQS
-=y9/V
+iQJ8BAEBCgBmBQJVc/izXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiz2MQAIJCet0U6PjsYe05lwraysAz
+VoHVtf0e4DznNWMbOCKKsmXZ8+KxD5M6+2dyNKbKot1rty04ZHwz2w6nWbtRzJ+2
+7UQ6gPsMxmhFH527rH9jCgMQwC+vVdIVILfgzf+uSEUxt67QGT3rgBnrNPb/+mDJ
+z49EAACKg0FjnZtW396foYX9EBXgE4EMHPRuRmdQC/qzUAN+NvhNzPl6U6eNPzLb
+GMadfoowoe1MsU57mYGqiaoTefRA0LrSOMknza0ELKeVAG3vd0/mH5WovgrmuoPX
+XN6G47tGX7ucbFdm2K0NZ+1fCNDxBjLsEanKkl8+GpkBE5P4Uikc6Gl5JJi8PmEZ
+FDarcxmFEHX0b4Xw6x6BS0m+KFYpwuR5vro3tvwprQpDWSZakquWKgLX/HMkn0QU
+9IoH5J8ugxzxyf0dIfzip4+rxHoxZ1NrbuinTsJel7HnnxwgufSYjqYsxRzhhfMW
+JIqeAFDlwFGHKcqC1ha12ZvriT6BDq8XppRD7PhmVYUpaQvxaxsRNIfFKgb3APB0
+zqBJhD/bW3YbW6Y20yOxzP7UP/ovfKeiEcJK6KxU2tnnG0ZKr9z8faIH26yQ+yJF
+WJ/uPC5o12/QxWQlialAZMIpyMW6UshYhogXguOOCascNzhu9NFx+2cZEVw/P9+L
+F8tI6xOCTmUO25w1wW03
+=too8
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index 17c122cb2cbe..536d8f3d85be 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -14,4 +14,7 @@
   <use>
     <flag name="cgmanager">Enable support for cgroup management using <pkg>app-admin/cgmanager</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">lxc/lxc</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emulation/vagrant/ChangeLog b/app-emulation/vagrant/ChangeLog
index 3e07e0375b12..6e0047b4b984 100644
--- a/app-emulation/vagrant/ChangeLog
+++ b/app-emulation/vagrant/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/vagrant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.41 2015/04/26 04:51:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/ChangeLog,v 1.42 2015/06/07 07:54:49 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   26 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -vagrant-1.0.7.ebuild:
   Remove old.
diff --git a/app-emulation/vagrant/Manifest b/app-emulation/vagrant/Manifest
index ecd919277c44..b0c8268e5884 100644
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX vagrant-1.2.1-no-warning.patch 257 SHA256 63e9af972c097ea3b7046350565a7188061348bbdeef73bbc5445974ca2e2249 SHA512 297908474c7da8622b45754a0de71bf584b4488432b4265c0308248f13b00bd1c3bc8f643700400a3028e552673bbbca58ab25ac7900cfcc1b6900dd1c4b8a9f WHIRLPOOL 7ef40c4f6dd22913830a22fcee1eb95aeda029afde03dd2dbbfcd9816f1e9584acd0703d22383913498f8be0c7675473a298b8cc44a87d31e395409de532d515
 AUX vagrant-1.2.2-rvm.patch 284 SHA256 45b8b4ce8c9d7b0b96922da92390c8d23b083534629074abcbf9d8ce2b4f9ecf SHA512 cacb09967bc8a6158fa6ec6f728fed4dc4ad43c64a63d68be867174bb045e75eca67aa2c494e91df7ba78641bc5f69cf147d44f4482333a71d0f6e7208d86226 WHIRLPOOL 682b7a72749dfcee8e93cf994bf0a340b782983befddb89320cf3c3c5de3a9134965350099d00fd67260afd83ca3876194208158d1914d921f351e304bcf5c3c
 DIST vagrant-1.4.3.tar.gz 2391973 SHA256 09ccc0d87999a3c133b9ef52a5cff58402745ee64af6080b2a5d304eb06c9c58 SHA512 93fd1cfa263004cadbf670fac4dc318db9719d2a86afe188857cbc97c1317e6ef2387be498ef9278ca95cdda6bd41400426e3bf52448eb59c31877c9fd0624e4 WHIRLPOOL e581e8488e0b1e75bcdd75f4572b89f9c23338e422d3acb57b1d5d513d9357ec0b061371d926ad0bb1087bf890e70422d4e3527dfd518329ba910f42f0733673
 EBUILD vagrant-1.4.3-r2.ebuild 1785 SHA256 ae9ee2b89c1ff194bdc26fcbb348fcbea1c8da0bae0af233218fab342aac34e2 SHA512 c3278ddf7524cfe5dbf761ce4533d3f5b5f03c463d0383a517065dc2978832516675ee893c73758699d166744e63e1408e198bbb4dff64e38f941c90bbf6a268 WHIRLPOOL 3e344fa15e0babc21dafb1df0c6afe5c3a2361ef57b6a17c070830ffaceb1a52af4d615b83e4afa38d6976a7af6f4eb33476fd5765515a27728288af77de3140
-MISC ChangeLog 5769 SHA256 765f62ecbcfa782579973b6083142f702a2db5ccc9a6c7376164c9f2e42bec16 SHA512 10c40bacb0187489a3b2585872f9ccea1e1641f4715a68418fd25580c53b6720b90bdb53cf159e4fe6453507dcf12cf9e6237bf82009a5a41f443699900d67ef WHIRLPOOL 95efc23d03d535ea261b2749ebc04980debe16f2235df83f84750327c32856496d69dd2eaac4f2d368e52f40d29bb97c2aa3960969e28ef6947dc5780cfa1a8a
-MISC metadata.xml 214 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5 SHA512 701b8c51f43f8660d40700929c243a2dae9f19dcbc7b8eca877e20eadc1ae2e0c84f7c7d8c3cb576055c1a49a55e9c759ef469eeda67026ce252d341937f6691 WHIRLPOOL 977119e736e0795137df14faae681f7fa07ba8297a19ef4a7d7b93de7efceaed16f7103f179a762be41b8849c33c535b55d16d2fd0ea795df0525592752e0156
+MISC ChangeLog 5872 SHA256 e34883a45cf43c4dc5f1e70fe05237c1b2dfd516c521d1ef1133d2a85250d610 SHA512 28e0390fb222950479e87991ed877731aff7d1fe78177bdf1043036af7f792d44114ab86d8af947f9c80bd539f275a6516b1f9894cd140f4658aa3f05641506d WHIRLPOOL 55c00413ec85340e8fbf7f7b86550a1de8dcba1f2cfe6b0813e57a3f84c67a77fdc2b90ae4bfef37335e4ec86d028413bc00798d1c7bd8221f9b767759c3ac65
+MISC metadata.xml 304 SHA256 af501b4f9080b1be7057a3506c07d5df61e320e6b3f013e63c1b967ff2726d80 SHA512 398a8f285d369943ac77c1a491f2c1d25ad0ce489a14377566641c72aa74621d8361134bcda05ea2fe0d3c6069ca47c54bd1254422cb4504f2f527262d43dc62 WHIRLPOOL 47edfb64aeb5b89977f3cb761cd582b1a6f7e81bad5247cc76e15399d87fb24621472fa70cd5218bdf752c0108ee1ffa422213b94a79134053071c3eb3bb8e94
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVc/jKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi/lQP+gLO1DlyocodfG+srnTD4iix
+cM4i68o8TFG6dHkZWVRjK/g2oas2R7oGsc5NrFeXfUTs6PFrXP+ahGm65dLEtnNQ
+57ftKYsTm8Vqi7LkvkGBPodGfeA3FRu7ZJy8Rwt+vorxskcdKo0L7Lo1PHQcZDSm
+zH/HVa+Hinx8r197J6qxJwnihXp/fDHdLo4HopbYOexne97zZJ/lWDuboXsbX8uE
+DhQ1auA3g8NKdYB9f9ezsxqb1PYtr5BluTGYK3ECsSff4kXw9pZuY4qX9NpFOXZc
+ZqxtzjpKF5fucCjkIlSmzEE6EUvp1JTE/X/oiv+/pOGMrv5ljyAnyZZhHiyA2O9X
+TiCtESToX4O9YO88Z8qwPm/KxP07dlBuqs6dh2icn4wzWi9q3ZodnGVFG/Lx2Dd/
+ZinNpu1kqobQHEOrbiKO0vcspCxN4x/Yw5lPcPWTVtqEwNJR9VxYZujPtlxsDYy9
+uAcOFpoXDZwXeXPHZEi0k91wLu5yay3l38Gpj2n6r4jSmfg4/COH0f+MYK0SG8S0
+SzLExg7uLxgwRnQGYdaZpgLsi/vGfThXua/O21jmL0IULfkiKTOMT5sxRvkZ7SYp
+pkNW2iIJD/GuI/sUOqNUEd1miY2NOALBZS72Mxjh62mHTWVVFrk8TIGPNzMVXR0K
+eDgxhUM+3DA8Gbi560Fd
+=Kjo9
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index 91f4e72fb544..5125c656be0c 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+  <maintainer>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mitchellh/vagrant</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index d347d69c7035..6a1f72df31cc 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/vmware-workstation
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.261 2014/10/16 21:50:33 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.262 2015/06/07 07:55:11 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *vmware-workstation-10.0.3.1895310 (16 Oct 2014)
 
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index f74e4568f083..7390f12fb1ac 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX configure-hostd.sh 372 SHA256 072604b18a4122d72004caa33fee4e5a8624f37c6c4a32ac9fb5f834d7cf157b SHA512 87c84f5e51e8b4585a9a55f13771cd8b84f2e4e0bb33679e3a1b23eb84a5be5d523a57b6c770095c1d21712a98e9317bbd215ab027843b0586b35ecf9fb85b49 WHIRLPOOL 6bd9bbfa93bcd85e6b8c135e517fb3b16287696f49080d731d5ea82166c7ac609ca2c508f2c6cd45143f6fd1e2e8cd2310c462b21e34131a9320edfeae623811
 AUX list-bundle-components.xsl 470 SHA256 4fe6b25ecbb99b3a4f15cbb8de41be466ff545f8e9fa1110d62ca0cf24e72395 SHA512 7e1a186e9e40df09f3fdee413e67a5377d04c25f92b807a7800929cb7d585aeb0d5d3869997a409d35ff8dcd0334255d1e33d32e1a78d7ba9876f99b0f8647ae WHIRLPOOL 9b6a0a79e4ecdfe5bdf40eabbeb37d5d69aa34559d5507a6e9350b6978617fb7ccc684fbfd2516f3c591ed76e68acea30872bf74f4d8ad7eff50fafd4f16048c
@@ -21,24 +21,24 @@ EBUILD vmware-workstation-10.0.1.1379776-r1.ebuild 14292 SHA256 ae080d59ebfaaf13
 EBUILD vmware-workstation-10.0.2.1744117.ebuild 14292 SHA256 f63c45ed05957569e137012ec0a0755d02b8e6f5a221bf3ac79e32359ec39fb9 SHA512 a70938e1f4a7981b30725f53b82539f05ed485543caded93102eaf26c6a3b9ac4f6804e6e223370d948a734fdac463141a4282938f9b66aa1dc29ee92bd7b6b1 WHIRLPOOL b470271eb115c08c35d7ddc9c5fb3b281f523fc9b2800cdfd3f08d4d4800a4bb098fc1d35c1a02a9ee76f08673d9982546a6d409b7cf4408866876e16c923ad0
 EBUILD vmware-workstation-10.0.3.1895310.ebuild 14292 SHA256 47205418be71f7b65fd692d7a62ccdacd7f0c2c9e0f3bd8b6d994a5b33931941 SHA512 f5b1595cee37d1e0f6914b6dd2d0634fd673ca10c5f050c27e82269446eda3fddf1b3e5d87325a27c98c83f6c36fc687ca1c03299fcfa5eb56942486ece285d2 WHIRLPOOL d684fdf246fe8002e35e046f7c271cea0b4d4c35606ffd56266988f4c7ea1f53464ff7fcaf83ba5dbd73d3028d42b970f44eafff03ff20b8f6962692526fa58e
 EBUILD vmware-workstation-9.0.3.1410761.ebuild 14217 SHA256 d9e8f99de530a0e61be3defbad4ed75f06fa05d273d23990326e6d1686eec42f SHA512 d4c16393bbbdf97a5133fca2610bcd1074eedb322800f5bd4773e71eaf3b7989e483231901f6bf5a2deb03a9dd49fcf97f767e2c8580971b244f01fe4215aa0b WHIRLPOOL cab5419208a7575b0dee7fe8896e64f139f882ca3bd413c656f71ab2311de03d2254796d03950f057bd97d8f1f47fc4e05f2d9557499f427bc9acf021ed0233d
-MISC ChangeLog 45446 SHA256 fabf9886ab3e2ebbacb8505ed5e4ab353b487eff4de40a3fda382f1e4a387c37 SHA512 d3daf911e6764cb2068ba7af71e9d0b919dd8033e2d2d9a44b93b04001214edef08bbd08b347dcc79aa876cc8f4d1d1ba2f7e8a542316d2503647008aeaeae77 WHIRLPOOL 82600bd8d67855fdea1abd1ffeacff122accd0deb7db0146e744be81591340f82cbda7fea6e265430f6b15fee2f19cf611dd8bd5cce923283c3a5dcf8bb79416
-MISC metadata.xml 757 SHA256 299d53409b7bdc264fadde3385e44b378fb1394745f8df5e3847411f0a3f7217 SHA512 6114d20497a28437680b733e501357b401ae31645f189128c450942adc8c0886530d07ebcc1bed93e3b5966c7e79b13eeb79cb68a6f16da130b3761694f94b4f WHIRLPOOL db2983b2e0a2827824c2a78f5e5379cf0481cbd3bc5612c4a43b196f2d22826362fd3d4fdd1f78d15fdd7e98f7acbc7c1f0a7313955cbf69dc502957e4ecddb4
+MISC ChangeLog 45545 SHA256 af9adcbbd90d4ff3bd8d8065c817b0628686b441f021762f239ec03f21eecdc5 SHA512 a7d8dc4e87fdeb6883dcdad5d71facc889a0f78bd3453bcd8982ce3c58321d04a5bdafa5d2ddb9720a12d3b60c3c8eba6d5ccf7cfdd9549c3ea673e492ae1477 WHIRLPOOL b40a95e29abde1024258dd7931ca318df2db63e0aec84f725d35fab36880bf8094816cbb9bc81d9730fcf221fdc05bf0e874925f35f52e6c682c197b83016a12
+MISC metadata.xml 846 SHA256 69b6b2803c3c4741c1ee8da6a7318438fa5b635b1f85ba5ba28576bea0c5d0a0 SHA512 c8f6775de74741357037ca908af922fe3d83f8d780cd72cef56dc137ba276bba768fecb27d370393034643faa3affdfa67e26f565ee94cb16b80c3b60c70a04d WHIRLPOOL 1529e4259a08d3451913622c47ecc442e5a137de8d8a0c873592f3b3e0a8991986b5f2a2fd8c2c567ceb60b957859aaf7733882e78a6a395fc117882c994307e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUQD2qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcf/MQAKDBqGr+UQoza+ikAnZQCM1C
-PhV4EhydTZMy8qdtzICdG79sXY0rBm2VkxGxfEyHM8XhuNUclaX9KQWPZ2kjGU26
-L9JjVFL5UE6VJxfnVwTMavznmtrfM2JcOnAbOh0U3IXvx/edhi/FF57j5YlPwsQY
-6i3f0mqTVSVeBcxt1Ul4j7fWm7HOqtLiWfsb40nDGW3itkD0S8hiXFK4kfBz7bT2
-u7jzhECrVK0B7EoQpWmQ67FPIWbOZ3GvB3g/KETjLpJxUrhGhlwjK03AUTgZiPix
-wPHjvApQ1iQgABUs/yLWFjoocyeD01n8zmNdYa7pPfkeOsUG64BjFcZB2iB83qEM
-6SPjaRhtY+DGKq6sP/FIcC+mxgAPbI84BW7u7/RY8AzGhFIMuY16DTSigBTif6VB
-lpYF6bQcwDkeevq2/tBFqxvIxIQHZAFzv0I+iqbWvdl74mQPWJUMY3Jktq1fetnJ
-BhlIvuhrE2DtiTZsA4ndyuK0Krd17PzCVkVAU6fCj1t7isB9Kbv/kZbdPZZJUdaz
-4WghQ6QTamsSaU6hCTE+EnYqwcdsdW5BUCQpNj0s0SH2pihhV2RC942egvH/3OXy
-iwldrZNYz9Prqzh9+o7UqNDRlZfKhV4QKrBfVuoMlMx3n/ZrLmMGapcu6GzuDhC2
-mnLuS1+2uVMEXdDYMBuX
-=03TI
+iQJ8BAEBCgBmBQJVc/jgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHm4QAJgSUKS7zByaSJNrOCig76CC
+FlPWwZPtwshxltUP8qKnC63aDM3AQ89poH+K+aTcAkToT35BGw3UN+sJDXBj1c2o
+4qOhdMWslWVmhgmOReyx7dW7eZQ7Ij6DBEOEL+WahLyf1bGyd4WdeochxWoYLi6f
+chgqbj4XjGZvNyzW/+Yg7uxZW5e5E/VNKkyXQiQqv8isO524Df36ScSFQUTlD58U
+xxELDo4oQBIBx2WlfYkvmMd+yS60z4apuEkfHDcynxNdqr9AspLD2Udn/B+ZlMl1
+hEQEkuUScO8mh1/lNf1aTQ1GEBhjeYEVlR5yAaTpGuF6fGDgvzELPmL4YqUtKIoD
+BO2jGiXe9tZM6maCJpqJKnLuH3w8smQhfH3OHfd4x11ZS9NvextyJ1IV/8Ew43Ky
+PleYrppzfqXNtwwIEo6SpBWxjLePKl6Va9Wk8LfGCyY3p7YXn1VdVPgZh3w5tHeS
+RUxl6M2W9A/zGIUACKWUU1K8BVju+Nr5e5l2/bRPbqZYVzFAhBHULXTFq0brADs0
+Iqh9pdBvps1n5MNc3iqENmI898uUCElVcoNSQb/Qe1uRe3ZfJPYYqYrPSTvxkEAK
+12VgmLeQVC5k/LUQeRuW+E82W446zWVDK/8UE3Ydx9RKBlxOBjVN+LAZOKa9bGU/
+Uk6hm2P6X/phX8fKWLop
+=x9Eb
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-workstation/metadata.xml b/app-emulation/vmware-workstation/metadata.xml
index c2824d72bae0..7570b9e39a2c 100644
--- a/app-emulation/vmware-workstation/metadata.xml
+++ b/app-emulation/vmware-workstation/metadata.xml
@@ -7,12 +7,15 @@
 		other operating systems in a virtual environment to run on top of Gentoo.
 	</longdescription>
 	<use>
-		<flag name='ovftool'>Install OVF tool.</flag>
-		<flag name='server'>Install VMware Workstation Server component.</flag>
-		<flag name='vix'>Install VIX. The VIX API allows you to write programs and scripts
+		<flag name="ovftool">Install OVF tool.</flag>
+		<flag name="server">Install VMware Workstation Server component.</flag>
+		<flag name="vix">Install VIX. The VIX API allows you to write programs and scripts
 		that automate virtual machine operations, and run programs or manipulate
 		files within guest operating systems.
 		</flag>
 		<flag name="vmware-tools">Install VMware Tools images</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">akhuettel/systemd-vmware</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 0cc7059b07d8..49c1ee3aeff6 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.537 2015/05/31 22:07:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.538 2015/06/07 07:56:16 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
 *wine-1.7.44 (31 May 2015)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3691141f0344..d709ccd7e3a4 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wine-1.4_rc2-multilib-portage.patch 1256 SHA256 9d0acd304d11d1bf73f56699754aaa1bfe1facba90648ee330fdbe08d9ff4938 SHA512 ac0b29e2b4c9b04bb6694a4e4da654446f68efbf90cda6809b45dad51e6679ac5410398763fde7e9505ef959493a037aa588cee58d14906563a4746702d2b0e9 WHIRLPOOL 8ea26266c327bc8313eca9b5d39c9741b226037750ca2d1d33262420093e05c306e7f004656c362c3c50b330d050cf9e5fceaa2b024a82809aae8b3617b0ae18
 AUX wine-1.5.17-osmesa-check.patch 1774 SHA256 dc7dde67c416bb067e528b85228cff01833a2a20c802248ef56d74184014e50e SHA512 12325e75db5e63e1d4c4e2463c3e164b1eba0d3d88455cfcd698a8bb790d7c0b3c947a06e7a09e232b1a14202e64ea2dc9331cbc4b503833f78a7c1034410c79 WHIRLPOOL 2d9bb86a5d683301c75ea275302f67616a8e9c6ebfc436b05f8f1b3d5d815c310999ca9518747abcf4d248bd18f34388dcb323c526d633c50e66ffb4bf94e5d6
@@ -108,25 +108,25 @@ EBUILD wine-1.7.44.ebuild 14490 SHA256 0f257e976d937e8d3d47608404344729caac8446b
 EBUILD wine-1.7.8.ebuild 14079 SHA256 834e1a1d3f52e88f56b1d039d786e135a2b9841846b74b76a344e9538690cdeb SHA512 25d96cb05fd39d185afb9c3623fe6e7d9179b387e90714d126e9efd538beaf4be8f6c80971ed3b8217bfeecbe366f82bd1f4347abb30aceb9a46393f9551b8b9 WHIRLPOOL 7e05523f1e531faa813881fc3f0c00a561830c3db02928b164fd0b51167dfdc287cdc7a1b85a5c2095890937a36025075472b33291d8aa498e694ea0f4d5d80f
 EBUILD wine-1.7.9.ebuild 14079 SHA256 23fcbdbc8a3123ba66b5a9ff9b0eb8939c45da7fd520cbb3cea29c96b47462a7 SHA512 7b199fcc1ddd9b9a9a23633906c371e8a083ab66c4c62c7c50e90121e78181cdd56aba0705274ad6df93dcb06002d21c0040a6fbc2562b15a0f22a32becc969d WHIRLPOOL 4d0ee99f9b0c81e57dff869892a96d9bf0cfda7585dff1de68657d62ef987e8fed982cc5b15035299b5b122720c664b187336d7ea11e0a904dc790ad60c74b60
 EBUILD wine-9999.ebuild 14490 SHA256 f41a7759c95f647efaf46181b6551d1909a840c3dc164a30fa7403bc4c530a8d SHA512 0e1a351201c68fe7496f9aa82fda2773b61ee1e994a783fdb3f6ea6a9ff8bff82b4df6a5740531ec20c9e8bd99a592fa538498854efee230b067ac1d63ab9414 WHIRLPOOL a5d5f01a768409312063e8b94408455bcdaefd852ef778b33fc32021abb3a8bafa48b745f93326483641db958d5954ff0fd84b773be60c6623d1b4a492974d04
-MISC ChangeLog 30270 SHA256 4ba8aa01dd58f68d477dfd2409d14307b0e5937e558c7fee3dd8259e370b02f1 SHA512 bf4f348d0581f4f115b5aef4685898dd73db327e65f21bb28a2e4caa8eac2da0273bf35ef479e29fdbf784d6e1507bb0506f19691180084ee81ea80404a55087 WHIRLPOOL 0a82ea9edf77b8015661e3e904441896752773ef3c74fc9d4d1db90a1adee993f44374c6f55a8f6378d336426c787b7e38e7640fa27ec0c92f55ef08900adc56
+MISC ChangeLog 30369 SHA256 3c307eb9f887a72ed83b322d66aae642da6765b92049910af6446be9b00559b2 SHA512 c3a31064750bf613b31fb0e77dc0084dbba1bc75be97c335987a5359f2fdf3fc98f45c7a6953a0e1afe4c502a22735d20db7f06564a9a60fe54cc780638d9487 WHIRLPOOL 109da4869b505395211603c1bd8e0f5a64b0345b90066ed969673093ab8ce0b317c73d7e11278f5a849144b68e7ad4e40098cb52f67fbe8bf5baea98f0ebfd3e
 MISC ChangeLog-2012 100362 SHA256 8e70fc54e7945c1f41e3e0b64fef6b9a7fe89acdaf8c79a06a16048fe8d2e26c SHA512 ca875e847ba100e1f19774b31a2b45a81d776275e3d11944be8a7b01dfcdbf4265b1a340d691bc4fe4054fea006059a06ed52bc0516b1f8b44a1772a1c813278 WHIRLPOOL 36ec708601a25cb8fa93b471112538480b6ef82cc4e6703b3d045f883078b49209ceaeef7bafa8417b881c2d11df84df9c83d1985d0d687a11f3db3de5abb014
-MISC metadata.xml 2585 SHA256 8c17f880333a1153db219ded505c4fd559cb115277151171424e5491e414fdf2 SHA512 b6c74bf51e3e815556495fe647e7d812b45d9bd1cad0ddd5ca2c30a06a758f699411b776aaf2c6c94ac78556b4542acc9e348a1d8bca1ad6d180bb9ea090651c WHIRLPOOL c94c2966cfc4ff47aaf366b2fe4414e1681b966d60e33248fdbf3312c2c8b49d0e52b2beaaa435991b8d426afb01d598c40ed48eef39d7d1fc458635c47d062c
+MISC metadata.xml 2703 SHA256 767fabe08213997b918041f37d7d44a38b73f1c61b9f2e4dec863d379a9b2197 SHA512 05903b7cf25a195171a040042b13998822e45d651ba21b289028779b4019150bb2183f731fc4764cb14ce0a5ff5328fe31a143f3f8b2a5505f4ac15824b22e52 WHIRLPOOL bf31b595bf83d981ad4eed790399502c31782c270121a98686f309ac537e1f25d343164f88f9b8d14c2bdddcb379ab290b33c831c577721732000dd682fdf13e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVa4YWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
-OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwC4QAMhHe6+NfO9IQ4oVPwUO5hav
-8BodIZHQJKBAVvbRTwhh7FqNab9/dx69aA/vlLGTURz1W1Vg1wWpkDh7mAA4gcPD
-RTQ7DQA9YMQo+TJ7kI36MEIZOcD3KE6b3OMD3LI+qdMYdYip7MfdaNS1o0MrqRNe
-ZUN+u/jBmF3cAbCl1+eo9JRKiQ7Opg7aND3X/Dt3Td8dviPJLcVgn94TWhpThBE6
-SmdDI2t+lO43VrEmZSb2axkKRsgw2YdL5/+JDZomrub4iobTsC0F5/KFTic/FI0p
-olyGFSGEGgaA7yW1Gld1C0GrAzHteTB7u46VVPeX3Z/p4VOzAgk5UhaceizvAnX5
-Mj91NlQeG5IGOWzIfZR+89Mgnm8Zb3Un7Kz73DT7WotYxYCeGP5hsDR+BdDNo4JQ
-re3/y1eNuzZNPMiXx0d1/tUQikstNTn8iE06b7cbL0fDYFFCgrOJdzkXbiUp3XxU
-68Tm5OU0qyHz66Io5iX3SPDiKmk9MTAn8LFFqH19+zKMNKBfCBafxLr57Wy0f9L+
-zpjairLxHJh63X5pSa+W2qm5OywsizGNBmKGZLM4GE7kwYd6bNUcLPzWcqOKcbEg
-V9SCyI/ml+zc6m0XhCIAOf/nPXOMdo6svLkkafnISa0RehlHfX6L4uiKuuJU9Pvj
-c+Hmb60DtZ6Y+6LvjhuA
-=wgTe
+iQJ8BAEBCgBmBQJVc/kiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWK0P/2uZhtI18DnyTXEnNqIxIk8I
+bphT75KhDDd0h78GDyB4WVwk/WcW03LFeXQGP3usYV+hBQjQ08X0IVEGtl2pZctx
+2CVG+bW27dCsuri8M4ViS7lI+HVnaPlJKVZrGSeQ0OPs6WI0LuXbnSINrThUADHe
+qfYHBOeobPlhPYKMh/FWhAsmYC0BDRVVzIGsXhkLtvkoEVWnHfdZlw6ozkuPOCtL
+9qcXx4aD3DwAM8CjVbsop4QvxSSpfOn6yuIgCbDDsyJMFV+w1CiE5j0WLp8Jgm3R
+T5Q72sgl28oPuOHWEpoHt42+IAHU+ynWmvg1ioCptyYKTFtLr1Eku1KQyuTkod7v
+wb9weDx+GwsNyEBAJk3tXfbPMyHXozlu9DDOW4tGqXCyZpKNzvujVcrMYP+jGvvn
+75wdu2Fdone1cmtpTfTXliCD7EKSvb84+vzeAlS0jpzHi2tDzk1pRBH4kr4lYEnM
+ZPgCQcRqx23CSkELD5Wt83pVE2rnU0vd8uA0gNge1MN2CC/DYsQWijCBFjZg3SPD
+4HYsSkH7qb5dchlck//Uw6q0uGRW4OcFaHW0nWgbHM3HJ+Qox72ryk94bruQamr7
+/rtvh6Ez8k+ZPC1qez+poQ/CelaUCoN997wkGO9Ie4q3dWviuG/xp0cnCavXs/JY
+imO5csuOgPgb42LCY/52
+=8Veo
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index c14be1c7c846..c554f0d42058 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -1,37 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wine</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-	<email>np.hardass@gmail.com</email>
-	<name>NP-Hardass</name>
-	<description>Proxied co-maintainer</description>
-</maintainer>
-<longdescription>
+	<herd>wine</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>np.hardass@gmail.com</email>
+		<name>NP-Hardass</name>
+		<description>Proxied co-maintainer</description>
+	</maintainer>
+	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
 
 Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-</longdescription> 
-<use>
-	<flag name='capi'>Enable ISDN support via CAPI</flag>
-	<flag name='custom-cflags'>Bypass strip-flags; use at your own peril</flag>
-	<flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
-	<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
-	<flag name='netapi'>Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
-	<flag name='opencl'>Enable OpenCL support</flag>
-	<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
-	<flag name='pcap'>Support packet capture software (e.g. wireshark)</flag>
-	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
-	<flag name='pipelight'>Apply unofficial Wine-Staging patches for Pipelight/Silverlight support</flag>
-	<flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
-	<flag name='realtime'>Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
-	<flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</flag>
-	<flag name='s3tc'>Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
-	<flag name='samba'>Add support for NTLM auth. see
+</longdescription>
+	<use>
+		<flag name="capi">Enable ISDN support via CAPI</flag>
+		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
+		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
+		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
+		<flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
+		<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
+		<flag name="opencl">Enable OpenCL support</flag>
+		<flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
+		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
+		<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
+		<flag name="pipelight">Apply unofficial Wine-Staging patches for Pipelight/Silverlight support</flag>
+		<flag name="prelink">Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
+		<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
+		<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
+		<flag name="s3tc">Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
+		<flag name="samba">Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
-	<flag name='staging'>Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
-</use>
+		<flag name="staging">Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wine-compholio/wine-staging</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/winetricks/ChangeLog b/app-emulation/winetricks/ChangeLog
index ed780a924b6d..c8075bbc80fa 100644
--- a/app-emulation/winetricks/ChangeLog
+++ b/app-emulation/winetricks/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/winetricks
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.34 2015/06/04 18:59:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/ChangeLog,v 1.35 2015/06/07 07:56:50 jlec Exp $
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
   winetricks-20150416.ebuild, winetricks-99999999.ebuild:
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 2a64952705cf..46f8753a858f 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST winetricks-20150416.tar.gz 171166 SHA256 6b1bda0d9ec34c7a8596d59a49fa29fbe00848d9f0fecbf9dff8b314d51a1945 SHA512 75997e0645eb0e984117c6998eeb5c10318ac0be9307e6d60485aae0894d4f631c0486c54f04e7622b2827cafef717e778bfbb4f33a5fc5cb2b8a37430a937b9 WHIRLPOOL 5dc99c1152f5c7d0c8f08dea75cbdb758de64ad6362b078675d90124d9722f73249dda811b19b6be60dc40a4e182ba9f76de577ae3200328acbbc9b570a167db
 DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b
 EBUILD winetricks-20150416.ebuild 1955 SHA256 72b42f151519fa939e8d8b1ee41a0791fe1107a7cf38a566f20242fe4169a007 SHA512 e471c2b150af5906d52ba1a7dce049204fb6c92bd53ee6655578469a174812bec3074428469bf0578e5ddba6d60e3da02131eab400fd07e4a37a93b8e872f892 WHIRLPOOL bfdd953ee96ea0c94e13701cdbb32c911cb10cac53ee7ce39007149f601a9b697dfdcc8de732b0e1301540f0586667a7da482869514e3ab60725fc439e6f653e
 EBUILD winetricks-99999999.ebuild 1956 SHA256 8cce467bd61754bf57e235a2ce2deb988df849081787739aa4fb369bd648f67e SHA512 bb28d2d8426acd1ccc58756582502530f0ccf093e1ece2e6bccfd860a32c006d033685867a83d94b1812cb8de40da6df8c271104b3780e26a4515cd4f37c3b0c WHIRLPOOL 50715ec03ca0630f96387afe06d8da3b720b52a635259544e604c470d9d9eb79d24c0fc07840c680f9c436bc7710d91c95eeb8ab4d087133879668dacc518651
-MISC ChangeLog 7427 SHA256 91c1f9c8b3b0c7b2095a65d6b1afbcc206250093bd7ccb94456c362d6ff5fbcc SHA512 b681da9c1d249de28ffef5e058541328480a4360cbcd5fd1334d9f7d8d9ec7617479ec55bd2e837d8e670d0bdb64d68403668d2b9a7f3876cf8ea0209b9cebb1 WHIRLPOOL a08658858d745f63b948d11697c469a43dd408b1b0f0609eae67566b33915c745d717034f3f9a9d6226f73adcca1af8f821a99fe0d08d8cb7cdae250d20db9e5
-MISC metadata.xml 531 SHA256 b64899c713fad5c0273467093ff918dd51788672ceb00f20cd4dced3be04bd54 SHA512 c66faa81075bb1fbaf619f95db0b8f12a889d649f008e4dffee8fffa1c86b9c31ab2f9148904e4c2fdaee30d43672e4f2999b4a281e62860bef5fd4972aade68 WHIRLPOOL 3b289dd750abe92894b422d8468280e6885421ae1c86e8caf82d3911738e569263eaad5c628107933d9d3331cfd4f7af4f84198e964f15a75c2a45438335b5ea
+MISC ChangeLog 7525 SHA256 6a6903cf37353956738bf1418bc5e75d3386c45031c935b6b455dcd44c255b2c SHA512 35578530e2a89050b979e9927e71564eb65916f46753f71b04b29507239cbb25d6dbfb4f5870f8d394b9c62afb4ec0bc24d13a9463c3081755858ebbc0a0e016 WHIRLPOOL 4c85b61384297b05777abfb279fb70bdd014a211652759866decd97813a25232af199869677a6219c216284923486aef4794d192c796840b6536f8fa4fe0d511
+MISC metadata.xml 596 SHA256 424c4a10821ee0b11817fc1204e76642a6ca17ff7df29501c04c116fb74d8e2a SHA512 02bf1574b47a7bdd96d4f346edee4dbeb8eeb829ea8832d96fb1e1566def9acf88ab56eee8eac4df89150febdc29c9385a3de75df9bad6c184c83d3cf195b5cd WHIRLPOOL 915b3fe8d063c665d1b873ed0bfa0c9fb26f3c0bccedd511459306034b980aee17f9001e6b5833051cc136f1a11e976e4cf97ae279314bb9e262f7582cf3a5be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcJ/5RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7LMaD/96anFLeZGg4t7WzGMyQ+Hh2pV0JJigh9HsIirFYqO/vSGmWyKmFn7qQi9z
-/hUuUNMS0aCqaRcl+rZL73LYmD25G4xOd3giYwlj5JNC8SmgbswI8eLyaM3HbigS
-dKFZoooJvJSUcD9GH6TI+5mt9WXP6WdROOZ8TcL3o0o4JM79ofuBSBf6dv8mpkyc
-Yx/hQ4RAkBUZ5U7Psg7FwApaiTKtbiJzWPNDu1Fc3mRCLya2E1YMtiixLeZxovrY
-L/XjgwIth7Y1dk1n70ibNw58sUP9e/23vFw+JfGUbAa7XMOmdG4P+1Tut7jikN/Q
-kVkxU3gEB+4hdo2ruhbJgDLfbQcNSyHlhmiBOdTZ3ddAbyRPqqFSvNyPzSVOZMkD
-qo+sbICArqqzxMNOwzj9/kO8wAhnV553qZQ325XN90/R+ChUCy4ZyB0gpeQc6Czp
-1uH67c5WvuHJpxq+7ZsFMP51L9WC7PlxwwP7svLaSfahBvilLibu3Mm4lxOkP6Jk
-662z+B3glaLxK1/pbX+GaVUxIKhdo+MSnRsFY3uc1L4IGLxZfRO/9tDDaVNS3iOB
-lTaB6A0Q7ns24MpbgO7gpyrxScmFjJ011CP11G10aVhVUxzuTQJHZwWyyoS2x0i+
-3KvE26hoO5ysO0s8joHyG6Ah+j8TBz3L6//njglP79jqZk68yA==
-=2Urq
+iQJ8BAEBCgBmBQJVc/lDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmic4wQAIs5O3EaWqSftbDQl6fsqS+q
+wnsCuKhgp96OHo3c4J6GjqmS3KvGjrjnRVZmQq/uV+ZC0F1qDzsfE0LJOE+1d9nj
+lJzh06VQBoyOtpSd8Q/NC23P4/lt/hd1UjI/qza1oKDzcJ30UzqxFmk40GYIC0Ia
+E7XPCTbQyOthdWczhB+9fX3gWfikrpgd0ITTIxiBAU0aumcWmouugaOxiNucTnPr
+SbRVudetx/Q7GUN5sbr+YfMmLStmGzQK0Oz7LegGqBYZCobLIgxO4bsC4sapzwel
+iYf1K20os+u2AsQu5d+jJVQMr+ZtqxRJBQ8WTShPuTPn+tb40fgr0NXnQhYiaWl8
+gxe2ZE75HYM+6c5NNKlbw3hC0/fS6TVrrjvgH7EdSqCH1ALtHFKa6DvBqXh25Ib4
+WewkgaVHIBcHFSHIcAEYctUjSlrpsUy+xtHixbfAz26WGRiwhjLpoAMf8vhnQNbZ
+t57tTYTdqRki/Q2pFv/CizU5x9GkpyggBF1KexowMsnDUSgkm6o6Q+EyTLe1RGql
+itL+bLDQESHquJl4lj9dZR5wHjUJSkknqkoe/bwg9N/+kbt24CCLK06Lp6yr14uR
+hCAbWrOT+Oh7r6c5CvI+9+ZeX3mXmc4cJN2ngNRaulpLldC8NjCV1tA8EzgzjG3X
+CvNU6VEExdzLc8xg/ZM5
+=MU/J
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml
index 85a63636d81a..6cb30b92d9a2 100644
--- a/app-emulation/winetricks/metadata.xml
+++ b/app-emulation/winetricks/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wine</herd>
-<herd>proxy-maintainers</herd>
-<maintainer>
-    <email>np.hardass@gmail.com</email>
-    <name>NP-Hardass</name>
-    <description>Proxied co-maintainer</description>
-</maintainer>
-<upstream>
-	<remote-id type="google-code">winetricks</remote-id>
-</upstream>
-<use>
-	<flag name="rar">Pull in <pkg>app-arch/unrar</pkg> for extraction of
+	<herd>wine</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>np.hardass@gmail.com</email>
+		<name>NP-Hardass</name>
+		<description>Proxied co-maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">winetricks</remote-id>
+		<remote-id type="github">Winetricks/winetricks</remote-id>
+	</upstream>
+	<use>
+		<flag name="rar">Pull in <pkg>app-arch/unrar</pkg> for extraction of
 		rar-compressed game files</flag>
-</use>
+	</use>
 </pkgmetadata>