Stable for amd64, wrt bug #519736

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
RepoMan-Options: --include-arches="amd64"
Manifest-Sign-Key: 0x7194459F

3 files changed, 22 insertions, 19 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index d7a0484e131e..03420b1df693 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.284 2014/09/30 10:11:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.285 2014/09/30 10:20:24 ago Exp $
+
+  30 Sep 2014; Agostino Sarubbo <ago@gentoo.org> git-2.0.4.ebuild:
+  Stable for amd64, wrt bug #519736
 
   30 Sep 2014; Agostino Sarubbo <ago@gentoo.org> git-1.8.5.5.ebuild:
   Stable for ppc64, wrt bug #501662
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index e3e6bcf5ca84..68584fdf1eaa 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -51,30 +51,30 @@ EBUILD git-1.8.3.2-r1.ebuild 17640 SHA256 c1c81ca4b8dca5873333af28535527fd5af975
 EBUILD git-1.8.4.5.ebuild 17938 SHA256 bff93f337fa7bfaae36d99ced6712c76e92c2a82d1d359fe7c2cf1d068e4054c SHA512 c2a79efad5b6c55e04ba9cb2cbf95402af5ade4e1d61e436ed689565e1a5b663ef2f90a0f9baef2c8447f4da19a53df23db623d78b479cb040d58651d2b23eeb WHIRLPOOL 13feb40ae2ebe210cf2d4cf8d7c71654407276ec6d1ef6ba0433aeef56f400c45993ed2794e87cd770d574edc5e8548dca7b7490bb7c2489b28f1d91822cd3f6
 EBUILD git-1.8.5.5.ebuild 18442 SHA256 d8f5f29685722c3b17b844f1f4051a74c095d063641c34dd2ce6bdfe79f8cdef SHA512 fcd8521161f8830e5cd3c108bde75b660bf25e59cf3edb7bc871b6031c52338d5c91b36e794ae37d7d4ae780a60e41b2b31f5bc5b24281f2e33cb43e1561f3ec WHIRLPOOL 46362e84f562efe3b27575ece2fa7920e6f5cd0e0bcfb78925902231c0581ee523cb230d40cd408572c6b0a3c008e46b6ef00dee50aa6c06b17afc066eba2a9c
 EBUILD git-1.9.3.ebuild 18400 SHA256 b47f9a4b6dd0ecbb9a59ddb25ab51683ccf977b49c12d226bd7c453e5014d499 SHA512 212a40b06742c3e537b81ca8bb8097b44e4665bed9385b9afc3ebac4b28d8d2554b95756d6aecd27a8d3a55bb25151cd67105274a20b34270eef0fce129d0403 WHIRLPOOL cdc8c30099f9730784f79c6b2c2d171a14188ea21af3bb0681cb2d88ffd160c630b18689de1bb391aaac21081161d210d2dad626cd29f0da794e18a8e165f7b5
-EBUILD git-2.0.4.ebuild 18484 SHA256 4321f8cfe39a9357965b830c14e5e1fb59e355e07bd00b40a2f730bb4fa34f2c SHA512 f9100c1e7c6550fd4655fde3eecf033fcb985c786718fcc56d5224883121a15f0253d88590ec20fa6a62b6c55de6e558ea9ee690db9b701716585a467e759fb4 WHIRLPOOL 985ebfb790a66c0836dca26b89b0f8ee5d06afe972e7b3cd317e497569264acdde9c0e2436e84d444d88bae64c952cd01300fb21793758a9afde5a0bc3616dd5
+EBUILD git-2.0.4.ebuild 18486 SHA256 1ca965ebca9757b215dfffab48d7449e075c847e9174476f9de3d6ee59e9a5d4 SHA512 50080f5669e012acb43697ee3dfd95ffd347683c6102a67ae66fb747661e5fc2341606a1b769ad9b667f440f17cec45f99669fda6f05f6ffac9877f4cfe59b88 WHIRLPOOL 679a0b5ff115e626e92b19671099881a33d8dc4cb13ffedba0b9206325f19111a5afbab05108c7598439d8a4dc9acf8bd4ad6482dc84927e5ff7629666a435fe
 EBUILD git-2.1.0.ebuild 18384 SHA256 5ff098a33c2bc90783001e783ee48d4fe63da6df2f04ea8069eabe2f6e19a78e SHA512 134779decc038a2a18f5c40d7d539e85310627f6335a4504a18a67b78a8722d046a97b0f8d9fbd81fa81cebd47d37899aca0993e01fc93924c471bee8a5ec832 WHIRLPOOL b9672cd750ac3b1a2f78011228a8f7a560610d50a498bcea0495d362b9ba1a11d1e6825d8738549a383ec36e96d16ec4d89a7e5d850e8cd311b14ce85e74f245
 EBUILD git-2.1.1.ebuild 18378 SHA256 0cea1154f47230a64db8ae2423ddc9ebd3af4370867e7579effcb903a9ffa1dd SHA512 fc32d27f71ccb1d6066ba63af1953698b1c95b889bc9df8c69cae8a1d195c45f7dbdd57d0de32de0d7d4451cd97b9e0afcf622d3f428d5159c7a5a78057921c4 WHIRLPOOL 092a7a47ff4a5a501c1afc67b8de7f2a4664b6b0e59d053b48b80c4bc36dce054dcfe7692cbb9c6fc075065c1b0cea4a652670ebeb6fee2f74c0d2ca9969a445
 EBUILD git-9999-r1.ebuild 18363 SHA256 ed83da3de5dcdef682bcbd1c78141f554fccad4f2138314b2dc6717f88b09414 SHA512 c512da959b95e0df9047ef93f4c8d19df2e3efbea3fabc267a8b3b2db3e59c71a86b495ad673b8641009b9d11cbcc8d2d09c3ddc4c4a39f18b5df31d7319a9dc WHIRLPOOL 524842b63c8c8f207986ac7db33db5a706bfafdf352b9b96efc2a89b63c74bb864cec65574bb26a323d11a890c2ff29262ae35b3b0381c413385487582771ee7
 EBUILD git-9999-r2.ebuild 18362 SHA256 26c8b4d88faec52a6938b5fe1e43b7a2b722eb495bd8597e41106d29e614d7ec SHA512 dd2edf5d926347086ed641351a479662895469e8ed94105248885a1fd844f50ff592f621dc479d77f0f223907f7e691630572eb63b415cbfac0532c090f8d8f1 WHIRLPOOL 50d2afdbaef31c2484ec5aa7b28d646494d5fd9ab1401e4b0d784901e798da358a62dc23fbfc395889db85fb83894210c6013ff5d4f9ad56c4004c2ac84a9e26
 EBUILD git-9999-r3.ebuild 18360 SHA256 6e6ecba33d89f9ce94810015d1f9638e14081ff067fec8ecb9e0a073b9b944aa SHA512 16f07d13a6bb859c4db67f6caa22e998e556ebc4f9f5287b650b3f3004c1013176ca84478aae8fd25aa47302f83140260cd150725ba789eac42f04c9b930eefa WHIRLPOOL 98c6fe15032e74af21d063c83a3518a7a58ae4bf0cc0a22ca6792896e9395050eb4be29b98a49fbf8a0370efd48aa75de86fea6a481627b7a4256bfc14cde2af
 EBUILD git-9999.ebuild 18362 SHA256 292a797d369aecd50e9a63f56ffafec53cd40dd53da34b16a819c3c685de6080 SHA512 a692155f2258d5aea97580ecd293fbcb8b51048a07b811b3d7cc6cd5df8aa09cf5d823e6fa169873d164549de79e508dc9810b5e650e3363fc1f69bfd0a6bf16 WHIRLPOOL f261d813faed303793e8fe4af3b1d05eae2c967a76320ab5e1ef305f2f0906d9df505800b2eac172f100908aaa312f29a2ab57614de9faa7199f75f047b72bc9
-MISC ChangeLog 19440 SHA256 e1b5029ebba214eec3c83f62bc359e954bf1e2f448b67fb5130ec7a6f588a932 SHA512 4b60080862b2c69de80901d4e746d86d5d2972862ecf5980195ae1e42ffe778cfe3760e9bb7f15d957a383e0d98db3f1f2f2aff1cd0337ee5179d2cfd08ec819 WHIRLPOOL 44d20d50862b2015ac65a7d0f3c4194f5d04c94b3ceafbdf650644591dc9b3224ff16bc16333c0e744339d43981efd928f1969830086668efd875148747ba8d5
+MISC ChangeLog 19544 SHA256 f15d18ac9f4fc302985a2b278ff62f40f88ae9dd03a8988fd1751614f534ecef SHA512 960e13698ea16ffccaf71ca678dd0151deb084227bf47b3e06d91fa5057b47980ee8dca6bc6e0d4a4045e66193097c461d850bffec01b223851ee601ef6c6d17 WHIRLPOOL 6b0e18b0609a12564620cb6e5801767fbc225fb8a92baee534242f4fed16254c897da5c91a19c68fdbc945ce77e48ca5bc615dddf4ff7527bbf50ff3523e1b51
 MISC ChangeLog-2012 94624 SHA256 7c8c313ea4800194191f7255023cabd205e56bb9761e8877dfab3770024b158c SHA512 f19cae0a29e8598e3bb68f1295baa56ff0edf06b2e3a95081ea2f95c4555d63dd6a0bff5a82345b274a1936104a75a69fe7862d7738a7fa2539ec9a7afd6b28f WHIRLPOOL 059ab6c542757c4524cb20cebb3cfa4bfbbe16d3a66da0805fb972d32f91f2a49bee97d1d73acf74d8e2cf3cc7a552371cf66db0580506d4b1a9e05ee52bdea4
 MISC metadata.xml 1877 SHA256 74e93a953d9484c1f5806efc9c80bfa729b4d53415a00168e5ffec255750f7bd SHA512 3ef0d74206f67c27b82cefa40602cd33e432cc0f06ce900766d32f1ebd0a71d6cfa750ae77660531fc61a1117f7959d7df6ec10f439cfa2ee372d54d7ac87c5c WHIRLPOOL b9d97eb6b92a1894d965a5e9fbfbfd0d64625b31318fab2eb11b4dcb331133dbf678f62a7216c12b53a2546fa5d6a07c6240bddfa7784a925eafed602a7ffa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUKoHCAAoJELp701BxlEWfEv4P+wWhvbNwBEHLOZT/i0PPrnox
-PQliKR4sIa6TEEpRL85NLT67g5XfSOdPlIcYyucf1LvfaGcYiXBtzV972igVSx34
-0WueIai4GEfqRo/fndpEX/5JkFbUlrM+aZKcwv+EAKXYrDOn89HnGTyFIei/oiif
-he14azJsUYK2MVidgryHPmnCq9df3QgLy8futmQBZwyit76WunryHhWzqznpm4xI
-SJ0w9MwhwHXr/flr1MiHSqrRZIuxV5B4d8in2lA4gUOgGHwUC3/BWPHpMj5XJeIl
-LoyDOQ+0WivUjcgOTtvMnfr8Bpi4Xc8D5tDOhO67qneB7yx/aYwbXQR7H4KuvsrH
-9EcMyJFWbYrvqJKaaqo72Ye5vM8y/O5o2LAOLEUQTGac/Usv6Jhb4NT3urW3YX+1
-6N+Z5XK47waj906leBR2hRi8FP1qg2PvYzmv8T9huZGf6O8XJlQ/nbNOwpgEXSQH
-eGI/7qKFJyStzUSm2R6gDpYmIxnZV7gyppZ82lLBSLbvK6WrISyPILAW0Xhbv/oa
-fjye/PqMk8Ps6E0cJ/GU+l2FBT+0vko2f5/tUNu94TWXNsw/AO/ICh8oveyzpvLM
-1dyMfBbe61Xbm9qHRciAlNe6yi8ZJXgzDBPG6yOgCzoF+MSegY3jDt5vjXnjwlIs
-vGDhzp7ZLmVnLTHmKREY
-=rthL
+iQIcBAEBCAAGBQJUKoPpAAoJELp701BxlEWfEswP/0IIsMzli4pTAYW9Z3GAGZLo
+J1b5p8+TKssc+OEL7Zwof1CFiYz8SO+McqF88QqgS95jKwo1il65roMI+L+3RGit
+0wHgRg67P8g9fG263XKLrlNLdVZJcOZS0DacxkFZ9/xnV4NJEvKNMR8hijUuaayR
+XOe4KjC2VGtzva3NLWOUXcnwQ16UCbGzbUlDuQEwH+8bJX9JIKQasGvWAtAU734m
+CUgrTWbGX2ZAwScblsAfgsvMeNoQzR74kaNi9Pi4qSWVXyQeyICW99OJ7CHjfE2d
+EgJS/Nupp05CCFCUbskh2kHyhLMjDQYFQj6BLB4lLmDUuEWIBaD3vZUwH2wB1qkq
+Wj0JwdTDbTBbHRFCiSs+3rvXIPS9Rq4mZ5qA5nkTFnssqS95C0xmjsMCE7tfhIUH
+bT8fT74gXFl2RJ7/LQ1vzXnC0KTK1dM/YHYIzr+MDJC/FOE4gQknCawboU2U3AEs
+Mzgd7pPbkUR/E4/fO+IXpMSFdWq/ceeZ/AnRZQHdrQgr4uFLmm2XJbj6tWDXT5iS
+6EhX6iAdGPruVQRf7wuJeg7XNkaTynSdg0Tph9dNcDhNkioAXWvOhglFBqlvAlZ/
+JLzmBGfjBMCMKHgxYJ0fa5gGYNSsgZGl7rU54cFq/QrG6oogwCwvdxofS10olPpl
+elXDIDn7/+nVeRhPPFfJ
+=ItRX
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git/git-2.0.4.ebuild b/dev-vcs/git/git-2.0.4.ebuild
index 745b8fdb3dba..d35902717a6e 100644
--- a/dev-vcs/git/git-2.0.4.ebuild
+++ b/dev-vcs/git/git-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.5 2014/09/13 12:00:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.4.ebuild,v 1.6 2014/09/30 10:20:24 ago Exp $
 
 EAPI=5
 
@@ -33,10 +33,10 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
-	KEYWORDS="arm hppa"
+	KEYWORDS="amd64 arm hppa"
 fi
 
 LICENSE="GPL-2"