From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 29309158020 for ; Thu, 24 Nov 2022 12:29:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AD5EE091C; Thu, 24 Nov 2022 12:29:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F56BE091C for ; Thu, 24 Nov 2022 12:29:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C2BB340E47 for ; Thu, 24 Nov 2022 12:29:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2416756 for ; Thu, 24 Nov 2022 12:29:09 +0000 (UTC) From: "Sergey Torokhov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Torokhov" Message-ID: <1669292841.4eb85a6d0a4c650946002fa3ee514df326efa5b5.SergeyTorokhov@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-libs/fortran-stdlib/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-libs/fortran-stdlib/fortran-stdlib-0.2.1-r1.ebuild dev-libs/fortran-stdlib/fortran-stdlib-9999.ebuild X-VCS-Directories: dev-libs/fortran-stdlib/ X-VCS-Committer: SergeyTorokhov X-VCS-Committer-Name: Sergey Torokhov X-VCS-Revision: 4eb85a6d0a4c650946002fa3ee514df326efa5b5 X-VCS-Branch: dev Date: Thu, 24 Nov 2022 12:29:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d119e4e0-0d7a-4754-b8d7-f7803779a4e6 X-Archives-Hash: 11ff957d03777eeda7bd1a95ff74e716 commit: 4eb85a6d0a4c650946002fa3ee514df326efa5b5 Author: Sergey Torokhov yandex ru> AuthorDate: Thu Nov 24 12:27:21 2022 +0000 Commit: Sergey Torokhov yandex 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 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