diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-01-07 21:51:31 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-07 21:51:31 +0000 |
| commit | c9512cbae26e6a76088ebdd202aa6db723bef56d (patch) | |
| tree | 44e75ed8e26f6b4baef88e9f3899d0733be63f86 /dev-vcs/git/git-1.7.4_rc1-r1.ebuild | |
| parent | stable ppc, bug 348487 (diff) | |
| download | gentoo-2-c9512cbae26e6a76088ebdd202aa6db723bef56d.tar.gz gentoo-2-c9512cbae26e6a76088ebdd202aa6db723bef56d.tar.bz2 gentoo-2-c9512cbae26e6a76088ebdd202aa6db723bef56d.zip | |
Port bug #350330 fixes to newer ebuilds.
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs/git/git-1.7.4_rc1-r1.ebuild')
| -rw-r--r-- | dev-vcs/git/git-1.7.4_rc1-r1.ebuild | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild index 31953170f8c4..c9d826e96a6c 100644 --- a/dev-vcs/git/git-1.7.4_rc1-r1.ebuild +++ b/dev-vcs/git/git-1.7.4_rc1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.2 2011/01/07 07:49:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.4_rc1-r1.ebuild,v 1.3 2011/01/07 21:51:31 robbat2 Exp $ EAPI=3 @@ -142,6 +142,8 @@ exportmakeopts() { || myopts="${myopts} NO_SVN_TESTS=YesPlease" use threads \ && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" + use cvs \ + || myopts="${myopts} NO_CVS=YesPlease" # Disabled until ~m68k-mint can be keyworded again # if [[ ${CHOST} == *-mint* ]] ; then # myopts="${myopts} NO_MMAP=YesPlease" @@ -208,6 +210,9 @@ src_prepare() { # Merged upstream #epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch + # bug #350330 - automagic CVS when we don't want it is bad. + epatch "${FILESDIR}"/git-1.7.3.5-optional-cvs.patch + sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ -e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \ |