summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-20 05:02:36 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-20 05:02:36 +0000
commitdce21b0df441d09dab6eaa8bbef5453a8a1e8e72 (patch)
tree8faf38a740351ae34bcfef9482469244c3ae033f /app-shells/bash
parentbump; add py3 support, drop keyword hppa subsequent to adding new dep, remove... (diff)
downloadgentoo-2-dce21b0df441d09dab6eaa8bbef5453a8a1e8e72.tar.gz
gentoo-2-dce21b0df441d09dab6eaa8bbef5453a8a1e8e72.tar.bz2
gentoo-2-dce21b0df441d09dab6eaa8bbef5453a8a1e8e72.zip
Drop old mail config settings.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-shells/bash')
-rw-r--r--app-shells/bash/ChangeLog6
-rw-r--r--app-shells/bash/bash-3.0_p22.ebuild3
-rw-r--r--app-shells/bash/files/bash-3.0-configs.patch22
3 files changed, 6 insertions, 25 deletions
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 8d6faf5bc801..8e304d987bcd 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
# 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.423 2014/10/19 20:32:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.424 2014/10/20 05:02:36 vapier Exp $
+
+ 20 Oct 2014; Mike Frysinger <vapier@gentoo.org> -files/bash-3.0-configs.patch,
+ bash-3.0_p22.ebuild:
+ Drop old mail config settings.
19 Oct 2014; Mike Frysinger <vapier@gentoo.org> bash-4.3_p30.ebuild:
Move bash-4.3 into ~arch.
diff --git a/app-shells/bash/bash-3.0_p22.ebuild b/app-shells/bash/bash-3.0_p22.ebuild
index 765314adcb36..cdb98479392e 100644
--- a/app-shells/bash/bash-3.0_p22.ebuild
+++ b/app-shells/bash/bash-3.0_p22.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-3.0_p22.ebuild,v 1.1 2014/10/19 20:31:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.0_p22.ebuild,v 1.2 2014/10/20 05:02:36 vapier Exp $
EAPI="4"
@@ -80,7 +80,6 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.0-read-builtin-pipe.patch #87093
epatch "${FILESDIR}"/${PN}-3.0-trap-fg-signals.patch
epatch "${FILESDIR}"/${PN}-3.0-pgrp-pipe-fix.patch #92349
- epatch "${FILESDIR}"/${PN}-3.0-configs.patch
epatch "${FILESDIR}"/${PN}-3.0-strnlen.patch
epatch_user
diff --git a/app-shells/bash/files/bash-3.0-configs.patch b/app-shells/bash/files/bash-3.0-configs.patch
deleted file mode 100644
index 956d1dca45b8..000000000000
--- a/app-shells/bash/files/bash-3.0-configs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bash-3.0/config.h.in
-+++ bash-3.0/config.h.in
-@@ -197,7 +197,7 @@
-
- /* System paths */
-
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
-
- /* Characteristics of the system's header files and libraries that affect
- the compilation environment. */
---- bash-3.0/config-bot.h
-+++ bash-3.0/config-bot.h
-@@ -178,4 +178,7 @@
- /******************************************************************/
-
- /* If you don't want bash to provide a default mail file to check. */
--/* #undef DEFAULT_MAIL_DIRECTORY */
-+/* DP: - don't define a default DEFAULT_MAIL_DIRECTORY, because it
-+ * DP: can cause a timeout on NFS mounts.
-+ */
-+#undef DEFAULT_MAIL_DIRECTORY