app-shells/mpibash: Bump to EAPI=5

Package-Manager: portage-2.2.14

3 files changed, 33 insertions, 29 deletions

diff --git a/app-shells/mpibash/ChangeLog b/app-shells/mpibash/ChangeLog
index 58fda675a..d8edb92f9 100644
--- a/app-shells/mpibash/ChangeLog
+++ b/app-shells/mpibash/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Nov 2014; Justin Lecher <jlec@gentoo.org> mpibash-4.3_p24.ebuild,
+  metadata.xml:
+  Bump to EAPI=5
+
 *mpibash-4.3_p24 (29 Aug 2014)
 
   29 Aug 2014; Christoph Junghans <ottxor@gentoo.org>
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 8598dc9b8..372a889b8 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
-  <flag name='bashlogger'>Log ALL commands typed into bash; should ONLY be
+  <herd>base-system</herd>
+  <use>
+    <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
     used in restricted environments such as honeypots</flag>
-  <flag name='mem-scramble'>Build with custom malloc/free overwriting allocated/freed memory</flag>
-  <flag name='net'>Enable /dev/tcp/host/port redirection</flag>
-  <flag name='plugins'>Add support for loading builtins at runtime via
+    <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
+    <flag name="net">Enable /dev/tcp/host/port redirection</flag>
+    <flag name="plugins">Add support for loading builtins at runtime via
     'enable'</flag>
-</use>
-<upstream>
-  <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
-</upstream>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:bash</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-shells/mpibash/mpibash-4.3_p24.ebuild b/app-shells/mpibash/mpibash-4.3_p24.ebuild
index cf8e545b0..f6e8cc478 100644
--- a/app-shells/mpibash/mpibash-4.3_p24.ebuild
+++ b/app-shells/mpibash/mpibash-4.3_p24.ebuild
@@ -2,7 +2,7 @@
 # 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 $
 
-EAPI="4"
+EAPI=5
 
 inherit autotools eutils flag-o-matic toolchain-funcs multilib
 
@@ -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"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
+DEPEND="
+	sys-libs/ncurses
 	readline? ( >=sys-libs/readline-${READLINE_VER} )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	virtual/mpi
-	sys-cluster/libcircle
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
+	sys-cluster/libcircle"
 # 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}/*
+		rm -rf lib/{readline,termcap}/* || die
 		touch lib/{readline,termcap}/Makefile.in # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
@@ -85,10 +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
-	epatch "${FILESDIR}"/${PN#mpi}-4.3-parse-time-keyword.patch
-	epatch "${FILESDIR}"/${PN#mpi}-4.3-append-process-segfault.patch
-	epatch "${FILESDIR}"/${PN}-4.3.patch
+	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_user
 
@@ -140,7 +141,8 @@ 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::' \
@@ -164,11 +166,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake
+	default
 
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
+	use plugins && emake -C examples/loadables all others
 }
 
 src_install() {
@@ -176,7 +176,7 @@ src_install() {
 
 	default
 
-	find "${ED}" -name "bashbug*" -delete
+	find "${ED}" -name "bashbug*" -delete || die
 	mv "${ED}"/usr/share/man/man1/{,mpi}bash.1 || die
 	mv "${ED}"/usr/share/info/{,mpi}bash.info || die
 	return 0
@@ -245,8 +245,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}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
+		ln -sf "${target}" "${tmp}" || die
+		mv -f "${tmp}" "${EROOT}"/bin/sh || die
 	fi
 }
 
@@ -254,6 +254,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
+		ln -sf bash "${EROOT}"/bin/sh || die
 	fi
 }