summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-05 07:36:58 +0000
committerMike Frysinger <vapier@gentoo.org>2007-10-05 07:36:58 +0000
commit4bc554ba38270f9812709a4eaac69edf69b28c33 (patch)
tree57cab983dcfb074abc253250db3635f3acfb421b /dev-util
parentstable on ppc64 (diff)
downloadgentoo-2-4bc554ba38270f9812709a4eaac69edf69b28c33.tar.gz
gentoo-2-4bc554ba38270f9812709a4eaac69edf69b28c33.tar.bz2
gentoo-2-4bc554ba38270f9812709a4eaac69edf69b28c33.zip
Fix incorrect binding of iconv<->uclibc.
(Portage version: 2.1.3.11)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/git/ChangeLog5
-rw-r--r--dev-util/git/git-1.5.3.4.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 4e4e8597c5e1..b946bdd8dfa2 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/git
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.227 2007/10/04 18:31:12 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.228 2007/10/05 07:36:58 vapier Exp $
+
+ 05 Oct 2007; Mike Frysinger <vapier@gentoo.org> git-1.5.3.4.ebuild:
+ Fix incorrect binding of iconv<->uclibc.
*git-1.5.3.4 (04 Oct 2007)
diff --git a/dev-util/git/git-1.5.3.4.ebuild b/dev-util/git/git-1.5.3.4.ebuild
index 42a71c8bbf5a..edbec3694a59 100644
--- a/dev-util/git/git-1.5.3.4.ebuild
+++ b/dev-util/git/git-1.5.3.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.4.ebuild,v 1.1 2007/10/04 18:31:12 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3.4.ebuild,v 1.2 2007/10/05 07:36:58 vapier Exp $
inherit toolchain-funcs eutils elisp-common perl-module bash-completion
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/software/scm/git/${MY_P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
+IUSE="curl doc emacs gtk iconv mozsha1 perl ppcsha1 tk webdav"
DEPEND="
!app-misc/git
@@ -56,7 +56,7 @@ exportmakeopts() {
myopts="${myopts} WITH_SEND_EMAIL=YesPlease"
- use elibc_uclibc && myopts="${myopts} NO_ICONV=YesPlease"
+ use iconv || myopts="${myopts} NO_ICONV=YesPlease"
export MY_MAKEOPTS=${myopts}
}