diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2011-01-08 06:27:01 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-01-08 06:27:01 +0000 |
| commit | b8d5ac78dc808f130f066ed01a916d8ce0794978 (patch) | |
| tree | 5b9d35a2997da090f1cd3c712726f37b9456bca0 /dev-vcs/git | |
| parent | Version bumped. Support imsettings. (diff) | |
| download | gentoo-2-b8d5ac78dc808f130f066ed01a916d8ce0794978.tar.gz gentoo-2-b8d5ac78dc808f130f066ed01a916d8ce0794978.tar.bz2 gentoo-2-b8d5ac78dc808f130f066ed01a916d8ce0794978.zip | |
Backport bug #350330 automagic perl to stable ebuild.
(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-1.7.3.4-r1.ebuild | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog index d5c731fe070c..09bc6e5232d2 100644 --- a/dev-vcs/git/ChangeLog +++ b/dev-vcs/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-vcs/git # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.78 2011/01/08 01:23:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.79 2011/01/08 06:27:01 robbat2 Exp $ + + 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild: + Backport bug #350330 automagic CVS to stable ebuild. 08 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.5-r2.ebuild, -git-1.7.3.5-r2.ebuild.orig, git-1.7.4_rc1-r2.ebuild, git-9999.ebuild: diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild index 13b2efa00e4e..dd58e424783c 100644 --- a/dev-vcs/git/git-1.7.3.4-r1.ebuild +++ b/dev-vcs/git/git-1.7.3.4-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.3.4-r1.ebuild,v 1.14 2011/01/07 15:11:30 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.15 2011/01/08 06:27:01 robbat2 Exp $ EAPI=3 @@ -139,6 +139,8 @@ exportmakeopts() { && myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease" use subversion \ || myopts="${myopts} NO_SVN_TESTS=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" @@ -203,6 +205,9 @@ src_prepare() { # bug #350075: t9001: fix missing prereq on some tests 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):' \ |