summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-19 20:30:15 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-19 20:30:15 +0000
commit5d7b4d99957c96f3a5b718eae318c6df6d48178c (patch)
tree6dbcda6e00bdcbd98b3f8fa4cb0874ce9f74aae3 /app-shells/bash
parentDrop old. (diff)
downloadgentoo-2-5d7b4d99957c96f3a5b718eae318c6df6d48178c.tar.gz
gentoo-2-5d7b4d99957c96f3a5b718eae318c6df6d48178c.tar.bz2
gentoo-2-5d7b4d99957c96f3a5b718eae318c6df6d48178c.zip
Update prototype headers, drop Mandrake/readline patches that are not needed, and pull back in the old version.h parallel build fix.
Diffstat (limited to 'app-shells/bash')
-rw-r--r--app-shells/bash/ChangeLog5
-rw-r--r--app-shells/bash/bash-4.0_p44.ebuild4
2 files changed, 5 insertions, 4 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 2a49997b9b0b..d08d62101a57 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,11 +1,12 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.420 2014/10/19 20:16:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.421 2014/10/19 20:30:15 vapier Exp $
19 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+files/bash-2.05b-parallel-build.patch, +files/bash-3.1-protos.patch,
-files/bash-3.1-gentoo.patch, -files/bash-3.2-parallel-build.patch,
- bash-3.1_p23.ebuild, bash-3.2_p57.ebuild, files/bash-3.2-protos.patch:
+ bash-3.1_p23.ebuild, bash-3.2_p57.ebuild, files/bash-3.2-protos.patch,
+ bash-4.0_p44.ebuild:
Update prototype headers, drop Mandrake/readline patches that are not needed,
and pull back in the old version.h parallel build fix.
diff --git a/app-shells/bash/bash-4.0_p44.ebuild b/app-shells/bash/bash-4.0_p44.ebuild
index bfd7ce914f73..ab3a3cc93270 100644
--- a/app-shells/bash/bash-4.0_p44.ebuild
+++ b/app-shells/bash/bash-4.0_p44.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/app-shells/bash/bash-4.0_p44.ebuild,v 1.4 2014/10/08 06:21:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0_p44.ebuild,v 1.5 2014/10/19 20:30:15 vapier Exp $
EAPI="4"
@@ -68,7 +68,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-4.0-configure.patch #304901
epatch "${FILESDIR}"/${PN}-4.x-deferred-heredocs.patch
sed -i '1i#define NEED_FPURGE_DECL' execute_cmd.c # needs fpurge() decl
- epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
+ epatch "${FILESDIR}"/${PN}-2.05b-parallel-build.patch #41002
epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
epatch "${FILESDIR}"/${PN}-4.0-parallel-build.patch #267613