summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2014-08-21 05:16:37 +0000
committerLars Wendler <polynomial-c@gentoo.org>2014-08-21 05:16:37 +0000
commit6603c799e8fc492df91682691597a5d1d10e1996 (patch)
tree85ea0a508c169417d0007ae7444434f5f4b05372 /dev-vcs/git
parentBump (diff)
downloadgentoo-2-6603c799e8fc492df91682691597a5d1d10e1996.tar.gz
gentoo-2-6603c799e8fc492df91682691597a5d1d10e1996.tar.bz2
gentoo-2-6603c799e8fc492df91682691597a5d1d10e1996.zip
Don't install no longer available contrib files (git-diffall and vim)
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/ChangeLog5
-rw-r--r--dev-vcs/git/git-2.1.0.ebuild10
2 files changed, 6 insertions, 9 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 0db457334e18..6f64ec7212b0 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.276 2014/08/19 19:10:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.277 2014/08/21 05:16:37 polynomial-c Exp $
+
+ 21 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> git-2.1.0.ebuild:
+ Don't install no longer available contrib files (git-diffall and vim).
*git-2.1.0 (19 Aug 2014)
diff --git a/dev-vcs/git/git-2.1.0.ebuild b/dev-vcs/git/git-2.1.0.ebuild
index ef2a17f1cf34..00fc67b54c3f 100644
--- a/dev-vcs/git/git-2.1.0.ebuild
+++ b/dev-vcs/git/git-2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.1 2014/08/19 19:10:15 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.1.0.ebuild,v 1.2 2014/08/21 05:16:37 polynomial-c Exp $
EAPI=5
@@ -420,10 +420,6 @@ src_install() {
cd "${S}"
fi
- # git-diffall
- dobin contrib/diffall/git-diffall
- newdoc contrib/diffall/README git-diffall.txt
-
# diff-highlight
dobin contrib/diff-highlight/diff-highlight
newdoc contrib/diff-highlight/README README.diff-highlight
@@ -463,7 +459,6 @@ src_install() {
# completion - installed above
# credential/gnome-keyring TODO
# diff-highlight - done above
- # diffall - done above
# emacs - installed above
# examples - these are stuff that is not used in Git anymore actually
# git-jump - done above
@@ -478,7 +473,7 @@ src_install() {
for i in \
buildsystems convert-objects fast-import \
hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats vim workdir \
+ stats workdir \
; do
cp -rf \
"${S}"/contrib/${i} \
@@ -526,7 +521,6 @@ src_install() {
}
src_test() {
- # t7004 segfaults
local disabled=""
local tests_cvs="t9200-git-cvsexportcommit.sh \
t9400-git-cvsserver-server.sh \