gentoo resync : 17.07.2021

6 files changed, 58 insertions, 52 deletions

diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 368331142eb1..41c097e21d43 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -13,15 +13,15 @@ DIST openmpi-4.0.2.tar.bz2 9819372 BLAKE2B 000faa8ff032f9aa6bf5f0a14fb9a363080cf
 DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724498971409fb25e11cc90ad4d7f9106f4ad093d4722754303808b82c58bf3b39a72a2567192efd1b98422f09160f SHA512 01f773064c575a0fe6ab081c20c5cf07ba1c9eada5ecfe520d14ce2b9fc6d021d0f56a0159fa354fd6c8e2bb7354a272aa8d0063b351f59251deb56474849acc
 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64
 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011
-EBUILD openmpi-1.10.7.ebuild 6265 BLAKE2B 33362f7aa92673ae525b737239a81d608db4b783e62130bf30a6cc1b29d6f59cf2f3bff21e3d0389e582d81b25e7949eab5de965e124e7b3d5b6b538343f33e8 SHA512 5434a10d4c06ad6cc4da12ec45192ce2f08ff0c95bf138487b75b81dfb6a6055b5bcb6d81827e885935ef8481907f631268e9d6065fba330ec3e553f9ce10806
+EBUILD openmpi-1.10.7.ebuild 6255 BLAKE2B 9c95f5795f1ae64079ee6196437bd10fa74cd94cbe38c2923d582ba50041e61fec23accffb9e21c259495b79a37d8a5cc151e6d81818fb7f7840bd40de666671 SHA512 45d7ca9d261a9309acc1e857e3e26ba63d0a39c95bcabca2023b2573c336d2d4ebe25213a037a986bfac38385cf5977ddabe16f7cebcf18a2f697a363fcf2469
 EBUILD openmpi-1.4.5.ebuild 2413 BLAKE2B 0e4c9ad51c2f7f44449b0a5d3e1400de600f5337d591dcb89eb938455afa24d891573e03abdfa7434432b8377ffb3f9aefc291881713de0b80fe50322b962ba7 SHA512 187962e3788b94607b9a22728c6f90405cd4c49007413e9d0cfb4df45d5e67f30bcd2129ae8132d08460d9760891f2b15539f995e481962d91c2b7c5a7005002
 EBUILD openmpi-1.6.5-r1.ebuild 4944 BLAKE2B 8e5686a037431c45d7ebde9e82e633f138dc887ca2f1cc2ae24e76dc800ace2a79f63f6c7804794cde1cad5ec7e84b00ded707d84424d7a6413da9c80359fb51 SHA512 008b5b5ad61126d5a758784f6c2c805a55837de6dc109c11758941e2e3a414d3361ba3dbb3959185e2b6b3f02eb7ecf4a8aadb76bea0b872e463c13620a48a08
 EBUILD openmpi-1.7.5-r1.ebuild 4695 BLAKE2B c00f8c11c18323c38a9ed700693d9b67313588d04facacf24f29fae2d625aaa6fe5643adb01f9505effefd5314ce016730a1ff350ab7d467876be6d36d556135 SHA512 07050a17e0f331301f07b7de3473c9f7eb0e89741e39206b69f18d0cb48beb0541c29557ebc7e833a0e79df6405a22eace83799b6b4745a9bdda26d6919ddcc5
 EBUILD openmpi-1.8.8.ebuild 5249 BLAKE2B 6fbf1a0adad811879e393672e6425f1766fbe69e51479a8eaa9cb456f506077833fe07e8befe274546de5e0fe5a93c96b17e5ff1a23a71d8518e9d05a5851380 SHA512 f423c2423f12ca013c393bc14c42841acf910674770124eb4f8a81220606e80ae46795d27524242ea98e83f5d5aaf4bc53358097cffc4b54ce908b93b4eb41bd
-EBUILD openmpi-2.0.4.ebuild 5877 BLAKE2B 353ab1af6828784e696f0688487cb6ad45f6af3a40c4fa636f7b28156623c92ff8af82ed20dc39fd4372abf9cff0d29ffdb265a1e4d810ae73cf1d8eb9e1f1a3 SHA512 e38b332dae2e88edeca894cf82a1b6e89e76438836cd7d841f08b717a2bf13c068eac380c13411417c3d2511893111e49971f1ad706ae57b52860d1064d539d5
-EBUILD openmpi-2.1.6.ebuild 5495 BLAKE2B c31d193ddfe6a521d3173cbf0d4301a0c39dbebeb9981eba5a78c2c23172630d3bc6a969ccaa231dfd2e38101951b69b755c1effaf139a99f89b795884ebbd25 SHA512 b945303b1f459ede6d85b551db588f63ae604817ebae9c8475a70c424313d488bc85b48b2990d2766e7e284ea2a74d7f11ca19fb6cea726db22a0a663538ab1c
-EBUILD openmpi-3.0.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
-EBUILD openmpi-3.1.4.ebuild 5381 BLAKE2B 806722e9526f4659ac549e306c169d2647078a1fc86389b5490133034f41d4cd60eef31e83d962ca1ac798c5506ae9e4774a90cefa1af210f7c166138d554f3b SHA512 33586d6a1d613b2efbf6b73892c3c554fb5afbda87051ef0894168caf28f10f269a18d1faf779cdff8a7b1a8a18e4d4b8d04745852d809f11df90b9550c7b3a2
+EBUILD openmpi-2.0.4.ebuild 5865 BLAKE2B d16aaad399c13dedfeaffdc1c171c3a93a3394969b258c8b6a1b3b44494d8bdbb680f04c6a77cccef65baec41da2c7c9a408c895bdf74a8509239e786380c807 SHA512 82a99b9e2fde11a9f9b847077e0c685f467b7764d638580bbe6175c6d0065a085cf44d30101859ca7025eddaa5b041d370a7e1cb4acb104eb273d38e88c8e33f
+EBUILD openmpi-2.1.6.ebuild 5470 BLAKE2B 3b2c88ac0478b6828001366437acb965d62061a956de45fb7b9e7917641757a65dddfaf63b6c80475837d5742f92d60cc4bf140ea6f42f78b1491f56fd324f52 SHA512 166142b1364b7964991129d1340549148f0cf96124493495e83a0a2ea011dc60424f297f0c5c101b3d3b0d14c58e6bd45d05b50ae0f0d13fe22cda183542bffe
+EBUILD openmpi-3.0.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
+EBUILD openmpi-3.1.4.ebuild 5356 BLAKE2B 2330d221b4b6f8cfb83abddd5c9d0ea62c733bfb3c2b2e0f9a05be4cf54516208ef508bcf782ef3ff0b22221b5eb91bc8e963db2032495e58b4620fec52a9084 SHA512 7ff7298fe6e6bf4d20d2ab5c75b47c5f354a34c24a057ca18150a971665b93926355b6de7d2434bd4c4237072a5346641b02debcedb48d4aecfb5d1f782876a2
 EBUILD openmpi-4.0.2.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.3.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
 EBUILD openmpi-4.0.4.ebuild 5321 BLAKE2B 09350d41a27b89cc1938e2ecc9330b5b9511cfda313ec1c46467ae148ecf2c752d301d1c21d9cb164550f9f792fdbd1d1684a1ed2285be59a85d7c5ce4b332cf SHA512 09b95d07f982900cd4d46eaaba11a316528d37c6ac48b1ce51fb94968481530e8283170405bb3c7c9272ae7c452f3cc8f57a55ddd645854c6c1c318f45363b35
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 15fdb90992dc..662924556001 100644
--- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -160,30 +160,33 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
 	fi
 }
 
 multilib_src_install_all() {
 	# From USE=vt see #359917
-	rm -rf "${ED}"usr/share/libtool &> /dev/null || die
+	rm -rf "${ED}"/usr/share/libtool &> /dev/null || die
 
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Avoid collisions with libevent
-	rm -rf "${ED}"usr/include/event2 &> /dev/null || die
+	rm -rf "${ED}"/usr/include/event2 &> /dev/null || die
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-2.0.4.ebuild b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
index 39c9e77772d7..93c7bfd018cf 100644
--- a/sys-cluster/openmpi/openmpi-2.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -29,7 +29,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux"
@@ -149,24 +149,27 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/bin/mpif* || die
+		rm \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			|| die
 	fi
 }
 
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-2.1.6.ebuild b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
index 8fead75c26b0..bb8a65b2cf1c 100644
--- a/sys-cluster/openmpi/openmpi-2.1.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.1.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -140,14 +140,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -155,14 +155,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-3.0.4.ebuild b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.0.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.0.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.
diff --git a/sys-cluster/openmpi/openmpi-3.1.4.ebuild b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
index 108954556787..6d1e97a1de5c 100644
--- a/sys-cluster/openmpi/openmpi-3.1.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-3.1.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
 
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal
+inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib-minimal
 
 MY_P=${P/-mpi}
 S=${WORKDIR}/${MY_P}
@@ -27,7 +27,7 @@ IUSE_OPENMPI_OFED_FEATURES="
 
 DESCRIPTION="A high-performance message passing library (MPI)"
 HOMEPAGE="https://www.open-mpi.org"
-SRC_URI="https://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
@@ -137,14 +137,14 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
 		rm \
-			"${ED}"usr/include/mpif* \
-			"${ED}"usr/bin/mpif* \
-			"${ED}"usr/bin/oshfort \
-			"${ED}"usr/bin/shmemfort \
+			"${ED}"/usr/include/mpif* \
+			"${ED}"/usr/bin/mpif* \
+			"${ED}"/usr/bin/oshfort \
+			"${ED}"/usr/bin/shmemfort \
 			|| die
 	fi
 }
@@ -152,14 +152,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/mpif* "${ED}"usr/include || die
+		mv "${T}"/fortran/mpif* "${ED}"/usr/include || die
 	fi
 
 	# Remove la files, no static libs are installed and we have pkg-config
 	find "${ED}" -name '*.la' -delete || die
 
 	if use java; then
-		local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
+		local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar
 		java-pkg_dojar "${mpi_jar}"
 		# We don't want to install the jar file twice
 		# so let's clean after ourselves.