[gentoo-commits] proj/sci:master commit in: app-shells/mpibash/, app-shells/mpibash/files/

[Christoph Junghans]

commit:     77aa52c0900d7519814f3b53c5a59fb9ad1dbae1
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  3 18:45:08 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Dec  3 18:45:08 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=77aa52c0

version bump

Package-Manager: portage-2.2.8-r2

---
 app-shells/mpibash/ChangeLog                       |  7 ++++
 .../mpibash/files/bash-4.3-term-cleanup.patch      | 47 ++++++++++++++++++++++
 ...sh-4.3_p24.ebuild => mpibash-4.3_p30-r1.ebuild} | 45 +++++++++++----------
 3 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/app-shells/mpibash/ChangeLog b/app-shells/mpibash/ChangeLog
index d8edb92..441e0df 100644
--- a/app-shells/mpibash/ChangeLog
+++ b/app-shells/mpibash/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpibash-4.3_p30-r1 (03 Dec 2014)
+
+  03 Dec 2014; Christoph Junghans <ottxor@g.o>
+  +files/bash-4.3-term-cleanup.patch, +mpibash-4.3_p30-r1.ebuild,
+  -mpibash-4.3_p24.ebuild:
+  version bump
+
   01 Nov 2014; Justin Lecher <jlec@g.o> mpibash-4.3_p24.ebuild,
   metadata.xml:
   Bump to EAPI=5

diff --git a/app-shells/mpibash/files/bash-4.3-term-cleanup.patch b/app-shells/mpibash/files/bash-4.3-term-cleanup.patch
new file mode 100644
index 0000000..be7a5de
--- /dev/null
+++ b/app-shells/mpibash/files/bash-4.3-term-cleanup.patch
@@ -0,0 +1,47 @@
+http://lists.gnu.org/archive/html/bug-bash/2014-09/msg00031.html
+
+*** ../bash-4.3-patched/bashline.c	2014-05-14 09:22:39.000000000 -0400
+--- bashline.c	2014-09-08 11:28:56.000000000 -0400
+***************
+*** 203,206 ****
+--- 203,207 ----
+  extern int array_needs_making;
+  extern int posixly_correct, no_symbolic_links;
++ extern int sigalrm_seen;
+  extern char *current_prompt_string, *ps1_prompt;
+  extern STRING_INT_ALIST word_token_alist[];
+***************
+*** 4209,4214 ****
+    /* If we're going to longjmp to top_level, make sure we clean up readline.
+       check_signals will call QUIT, which will eventually longjmp to top_level,
+!      calling run_interrupt_trap along the way. */
+!   if (interrupt_state)
+      rl_cleanup_after_signal ();
+    bashline_reset_event_hook ();
+--- 4262,4268 ----
+    /* If we're going to longjmp to top_level, make sure we clean up readline.
+       check_signals will call QUIT, which will eventually longjmp to top_level,
+!      calling run_interrupt_trap along the way.  The check for sigalrm_seen is
+!      to clean up the read builtin's state. */
+!   if (terminating_signal || interrupt_state || sigalrm_seen)
+      rl_cleanup_after_signal ();
+    bashline_reset_event_hook ();
+*** ../bash-4.3-patched/sig.c	2014-01-10 15:06:06.000000000 -0500
+--- sig.c	2014-09-08 11:26:33.000000000 -0400
+***************
+*** 533,538 ****
+    /* Set the event hook so readline will call it after the signal handlers
+       finish executing, so if this interrupted character input we can get
+!      quick response. */
+!   if (interactive_shell && interactive && no_line_editing == 0)
+      bashline_set_event_hook ();
+  #endif
+--- 533,540 ----
+    /* Set the event hook so readline will call it after the signal handlers
+       finish executing, so if this interrupted character input we can get
+!      quick response.  If readline is active or has modified the terminal we
+!      need to set this no matter what the signal is, though the check for
+!      RL_STATE_TERMPREPPED is possibly redundant. */
+!   if (RL_ISSTATE (RL_STATE_SIGHANDLER) || RL_ISSTATE (RL_STATE_TERMPREPPED))
+      bashline_set_event_hook ();
+  #endif

diff --git a/app-shells/mpibash/mpibash-4.3_p24.ebuild b/app-shells/mpibash/mpibash-4.3_p30-r1.ebuild
similarity index 87%
rename from app-shells/mpibash/mpibash-4.3_p24.ebuild
rename to app-shells/mpibash/mpibash-4.3_p30-r1.ebuild
index f6e8cc4..692f998 100644
--- a/app-shells/mpibash/mpibash-4.3_p24.ebuild
+++ b/app-shells/mpibash/mpibash-4.3_p30-r1.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.3_p24.ebuild,v 1.1 2014/08/24 17:53:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p30-r1.ebuild,v 1.1 2014/11/09 20:41:28 mgorny Exp $
 
 EAPI=5
 
@@ -38,17 +38,17 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
-DEPEND="
-	sys-libs/ncurses
+DEPEND=">=sys-libs/ncurses-5.2-r2
 	readline? ( >=sys-libs/readline-${READLINE_VER} )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	virtual/mpi
-	sys-cluster/libcircle"
+	sys-cluster/libcircle
+	!<sys-apps/portage-2.1.6.7_p1
+	!<sys-apps/paludis-0.26.0_alpha5"
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
 
@@ -76,7 +76,7 @@ src_prepare() {
 
 	# Clean out local libs so we know we use system ones w/releases.
 	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/* || die
+		rm -rf lib/{readline,termcap}/*
 		touch lib/{readline,termcap}/Makefile.in # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
@@ -85,11 +85,11 @@ src_prepare() {
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/*
 
-	epatch \
-		"${FILESDIR}"/${PN#mpi}-4.3-compat-lvl.patch \
-		"${FILESDIR}"/${PN#mpi}-4.3-parse-time-keyword.patch \
-		"${FILESDIR}"/${PN#mpi}-4.3-append-process-segfault.patch \
-		"${FILESDIR}"/${PN}-4.3.patch
+	epatch "${FILESDIR}"/${PN#mpi}-4.3-compat-lvl.patch
+	epatch "${FILESDIR}"/${PN#mpi}-4.3-parse-time-keyword.patch
+	epatch "${FILESDIR}"/${PN#mpi}-4.3-append-process-segfault.patch
+	epatch "${FILESDIR}"/${PN#mpi}-4.3-term-cleanup.patch
+	epatch "${FILESDIR}"/${PN}-4.3.patch
 
 	epatch_user
 
@@ -141,8 +141,7 @@ src_configure() {
 	else
 		# Disable the plugins logic by hand since bash doesn't
 		# provide a way of doing it.
-		export \
-			ac_cv_func_dl{close,open,sym}=no \
+		export ac_cv_func_dl{close,open,sym}=no \
 			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
 		sed -i \
 			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
@@ -166,9 +165,11 @@ src_configure() {
 }
 
 src_compile() {
-	default
+	emake
 
-	use plugins && emake -C examples/loadables all others
+	if use plugins ; then
+		emake -C examples/loadables all others
+	fi
 }
 
 src_install() {
@@ -186,7 +187,9 @@ src_install() {
 	dosym bash /bin/rbash
 
 	insinto /etc/bash
-	doins "${FILESDIR}"/{bashrc,bash_logout}
+	doins "${FILESDIR}"/bash_logout
+	newins "${FILESDIR}"/bashrc-r1 bashrc
+	keepdir /etc/bash/bashrc.d
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
@@ -215,7 +218,7 @@ src_install() {
 	fi
 
 	if use examples ; then
-		for d in examples/{functions,misc,scripts,scripts.noah,scripts.v2} ; do
+		for d in examples/{functions,misc,scripts,startup-files} ; do
 			exeinto /usr/share/doc/${PF}/${d}
 			insinto /usr/share/doc/${PF}/${d}
 			for f in ${d}/* ; do
@@ -245,8 +248,8 @@ pkg_preinst() {
 		# missing even temporarily causes a fatal error with paludis.
 		local target=$(readlink "${EROOT}"/bin/sh)
 		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}" || die
-		mv -f "${tmp}" "${EROOT}"/bin/sh || die
+		ln -sf "${target}" "${tmp}"
+		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
 }
 
@@ -254,6 +257,6 @@ pkg_postinst() {
 	return 0
 	# If /bin/sh does not exist, provide it
 	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh || die
+		ln -sf bash "${EROOT}"/bin/sh
 	fi
 }