gentoo resync : 26.11.2017

3 files changed, 56 insertions, 12 deletions

diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index 1753411a1fc3..b9e8ae551d1a 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -1,6 +1,6 @@
 DIST mpibash-1.2.tar.gz 347083 SHA256 5c2faaa74464111205dbae4799bd89c2425810ec3708d004237b42d620c8be57 SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104 WHIRLPOOL 94fcf50d89250a6478a2ed56a0c1769dd678869884e1e80066ebdb479dd0c6d64048ade7829020fdad050b1e77a2315ab7e325a97aa472291d3e9a4888c915e3
-EBUILD mpibash-1.2.ebuild 1018 SHA256 d3c9d3cb1965f75c94ecaa4cdef13530e9ffe4cf71e198653b9264e3a0a03321 SHA512 ed96bc0db5a157c7c6698398ad49f310a1569a908530ee25ec434557be6e28fd2427e574e1559f73a88622428549bdd72a524457c21bd621702207883f376dc2 WHIRLPOOL 44d892932e33fba73febd4c40e77dec91fabccf21d62d2ed396eab5209862c9c52d3753a0114d4a2cd34ab2f9f61bb80a2b32e4ee59051f4eb83f7dbee7e4a9a
-EBUILD mpibash-9999.ebuild 1018 SHA256 d3c9d3cb1965f75c94ecaa4cdef13530e9ffe4cf71e198653b9264e3a0a03321 SHA512 ed96bc0db5a157c7c6698398ad49f310a1569a908530ee25ec434557be6e28fd2427e574e1559f73a88622428549bdd72a524457c21bd621702207883f376dc2 WHIRLPOOL 44d892932e33fba73febd4c40e77dec91fabccf21d62d2ed396eab5209862c9c52d3753a0114d4a2cd34ab2f9f61bb80a2b32e4ee59051f4eb83f7dbee7e4a9a
-MISC ChangeLog 2762 SHA256 25595c673d942a4e6a21670b180fd7f6ff7c8cc82ea804d9db45f0b2e025e101 SHA512 d7605fb4571ac15851f23b4f3f54d47d1e1b5cb005cce0b8dce56c57926b89aea9ebe7a0421bdc029da72f19b9657a234052f6acc5c26cfdb1a49c5a724f385d WHIRLPOOL e079ebe7e0218cc37ff2a0f96e694a73db11ce105c14e42973603064fd261523e3d754ce083a1c5a4e3f825cd2b5b84ec46d33bd4fce713b689936592c80fc59
-MISC ChangeLog-2015 870 SHA256 ff79f3f3059cb1c3306a531ed02522e397bab1adfaf35044c0b1766d1cffed12 SHA512 f89747a73d22ef81bb095ecfc7192577a0acc0909c357fe62803eb8e2e86c49415fa2b71ff310fb9fb681a38fe3e2b1ac50ae9ae45cb1c9105cf097e3837a71a WHIRLPOOL ede20a6722c43d98b6d0bdf16d98fa54d4f64caf96c02ab5f65cd9e24b3fddc853ee01a89a7a5fb2ddb179d99d10c81d249ccb669b264153ef34127652f02756
-MISC metadata.xml 461 SHA256 ed713d3ed1180e196bff711002163250a61f20aef544ed957476562811f78ed6 SHA512 c859d865a24aa9ba99b293ce2ef438ae6060860faed308d358c173d83f3a17017a51f509e80e1e63347781fae2db0bcd7e4a03e8c16561d0f09210ccbdde0c64 WHIRLPOOL b6a05a5f8e2901d6541d2073ba7c432ccc19a4d411e649b19d64b23daba9409022bc5e1c6e5db9c79c0795102f49dab845099d81d199ec8920135b4cbbb6bbf6
+DIST mpibash-1.3.tar.gz 369803 BLAKE2B b1959deaa2d5b3bce1a66e5ef0ff41ad156093aec9cc1efcd12873b6d5814ad1586ff951d6fd7f37dab6a55040378774b435edc4e2c8892952480539864f91fa SHA512 4728565239aae80013322231a928fd1e9a59484614a92cf7e314d0cd5c090d3a47de395507ce52f71a6900245855089d659c6509f8c4df3bfd88e46fc2187749
+EBUILD mpibash-1.2.ebuild 1018 BLAKE2B 97e15e59ee643cbd1aee1f23bd6920add75e4cf29132df2aecbca07f000ffae35c04d2fa6f8d1b1ddbc3ebeb4f3b6e45db941cc6c1897a0787fbcc41d8a1f404 SHA512 ed96bc0db5a157c7c6698398ad49f310a1569a908530ee25ec434557be6e28fd2427e574e1559f73a88622428549bdd72a524457c21bd621702207883f376dc2
+EBUILD mpibash-1.3.ebuild 984 BLAKE2B 0d584b8c22c26c47a714582e7afa1a33a1b43a71121f5e9410046b5b484f9ade04b465fd6842e8deb647a1a20ccea3549c1e2f77efd7ff9cc083ff9de192759f SHA512 07f27042d47c45352d90d849d034c1ae6c850db03c36af8077d69b78315d81cc1755d0892aba55eafc9fa71c8b3964c9d9c683c5702903523395fad02c906abc
+EBUILD mpibash-9999.ebuild 984 BLAKE2B 0d584b8c22c26c47a714582e7afa1a33a1b43a71121f5e9410046b5b484f9ade04b465fd6842e8deb647a1a20ccea3549c1e2f77efd7ff9cc083ff9de192759f SHA512 07f27042d47c45352d90d849d034c1ae6c850db03c36af8077d69b78315d81cc1755d0892aba55eafc9fa71c8b3964c9d9c683c5702903523395fad02c906abc
+MISC metadata.xml 461 BLAKE2B 6bc032dcf773dc99625ddc538fff75f78d47d301645c1e5f2a6a6d037260519cad4c76aa4b1f6ff4fd4b90552a73307505008e4ae2a825685eb60c53d5f7027c SHA512 c859d865a24aa9ba99b293ce2ef438ae6060860faed308d358c173d83f3a17017a51f509e80e1e63347781fae2db0bcd7e4a03e8c16561d0f09210ccbdde0c64
diff --git a/app-shells/mpibash/mpibash-1.3.ebuild b/app-shells/mpibash/mpibash-1.3.ebuild
new file mode 100644
index 000000000000..76bbce43cda2
--- /dev/null
+++ b/app-shells/mpibash/mpibash-1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools multilib
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Parallel scripting right from the Bourne-Again Shell (Bash)"
+HOMEPAGE="https://github.com/lanl/MPI-Bash"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="virtual/mpi
+	>=app-shells/bash-4.2[plugins]
+	sys-cluster/libcircle"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} != 9999 ]] || eautoreconf
+}
+
+src_configure() {
+	econf --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash \
+		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
+}
+
+src_install() {
+	default
+	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
+	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+}
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
index 594ac6bc88cb..76bbce43cda2 100644
--- a/app-shells/mpibash/mpibash-9999.ebuild
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=5
 
-inherit autotools-utils multilib
+inherit autotools multilib
 
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git"
 	inherit git-r3
 	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64"
@@ -27,16 +26,18 @@ DEPEND="virtual/mpi
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	default
+	[[ ${PV} != 9999 ]] || eautoreconf
+}
+
 src_configure() {
-	local myeconfargs=(
+	econf --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash \
 		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
-	)
-	autotools-utils_src_configure
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 	sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die
 	use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die
 }