summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2013-11-04 09:51:08 +0000
committerLars Wendler <polynomial-c@gentoo.org>2013-11-04 09:51:08 +0000
commit1d52ea7a7e8b6d3e7231fff2360b061106356bcf (patch)
tree19c767682f676faaa11d4ee5cd97bb4f539fd400 /app-shells/fish
parentTry to prevent crashes with nvidia-drivers, upstream bug #703174 (diff)
downloadgentoo-2-1d52ea7a7e8b6d3e7231fff2360b061106356bcf.tar.gz
gentoo-2-1d52ea7a7e8b6d3e7231fff2360b061106356bcf.tar.bz2
gentoo-2-1d52ea7a7e8b6d3e7231fff2360b061106356bcf.zip
Fixed docdir handling (bug #489934)
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'app-shells/fish')
-rw-r--r--app-shells/fish/ChangeLog9
-rw-r--r--app-shells/fish/fish-2.1.0-r1.ebuild (renamed from app-shells/fish/fish-2.1.0.ebuild)7
2 files changed, 13 insertions, 3 deletions
diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 055a4796e962..9d154cdbd12b 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-shells/fish
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.60 2013/10/31 02:44:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.61 2013/11/04 09:51:08 polynomial-c Exp $
+
+*fish-2.1.0-r1 (04 Nov 2013)
+
+ 04 Nov 2013; Lars Wendler <polynomial-c@gentoo.org> -fish-2.1.0.ebuild,
+ +fish-2.1.0-r1.ebuild:
+ Fixed docdir handling. Thanks to Elis Axelsson who reported this in bug
+ #489934 and made upstream aware of the problem.
*fish-2.1.0 (31 Oct 2013)
diff --git a/app-shells/fish/fish-2.1.0.ebuild b/app-shells/fish/fish-2.1.0-r1.ebuild
index d54d9ab1bd30..18fd2a684374 100644
--- a/app-shells/fish/fish-2.1.0.ebuild
+++ b/app-shells/fish/fish-2.1.0-r1.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/app-shells/fish/fish-2.1.0.ebuild,v 1.1 2013/10/31 02:44:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r1.ebuild,v 1.1 2013/11/04 09:51:08 polynomial-c Exp $
EAPI=5
@@ -8,7 +8,8 @@ inherit base autotools
DESCRIPTION="fish is the Friendly Interactive SHell"
HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
+SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz
+ https://github.com/fish-shell/fish-shell/commit/9a3643501607bff8b314977931916081dd39646a.patch -> ${P}-docdir.patch"
LICENSE="GPL-2"
SLOT="0"
@@ -23,6 +24,8 @@ DEPEND="sys-libs/ncurses
RDEPEND="${DEPEND}"
src_prepare() {
+ epatch "${DISTDIR}"/${P}-docdir.patch #489934
+
eautoreconf
}