gentoo (leap year) resync : 29.02.2020

5 files changed, 35 insertions, 52 deletions

diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest
index e18e37b2caca..2e6304de1823 100644
--- a/app-shells/mpibash/Manifest
+++ b/app-shells/mpibash/Manifest
@@ -1,6 +1,5 @@
-DIST mpibash-1.2.tar.gz 347083 BLAKE2B 75b79d8e1f418de8220ff502245bc094774984f4760d922297a2ad2fcdb7d87a4a5d28015fd2686fbc68939ac532551046f8a987166accaa8b96025cce9fc79e SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104
+AUX mpi-3.patch 806 BLAKE2B 4a5f6db66474f1df8edb63390ffebc8d1648cd77d56f494d1951559df6d060edf53e0ef4223764b55b0ecde7d61961d8903b21892f35dd679101b39f25517491 SHA512 ad60f6b22f29cf389123aafde2778bfcf5b6690463d99ee5689adb17a4af4037c8e4722a0b8d9c66a97ee8c19268be9439968ef8aa9067158bcc7bfb14eaecb1
 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
+EBUILD mpibash-1.3-r1.ebuild 1022 BLAKE2B 35d66033ca0b935726ec14a83a675d36005f06a39c2ceacabc4453e9f1af503633b70e0da8578725d480024ced9390c6be7d913a24b57ce76a4f50769353a195 SHA512 fb159713a7dc10df82bdc91faf01f073543b5c9e63d242609ef9346d7c560bdaff9f568e4958ec69aa7b613335c35c56bfed7622d760190c7e7ed6d59fdefd0f
+EBUILD mpibash-9999.ebuild 983 BLAKE2B e7f061a7dfbf7165be9cf27fce717ea682519591ffcbc41c98cc9542305a1dabbe2ff7053fff7f244ead99cac095ba09d1a7732a29fdad14e1777143b20ac89e SHA512 7967bb9d2651ca505ce7760f549d13556a53a51ede1ac5e17b281a8ee5604eb46642dd7fae46398490cdfe99c4f6378e287517357224aec90f0ce0b7cdc8583b
 MISC metadata.xml 461 BLAKE2B 6bc032dcf773dc99625ddc538fff75f78d47d301645c1e5f2a6a6d037260519cad4c76aa4b1f6ff4fd4b90552a73307505008e4ae2a825685eb60c53d5f7027c SHA512 c859d865a24aa9ba99b293ce2ef438ae6060860faed308d358c173d83f3a17017a51f509e80e1e63347781fae2db0bcd7e4a03e8c16561d0f09210ccbdde0c64
diff --git a/app-shells/mpibash/files/mpi-3.patch b/app-shells/mpibash/files/mpi-3.patch
new file mode 100644
index 000000000000..7b7e1ec820de
--- /dev/null
+++ b/app-shells/mpibash/files/mpi-3.patch
@@ -0,0 +1,24 @@
+From 0b396b62ac314ae509ac3ca5fa9d5119e862be51 Mon Sep 17 00:00:00 2001
+From: Scott Pakin <pakin@lanl.gov>
+Date: Wed, 19 Feb 2020 13:43:40 -0700
+Subject: [PATCH] Replace deprecated MPI_Errhandler_set with newer
+ MPI_Comm_set_errhandler
+
+Resolves #17.
+---
+ src/init.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/init.c b/src/init.c
+index cd070a7..46b1127 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -77,7 +77,7 @@ mpi_init_builtin (WORD_LIST *list)
+ 
+   /* Make MPI errors return instead of crash.  Also, store our rank
+    * and number of ranks. */
+-  MPI_Errhandler_set (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
++  MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
+   MPI_Comm_rank (MPI_COMM_WORLD, &mpibash_rank);
+   MPI_Comm_size (MPI_COMM_WORLD, &mpibash_num_ranks);
+ 
diff --git a/app-shells/mpibash/mpibash-1.2.ebuild b/app-shells/mpibash/mpibash-1.2.ebuild
deleted file mode 100644
index 594ac6bc88cb..000000000000
--- a/app-shells/mpibash/mpibash-1.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils 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"
-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_configure() {
-	local myeconfargs=(
-		--with-bashdir="${EPREFIX}"/usr/include/bash-plugins
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	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-1.3.ebuild b/app-shells/mpibash/mpibash-1.3-r1.ebuild
index 76bbce43cda2..fcb33db81ee9 100644
--- a/app-shells/mpibash/mpibash-1.3.ebuild
+++ b/app-shells/mpibash/mpibash-1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools multilib
 
@@ -22,10 +22,12 @@ SLOT="0"
 IUSE="examples"
 
 DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
+	>=app-shells/bash-4.2:0[plugins]
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/mpi-3.patch" )
+
 src_prepare() {
 	default
 	[[ ${PV} != 9999 ]] || eautoreconf
diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild
index 76bbce43cda2..5832bd90df0a 100644
--- a/app-shells/mpibash/mpibash-9999.ebuild
+++ b/app-shells/mpibash/mpibash-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools multilib
 
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="examples"
 
 DEPEND="virtual/mpi
-	>=app-shells/bash-4.2[plugins]
+	>=app-shells/bash-4.2:0[plugins]
 	sys-cluster/libcircle"
 RDEPEND="${DEPEND}"