summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2015-02-17 15:03:26 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2015-02-17 15:03:26 +0000
commit0b0681bd4f35ea482598242ce774483a72c720d3 (patch)
tree55331027e2763243048d3ac94ba3cc884da8b757 /app-shells
parentrlwrap-0.42: Add ~ppc-aix keyword. (diff)
downloadgentoo-2-0b0681bd4f35ea482598242ce774483a72c720d3.tar.gz
gentoo-2-0b0681bd4f35ea482598242ce774483a72c720d3.tar.bz2
gentoo-2-0b0681bd4f35ea482598242ce774483a72c720d3.zip
tcsh-6.18.01-r2: Add AIX patch for now until upstream (bug#366) knows better.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C719EE20)
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/tcsh/ChangeLog8
-rw-r--r--app-shells/tcsh/files/tcsh-6.18.01-aix.patch14
-rw-r--r--app-shells/tcsh/tcsh-6.18.01-r2.ebuild5
3 files changed, 23 insertions, 4 deletions
diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 3d951a8c7ed3..2ed5376716ee 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-shells/tcsh
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.135 2014/01/26 12:11:23 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.136 2015/02/17 15:03:26 haubi Exp $
+
+ 17 Feb 2015; Michael Haubenwallner <haubi@gentoo.org> tcsh-6.18.01-r2.ebuild,
+ +files/tcsh-6.18.01-aix.patch:
+ Add AIX patch for now until upstream (bug#366) knows better.
26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> tcsh-6.18.01-r2.ebuild:
Stable for sparc, wrt bug #495350
diff --git a/app-shells/tcsh/files/tcsh-6.18.01-aix.patch b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
new file mode 100644
index 000000000000..669d20634731
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.18.01-aix.patch
@@ -0,0 +1,14 @@
+Upstream report, without better patch yet:
+http://bugs.gw.com/view.php?id=366
+
+--- tc.who.c.orig 2014-06-26 11:21:43 +0200
++++ tc.who.c 2014-06-26 11:21:58 +0200
+@@ -60,6 +60,8 @@
+ # define TCSH_PATH_UTMP _PATH_UTMPX
+ # elif defined(UTMPX_FILE)
+ # define TCSH_PATH_UTMP UTMPX_FILE
++# elif defined(UTMP_FILE)
++# define TCSH_PATH_UTMP UTMP_FILE
+ # elif __FreeBSD_version >= 900000
+ # /* Why isn't this defined somewhere? */
+ # define TCSH_PATH_UTMP "/var/run/utx.active"
diff --git a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
index 6bf50e2cecd7..c86a1917dd80 100644
--- a/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
+++ b/app-shells/tcsh/tcsh-6.18.01-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.10 2014/01/26 12:11:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.11 2015/02/17 15:03:26 haubi Exp $
EAPI="3"
@@ -32,6 +32,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+ epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
# fix dependency on ncurses[tinfo], #459484
sed \