From 2ba0f9b22c4450103776d817a51957e8bacc5792 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Sat, 5 Mar 2022 02:25:16 +0100 Subject: [PATCH] sys-cluster/dlb: fix repoman complaint, EAPI 8, bump py Signed-off-by: Alessandro Barbieri --- .../{dlb-2.1-r2.ebuild => dlb-2.1-r3.ebuild} | 10 +++++----- sys-cluster/dlb/files/dlb-2.1-chmod.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) rename sys-cluster/dlb/{dlb-2.1-r2.ebuild => dlb-2.1-r3.ebuild} (88%) create mode 100644 sys-cluster/dlb/files/dlb-2.1-chmod.patch diff --git a/sys-cluster/dlb/dlb-2.1-r2.ebuild b/sys-cluster/dlb/dlb-2.1-r3.ebuild similarity index 88% rename from sys-cluster/dlb/dlb-2.1-r2.ebuild rename to sys-cluster/dlb/dlb-2.1-r3.ebuild index e9674f7bc8..431005b300 100644 --- a/sys-cluster/dlb/dlb-2.1-r2.ebuild +++ b/sys-cluster/dlb/dlb-2.1-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="tk" inherit autotools python-single-r1 @@ -35,11 +35,11 @@ BDEPEND="test? ( sys-devel/bc )" PATCHES=( "${FILESDIR}/${P}-pygen-python3.patch" "${FILESDIR}/${P}-tkinter.patch" + "${FILESDIR}/${P}-chmod.patch" ) src_prepare() { default - sed -e "s|chmod +x \$(|chmod +x ${ED}/\$(|g" -i Makefile.am || die sed -e "s|lib/|$(get_libdir)/|" -i scripts/viewer/dlb_wrapper.py || die eautoreconf @@ -59,7 +59,7 @@ src_configure() { } src_install() { - default + DESTDIR="${ED}" default find "${D}" -name '*.la' -delete || die find "${D}" -name '*.a' -delete || die } diff --git a/sys-cluster/dlb/files/dlb-2.1-chmod.patch b/sys-cluster/dlb/files/dlb-2.1-chmod.patch new file mode 100644 index 0000000000..f7052cf254 --- /dev/null +++ b/sys-cluster/dlb/files/dlb-2.1-chmod.patch @@ -0,0 +1,19 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -726,11 +726,11 @@ + clean-local: clean-rpm clean-deb clean-doc + + install-data-hook: +- chmod +x $(mpiompexamplesdir)/run.sh +- chmod +x $(mpiompomptexamplesdir)/run.sh +- chmod +x $(mpiompssexamplesdir)/run.sh +- chmod +x $(omptexamplesdir)/run.sh +- chmod +x $(statsexamplesdir)/run.sh ++ chmod +x ${DESTDIR}/$(mpiompexamplesdir)/run.sh ++ chmod +x ${DESTDIR}/$(mpiompomptexamplesdir)/run.sh ++ chmod +x ${DESTDIR}/$(mpiompssexamplesdir)/run.sh ++ chmod +x ${DESTDIR}/$(omptexamplesdir)/run.sh ++ chmod +x ${DESTDIR}/$(statsexamplesdir)/run.sh + + dist-hook: + if [ -x "$(GIT)" ]; \