From 8dc8d4025018d2db2c1ceffdfa6a3f1daec872a8 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Thu, 16 Sep 2021 00:37:23 +0300 Subject: [PATCH 1/4] sci-physics/SU2: Disable pywrapper tests. Fix axi_visccone test USE="tutorials" tests now run before parallel_regression.py tests as turorials tests have no fails currently. Signed-off-by: Sergey Torokhov --- sci-physics/SU2/SU2-7.1.1.ebuild | 5 ++++- sci-physics/SU2/SU2-7.2.0.ebuild | 10 +++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild index 87b3d2328d..899b5d72fe 100644 --- a/sci-physics/SU2/SU2-7.1.1.ebuild +++ b/sci-physics/SU2/SU2-7.1.1.ebuild @@ -74,6 +74,9 @@ src_prepare(){ if has_version ">=dev-libs/boost-1.75.0" ; then sed -i -e 's:cpp_std=c++11:cpp_std=c++14:' meson.build || die fi + + # Disable python-wrapper tests + sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die } src_configure() { @@ -111,10 +114,10 @@ src_test() { pushd TestCases/ || die if use mpi ; then - ${EPYTHON} parallel_regression.py || die if use tutorials ; then ${EPYTHON} tutorials.py || die fi + ${EPYTHON} parallel_regression.py || die else ${EPYTHON} serial_regression.py || die fi diff --git a/sci-physics/SU2/SU2-7.2.0.ebuild b/sci-physics/SU2/SU2-7.2.0.ebuild index e211c53883..7b30919077 100644 --- a/sci-physics/SU2/SU2-7.2.0.ebuild +++ b/sci-physics/SU2/SU2-7.2.0.ebuild @@ -76,6 +76,14 @@ src_prepare(){ # Force Disable parmetis support in meson.build (configure.ac has optional switch) use !parmetis && { sed -i -e "/parmetis/Id" meson.build || die ; } + + # Disable python-wrapper tests + sed -i "/append(pywrapper_/s/./#&/" TestCases/parallel_regression.py || die + + # Copy absence mesh file + if use test ; then + cp "${S}/TestCases/nonequilibrium/viscwedge/viscwedge.su2" "${S}/TestCases/nonequilibrium/axi_visccone/" || die + fi } src_configure() { @@ -113,10 +121,10 @@ src_test() { pushd TestCases/ || die if use mpi ; then - ${EPYTHON} parallel_regression.py || die if use tutorials ; then ${EPYTHON} tutorials.py || die fi + ${EPYTHON} parallel_regression.py || die else ${EPYTHON} serial_regression.py || die fi From 8b4e765860e5af98149889a94552cae886790cc1 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Thu, 16 Sep 2021 00:42:24 +0300 Subject: [PATCH 2/4] app-doc/ford: 6.1.4 version bump Signed-off-by: Sergey Torokhov --- app-doc/ford/Manifest | 1 + app-doc/ford/ford-6.1.4.ebuild | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 app-doc/ford/ford-6.1.4.ebuild diff --git a/app-doc/ford/Manifest b/app-doc/ford/Manifest index 226ccc488b..f3fb513942 100644 --- a/app-doc/ford/Manifest +++ b/app-doc/ford/Manifest @@ -1,2 +1,3 @@ DIST FORD-6.1.1.tar.gz 5832880 BLAKE2B 230aefd0f095f75fcf94c871b54bc471d348885494cbf1caad89aef85c52a76be5adaee5eb4db67c06c073a13174fec6457c00c9cf9d8d3ad404004d4730a02a SHA512 441a38440b4e405c85d5064e1e8fe62361c7c6641dfc612acfdb7b2c58625366d2ed7ecf068db7fc180fbeb1dccbef274e533856315be326a65bda0e8c203de7 DIST FORD-6.1.2.tar.gz 5834291 BLAKE2B f7bcea5d86fa1c9af073a74194c28fd8211860a36ad3e33b63d711818fe4070eb49f7c082d13e36ec6475b4830ab8360d232152ff895a790a55be208d9e25394 SHA512 ed9f457feb425faa4f17f147ea712191db2104fdb796a59163c6b2961543555d4186feab6fc8aae791f219a33c1e4a7b0a73fb147e7e08b3975bbe1ed3391f8f +DIST FORD-6.1.4.tar.gz 5838415 BLAKE2B fb98ec7b06b948e17d8df2896c1de125f779fdcf1c00303813db34164db5d39f46e5404264acde947aa3ba7d92765670139b7f1e6e19d7f5fcb8541eb3d9582c SHA512 15e1318d0653c2477c32cb07e74b5090bf0509fb94fe3ad63e15ccc98fce56b9e28f0f38ba48e235241b15fe3b52fa27db2eac1dc405bb53c1fd557d0140df82 diff --git a/app-doc/ford/ford-6.1.4.ebuild b/app-doc/ford/ford-6.1.4.ebuild new file mode 100644 index 0000000000..4602560ddf --- /dev/null +++ b/app-doc/ford/ford-6.1.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 + +MY_PN="FORD" +DESCRIPTION="FORD, automatic documentation generator for modern Fortran programs" +HOMEPAGE="https://github.com/Fortran-FOSS-Programmers/ford" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/${MY_PN}-${PV}" + +RDEPEND=" + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/graphviz[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + dev-python/markdown-include[${PYTHON_USEDEP}] + dev-python/md-environ[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/tqdm[${PYTHON_USEDEP}] + dev-python/toposort[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md README.md README.rst ) + +distutils_enable_tests pytest + +python_test(){ + # The 'test/test_projects' tests use subprocess, i.e. require FORD to be installed. + distutils_install_for_testing + distutils-r1_python_test +} From 2a8ba528ff5e74e834fbe3350d7942554d89898d Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Thu, 16 Sep 2021 01:22:02 +0300 Subject: [PATCH 3/4] dev-util/fypp: new package Signed-off-by: Sergey Torokhov --- dev-util/fypp/Manifest | 1 + dev-util/fypp/fypp-3.1.ebuild | 23 +++++++++++++++++++++++ dev-util/fypp/metadata.xml | 17 +++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 dev-util/fypp/Manifest create mode 100644 dev-util/fypp/fypp-3.1.ebuild create mode 100644 dev-util/fypp/metadata.xml diff --git a/dev-util/fypp/Manifest b/dev-util/fypp/Manifest new file mode 100644 index 0000000000..6d6d46fabc --- /dev/null +++ b/dev-util/fypp/Manifest @@ -0,0 +1 @@ +DIST fypp-3.1.tar.gz 68237 BLAKE2B 504fe6c655da647b9d30554afe1c0c036f636991562001763180425a572e03b52ceaf0287e68f82ea534914cd61d176fb4bad7fba5562bb1597500d80ae8c919 SHA512 91638d957f6a4306f23406b6a235e8ee8258cf9065e9b8dc3e137bbe651a2e1397f557292f2b4d3628a57ef6ced67df150c25c0bf304944f7c1b2b5b85087bd5 diff --git a/dev-util/fypp/fypp-3.1.ebuild b/dev-util/fypp/fypp-3.1.ebuild new file mode 100644 index 0000000000..33f1613958 --- /dev/null +++ b/dev-util/fypp/fypp-3.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 + +DESCRIPTION="Fypp - Python powered Fortran preprocessor" +HOMEPAGE="https://github.com/aradi/fypp" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +python_test() { + # pass python version as arg + test/runtests.sh ${EPYTHON} || die +} diff --git a/dev-util/fypp/metadata.xml b/dev-util/fypp/metadata.xml new file mode 100644 index 0000000000..415fd10dd2 --- /dev/null +++ b/dev-util/fypp/metadata.xml @@ -0,0 +1,17 @@ + + + + + torokhov-s-a@yandex.ru + Sergey Torokhov + + + Fypp is a Python powered preprocessor. + It can be used for any programming languages but its primary aim is to offer a Fortran preprocessor, + which helps to extend Fortran with condititional compiling and template metaprogramming capabilities. + + + fypp + aradi/fypp + + From 1fca5f27340ac2e78813e78414a5c14c93f1bf28 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Thu, 16 Sep 2021 01:39:02 +0300 Subject: [PATCH 4/4] dev-libs/fortran-stdlib: new package live ebuild There is currently no any releases, maybe later the versions binded to certain dates will be added. Signed-off-by: Sergey Torokhov --- .../fortran-stdlib/fortran-stdlib-9999.ebuild | 59 +++++++++++++++++++ dev-libs/fortran-stdlib/metadata.xml | 11 ++++ 2 files changed, 70 insertions(+) create mode 100644 dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild create mode 100644 dev-libs/fortran-stdlib/metadata.xml diff --git a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild new file mode 100644 index 0000000000..4a75181b01 --- /dev/null +++ b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_STANDARD="2003" +PYTHON_COMPAT=( python3_{8..9} ) + +inherit cmake fortran-2 git-r3 python-any-r1 toolchain-funcs + +EGIT_REPO_URI="https://github.com/fortran-lang/stdlib.git" +SRC_URI="" + +DESCRIPTION="A community driven standard library for (modern) Fortran" +HOMEPAGE="https://stdlib.fortran-lang.org/" + +LICENSE="MIT" +SLOT="0" +IUSE="doc test" +RESTRICT="mirror !test? ( test )" + +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-util/fypp[${PYTHON_USEDEP}] + ') + doc? ( + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +pkg_setup() { + fortran-2_pkg_setup +} + +src_configure() { + local mycmakeargs+=( + -DBUILD_SHARED_LIBS=on + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc ; then + einfo "Build API documentation:" + ${EPYTHON} ford API-doc-FORD-file.md || die + fi +} + +src_install() { + cmake_src_install + + use doc && HTML_DOCS=( "${WORKDIR}/${P}"/API-doc/. ) + einstalldocs +} diff --git a/dev-libs/fortran-stdlib/metadata.xml b/dev-libs/fortran-stdlib/metadata.xml new file mode 100644 index 0000000000..836f42bd01 --- /dev/null +++ b/dev-libs/fortran-stdlib/metadata.xml @@ -0,0 +1,11 @@ + + + + + torokhov-s-a@yandex.ru + Sergey Torokhov + + + fortran-lang/stdlib + +