[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/fortran-stdlib/

[Sergey Torokhov]

commit:     4eb85a6d0a4c650946002fa3ee514df326efa5b5
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Nov 24 12:27:21 2022 +0000
Commit:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Thu Nov 24 12:27:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4eb85a6d

dev-libs/fortran-stdlib: 0.2.1-r1 revision bump

Drop GFORTRAN_VERSION subdir from installation path.
Replace absence html doc icon with presented favicon.png

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 ...-9999.ebuild => fortran-stdlib-0.2.1-r1.ebuild} | 25 +++++++++++++++++-----
 dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild | 10 +++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild 
b/dev-libs/fortran-stdlib/fortran-stdlib-0.2.1-r1.ebuild
similarity index 59%
copy from dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
copy to dev-libs/fortran-stdlib/fortran-stdlib-0.2.1-r1.ebuild
index 408804347..6f04f3551 100644
--- a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-0.2.1-r1.ebuild
@@ -6,19 +6,22 @@ EAPI=8
 FORTRAN_STANDARD="2003"
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake fortran-2 git-r3 python-any-r1
+inherit cmake fortran-2 python-any-r1
 
-EGIT_REPO_URI="https://github.com/fortran-lang/stdlib.git";
-SRC_URI=""
+MY_PN="stdlib"
+SRC_URI="https://github.com/fortran-lang/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
 
 DESCRIPTION="A community driven standard library for (modern) Fortran"
 HOMEPAGE="https://stdlib.fortran-lang.org/";
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 RESTRICT="mirror !test? ( test )"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 DEPEND="
        ${PYTHON_DEPS}
        $(python_gen_any_dep '
@@ -36,6 +39,18 @@ pkg_setup() {
        fortran-2_pkg_setup
 }
 
+src_prepare() {
+       default
+
+       # Remove Fortran compiler version from paths
+       sed -i -e 
"s:/\${CMAKE_Fortran_COMPILER_ID}-\${CMAKE_Fortran_COMPILER_VERSION}::" 
config/CMakeLists.txt || die
+
+       # Use favicon.png instead remote icon
+       sed -i -e 
's#https://fortran-lang.org/assets/img/fortran_logo_512x512.png#favicon.png#' 
API-doc-FORD-file.md || die
+
+       cmake_src_prepare
+}
+
 src_configure() {
        local mycmakeargs+=(
                -DBUILD_SHARED_LIBS=on
@@ -49,7 +64,7 @@ src_compile() {
 
        if use doc ; then
                einfo "Build API documentation:"
-               ${EPYTHON} ford API-doc-FORD-file.md || die
+               ford API-doc-FORD-file.md || die
        fi
 }
 
@@ -60,6 +75,6 @@ src_test() {
 src_install() {
        cmake_src_install
 
-       use doc && HTML_DOCS=( "${WORKDIR}/${P}"/API-doc/. )
+       use doc && HTML_DOCS=( "${WORKDIR}/${MY_PN}-${PV}"/API-doc/. )
        einstalldocs
 }

diff --git a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild 
b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
index 408804347..88b88e009 100644
--- a/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
+++ b/dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild
@@ -36,6 +36,16 @@ pkg_setup() {
        fortran-2_pkg_setup
 }
 
+src_prepare() {
+       default
+
+       # Remove Fortran compiler version from paths
+       sed -i -e 
"s:/\${CMAKE_Fortran_COMPILER_ID}-\${CMAKE_Fortran_COMPILER_VERSION}::" 
config/CMakeLists.txt || die
+
+       cmake_src_prepare
+}
+
+
 src_configure() {
        local mycmakeargs+=(
                -DBUILD_SHARED_LIBS=on