diff options
author | 2010-02-28 02:18:15 +0000 | |
---|---|---|
committer | 2010-02-28 02:18:15 +0000 | |
commit | 5f960fc7e316d6a29247e7eb711f86d6ccc9c799 (patch) | |
tree | 896a85c3e4e7d73e51f8624e40bc665717067606 /dev-util | |
parent | Version bump. Fix building with ant-1.8 - bug #305929. Use java_prepare. (diff) | |
download | gentoo-2-5f960fc7e316d6a29247e7eb711f86d6ccc9c799.tar.gz gentoo-2-5f960fc7e316d6a29247e7eb711f86d6ccc9c799.tar.bz2 gentoo-2-5f960fc7e316d6a29247e7eb711f86d6ccc9c799.zip |
dev-util/git: Sync live ebuild with latest (bug #305157)
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/git/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/git/git-9999.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog index 0cdcc629c1f4..1071be70a996 100644 --- a/dev-util/git/ChangeLog +++ b/dev-util/git/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/git # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.396 2010/02/13 18:37:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.397 2010/02/28 02:18:15 sping Exp $ + + 28 Feb 2010; Sebastian Pipping <sping@gentoo.org> git-9999.ebuild: + Sync live ebuild with latest (bug #305157) *git-1.7.0 (13 Feb 2010) diff --git a/dev-util/git/git-9999.ebuild b/dev-util/git/git-9999.ebuild index 6cd1f9ba6a50..57441bd7bc11 100644 --- a/dev-util/git/git-9999.ebuild +++ b/dev-util/git/git-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.19 2009/12/26 00:44:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-9999.ebuild,v 1.20 2010/02/28 02:18:15 sping Exp $ EAPI=2 @@ -163,7 +163,7 @@ src_prepare() { #epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch # JS install fixup - epatch "${FILESDIR}"/git-1.6.6-always-install-js.patch + epatch "${FILESDIR}"/git-1.7.0-always-install-js.patch sed -i \ -e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \ |