commit: 45d83f6dfdeecffefc0939bc41bdf4ecf3685b1d
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 22:32:40 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 22:45:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d83f6d
sys-cluster/openmpi: update EAPI 6 -> 7
Interestingly enough both the newest and the *oldest* versions were
already EAPI 7, as the latter had been migrated to it directly from 5.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-cluster/openmpi/openmpi-1.10.7.ebuild | 23 +++++++++++++----------
sys-cluster/openmpi/openmpi-2.0.4.ebuild | 17 ++++++++++-------
sys-cluster/openmpi/openmpi-2.1.6.ebuild | 20 ++++++++++----------
sys-cluster/openmpi/openmpi-3.0.4.ebuild | 20 ++++++++++----------
sys-cluster/openmpi/openmpi-3.1.4.ebuild | 20 ++++++++++----------
5 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild
b/sys-cluster/openmpi/openmpi-1.10.7.ebuild
index 15fdb90992d..66292455600 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 39c9e77772d..93c7bfd018c 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 8fead75c26b..bb8a65b2cf1 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 10895455678..6d1e97a1de5 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 10895455678..6d1e97a1de5 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.
