From 2e212dfe252aa630cc55991c053fb2e8d890ee6c Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 01:26:09 +0200 Subject: [PATCH 01/18] sys-cluster/nanos6: new package Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/nanos6/Manifest | 1 + sys-cluster/nanos6/metadata.xml | 29 +++++++ sys-cluster/nanos6/nanos6-2.5.1.ebuild | 114 +++++++++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 sys-cluster/nanos6/Manifest create mode 100644 sys-cluster/nanos6/metadata.xml create mode 100644 sys-cluster/nanos6/nanos6-2.5.1.ebuild diff --git a/sys-cluster/nanos6/Manifest b/sys-cluster/nanos6/Manifest new file mode 100644 index 0000000000..783a17df8b --- /dev/null +++ b/sys-cluster/nanos6/Manifest @@ -0,0 +1 @@ +DIST nanos6-2.5.1.tar.gz 744260 BLAKE2B 6b294391ebb18806da76b4bc73aaf6f7082ab4a61693ab300e130f04942bf50c1da884e5271765465bedab863cb1ce545a43ac09727152c0a52d69852e60e373 SHA512 c7da862aa41fb0be1a992f4fde7306a02c4159c05a89055f0144bf6a815c10ff5f7e7ee11b4afaa4c468afdd538a99b3b5971a896221b20928805b45d35e0335 diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml new file mode 100644 index 0000000000..d72d9ec643 --- /dev/null +++ b/sys-cluster/nanos6/metadata.xml @@ -0,0 +1,29 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + + https://github.com/bsc-pm/nanos6/issues + bsc-pm/nanos6 + + + + Enable OmpSs@Cluster support. This requires an MPI version that supports MPI_THREAD_MULTIPLE to be present in your environment + + enable extra assertions and checks in debug - may cause significant slowdown + enable dynamic management and sharing of computing resources + embed into the runtime any code changes present in the source + Enable execution using the Execution Workflow + + + + + + enable dev-libs/papi support + + to generate sample-based profiling + + diff --git a/sys-cluster/nanos6/nanos6-2.5.1.ebuild b/sys-cluster/nanos6/nanos6-2.5.1.ebuild new file mode 100644 index 0000000000..a49c3601ad --- /dev/null +++ b/sys-cluster/nanos6/nanos6-2.5.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="runtime that implements the OmpSs-2 parallel programming model" +HOMEPAGE="https://github.com/bsc-pm/nanos6" +SRC_URI="https://github.com/bsc-pm/nanos6/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cluster debug dlb doc embed-code-changes execution-workflow git papi unwind" +#chrono-arch build fail +#jemalloc require custom stuff +#TODO: cuda pqos mercurium memkind k1om extrae +RDEPEND=" + >=dev-libs/boost-1.59:= + sys-apps/hwloc + sys-process/numactl + virtual/libelf + + cluster? ( virtual/mpi ) + dlb? ( sys-cluster/dlb ) + embed-code-changes? ( dev-vcs/git ) + papi? ( dev-libs/papi ) + unwind? ( sys-libs/libunwind ) +" +#extrae? ( sys-cluster/extrae[nanos] ) +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-doc/doxygen )" +REQUIRED_USE="cluster? ( execution-workflow )" +S="${WORKDIR}/${PN}-version-${PV}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-chrono-arch + --disable-openacc + --disable-static + + --enable-shared + + --with-boost="${EPREFIX}/usr" + --with-libnuma="${EPREFIX}/usr" + --with-pic + + --without-k1om + --without-nanos6-clang + --without-nanos6-mercurium + --without-pgi + + $(use_enable cluster) + $(use_enable doc doxygen-doc) + $(use_enable doc doxygen-dot) + $(use_enable doc doxygen-html) + $(use_enable doc doxygen-man) + $(use_enable doc doxygen-pdf) + $(use_enable doc doxygen-ps) + $(use_enable debug extra-debug) + $(use_enable embed-code-changes) + $(use_enable execution-workflow) + ) + + if use dlb; then + myconf+=( "--with-dlb=${EPREFIX}/usr" ) + else + myconf+=( "--without-dlb" ) + fi + if use embed-code-changes; then + myconf+=( "--with-git=${EPREFIX}/usr" ) + else + myconf+=( "--without-git" ) + fi +# if use extrae; then +# myconf+=( "--with-extrae=${EPREFIX}/usr/$(get_libdir)/extrae" ) +# else + myconf+=( "--without-extrae" ) +# fi + if use papi; then + myconf+=( "--with-papi=${EPREFIX}/usr" ) + else + myconf+=( "--without-papi" ) + fi + if use unwind; then + myconf+=( "--with-libunwind=${EPREFIX}/usr" ) + else + myconf+=( "--without-libunwind" ) + fi + + econf "${myconf[@]}" +} +# --without-pqos +# --without-jemalloc +# --without-cuda +# --without-memkind + +src_install() { + default + + docompress -x "/usr/share/doc/${PF}/paraver-cfg" + docompress -x "/usr/share/doc/${PF}/scripts" +} + +pkg_postinst() { + elog "install media-gfx/graphviz and app-text/pdfjam or >=app-text/texlive-core-2021 to generate graphical representations of the dependency graph" + elog "install sys-process/parallel to generate the graph representation in parallel" +} From 9a8335750d5b97c8963cd8799499c469605734d3 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 01:48:40 +0200 Subject: [PATCH 02/18] sys-cluster/extrae: add nanos support Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/extrae/extrae-3.8.3-r1.ebuild | 176 ++++++++++++++++++++++ sys-cluster/extrae/metadata.xml | 2 +- 2 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 sys-cluster/extrae/extrae-3.8.3-r1.ebuild diff --git a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild new file mode 100644 index 0000000000..4affa08955 --- /dev/null +++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild @@ -0,0 +1,176 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) +inherit autotools java-pkg-opt-2 python-single-r1 + +DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes" +HOMEPAGE="https://github.com/bsc-performance-tools/extrae" +SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml" +#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver +#TODO: find out which FFT library is used +#TODO: remove some useflags (boost fft elf dwarf) +#TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj +#TODO: support llvm libunwind, llvm rt, elftoolchain + +CDEPEND=" + ${PYTHON_DEPS} + dev-libs/icu + sys-libs/libunwind + dev-libs/libxml2 + dev-libs/papi + sys-apps/hwloc + sys-libs/glibc + sys-libs/zlib + virtual/mpi + + || ( sys-devel/binutils:* sys-libs/binutils-libs ) + + boost? ( dev-libs/boost:= ) + dwarf? ( dev-libs/libdwarf ) + elf? ( virtual/libelf ) + nanos? ( sys-cluster/nanos6 ) + opencl? ( dev-util/opencl-headers ) +" +DEPEND=" + ${CDEPEND} + java? ( virtual/jdk:1.8 ) +" +RDEPEND=" + ${CDEPEND} + java? ( virtual/jre:1.8 ) + virtual/opencl +" +BDEPEND=" + doc? ( dev-python/sphinx ) +" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} +" +# cupti? ( cuda ) +# dyninst? ( boost dwarf elf ) +# online? ( synapse ) +# aspectj? ( java ) +# spectral? ( fft ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + --datadir="${T}" + --datarootdir="${T}" + --libdir="${EPREFIX}/usr/$(get_libdir)/extrae/lib" + + --disable-mic + --disable-online + --disable-peruse + --disable-pmapi + --disable-static + + --enable-shared + + --with-librt="${EPREFIX}/usr" + --with-mpi="${EPREFIX}/usr" + --with-papi="${EPREFIX}/usr" + --with-pic + --with-unwind="${EPREFIX}/usr" + + --without-dyninst + --without-cupti + --without-memkind + --without-clustering + --without-java-aspectj + --without-java-aspectj-weaver + --without-synapse + --without-spectral + --without-openshmem + --without-gm + --without-mx + + $(use_enable doc) + $(use_enable heterogeneous) + $(use_enable inotify) + $(use_enable instrument-dynamic-memory) + $(use_enable instrument-io) + $(use_enable instrument-syscall) + $(use_enable merge-in-trace) + $(use_enable nanos) + $(use_enable openmp) + $(use_enable sampling) + $(use_enable parallel-merge) + $(use_enable pebs-sampling) + $(use_enable posix-clock) + $(use_enable pthread) + $(use_enable single-mpi-lib) + $(use_enable smpss) + $(use_enable xml) + ) +# --without-sionlib +#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi)) + + if use boost; then + myconf+=( "--with-boost=${EPREFIX}/usr" ) + else + myconf+=( "--without-boost" ) + fi + if use dwarf; then + myconf+=( "--with-dwarf=${EPREFIX}/usr" ) + else + myconf+=( "--without-dwarf" ) + fi + if use elf; then + myconf+=( "--with-elf=${EPREFIX}/usr" ) + else + myconf+=( "--without-elf" ) + fi + if use fft; then + myconf+=( "--with-fft=${EPREFIX}/usr" ) + else + myconf+=( "--without-fft" ) + fi + if use java; then + myconf+=( "--with-java-jdk=$(java-config -O)" ) + else + myconf+=( "--without-java-jdk" ) + fi + if use opencl; then + myconf+=( "--with-opencl=${EPREFIX}/usr" ) + else + myconf+=( "--without-opencl" ) + fi + econf "${myconf[@]}" +} + +src_install() { + default + + mkdir -p "${D}/$(python_get_sitedir)/" || die + mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die + python_optimize "${D}/$(python_get_sitedir)/pyextrae" + + #super-duper workaround + mkdir -p "${ED}/usr/share/doc/${PF}" || die + mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die + mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die + + if use doc ; then + mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die + mv "${T}/man" "${ED}/usr/share/" || die + docompress -x "/usr/share/doc/${PF}/html" + fi + docompress -x "/usr/share/doc/${PF}/examples" + docompress -x "/usr/share/doc/${PF}/tests" + + find "${ED}" -name '*.a' -delete || die + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml index 63ba6df57e..fb390763b4 100644 --- a/sys-cluster/extrae/metadata.xml +++ b/sys-cluster/extrae/metadata.xml @@ -31,7 +31,7 @@ process). Extrae generates trace files that can be later visualized with sy Enables instrumentation for system calls (other than I/O and mallocs) Enable support for tracing Java. This is necessary to create the connectors between |TRACE| and Java applications. Embed the merging process in the tracing library so the final tracefile can be generated automatically from the application run - + Enable support for tracing sys-cluster/nanos run-time Enable support for tracing OpenCL Enable support for tracing OpenMP From aeadb10ff9c2c671b48c60f33b2f4c73d95aa5ba Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 02:17:10 +0200 Subject: [PATCH 03/18] sys-cluster/extrae: fix dependencies Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/extrae/extrae-3.8.3-r1.ebuild | 5 +- sys-cluster/extrae/extrae-3.8.3.ebuild | 175 ---------------------- 2 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 sys-cluster/extrae/extrae-3.8.3.ebuild diff --git a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild index 4affa08955..d0518e68f7 100644 --- a/sys-cluster/extrae/extrae-3.8.3-r1.ebuild +++ b/sys-cluster/extrae/extrae-3.8.3-r1.ebuild @@ -15,6 +15,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml" #aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver +#TODO: find out who is pulling in libpfm #TODO: find out which FFT library is used #TODO: remove some useflags (boost fft elf dwarf) #TODO: pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj @@ -22,7 +23,9 @@ IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory + CDEPEND=" ${PYTHON_DEPS} + app-arch/xz-utils dev-libs/icu + dev-libs/libpfm sys-libs/libunwind dev-libs/libxml2 dev-libs/papi @@ -36,7 +39,7 @@ CDEPEND=" boost? ( dev-libs/boost:= ) dwarf? ( dev-libs/libdwarf ) elf? ( virtual/libelf ) - nanos? ( sys-cluster/nanos6 ) + inotify? ( dev-libs/libevent ) opencl? ( dev-util/opencl-headers ) " DEPEND=" diff --git a/sys-cluster/extrae/extrae-3.8.3.ebuild b/sys-cluster/extrae/extrae-3.8.3.ebuild deleted file mode 100644 index 59b3c2edbe..0000000000 --- a/sys-cluster/extrae/extrae-3.8.3.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python3_{7,8,9} ) -inherit autotools java-pkg-opt-2 python-single-r1 - -DESCRIPTION="Instrumentation framework to generate execution traces of parallel runtimes" -HOMEPAGE="https://github.com/bsc-performance-tools/extrae" -SRC_URI="https://github.com/bsc-performance-tools/extrae/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" -#TODO: correctly install python stuff -IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml" -#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver -#TODO: find out which FFT library is used -#TODO: remove some useflags (boost fft elf dwarf) -#TODO: nanos pmapi online dyninst cuda spectral cupti openshmem gm mx synapse memkind sionlib aspectj -#TODO: support llvm libunwind, llvm rt, elftoolchain - -CDEPEND=" - ${PYTHON_DEPS} - dev-libs/icu - sys-libs/libunwind - dev-libs/libxml2 - dev-libs/papi - sys-apps/hwloc - sys-libs/glibc - sys-libs/zlib - virtual/mpi - || ( sys-devel/binutils:* sys-libs/binutils-libs ) - boost? ( dev-libs/boost:= ) - dwarf? ( dev-libs/libdwarf ) - elf? ( virtual/libelf ) - opencl? ( dev-util/opencl-headers ) -" -DEPEND=" - ${CDEPEND} - java? ( virtual/jdk:1.8 ) -" -RDEPEND=" - ${CDEPEND} - java? ( virtual/jre:1.8 ) - virtual/opencl -" -BDEPEND=" - doc? ( dev-python/sphinx ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" -# cupti? ( cuda ) -# dyninst? ( boost dwarf elf ) -# online? ( synapse ) -# aspectj? ( java ) -# spectral? ( fft ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myconf=( - --datadir="${T}" - --datarootdir="${T}" - --libdir="${EPREFIX}/usr/$(get_libdir)/extrae" - - --disable-mic - --disable-nanos - --disable-online - --disable-peruse - --disable-pmapi - --disable-static - - --enable-shared - - --with-librt="${EPREFIX}/usr" - --with-mpi="${EPREFIX}/usr" - --with-papi="${EPREFIX}/usr" - --with-pic - --with-unwind="${EPREFIX}/usr" - - --without-dyninst - --without-cupti - --without-memkind - --without-clustering - --without-java-aspectj - --without-java-aspectj-weaver - --without-synapse - --without-spectral - --without-openshmem - --without-gm - --without-mx - - $(use_enable doc) - $(use_enable heterogeneous) - $(use_enable inotify) - $(use_enable instrument-dynamic-memory) - $(use_enable instrument-io) - $(use_enable instrument-syscall) - $(use_enable merge-in-trace) - $(use_enable openmp) - $(use_enable sampling) - $(use_enable parallel-merge) - $(use_enable pebs-sampling) - $(use_enable posix-clock) - $(use_enable pthread) - $(use_enable single-mpi-lib) - $(use_enable smpss) - $(use_enable xml) - ) -# $(use_enable nanos) -# --without-sionlib -#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi)) - - if use boost; then - myconf+=( "--with-boost=${EPREFIX}/usr" ) - else - myconf+=( "--without-boost" ) - fi - if use dwarf; then - myconf+=( "--with-dwarf=${EPREFIX}/usr" ) - else - myconf+=( "--without-dwarf" ) - fi - if use elf; then - myconf+=( "--with-elf=${EPREFIX}/usr" ) - else - myconf+=( "--without-elf" ) - fi - if use fft; then - myconf+=( "--with-fft=${EPREFIX}/usr" ) - else - myconf+=( "--without-fft" ) - fi - if use java; then - myconf+=( "--with-java-jdk=$(java-config -O)" ) - else - myconf+=( "--without-java-jdk" ) - fi - if use opencl; then - myconf+=( "--with-opencl=${EPREFIX}/usr" ) - else - myconf+=( "--without-opencl" ) - fi - econf "${myconf[@]}" -} - -src_install() { - default - - mkdir -p "${D}/$(python_get_sitedir)/" || die - mv "${ED}/usr/libexec/pyextrae" "${D}/$(python_get_sitedir)/" || die - python_optimize "${D}/$(python_get_sitedir)/pyextrae" - - #super-duper workaround - mkdir -p "${ED}/usr/share/doc/${PF}" || die - mv "${ED}/${T}/example" "${ED}/usr/share/doc/${PF}/examples" || die - mv "${ED}/${T}/tests" "${ED}/usr/share/doc/${PF}/" || die - - if use doc ; then - mv "${T}/docs"/* "${ED}/usr/share/doc/${PF}/" || die - mv "${T}/man" "${ED}/usr/share/" || die - docompress -x "/usr/share/doc/${PF}/html" - fi - docompress -x "/usr/share/doc/${PF}/examples" - docompress -x "/usr/share/doc/${PF}/tests" - - find "${ED}" -name '*.a' -delete || die - find "${ED}" -name '*.la' -delete || die -} From 52d40bd6640cec7798fe8865a30982cef4723142 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:16:35 +0200 Subject: [PATCH 04/18] sys-cluster/nanos6: extrae support Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/nanos6/metadata.xml | 2 +- ...s6-2.5.1.ebuild => nanos6-2.5.1-r1.ebuild} | 25 ++++++++----------- 2 files changed, 12 insertions(+), 15 deletions(-) rename sys-cluster/nanos6/{nanos6-2.5.1.ebuild => nanos6-2.5.1-r1.ebuild} (81%) diff --git a/sys-cluster/nanos6/metadata.xml b/sys-cluster/nanos6/metadata.xml index d72d9ec643..ad6f5454f7 100644 --- a/sys-cluster/nanos6/metadata.xml +++ b/sys-cluster/nanos6/metadata.xml @@ -17,7 +17,7 @@ enable dynamic management and sharing of computing resources embed into the runtime any code changes present in the source Enable execution using the Execution Workflow - + to generate execution traces for offline performance analysis with paraver diff --git a/sys-cluster/nanos6/nanos6-2.5.1.ebuild b/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild similarity index 81% rename from sys-cluster/nanos6/nanos6-2.5.1.ebuild rename to sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild index a49c3601ad..599e265c2f 100644 --- a/sys-cluster/nanos6/nanos6-2.5.1.ebuild +++ b/sys-cluster/nanos6/nanos6-2.5.1-r1.ebuild @@ -12,10 +12,10 @@ SRC_URI="https://github.com/bsc-pm/nanos6/archive/refs/tags/version-${PV}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="cluster debug dlb doc embed-code-changes execution-workflow git papi unwind" +IUSE="cluster debug dlb embed-code-changes execution-workflow extrae git papi unwind" #chrono-arch build fail #jemalloc require custom stuff -#TODO: cuda pqos mercurium memkind k1om extrae +#TODO: cuda pqos mercurium memkind k1om RDEPEND=" >=dev-libs/boost-1.59:= sys-apps/hwloc @@ -25,12 +25,12 @@ RDEPEND=" cluster? ( virtual/mpi ) dlb? ( sys-cluster/dlb ) embed-code-changes? ( dev-vcs/git ) + extrae? ( sys-cluster/extrae[nanos] ) papi? ( dev-libs/papi ) unwind? ( sys-libs/libunwind ) " -#extrae? ( sys-cluster/extrae[nanos] ) DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="" REQUIRED_USE="cluster? ( execution-workflow )" S="${WORKDIR}/${PN}-version-${PV}" @@ -57,12 +57,6 @@ src_configure() { --without-pgi $(use_enable cluster) - $(use_enable doc doxygen-doc) - $(use_enable doc doxygen-dot) - $(use_enable doc doxygen-html) - $(use_enable doc doxygen-man) - $(use_enable doc doxygen-pdf) - $(use_enable doc doxygen-ps) $(use_enable debug extra-debug) $(use_enable embed-code-changes) $(use_enable execution-workflow) @@ -78,11 +72,11 @@ src_configure() { else myconf+=( "--without-git" ) fi -# if use extrae; then -# myconf+=( "--with-extrae=${EPREFIX}/usr/$(get_libdir)/extrae" ) -# else + if use extrae; then + myconf+=( "--with-extrae=${EPREFIX}/usr/$(get_libdir)/extrae" ) + else myconf+=( "--without-extrae" ) -# fi + fi if use papi; then myconf+=( "--with-papi=${EPREFIX}/usr" ) else @@ -103,6 +97,9 @@ src_configure() { src_install() { default + dodoc CHANGELOG.md + rm -r docs/Doxyfile* || die + dodoc -r docs/. docompress -x "/usr/share/doc/${PF}/paraver-cfg" docompress -x "/usr/share/doc/${PF}/scripts" From 1bb407e464ffcc0260d9add8a2ac1ad6ea72dd20 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:40:24 +0200 Subject: [PATCH 05/18] sys-cluster/shuffile: patch scrubbed Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/shuffile/files/no-static-0.0.4.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/shuffile/files/no-static-0.0.4.patch b/sys-cluster/shuffile/files/no-static-0.0.4.patch index 33edb7d016..e56f4cfdd1 100644 --- a/sys-cluster/shuffile/files/no-static-0.0.4.patch +++ b/sys-cluster/shuffile/files/no-static-0.0.4.patch @@ -1,5 +1,5 @@ ---- a/src/CMakeLists.txt 2021-04-13 01:07:33.798593182 +0200 -+++ b/src/CMakeLists.txt 2021-04-13 01:08:02.110951981 +0200 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -24,13 +24,3 @@ TARGET_LINK_LIBRARIES(shuffile ${SHUFFILE_EXTERNAL_LIBS}) SET_TARGET_PROPERTIES(shuffile PROPERTIES OUTPUT_NAME shuffile CLEAN_DIRECT_OUTPUT 1) From 215731862a5dd431f9cc795c4927e823c12e0f14 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:49:24 +0200 Subject: [PATCH 06/18] sys-cluster/redset: scrub patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/redset/files/no-static-0.0.5.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/redset/files/no-static-0.0.5.patch b/sys-cluster/redset/files/no-static-0.0.5.patch index 96686b691f..3af659db43 100644 --- a/sys-cluster/redset/files/no-static-0.0.5.patch +++ b/sys-cluster/redset/files/no-static-0.0.5.patch @@ -1,5 +1,5 @@ ---- a/src/CMakeLists.txt 2021-04-13 00:58:19.047554716 +0200 -+++ b/src/CMakeLists.txt 2021-04-13 00:58:58.326053601 +0200 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -44,26 +44,11 @@ SET_TARGET_PROPERTIES(redset PROPERTIES OUTPUT_NAME redset CLEAN_DIRECT_OUTPUT 1) INSTALL(TARGETS redset DESTINATION ${CMAKE_INSTALL_LIBDIR}) From 6eb0e7e6aed0f60a129f771eb9382a1ef63e2913 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:51:18 +0200 Subject: [PATCH 07/18] sys-cluster/pcs: scrub patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/pcs/files/openrc-0.10.7.patch | 40 ++++++++----------- sys-cluster/pcs/files/openrc-0.10.8.patch | 40 ++++++++----------- .../pcs/files/remove-ruby-bundle-path.patch | 4 +- 3 files changed, 34 insertions(+), 50 deletions(-) diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch index 96a4b7e17b..18c56936a3 100644 --- a/sys-cluster/pcs/files/openrc-0.10.7.patch +++ b/sys-cluster/pcs/files/openrc-0.10.7.patch @@ -1,6 +1,5 @@ -diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py ---- a/pcs-0.10.7/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 -+++ b/pcs-0.10.7/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 +--- a/pcs-0.10.7/pcs/lib/external.py ++++ b/pcs-0.10.7/pcs/lib/external.py @@ -13,8 +13,8 @@ from pcs.lib.errors import LibraryError @@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py if return_code != 0: return [] -diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_default.py ---- a/pcs-0.10.7/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 -+++ b/pcs-0.10.7/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 +--- a/pcs-0.10.7/pcs/settings_default.py ++++ b/pcs-0.10.7/pcs/settings_default.py @@ -1,8 +1,8 @@ import os.path @@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_defaul # this limit is also mentioned in docs, change there as well sbd_max_device_num = 3 # message types are also mentioned in docs, change there as well -diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debian ---- a/pcs-0.10.7/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 -+++ b/pcs-0.10.7/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 +--- a/pcs-0.10.7/pcs/settings.py.debian ++++ b/pcs-0.10.7/pcs/settings.py.debian @@ -1,10 +1,10 @@ from pcs.settings_default import * -service_binary = "/usr/sbin/service" @@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debi pcsd_exec_location = "/usr/share/pcsd/" pcsd_gem_path = None pcsd_config = "/etc/default/pcsd" -diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py ---- a/pcs-0.10.7/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 -+++ b/pcs-0.10.7/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 +--- a/pcs-0.10.7/pcs/utils.py ++++ b/pcs-0.10.7/pcs/utils.py @@ -2187,7 +2187,7 @@ ) else: @@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py ) return join_multilines([stderr, stdout]), retval -diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb ---- a/pcs-0.10.7/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 -+++ b/pcs-0.10.7/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 +--- a/pcs-0.10.7/pcsd/pcs.rb ++++ b/pcs-0.10.7/pcsd/pcs.rb @@ -1708,11 +1708,22 @@ def is_service_enabled?(service) if ISSYSTEMCTL @@ -239,9 +234,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) return (retcode == 0) I file binari a/pcs-0.10.7/pcsd/.pcs.rb.swp e b/pcs-0.10.7/pcsd/.pcs.rb.swp sono diversi -diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb ---- a/pcs-0.10.7/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 -+++ b/pcs-0.10.7/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 +--- a/pcs-0.10.7/pcsd/settings.rb ++++ b/pcs-0.10.7/pcsd/settings.rb @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -251,9 +245,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.debian ---- a/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 -+++ b/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 +--- a/pcs-0.10.7/pcsd/settings.rb.debian ++++ b/pcs-0.10.7/pcsd/settings.rb.debian @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/share/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -263,9 +256,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.de CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py ---- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 -+++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 +--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py ++++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py @@ -16,8 +16,8 @@ import pcs.lib.external as lib diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch index b7dcbce8c5..5a12610025 100644 --- a/sys-cluster/pcs/files/openrc-0.10.8.patch +++ b/sys-cluster/pcs/files/openrc-0.10.8.patch @@ -1,6 +1,5 @@ -diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py ---- a/pcs-0.10.8/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 -+++ b/pcs-0.10.8/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 +--- a/pcs-0.10.8/pcs/lib/external.py ++++ b/pcs-0.10.8/pcs/lib/external.py @@ -13,8 +13,8 @@ from pcs.lib.errors import LibraryError @@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py if return_code != 0: return [] -diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py ---- a/pcs-0.10.8/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 -+++ b/pcs-0.10.8/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 +--- a/pcs-0.10.8/pcs/settings_default.py ++++ b/pcs-0.10.8/pcs/settings_default.py @@ -1,8 +1,8 @@ import os.path @@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_defaul # this limit is also mentioned in docs, change there as well sbd_max_device_num = 3 # message types are also mentioned in docs, change there as well -diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian ---- a/pcs-0.10.8/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 -+++ b/pcs-0.10.8/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 +--- a/pcs-0.10.8/pcs/settings.py.debian ++++ b/pcs-0.10.8/pcs/settings.py.debian @@ -1,10 +1,10 @@ from pcs.settings_default import * -service_binary = "/usr/sbin/service" @@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debi pcsd_exec_location = "/usr/share/pcsd/" pcsd_gem_path = None pcsd_config = "/etc/default/pcsd" -diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py ---- a/pcs-0.10.8/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 -+++ b/pcs-0.10.8/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 +--- a/pcs-0.10.8/pcs/utils.py ++++ b/pcs-0.10.8/pcs/utils.py @@ -2187,7 +2187,7 @@ ) else: @@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py ) return join_multilines([stderr, stdout]), retval -diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb ---- a/pcs-0.10.8/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 -+++ b/pcs-0.10.8/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 +--- a/pcs-0.10.8/pcsd/pcs.rb ++++ b/pcs-0.10.8/pcsd/pcs.rb @@ -1708,11 +1708,22 @@ def is_service_enabled?(service) if ISSYSTEMCTL @@ -238,9 +233,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb end _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) return (retcode == 0) -diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb ---- a/pcs-0.10.8/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 -+++ b/pcs-0.10.8/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 +--- a/pcs-0.10.8/pcsd/settings.rb ++++ b/pcs-0.10.8/pcsd/settings.rb @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -250,9 +244,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian ---- a/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 -+++ b/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 +--- a/pcs-0.10.8/pcsd/settings.rb.debian ++++ b/pcs-0.10.8/pcsd/settings.rb.debian @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/share/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -262,9 +255,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.de CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py ---- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 -+++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 +--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py ++++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py @@ -16,8 +16,8 @@ import pcs.lib.external as lib diff --git a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch index 69052b8e35..bf54e59f09 100644 --- a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch +++ b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch @@ -1,5 +1,5 @@ ---- a/pcs/settings_default.py 2018-11-23 12:57:53.000000000 +0000 -+++ b/pcs/settings_default.py 2019-05-11 20:07:19.080000000 +0000 +--- a/pcs/settings_default.py ++++ b/pcs/settings_default.py @@ -81,7 +81,7 @@ ]) # Set pcsd_gem_path to None if there are no bundled ruby gems and the path does From a04f086d707fc8bf4f95a6d27522541061566b84 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:52:29 +0200 Subject: [PATCH 08/18] sys-cluster/er: scrub patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/er/files/no-static-0.0.4.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-cluster/er/files/no-static-0.0.4.patch b/sys-cluster/er/files/no-static-0.0.4.patch index bbe1a41c8c..0a62d1d158 100644 --- a/sys-cluster/er/files/no-static-0.0.4.patch +++ b/sys-cluster/er/files/no-static-0.0.4.patch @@ -1,5 +1,5 @@ ---- a/src/CMakeLists.txt 2021-04-16 03:54:24.548709584 +0200 -+++ b/src/CMakeLists.txt 2021-04-16 03:54:48.685073637 +0200 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -23,13 +23,3 @@ TARGET_LINK_LIBRARIES(er ${ER_EXTERNAL_LIBS}) SET_TARGET_PROPERTIES(er PROPERTIES OUTPUT_NAME er CLEAN_DIRECT_OUTPUT 1) From ac155c0ccf7cc27934d327132aa0d86da34c6916 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:54:07 +0200 Subject: [PATCH 09/18] sys-cluster/dlb: scrub patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch b/sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch index 4b345d85f3..b2ec60577f 100644 --- a/sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch +++ b/sys-cluster/dlb/files/dlb-2.1-pygen-python3.patch @@ -10,8 +10,6 @@ Subject: [PATCH] Run pygen script with either python2 or python3 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100755 scripts/pygen.py3 -diff --git a/Makefile.am b/Makefile.am -index 7d575e7..b274011 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,11 @@ nodist_include_HEADERS = src/LB_MPI/MPI_interface.h \ @@ -35,8 +33,6 @@ index 7d575e7..b274011 100644 scripts/viewer/dlb_cpu_usage.in \ scripts/viewer/dlb_viewer.py.in \ $(DEBIAN_EXTRA) \ -diff --git a/configure.ac b/configure.ac -index 2200d23..8a587b9 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,8 @@ AC_SUBST([INSTR_DEBUG_CPPFLAGS]) @@ -48,9 +44,6 @@ index 2200d23..8a587b9 100644 # check for OpenMP availability AC_OPENMP -diff --git a/scripts/pygen.py3 b/scripts/pygen.py3 -new file mode 100755 -index 0000000..9748d96 --- /dev/null +++ b/scripts/pygen.py3 @@ -0,0 +1,166 @@ From 00d36935996d771c36b44d033617cc248089df25 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 21 Apr 2021 03:55:04 +0200 Subject: [PATCH 10/18] sys-cluster/AXL: scrub patch Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alessandro Barbieri --- sys-cluster/AXL/files/no-install-readme.patch | 4 ++-- sys-cluster/AXL/files/no-static-0.4.0.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-cluster/AXL/files/no-install-readme.patch b/sys-cluster/AXL/files/no-install-readme.patch index 34fb418a5c..40876175d7 100644 --- a/sys-cluster/AXL/files/no-install-readme.patch +++ b/sys-cluster/AXL/files/no-install-readme.patch @@ -1,5 +1,5 @@ ---- a/CMakeLists.txt 2021-04-15 02:41:40.120725634 +0200 -+++ b/CMakeLists.txt 2021-04-15 02:42:14.146330416 +0200 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -125,9 +125,6 @@ SET_SOURCE_FILES_PROPERTIES(config.h.in PROPERTIES GENERATED FALSE) SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/config.h PROPERTIES GENERATED TRUE) diff --git a/sys-cluster/AXL/files/no-static-0.4.0.patch b/sys-cluster/AXL/files/no-static-0.4.0.patch index 1a2b5ff793..2240be4285 100644 --- a/sys-cluster/AXL/files/no-static-0.4.0.patch +++ b/sys-cluster/AXL/files/no-static-0.4.0.patch @@ -1,5 +1,5 @@ ---- a/src/CMakeLists.txt 2021-04-15 02:42:47.537923628 +0200 -+++ b/src/CMakeLists.txt 2021-04-15 02:43:07.157272036 +0200 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -29,13 +29,3 @@ TARGET_LINK_LIBRARIES(axl ${AXL_EXTERNAL_LIBS}) SET_TARGET_PROPERTIES(axl PROPERTIES OUTPUT_NAME axl CLEAN_DIRECT_OUTPUT 1) From 8dfbc6cb487c2725fcaa712aed390f61b9b2915a Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Wed, 21 Apr 2021 08:13:41 +0200 Subject: [PATCH 11/18] Revert "dev-libs/mtxclient: Remove old ebuild." Turns out <=net-im/nheko-0.8.1 doesn't work with >=dev-libs/mtxclient-0.5.0. This reverts commit 760f3c9463222a4f35caf23d6ed804cfa44ad3f3. Signed-off-by: Ronny (tastytea) Gutbrod --- dev-libs/mtxclient/Manifest | 1 + dev-libs/mtxclient/mtxclient-0.4.1.ebuild | 44 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 dev-libs/mtxclient/mtxclient-0.4.1.ebuild diff --git a/dev-libs/mtxclient/Manifest b/dev-libs/mtxclient/Manifest index b80e8680c1..8d47a37c37 100644 --- a/dev-libs/mtxclient/Manifest +++ b/dev-libs/mtxclient/Manifest @@ -1,2 +1,3 @@ +DIST mtxclient-0.4.1.tar.gz 572552 BLAKE2B 4d0facaffb0ce1fadc1011b7d557774bcd9ffcef7349894255b9522bcc4e9228739ad8da5a60b0addf6835cf5de3613bebc19842b6922ab9cf94f88c944d0091 SHA512 246c84bc8bc7dd6fd688c79601d16e931b5aaf5fe967d6ea226f1961df2b74ad70d4e790b7400051e007506f58ecd6594ccead31bd3c6308aa2c6727b122c203 DIST mtxclient-0.5.0.tar.gz 582236 BLAKE2B 5166c32127973e886adadb6ad8a2895ba5ac77f78e9a774f039b0c8d4329078c0b8de965b477ce1c3a7e4cd929de8ba9b8d4f8d8b0452f6c49c873285a4d8b3a SHA512 6e1e9f5ecb1e6911b5bee85569e4477f6ee4c86ef479a3f408c8bbd187750b3b78db1db0337b51e1df9b90fee3b486eaf909bb79b69a97919685074eee3a82cd DIST mtxclient-0.5.1.tar.gz 582367 BLAKE2B d30a5e0e16d6783d8d1175e5f4144d845fe62897dcc7952cb1598470befa1da47a2b06cd70a60f511a1c2e7656eca2cf5a87734cbc61b79d2a05df295fd256e0 SHA512 f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f diff --git a/dev-libs/mtxclient/mtxclient-0.4.1.ebuild b/dev-libs/mtxclient/mtxclient-0.4.1.ebuild new file mode 100644 index 0000000000..43315c94dc --- /dev/null +++ b/dev-libs/mtxclient/mtxclient-0.4.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Client API library for Matrix, built on top of Boost.Asio" +HOMEPAGE="https://github.com/Nheko-Reborn/mtxclient" +SRC_URI="https://github.com/Nheko-Reborn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/boost-1.70.0 + dev-libs/olm + >=dev-libs/openssl-1.1.0 + dev-cpp/nlohmann_json +" +DEPEND=" + ${RDEPEND} + dev-libs/spdlog + test? ( dev-cpp/gtest ) +" + +# remove_failing_tests depends on remove_network_tests. +PATCHES=( + "${FILESDIR}/0.3.0_remove_network_tests.patch" + "${FILESDIR}/0.3.0_remove_failing_tests.patch" +) + +src_configure() { + local -a mycmakeargs=( + -DBUILD_LIB_TESTS="$(usex test)" + -DBUILD_LIB_EXAMPLES=OFF + ) + + cmake_src_configure +} From b58b8dac7224635ce539b8181db695e9813b0dba Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Wed, 21 Apr 2021 08:17:51 +0200 Subject: [PATCH 12/18] net-im/nheko: Fix dev-libs/mtxclient dependency. Signed-off-by: Ronny (tastytea) Gutbrod --- net-im/nheko/nheko-0.8.0.ebuild | 2 +- net-im/nheko/nheko-0.8.1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/nheko/nheko-0.8.0.ebuild b/net-im/nheko/nheko-0.8.0.ebuild index 1d9735f03c..e89aaaa6d7 100644 --- a/net-im/nheko/nheko-0.8.0.ebuild +++ b/net-im/nheko/nheko-0.8.0.ebuild @@ -21,7 +21,7 @@ RDEPEND=" dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 app-text/cmark - >=dev-libs/mtxclient-0.4.0 + Date: Wed, 21 Apr 2021 08:56:51 +0200 Subject: [PATCH 13/18] net-vpn/riseup-vpn: add missing dep Closes: https://bugs.gentoo.org/784692 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild index b9f063bbd8..068dc89d0a 100644 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild @@ -92,6 +92,7 @@ DEPEND=" dev-util/debhelper sys-apps/fakeroot x11-libs/gtk+:3 + dev-qt/linguist-tools dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] " From 8825935b4a0d78cde6cefb5c9a8c23d265d23d91 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 21 Apr 2021 08:59:53 +0200 Subject: [PATCH 14/18] net-im/ruqola: correct dep Closes: https://bugs.gentoo.org/784659 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- net-im/ruqola/ruqola-1.3.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/ruqola/ruqola-1.3.1.ebuild b/net-im/ruqola/ruqola-1.3.1.ebuild index bfad83a4f0..09d1e17240 100644 --- a/net-im/ruqola/ruqola-1.3.1.ebuild +++ b/net-im/ruqola/ruqola-1.3.1.ebuild @@ -22,7 +22,7 @@ IUSE="speech telemetry" DEPEND=" dev-libs/qtkeychain - >=dev-qt/qtmultimedia-${QTMIN}:5 + >=dev-qt/qtmultimedia-${QTMIN}:5[widgets] >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtnetworkauth-${QTMIN}:5 >=dev-qt/qtwebsockets-${QTMIN}:5 From bb521806cd57c3c69cfa1e5e298e4b7e111d6997 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 21 Apr 2021 09:13:54 +0200 Subject: [PATCH 15/18] sci-libs/kissfft: add missing dep Closes: https://bugs.gentoo.org/784701 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- sci-libs/kissfft/kissfft-131.ebuild | 4 ++-- sci-libs/kissfft/kissfft-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-libs/kissfft/kissfft-131.ebuild b/sci-libs/kissfft/kissfft-131.ebuild index 395523fe9b..8a1bbe1508 100644 --- a/sci-libs/kissfft/kissfft-131.ebuild +++ b/sci-libs/kissfft/kissfft-131.ebuild @@ -21,8 +21,8 @@ else KEYWORDS="~amd64 ~x86" fi -DEPEND="" -RDEPEND="" +DEPEND="sci-libs/fftw:3.0" +RDEPEND="${DEPEND}" src_install() { dolib.so libkissfft.so diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild index 893afd7e69..0c8c52a0ac 100644 --- a/sci-libs/kissfft/kissfft-9999.ebuild +++ b/sci-libs/kissfft/kissfft-9999.ebuild @@ -21,8 +21,8 @@ else KEYWORDS="~amd64 ~x86" fi -DEPEND="" -RDEPEND="" +DEPEND="sci-libs/fftw:3.0" +RDEPEND="${DEPEND}" src_install() { dolib.so libkissfft.so From 2dafcb97ffcdb8a8d8786b35ea00c2d6ed9a0bf7 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 21 Apr 2021 09:16:05 +0200 Subject: [PATCH 16/18] mail-client/mailspring-bin: correct dep Closes: https://bugs.gentoo.org/784719 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild | 2 +- mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild | 2 +- mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild index cfaa43b622..a4581af663 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.8.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" net-dns/c-ares net-print/cups sys-devel/libtool - sys-libs/db + sys-libs/db:5.3 virtual/udev =x11-libs/gtk+-3* x11-libs/libnotify diff --git a/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild index cfaa43b622..a4581af663 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.9.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" net-dns/c-ares net-print/cups sys-devel/libtool - sys-libs/db + sys-libs/db:5.3 virtual/udev =x11-libs/gtk+-3* x11-libs/libnotify diff --git a/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild index cfaa43b622..a4581af663 100644 --- a/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild +++ b/mail-client/mailspring-bin/mailspring-bin-1.9.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" net-dns/c-ares net-print/cups sys-devel/libtool - sys-libs/db + sys-libs/db:5.3 virtual/udev =x11-libs/gtk+-3* x11-libs/libnotify From 83ece4c2f7e2402914d2c462f009abe4ac7438a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Bar=C4=87?= Date: Wed, 21 Apr 2021 09:15:08 +0200 Subject: [PATCH 17/18] x11-misc/gammy: fix src_install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/784683 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Maciej Barć --- x11-misc/gammy/gammy-0.9.60.ebuild | 2 +- x11-misc/gammy/gammy-0.9.64.ebuild | 11 +---------- x11-misc/gammy/gammy-9999.ebuild | 11 +---------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/x11-misc/gammy/gammy-0.9.60.ebuild b/x11-misc/gammy/gammy-0.9.60.ebuild index 1b54fd2fa4..bc90490eb8 100644 --- a/x11-misc/gammy/gammy-0.9.60.ebuild +++ b/x11-misc/gammy/gammy-0.9.60.ebuild @@ -37,7 +37,7 @@ src_configure() { } src_install() { - default + emake INSTALL_ROOT="${D}" install local sizes="128 16 32 64" cd ./icons || die diff --git a/x11-misc/gammy/gammy-0.9.64.ebuild b/x11-misc/gammy/gammy-0.9.64.ebuild index 1b54fd2fa4..f159cd6cec 100644 --- a/x11-misc/gammy/gammy-0.9.64.ebuild +++ b/x11-misc/gammy/gammy-0.9.64.ebuild @@ -37,14 +37,5 @@ src_configure() { } src_install() { - default - - local sizes="128 16 32 64" - cd ./icons || die - for size in ${sizes}; do - convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die - newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png" - done - - make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings" + emake INSTALL_ROOT="${D}" install } diff --git a/x11-misc/gammy/gammy-9999.ebuild b/x11-misc/gammy/gammy-9999.ebuild index 1b54fd2fa4..f159cd6cec 100644 --- a/x11-misc/gammy/gammy-9999.ebuild +++ b/x11-misc/gammy/gammy-9999.ebuild @@ -37,14 +37,5 @@ src_configure() { } src_install() { - default - - local sizes="128 16 32 64" - cd ./icons || die - for size in ${sizes}; do - convert "${size}x${size}ball.ico" "${size}x${size}ball.png" || die - newicon -s "${size}" "${size}x${size}ball.png" "${PN}.png" - done - - make_desktop_entry "${PN}" "${PN^}" "${PN}" "Graphics;Settings" + emake INSTALL_ROOT="${D}" install } From bb649a6596441adf642bad63959e42aebc771ef8 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 21 Apr 2021 09:32:09 +0200 Subject: [PATCH 18/18] net-vpn/riseup-vpn: move linguist-tools to BDEPEND Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild index 068dc89d0a..f3335afd20 100644 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild @@ -83,6 +83,7 @@ QA_PRESTRIPPED=" BDEPEND=" virtual/pkgconfig + dev-qt/linguist-tools test? ( dev-qt/qttest ) " @@ -92,7 +93,6 @@ DEPEND=" dev-util/debhelper sys-apps/fakeroot x11-libs/gtk+:3 - dev-qt/linguist-tools dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] "