summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-08-22 05:14:49 +0000
committerZac Medico <zmedico@gentoo.org>2012-08-22 05:14:49 +0000
commitf96ec951c11fc702d806bd2511b5c29b00146028 (patch)
tree9aab7296acc78f0ebbb3243f67aaf4ec1d019b9a /dev-vcs/git
parent~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild. (diff)
downloadgentoo-2-f96ec951c11fc702d806bd2511b5c29b00146028.tar.gz
gentoo-2-f96ec951c11fc702d806bd2511b5c29b00146028.tar.bz2
gentoo-2-f96ec951c11fc702d806bd2511b5c29b00146028.zip
Quick fix for USE=-perl.
(Portage version: 2.2.0_alpha121/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/ChangeLog5
-rw-r--r--dev-vcs/git/git-1.7.12-r1.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index e326831ee964..051ded6b80d2 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.149 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.150 2012/08/22 05:14:49 zmedico Exp $
+
+ 22 Aug 2012; Zac Medico <zmedico@gentoo.org> git-1.7.12-r1.ebuild:
+ Quick fix for USE=-perl.
22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r1.ebuild,
git-1.7.12.ebuild, git-9999.ebuild:
diff --git a/dev-vcs/git/git-1.7.12-r1.ebuild b/dev-vcs/git/git-1.7.12-r1.ebuild
index a034e6681fed..be77f1ddffcc 100644
--- a/dev-vcs/git/git-1.7.12-r1.ebuild
+++ b/dev-vcs/git/git-1.7.12-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.3 2012/08/22 05:14:49 zmedico Exp $
EAPI=4
@@ -261,8 +261,10 @@ src_configure() {
}
src_compile() {
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ if use perl ; then
+ git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+ git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+ fi
git_emake || die "emake failed"
if use emacs ; then