summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-05-31 20:06:33 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-05-31 20:06:33 +0000
commit12fc60a0fa8f0ba2565fa31141368c59da4d5ef5 (patch)
treee380c03fd878390d777afc041207163c12d16a12 /dev-vcs
parentVersion bump (diff)
downloadgentoo-2-12fc60a0fa8f0ba2565fa31141368c59da4d5ef5.tar.gz
gentoo-2-12fc60a0fa8f0ba2565fa31141368c59da4d5ef5.tar.bz2
gentoo-2-12fc60a0fa8f0ba2565fa31141368c59da4d5ef5.zip
Bug #322205: The iconv patch added for -r1 just stopped the segfaults, the testsuite still fails, so forcing USE=iconv for now.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog6
-rw-r--r--dev-vcs/git/git-1.7.1-r1.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 8ec049ce58e0..14d83a95d59d 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
# 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.8 2010/05/28 20:30:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.9 2010/05/31 20:06:33 robbat2 Exp $
+
+ 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
+ testsuite still fails, so forcing USE=iconv for now.
28 May 2010; Robin H. Johnson <robbat2@gentoo.org> -git-1.7.1.ebuild:
Remove broken 1.7.1.
diff --git a/dev-vcs/git/git-1.7.1-r1.ebuild b/dev-vcs/git/git-1.7.1-r1.ebuild
index 07059ba9ffef..2fd527190249 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.1 2010/05/28 20:27:41 robbat2 Exp $
+# $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 $
EAPI=2
@@ -114,7 +114,8 @@ exportmakeopts() {
fi
use iconv \
- || myopts="${myopts} NO_ICONV=YesPlease"
+ || einfo "Forcing iconv for 1.7.1-r1 due to bugs #321895, #322205."
+ # || myopts="${myopts} NO_ICONV=YesPlease"
use tk \
|| myopts="${myopts} NO_TCLTK=YesPlease"
use perl \