summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-12-05 09:54:51 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-12-05 09:54:51 +0000
commit0e7d1ffe854aeb257f5c00f27cfebb81bf03c0bd (patch)
tree17ef170b963f274e0cd775b6d87aed323e421b17 /dev-vcs
parentRemove dependencies on gems for filesystem events that we do not package. (diff)
downloadgentoo-2-0e7d1ffe854aeb257f5c00f27cfebb81bf03c0bd.tar.gz
gentoo-2-0e7d1ffe854aeb257f5c00f27cfebb81bf03c0bd.tar.bz2
gentoo-2-0e7d1ffe854aeb257f5c00f27cfebb81bf03c0bd.zip
Added changes to live ebuild
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git/ChangeLog5
-rw-r--r--dev-vcs/git/git-9999.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 248748760ed7..6a3390c1e7ff 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.229 2013/12/05 08:13:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.230 2013/12/05 09:54:51 polynomial-c Exp $
+
+ 05 Dec 2013; Lars Wendler <polynomial-c@gentoo.org> git-9999.ebuild:
+ Added changes to live ebuild.
*git-1.8.5.1 (05 Dec 2013)
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 16bc2afa529a..f59f804eb9e0 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.48 2013/10/20 20:11:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.49 2013/12/05 09:54:51 polynomial-c Exp $
EAPI=5
@@ -220,7 +220,7 @@ src_unpack() {
src_prepare() {
# bug #350330 - automagic CVS when we don't want it is bad.
- epatch "${FILESDIR}"/git-1.8.4-optional-cvs.patch
+ epatch "${FILESDIR}"/git-1.8.5-optional-cvs.patch
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -446,7 +446,7 @@ src_install() {
# svnimport - use git-svn
# thunderbird-patch-inline - fixes thunderbird
for i in \
- buildsystems ciabot convert-objects fast-import \
+ buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
stats vim workdir \
; do