summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-05 07:48:32 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2010-06-05 07:48:32 +0000
commitf5a63c6ad9ad8c487f3b8272be0e6f82fce4a801 (patch)
treee4ceee51668e0fd358da7d8705b50e2730f7e780 /dev-vcs
parentSinatra should also work with rack 1.1: update dependency. (diff)
downloadgentoo-2-f5a63c6ad9ad8c487f3b8272be0e6f82fce4a801.tar.gz
gentoo-2-f5a63c6ad9ad8c487f3b8272be0e6f82fce4a801.tar.bz2
gentoo-2-f5a63c6ad9ad8c487f3b8272be0e6f82fce4a801.zip
x86 stable wrt bug #321899
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog5
-rw-r--r--dev-vcs/git/git-1.7.1-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 14d83a95d59d..5a0e7c113e8a 100644
--- 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/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild
index 2fd527190249..927bfe1ffc8b 100644
--- 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"