summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-03-13 14:43:10 +0000
committerMike Frysinger <vapier@gentoo.org>2012-03-13 14:43:10 +0000
commit575a7f4922f52d010a16791b41ec71b7f4f097b2 (patch)
tree4da44b96a1cbf34339b6545b354ff27252b6523b /app-shells/bash
parentppc64 stable wrt #388171 (diff)
downloadgentoo-2-575a7f4922f52d010a16791b41ec71b7f4f097b2.tar.gz
gentoo-2-575a7f4922f52d010a16791b41ec71b7f4f097b2.tar.bz2
gentoo-2-575a7f4922f52d010a16791b41ec71b7f4f097b2.zip
Avoid regenerating bash info page #407985 by Jory A. Pratt.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'app-shells/bash')
-rw-r--r--app-shells/bash/ChangeLog6
-rw-r--r--app-shells/bash/bash-4.2_p20.ebuild6
-rw-r--r--app-shells/bash/bash-4.2_p24.ebuild6
3 files changed, 15 insertions, 3 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8c803465e091..bed6ca07481e 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-shells/bash
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.299 2012/03/13 13:20:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.300 2012/03/13 14:43:10 vapier Exp $
+
+ 13 Mar 2012; Mike Frysinger <vapier@gentoo.org> bash-4.2_p20.ebuild,
+ bash-4.2_p24.ebuild:
+ Avoid regenerating bash info page #407985 by Jory A. Pratt.
13 Mar 2012; Brent Baude <ranger@gentoo.org> bash-4.2_p20.ebuild:
Marking bash-4.2_p20 ppc for bug
diff --git a/app-shells/bash/bash-4.2_p20.ebuild b/app-shells/bash/bash-4.2_p20.ebuild
index c4fa2400ddd8..395af6cf02de 100644
--- a/app-shells/bash/bash-4.2_p20.ebuild
+++ b/app-shells/bash/bash-4.2_p20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.5 2012/03/13 13:20:10 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p20.ebuild,v 1.6 2012/03/13 14:43:10 vapier Exp $
EAPI="1"
@@ -72,6 +72,10 @@ src_unpack() {
touch lib/{readline,termcap}/Makefile.in # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[a-z]*.h::g' Makefile.in || die
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/*
+
epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
}
diff --git a/app-shells/bash/bash-4.2_p24.ebuild b/app-shells/bash/bash-4.2_p24.ebuild
index 00dc265b2fa4..c7e6f29c4d6c 100644
--- a/app-shells/bash/bash-4.2_p24.ebuild
+++ b/app-shells/bash/bash-4.2_p24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.1 2012/03/12 14:57:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.2_p24.ebuild,v 1.2 2012/03/13 14:43:10 vapier Exp $
EAPI="1"
@@ -72,6 +72,10 @@ src_unpack() {
touch lib/{readline,termcap}/Makefile.in # for config.status
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[a-z]*.h::g' Makefile.in || die
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/*
+
epatch "${FILESDIR}"/${PN}-4.2-execute-job-control.patch #383237
epatch "${FILESDIR}"/${PN}-4.2-parallel-build.patch
}