x86 stable wrt bug #321899

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 14d83a95d59d849e8bda5db39a626037ed7288af..5a0e7c113e8ab0abf56ee9cd3f3143c5c2193942 100644 (file)
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.9 2010/05/31 20:06:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.10 2010/06/05 07:48:32 phajdan.jr Exp $
+
+  05 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> git-1.7.1-r1.ebuild:
+  x86 stable wrt bug #321899
 
   31 May 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.1-r1.ebuild:
   Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the

diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 30cec0b4b2dc1fe45d7479735df38bb32c3e5534..cf7f591649e29c876b4ae9b62a2a1b365c687375 100644 (file)
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -120,7 +120,7 @@ EBUILD git-1.6.6_rc4.ebuild 11105 RMD160 e44c3bf204a32ea492d80bbefdb9358cf43706f
 EBUILD git-1.7.0.3.ebuild 11286 RMD160 ec0d03c0cabbc8404f477cec651c642114fe19bb SHA1 817e47bd7d0e529ce890ba80e9eb9220b78c78d0 SHA256 b2a99106887fd07d71ebe151093349fcba95b3f810b1fdcad62ad834c83ca8be
 EBUILD git-1.7.0.4.ebuild 11286 RMD160 06b16788b54bcfee5c8219817b016b6a45aacd45 SHA1 2adfba0b08d51f7fa0a5740dd35a48e9f23f8d41 SHA256 03a74571a6123a38dc789cece8d4513a7cb9a153c033ced71f8f431421e78552
 EBUILD git-1.7.0.ebuild 11284 RMD160 53c1bbdc72ac4f8950221d17534444cd906305f2 SHA1 276f6355d48e56d9ee12d195d9be169fee36a84c SHA256 15d4292f13126491032cc1aca9766b773bf7bbbc0f9b37274c1771663f50e1a8
-EBUILD git-1.7.1-r1.ebuild 11489 RMD160 9d7210a52fd2b97c68618bf9731cc3e49d5dd385 SHA1 6816269a3bd592f069e7b6f789c58571243383d9 SHA256 4e1038bf80e62a561439869b3d0c5de8891efcb12405004997bf152bed66665e
+EBUILD git-1.7.1-r1.ebuild 11491 RMD160 befd22d610bbddcf2bad4442c16434e7ac0ace42 SHA1 4cfcfc3c0427e44f4783137e362b91f2f726ceb1 SHA256 d4a6d565630af365e72776588062ec7d1b7e861e43c60b6e6d9a8df8df770316
 EBUILD git-9999.ebuild 11276 RMD160 0621eed66ee38cef41b541f279d07f893cd67e92 SHA1 3048e20973fe7b20b67bf61646f2a8c17677355c SHA256 4a8cd3861eed616cfcd96096d2ad817c08b36c52f3aaa9fa655f11bd9f933012
-MISC ChangeLog 64804 RMD160 013f28eda9b12b690ff8b366026bd995a2bb6320 SHA1 c2a024e396d8938279a1aa203654d04df72d99f0 SHA256 a2ae6cb57108f161471c243be35d4bece25d82b636b35d11aba9c04779e81f2c
+MISC ChangeLog 64914 RMD160 3483e33a93cae32f9326d8fa5f172e9a63cac0c5 SHA1 813dd37fe47ed02d59f338849dc64c074b48c575 SHA256 d51fa10c6195db4795945e1f41c3514425f0bda0ca2b12edb89ae0993a750e3c
 MISC metadata.xml 1610 RMD160 6b03b898986d26bba7ff441dc1c8c9ec04a9a2b9 SHA1 a0a0d304138c648729d225954de89c1aac359008 SHA256 d070dc8e46e0fd44676d0491353f95385e65c1ffcd1313193dc59d495245c007

diff --git a/dev-vcs/git/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild
index 2fd52719024909c1f8da95304b2d94a6d7f93b69..927bfe1ffc8bdd0e7822d90aba92449989bf9d07 100644 (file)
--- a/dev-vcs/git/git-1.7.1-r1.ebuild
+++ b/dev-vcs/git/git-1.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.2 2010/05/31 20:06:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.1-r1.ebuild,v 1.3 2010/06/05 07:48:32 phajdan.jr Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ if [ "$PV" != "9999" ]; then
        SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
                        mirror://kernel/software/scm/git/${PN}-manpages-${DOC_VER}.tar.bz2
                        doc? ( mirror://kernel/software/scm/git/${PN}-htmldocs-${DOC_VER}.tar.bz2 )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 else
        SRC_URI=""
        EGIT_BRANCH="master"