[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 09005bf654e5d221e7558201f7c9c6a23893a979 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Jan 21 20:10:26 2024 + Commit: Sergey Torokhov yandex ru> CommitDate: Sun Jan 21 20:10:26 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=09005bf6 dev-util/fpm: update {app-doc → app-text}/ford Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/fpm/fpm-0.9.0.ebuild b/dev-util/fpm/fpm-0.9.0.ebuild index c809ccf129..903018498b 100644 --- a/dev-util/fpm/fpm-0.9.0.ebuild +++ b/dev-util/fpm/fpm-0.9.0.ebuild @@ -39,7 +39,7 @@ DEPEND=" doc? ( ${PYTHON_DEPS} $(python_gen_any_dep ' - app-doc/ford[${PYTHON_USEDEP}] + app-text/ford[${PYTHON_USEDEP}] ') ) "
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 057d47c0f15ce776b8d51b1a41fb7cb0c051eb0b Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jul 9 01:40:05 2023 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Jul 9 01:55:44 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=057d47c0 dev-util/fpm: drop 0.8.1, 0.8.2 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-util/fpm/Manifest | 4 -- dev-util/fpm/fpm-0.8.1.ebuild | 116 -- dev-util/fpm/fpm-0.8.2.ebuild | 116 -- 3 files changed, 236 deletions(-) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index b084b1366..1bb962f6b 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -1,6 +1,2 @@ -DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d1c773c8bee3dfea84ab89dd2f57e7fdc6fc31e8297f5df89744ff657244d790bb8526ae35fc1d4be37a SHA512 627f5a6976358449b2dfa3623039244ddbab64007e1518718b6ae033e206d4a6b1ff462769df75137067522d85b0fbbb5f4a1749f7bbfba3c7b9040b457b1872 -DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 -DIST fpm-0.8.2.F90 1272455 BLAKE2B 1749d65cf45fee497aa42b9a53c3e3f76899414ca24d2c1c17764478740388e69f8e8bc7bd147c9ca3d8698a1424202effac0e661c2400068c9558626e7e3b9b SHA512 1cc070db2f03b474e70a8a889d1f11093a48f71f355c21d65ffb5edc255121e13419f9a9b95d8b42006725402a4aea8b644beb208f1af1c3de862d860dbfe4e6 -DIST fpm-0.8.2.tar.gz 199494 BLAKE2B 40ebf2185dcf7d68d19288ef43717a3fac41e7ec307739e64f0e89023b345358534cdf4914172ea3584233831fedc6a8bd2a3bc7e519668c7a18b96f2ffb611c SHA512 93cb6f25476e2f341004389edb9bb283f039a28bd09e461fdead91a0d53e069ffd2f8093cd7136f8b24d61c3705af555b7d45f4ffa9046f29870aadda97d3cb2 DIST fpm-0.9.0.F90 1371069 BLAKE2B df3439ca50176f0a8e3b2f48d130dc232da343d7fe5451af73b5bfa72112cfc7e08bc5c0dbaced2c5b5c72f48fc91d059ca533b4b47df23d1e579ebd03690078 SHA512 62f17491a2540d3b5f68435a87916b5e88bbd903a87cb4ecdfaa25e3024357e070c27e51a1f5ccdf22fb05ac8054ed83bb83e8a13c8639a47be822ff1fda9060 DIST fpm-0.9.0.tar.gz 219603 BLAKE2B cb282913c1c6dd6440e6c7b982e7a5ffd76a2e8177b70da22ee36946feb62229919b8f40a4747a2f0cd8b2c589ee111f063cab50ee0f0bee295cd8cf8946b46a SHA512 b80141408a2192efdd3c0777eb2df01de95ee5740332468ac95f89f6e6199c88c2d4180934ce552403572cadfc755395eb669336fcc9d3d00cb8ee0607205397 diff --git a/dev-util/fpm/fpm-0.8.1.ebuild b/dev-util/fpm/fpm-0.8.1.ebuild deleted file mode 100644 index cdb50e965..0 --- a/dev-util/fpm/fpm-0.8.1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_STANDARD="2003" - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Fortran Package Manager (fpm)" -HOMEPAGE="https://fpm.fortran-lang.org; -SRC_URI=" - https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="openmp doc test" -RESTRICT="!test? ( test )" - -CDEPEND=" - dev-libs/jonquil:0/2 - dev-libs/toml-f:0/4 - dev-libs/M_CLI2 -" - -RDEPEND=" - ${CDEPEND} - dev-vcs/git -" - -DEPEND=" - ${CDEPEND} - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - app-doc/ford[${PYTHON_USEDEP}] - ') - ) -" - -DOCS=( LICENSE PACKAGING.md README.md ) - -PATCHES="${FILESDIR}/${P}_fpm_toml.patch" - -BSDIR="build/bootstrap" # Bootstrap directory path - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -set_build_flags() { - OMPFLAG="" - if use openmp ; then - case $(tc-getFC) in - *gfortran* ) - OMPFLAG="-fopenmp" ;; - * ) - die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; - esac - fi - - BUILD_FLAGS=( --compiler "$(tc-getFC)" - --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f/modules -I/usr/include/jonquil/modules -I/usr/include/M_CLI2" - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" - --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" ) -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - fortran-2_pkg_setup - python-any-r1_pkg_setup - set_build_flags -} - -src_prepare() { - default - - mkdir -p "${BSDIR}"
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: b17866ef563f21d0016fa22dc4671735c704a8b5 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Sun Jul 9 01:40:11 2023 + Commit: Anna Vyalkova sysrq in> CommitDate: Sun Jul 9 01:55:44 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b17866ef dev-util/fpm: unkeyword 0.9.0 for ~x86 Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-util/fpm/fpm-0.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/fpm/fpm-0.9.0.ebuild b/dev-util/fpm/fpm-0.9.0.ebuild index 63c714656..c809ccf12 100644 --- a/dev-util/fpm/fpm-0.9.0.ebuild +++ b/dev-util/fpm/fpm-0.9.0.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" IUSE="openmp doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/
commit: 1f21debbca4f9fef493baa681a6f2b75fd053d3e Author: Sergey Torokhov yandex ru> AuthorDate: Sat Jun 3 07:51:39 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Sat Jun 3 07:52:10 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1f21debb dev-util/fpm: 0.9.0 version bump Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/Manifest | 2 + dev-util/fpm/files/fpm-0.9.0_fpm_toml.patch | 22 ++ dev-util/fpm/fpm-0.9.0.ebuild | 118 3 files changed, 142 insertions(+) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index a07bc29b9..b084b1366 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -2,3 +2,5 @@ DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 DIST fpm-0.8.2.F90 1272455 BLAKE2B 1749d65cf45fee497aa42b9a53c3e3f76899414ca24d2c1c17764478740388e69f8e8bc7bd147c9ca3d8698a1424202effac0e661c2400068c9558626e7e3b9b SHA512 1cc070db2f03b474e70a8a889d1f11093a48f71f355c21d65ffb5edc255121e13419f9a9b95d8b42006725402a4aea8b644beb208f1af1c3de862d860dbfe4e6 DIST fpm-0.8.2.tar.gz 199494 BLAKE2B 40ebf2185dcf7d68d19288ef43717a3fac41e7ec307739e64f0e89023b345358534cdf4914172ea3584233831fedc6a8bd2a3bc7e519668c7a18b96f2ffb611c SHA512 93cb6f25476e2f341004389edb9bb283f039a28bd09e461fdead91a0d53e069ffd2f8093cd7136f8b24d61c3705af555b7d45f4ffa9046f29870aadda97d3cb2 +DIST fpm-0.9.0.F90 1371069 BLAKE2B df3439ca50176f0a8e3b2f48d130dc232da343d7fe5451af73b5bfa72112cfc7e08bc5c0dbaced2c5b5c72f48fc91d059ca533b4b47df23d1e579ebd03690078 SHA512 62f17491a2540d3b5f68435a87916b5e88bbd903a87cb4ecdfaa25e3024357e070c27e51a1f5ccdf22fb05ac8054ed83bb83e8a13c8639a47be822ff1fda9060 +DIST fpm-0.9.0.tar.gz 219603 BLAKE2B cb282913c1c6dd6440e6c7b982e7a5ffd76a2e8177b70da22ee36946feb62229919b8f40a4747a2f0cd8b2c589ee111f063cab50ee0f0bee295cd8cf8946b46a SHA512 b80141408a2192efdd3c0777eb2df01de95ee5740332468ac95f89f6e6199c88c2d4180934ce552403572cadfc755395eb669336fcc9d3d00cb8ee0607205397 diff --git a/dev-util/fpm/files/fpm-0.9.0_fpm_toml.patch b/dev-util/fpm/files/fpm-0.9.0_fpm_toml.patch new file mode 100644 index 0..8765e164f --- /dev/null +++ b/dev-util/fpm/files/fpm-0.9.0_fpm_toml.patch @@ -0,0 +1,22 @@ +diff -Naur a/fpm.toml b/fpm.toml +--- a/fpm.toml b/fpm.toml +@@ -9,15 +9,9 @@ + [preprocess.cpp] + macros=["FPM_RELEASE_VERSION={version}"] + +-[dependencies] +-toml-f.git = "https://github.com/toml-f/toml-f; +-toml-f.rev = "d7b892b1d074b7cfc5d75c3e0eb36ebc1f7958c1" +-M_CLI2.git = "https://github.com/urbanjost/M_CLI2.git; +-M_CLI2.rev = "7264878cdb1baff7323cc48596d829ccfe7751b8" +-fortran-regex.git = "https://github.com/perazz/fortran-regex; +-fortran-regex.tag = "1.1.2" +-jonquil.git = "https://github.com/toml-f/jonquil; +-jonquil.rev = "4c27c8c1e411fa8790dffcf8c3fa7a27b6322273" ++[build] ++external-modules = ["tomlf","m_cli2","regex_module","jonquil"] ++link = ["toml-f","M_CLI2","fortran-regex","jonquil"] + + [[test]] + name = "cli-test" diff --git a/dev-util/fpm/fpm-0.9.0.ebuild b/dev-util/fpm/fpm-0.9.0.ebuild new file mode 100644 index 0..63c714656 --- /dev/null +++ b/dev-util/fpm/fpm-0.9.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Fortran Package Manager (fpm)" +HOMEPAGE="https://fpm.fortran-lang.org; +SRC_URI=" + https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/fortran-regex + dev-libs/jonquil:0/2 + dev-libs/toml-f:0/4 + dev-libs/M_CLI2 +" + +RDEPEND=" + ${CDEPEND} + dev-vcs/git +" + +DEPEND=" + ${CDEPEND} + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( LICENSE PACKAGING.md README.md ) + +PATCHES="${FILESDIR}/${P}_fpm_toml.patch" + +BSDIR="build/bootstrap" # Bootstrap directory path + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +set_build_flags() { + OMPFLAG="" + if use openmp ; then + case $(tc-getFC) in + *gfortran* ) + OMPFLAG="-fopenmp" ;; +
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/files/, dev-util/fpm/
commit: 56cbe1750b027fa8005dc5d650855a6bccfda6f4 Author: Sergey Torokhov yandex ru> AuthorDate: Fri Jun 2 21:01:59 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Fri Jun 2 21:01:59 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=56cbe175 dev-util/fpm: drop old 0.7.0-r2 Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/Manifest | 2 - dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch | 21 - dev-util/fpm/fpm-0.7.0-r2.ebuild| 115 3 files changed, 138 deletions(-) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index 899333c39..a07bc29b9 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -1,5 +1,3 @@ -DIST fpm-0.7.0.F90 985847 BLAKE2B 05d6acc336880ea0c2dcd01db9b5eb5790ee593d9d97b36c7dab231d96f564125293e944f4c7c1debcee1dace9a0709ca9dbec40535c2b7320f909023d561d0a SHA512 76e4a465f38375469ccad849f705837d90dc288df2ac101dfc6941f4fa676c3302f6f23bfd45037c7ce4bb5fac637f021373ff0756534d5cf762044709dbd8c0 -DIST fpm-0.7.0.tar.gz 169412 BLAKE2B 6895d91cb67a8d15e50025c298aed32e77966685a1db426b9437a5c441f7c365cec76a7836c83ff5a5299216a9392812ae832bfb72d5cd4263bcb60976d12b6e SHA512 ec18798e02b4fb3e403062c68f97bf34200559207ffc87dba3b8b801aef31cabefdcda29203a1405ed0231192316a1fab16ecff603b0bf9fab0cede0fe4506de DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d1c773c8bee3dfea84ab89dd2f57e7fdc6fc31e8297f5df89744ff657244d790bb8526ae35fc1d4be37a SHA512 627f5a6976358449b2dfa3623039244ddbab64007e1518718b6ae033e206d4a6b1ff462769df75137067522d85b0fbbb5f4a1749f7bbfba3c7b9040b457b1872 DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 DIST fpm-0.8.2.F90 1272455 BLAKE2B 1749d65cf45fee497aa42b9a53c3e3f76899414ca24d2c1c17764478740388e69f8e8bc7bd147c9ca3d8698a1424202effac0e661c2400068c9558626e7e3b9b SHA512 1cc070db2f03b474e70a8a889d1f11093a48f71f355c21d65ffb5edc255121e13419f9a9b95d8b42006725402a4aea8b644beb208f1af1c3de862d860dbfe4e6 diff --git a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch deleted file mode 100644 index 8d0685e3e..0 --- a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur a/fpm.toml b/fpm.toml a/fpm.toml -+++ b/fpm.toml -@@ -5,14 +5,9 @@ - maintainer = "" - copyright = "2020 fpm contributors" - --[dependencies] --[dependencies.toml-f] --git = "https://github.com/toml-f/toml-f; --rev = "e49f5523e4ee67db6628618864504448fb8c8939" -- --[dependencies.M_CLI2] --git = "https://github.com/urbanjost/M_CLI2.git; --rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24" -+[build] -+external-modules = ["tomlf", "m_cli2"] -+link = ["toml-f","M_CLI2"] - - [[test]] - name = "cli-test" diff --git a/dev-util/fpm/fpm-0.7.0-r2.ebuild b/dev-util/fpm/fpm-0.7.0-r2.ebuild deleted file mode 100644 index 1bded4efa..0 --- a/dev-util/fpm/fpm-0.7.0-r2.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_STANDARD="2003" - -PYTHON_COMPAT=( python3_{10..11} ) - -inherit fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Fortran Package Manager (fpm)" -HOMEPAGE="https://fpm.fortran-lang.org; -SRC_URI=" - https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="openmp doc test" -RESTRICT="!test? ( test )" - -CDEPEND=" - dev-libs/toml-f:0/2 - dev-libs/M_CLI2 -" - -RDEPEND=" - ${CDEPEND} - dev-vcs/git -" - -DEPEND=" - ${CDEPEND} - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - app-doc/ford[${PYTHON_USEDEP}] - ') - ) -" - -DOCS=( LICENSE PACKAGING.md README.md ) - -PATCHES="${FILESDIR}/${P}_fpm_toml.patch" - -BSDIR="build/bootstrap" # Bootstrap directory path - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -set_build_flags() { - OMPFLAG="" - if use openmp ; then - case $(tc-getFC) in - *gfortran* ) - OMPFLAG="-fopenmp" ;; - * ) - die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; - esac - fi - - BUILD_FLAGS=( --compiler "$(tc-getFC)" - --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" -
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/
commit: f1abaa84cbd92cde2018b77476397165b23ee3be Author: Sergey Torokhov yandex ru> AuthorDate: Tue May 16 20:08:16 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Tue May 16 20:08:16 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1abaa84 dev-util/fpm: 0.8.2 version bump Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/Manifest | 2 + dev-util/fpm/files/fpm-0.8.2_fpm_toml.patch | 20 + dev-util/fpm/fpm-0.8.2.ebuild | 116 3 files changed, 138 insertions(+) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index e9dcb..899333c39 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -2,3 +2,5 @@ DIST fpm-0.7.0.F90 985847 BLAKE2B 05d6acc336880ea0c2dcd01db9b5eb5790ee593d9d97b3 DIST fpm-0.7.0.tar.gz 169412 BLAKE2B 6895d91cb67a8d15e50025c298aed32e77966685a1db426b9437a5c441f7c365cec76a7836c83ff5a5299216a9392812ae832bfb72d5cd4263bcb60976d12b6e SHA512 ec18798e02b4fb3e403062c68f97bf34200559207ffc87dba3b8b801aef31cabefdcda29203a1405ed0231192316a1fab16ecff603b0bf9fab0cede0fe4506de DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d1c773c8bee3dfea84ab89dd2f57e7fdc6fc31e8297f5df89744ff657244d790bb8526ae35fc1d4be37a SHA512 627f5a6976358449b2dfa3623039244ddbab64007e1518718b6ae033e206d4a6b1ff462769df75137067522d85b0fbbb5f4a1749f7bbfba3c7b9040b457b1872 DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 +DIST fpm-0.8.2.F90 1272455 BLAKE2B 1749d65cf45fee497aa42b9a53c3e3f76899414ca24d2c1c17764478740388e69f8e8bc7bd147c9ca3d8698a1424202effac0e661c2400068c9558626e7e3b9b SHA512 1cc070db2f03b474e70a8a889d1f11093a48f71f355c21d65ffb5edc255121e13419f9a9b95d8b42006725402a4aea8b644beb208f1af1c3de862d860dbfe4e6 +DIST fpm-0.8.2.tar.gz 199494 BLAKE2B 40ebf2185dcf7d68d19288ef43717a3fac41e7ec307739e64f0e89023b345358534cdf4914172ea3584233831fedc6a8bd2a3bc7e519668c7a18b96f2ffb611c SHA512 93cb6f25476e2f341004389edb9bb283f039a28bd09e461fdead91a0d53e069ffd2f8093cd7136f8b24d61c3705af555b7d45f4ffa9046f29870aadda97d3cb2 diff --git a/dev-util/fpm/files/fpm-0.8.2_fpm_toml.patch b/dev-util/fpm/files/fpm-0.8.2_fpm_toml.patch new file mode 100644 index 0..d483f17fb --- /dev/null +++ b/dev-util/fpm/files/fpm-0.8.2_fpm_toml.patch @@ -0,0 +1,20 @@ +diff -Nuar a/fpm.toml b/fpm.toml +--- a/fpm.toml b/fpm.toml +@@ -9,13 +9,9 @@ + [preprocess.cpp] + macros=["FPM_RELEASE_VERSION={version}"] + +-[dependencies] +-toml-f.git = "https://github.com/toml-f/toml-f; +-toml-f.rev = "d7b892b1d074b7cfc5d75c3e0eb36ebc1f7958c1" +-M_CLI2.git = "https://github.com/urbanjost/M_CLI2.git; +-M_CLI2.rev = "7264878cdb1baff7323cc48596d829ccfe7751b8" +-jonquil.git = "https://github.com/toml-f/jonquil; +-jonquil.rev = "4c27c8c1e411fa8790dffcf8c3fa7a27b6322273" ++[build] ++external-modules = ["tomlf","jonquil","m_cli2"] ++link = ["toml-f","jonquil","M_CLI2"] + + [[test]] + name = "cli-test" diff --git a/dev-util/fpm/fpm-0.8.2.ebuild b/dev-util/fpm/fpm-0.8.2.ebuild new file mode 100644 index 0..cdb50e965 --- /dev/null +++ b/dev-util/fpm/fpm-0.8.2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +PYTHON_COMPAT=( python3_{10..11} ) + +inherit fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Fortran Package Manager (fpm)" +HOMEPAGE="https://fpm.fortran-lang.org; +SRC_URI=" + https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/jonquil:0/2 + dev-libs/toml-f:0/4 + dev-libs/M_CLI2 +" + +RDEPEND=" + ${CDEPEND} + dev-vcs/git +" + +DEPEND=" + ${CDEPEND} + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( LICENSE PACKAGING.md README.md ) + +PATCHES="${FILESDIR}/${P}_fpm_toml.patch" + +BSDIR="build/bootstrap" # Bootstrap directory path + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +set_build_flags() { + OMPFLAG="" + if use openmp ; then + case $(tc-getFC) in + *gfortran* ) + OMPFLAG="-fopenmp" ;; + * ) + die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; + esac + fi + +
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/
commit: 46babda30406faf836982f5796d12c0d2bc7 Author: Sergey Torokhov yandex ru> AuthorDate: Wed Apr 19 00:21:41 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Wed Apr 19 00:21:41 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=46bab888 dev-util/fpm: 0.8.1 version bump Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/Manifest | 2 + dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch | 20 + dev-util/fpm/fpm-0.8.1.ebuild | 116 3 files changed, 138 insertions(+) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest index ae6d0f021..e9dcb 100644 --- a/dev-util/fpm/Manifest +++ b/dev-util/fpm/Manifest @@ -1,2 +1,4 @@ DIST fpm-0.7.0.F90 985847 BLAKE2B 05d6acc336880ea0c2dcd01db9b5eb5790ee593d9d97b36c7dab231d96f564125293e944f4c7c1debcee1dace9a0709ca9dbec40535c2b7320f909023d561d0a SHA512 76e4a465f38375469ccad849f705837d90dc288df2ac101dfc6941f4fa676c3302f6f23bfd45037c7ce4bb5fac637f021373ff0756534d5cf762044709dbd8c0 DIST fpm-0.7.0.tar.gz 169412 BLAKE2B 6895d91cb67a8d15e50025c298aed32e77966685a1db426b9437a5c441f7c365cec76a7836c83ff5a5299216a9392812ae832bfb72d5cd4263bcb60976d12b6e SHA512 ec18798e02b4fb3e403062c68f97bf34200559207ffc87dba3b8b801aef31cabefdcda29203a1405ed0231192316a1fab16ecff603b0bf9fab0cede0fe4506de +DIST fpm-0.8.1.F90 1254888 BLAKE2B 681af746d74ef6208f8d4a6b7e560fda080124ca69d5d1c773c8bee3dfea84ab89dd2f57e7fdc6fc31e8297f5df89744ff657244d790bb8526ae35fc1d4be37a SHA512 627f5a6976358449b2dfa3623039244ddbab64007e1518718b6ae033e206d4a6b1ff462769df75137067522d85b0fbbb5f4a1749f7bbfba3c7b9040b457b1872 +DIST fpm-0.8.1.tar.gz 194794 BLAKE2B 6236cdcc22a16e4d46e7d49f513bc1506e956bad6e3b444c2c638db8e41910aafa07982e4116a4e4b6496a62b4f52c2792aa08d4692c30e6158639115066b0c9 SHA512 2c6243ded0c4603ab75acdb43ff953f026a30221abaa1c1a2791cbf8dd7f9c95016941b38a63d54bbb09a0c2451ad23a216bb100cb08bc1c7f25899ad88dad26 diff --git a/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch b/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch new file mode 100644 index 0..8bea036c4 --- /dev/null +++ b/dev-util/fpm/files/fpm-0.8.1_fpm_toml.patch @@ -0,0 +1,20 @@ +diff -Naur a/fpm.toml b/fpm.toml +--- a/fpm.toml b/fpm.toml +@@ -5,13 +5,9 @@ + maintainer = "" + copyright = "2020 fpm contributors" + +-[dependencies] +-toml-f.git = "https://github.com/toml-f/toml-f; +-toml-f.rev = "54686e45993f3a9a1d05d5c7419f39e7d5a4eb3f" +-M_CLI2.git = "https://github.com/urbanjost/M_CLI2.git; +-M_CLI2.rev = "7264878cdb1baff7323cc48596d829ccfe7751b8" +-jonquil.git = "https://github.com/toml-f/jonquil; +-jonquil.rev = "05d30818bb12fb877226ce284b9a3a41b971a889" ++[build] ++external-modules = ["tomlf","jonquil","m_cli2"] ++link = ["toml-f","jonquil","M_CLI2"] + + [[test]] + name = "cli-test" diff --git a/dev-util/fpm/fpm-0.8.1.ebuild b/dev-util/fpm/fpm-0.8.1.ebuild new file mode 100644 index 0..0f3dda1c3 --- /dev/null +++ b/dev-util/fpm/fpm-0.8.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Fortran Package Manager (fpm)" +HOMEPAGE="https://fpm.fortran-lang.org; +SRC_URI=" + https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" + +CDEPEND=" + dev-libs/jonquil:0/2 + dev-libs/toml-f:0/4 + dev-libs/M_CLI2 +" + +RDEPEND=" + ${CDEPEND} + dev-vcs/git +" + +DEPEND=" + ${CDEPEND} + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( LICENSE PACKAGING.md README.md ) + +PATCHES="${FILESDIR}/${P}_fpm_toml.patch" + +BSDIR="build/bootstrap" # Bootstrap directory path + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +set_build_flags() { + OMPFLAG="" + if use openmp ; then + case $(tc-getFC) in + *gfortran* ) + OMPFLAG="-fopenmp" ;; + * ) + die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; + esac + fi + + BUILD_FLAGS=( --compiler "$(tc-getFC)" + --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f/modules -I/usr/include/jonquil/modules -I/usr/include/M_CLI2" + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" + --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" ) +} + +pkg_setup() { +
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: cafd796f3a477cddfbcbf9c9bfb0e61702e9fb5b Author: Sergey Torokhov yandex ru> AuthorDate: Tue Apr 18 23:05:31 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Tue Apr 18 23:57:48 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cafd796f dev-util/fpm: replace repetitive build flags with BUILD_FLAGS array Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0-r2.ebuild | 26 +++--- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0-r2.ebuild b/dev-util/fpm/fpm-0.7.0-r2.ebuild index fba8f63c4..38cc9186d 100644 --- a/dev-util/fpm/fpm-0.7.0-r2.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r2.ebuild @@ -52,7 +52,7 @@ pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } -set_omp_flag() { +set_build_flags() { OMPFLAG="" if use openmp ; then case $(tc-getFC) in @@ -62,13 +62,19 @@ set_omp_flag() { die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; esac fi + + BUILD_FLAGS=( --compiler "$(tc-getFC)" + --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" + --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" ) } pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp fortran-2_pkg_setup python-any-r1_pkg_setup - set_omp_flag + set_build_flags } src_prepare() { @@ -88,10 +94,7 @@ src_compile() { "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die # Use the bootstrap binary to build the feature complete fpm version - "${BSDIR}"/fpm build --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm build --verbose "${BUILD_FLAGS[@]}" || die if use doc ; then einfo "Build API documentation:" @@ -100,19 +103,12 @@ src_compile() { } src_test() { - "${BSDIR}"/fpm test --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm test --verbose "${BUILD_FLAGS[@]}" || die } src_install() { # Set prefix and pass all used env flags to avoid recompiling with default values - "${BSDIR}"/fpm install --prefix "${ED}/usr" \ - --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/M_CLI2" \ - --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ - --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die + "${BSDIR}"/fpm install --prefix "${ED}/usr" "${BUILD_FLAGS[@]}" || die use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) einstalldocs
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/, dev-util/fpm/files/, dev-libs/m_cli2/, dev-libs/M_CLI2/
commit: 334cea92526c35a0ba95ae65e7edfd2c182f925a Author: Sergey Torokhov yandex ru> AuthorDate: Tue Apr 18 22:56:33 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Tue Apr 18 22:57:34 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=334cea92 dev-libs/m_cli2: rename to M_CLI2 to follow upstream naming Signed-off-by: Sergey Torokhov yandex.ru> .../M_CLI2-1.0.0_p20221116-r1.ebuild} | 10 +- dev-libs/{m_cli2 => M_CLI2}/Manifest | 2 +- dev-libs/{m_cli2 => M_CLI2}/metadata.xml | 0 dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch| 2 +- dev-util/fpm/{fpm-0.7.0-r1.ebuild => fpm-0.7.0-r2.ebuild} | 8 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild b/dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild similarity index 81% rename from dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild rename to dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild index 4097351e9..e7522a112 100644 --- a/dev-libs/m_cli2/m_cli2-1.0.0_p20221116.ebuild +++ b/dev-libs/M_CLI2/M_CLI2-1.0.0_p20221116-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ m_cli2_sha="90a1a146e19c8ad37b0469b8cbd04bc28eb67a50" DESCRIPTION="M_CLI2 - parse Unix-like command line arguments from Fortran" HOMEPAGE="https://github.com/urbanjost/M_CLI2; -SRC_URI="https://github.com/urbanjost/M_CLI2/archive/${m_cli2_sha}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/urbanjost/${PN}/archive/${m_cli2_sha}.tar.gz -> ${P}.tar.gz" LICENSE="Unlicense" SLOT="0" @@ -20,7 +20,7 @@ IUSE="test" RESTRICT="!test? ( test )" -S="${WORKDIR}/M_CLI2-${m_cli2_sha}/src" +S="${WORKDIR}/${PN}-${m_cli2_sha}/src" src_prepare() { default @@ -34,7 +34,7 @@ src_compile() { *gfortran* ) emake clean emake F90=$(tc-getFC) gfortran - $(tc-getFC) -Wl,-soname,lib"${PN}".so.1 ${LDFLAGS} -shared -o lib"${PN}".so.1 M_CLI2.o;; + $(tc-getFC) -Wl,-soname,lib"${PN}".so.1 ${LDFLAGS} -shared -o lib"${PN}".so.1 ${PN}.o;; * ) die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; esac @@ -46,7 +46,7 @@ src_test() { src_install() { insinto "/usr/include/${PN}" - doins "${PN}.mod" + doins "m_cli2.mod" dolib.so "lib${PN}.so.1" dosym "lib${PN}.so.1" "/usr/$(get_libdir)/lib${PN}.so" } diff --git a/dev-libs/m_cli2/Manifest b/dev-libs/M_CLI2/Manifest similarity index 79% rename from dev-libs/m_cli2/Manifest rename to dev-libs/M_CLI2/Manifest index a4c3673e0..493367e93 100644 --- a/dev-libs/m_cli2/Manifest +++ b/dev-libs/M_CLI2/Manifest @@ -1 +1 @@ -DIST m_cli2-1.0.0_p20221116.tar.gz 13771712 BLAKE2B a97eb944e7a117f821822a6018d27e666ad9e761cc0d0c6901ae384b1d1d19002ee117d22695e7cfbca62e8038adcdc11d902af58f15a61f44a0e3850b8547b5 SHA512 47ede587a6fd10a8f68deae0df0eb380a51499ed15b736905054619eefd25f018189f656384fa8d72093f622e0a9871cfdea81796a9f9071e797086182f8bd57 +DIST M_CLI2-1.0.0_p20221116.tar.gz 13771712 BLAKE2B a97eb944e7a117f821822a6018d27e666ad9e761cc0d0c6901ae384b1d1d19002ee117d22695e7cfbca62e8038adcdc11d902af58f15a61f44a0e3850b8547b5 SHA512 47ede587a6fd10a8f68deae0df0eb380a51499ed15b736905054619eefd25f018189f656384fa8d72093f622e0a9871cfdea81796a9f9071e797086182f8bd57 diff --git a/dev-libs/m_cli2/metadata.xml b/dev-libs/M_CLI2/metadata.xml similarity index 100% rename from dev-libs/m_cli2/metadata.xml rename to dev-libs/M_CLI2/metadata.xml diff --git a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch index 08000553f..8d0685e3e 100644 --- a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch +++ b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch @@ -15,7 +15,7 @@ diff -Naur a/fpm.toml b/fpm.toml -rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24" +[build] +external-modules = ["tomlf", "m_cli2"] -+link = ["toml-f","m_cli2"] ++link = ["toml-f","M_CLI2"] [[test]] name = "cli-test" diff --git a/dev-util/fpm/fpm-0.7.0-r1.ebuild b/dev-util/fpm/fpm-0.7.0-r2.ebuild similarity index 93% rename from dev-util/fpm/fpm-0.7.0-r1.ebuild rename to dev-util/fpm/fpm-0.7.0-r2.ebuild index ab52e3b87..fba8f63c4 100644 --- a/dev-util/fpm/fpm-0.7.0-r1.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r2.ebuild @@ -24,7 +24,7 @@ RESTRICT="!test? ( test )" CDEPEND=" dev-libs/toml-f:0/2 - dev-libs/m_cli2 + dev-libs/M_CLI2 " RDEPEND=" @@ -88,7 +88,7 @@ src_compile() { "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die # Use the bootstrap binary to build the feature complete fpm version - "${BSDIR}"/fpm build --verbose --compiler
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 9327576973a817f156ae0dd43271e307ab665166 Author: Sergey Torokhov yandex ru> AuthorDate: Wed Feb 1 21:25:27 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Wed Feb 1 22:28:12 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=93275769 dev-util/fpm: add Python3.11 compat Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/fpm/fpm-0.7.0-r1.ebuild b/dev-util/fpm/fpm-0.7.0-r1.ebuild index 4721d67e8..ab52e3b87 100644 --- a/dev-util/fpm/fpm-0.7.0-r1.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 FORTRAN_STANDARD="2003" -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit fortran-2 python-any-r1 toolchain-funcs
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 9cc83f3299535afe7c8e0c36892248f3991d52f7 Author: Sergey Torokhov yandex ru> AuthorDate: Wed Jan 18 23:59:57 2023 + Commit: Sergey Torokhov yandex ru> CommitDate: Wed Jan 18 23:59:57 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9cc83f32 dev-util/fpm: drop python3.8 compat Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0-r1.ebuild b/dev-util/fpm/fpm-0.7.0-r1.ebuild index 7a3699cfb..4721d67e8 100644 --- a/dev-util/fpm/fpm-0.7.0-r1.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 FORTRAN_STANDARD="2003" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..10} ) inherit fortran-2 python-any-r1 toolchain-funcs
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 3b8d080ae6a76fcf463a77a145e0b03b6eceb7a4 Author: Sergey Torokhov yandex ru> AuthorDate: Thu Dec 22 01:09:05 2022 + Commit: Sergey Torokhov yandex ru> CommitDate: Thu Dec 22 01:09:05 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3b8d080a dev-util/fpm: call 'die' if fail; add '--verbose' for detailed build.log Closes: https://bugs.gentoo.org/887633 Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0-r1.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0-r1.ebuild b/dev-util/fpm/fpm-0.7.0-r1.ebuild index de85b17db..7a3699cfb 100644 --- a/dev-util/fpm/fpm-0.7.0-r1.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r1.ebuild @@ -88,10 +88,10 @@ src_compile() { "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die # Use the bootstrap binary to build the feature complete fpm version - "${BSDIR}"/fpm build --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + "${BSDIR}"/fpm build --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" + --archiver "$(tc-getAR)" --link-flag "${LDFLAGS}" || die if use doc ; then einfo "Build API documentation:" @@ -100,10 +100,10 @@ src_compile() { } src_test() { - "${BSDIR}"/fpm test --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + "${BSDIR}"/fpm test --verbose --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die } src_install() { @@ -112,7 +112,7 @@ src_install() { --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ - --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" || die use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) einstalldocs
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 50af6bfa1e78a792c1d8d13658f3732bdb379805 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Nov 26 18:16:01 2022 + Commit: Sergey Torokhov yandex ru> CommitDate: Sat Nov 26 18:16:01 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=50af6bfa dev-util/fpm: 0.7.0-r1 bump; bind to dev-libs/toml-f:0/2; enable tests The fpm-0.7.0 initially has bundled toml-f-0.2.4 and currently incompatible with toml-f-0.3.1 resulting in tests failure. Therefore the dev-libs/toml-f is subsloted and dev-util/fpm-0.7.0 depends now on dev-libs/toml-f:0/2 (i.e. 0.2.4 version). Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/{fpm-0.7.0.ebuild => fpm-0.7.0-r1.ebuild} | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0.ebuild b/dev-util/fpm/fpm-0.7.0-r1.ebuild similarity index 87% rename from dev-util/fpm/fpm-0.7.0.ebuild rename to dev-util/fpm/fpm-0.7.0-r1.ebuild index 60e532ebc..de85b17db 100644 --- a/dev-util/fpm/fpm-0.7.0.ebuild +++ b/dev-util/fpm/fpm-0.7.0-r1.ebuild @@ -19,11 +19,11 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="openmp doc" -RESTRICT="test" +IUSE="openmp doc test" +RESTRICT="!test? ( test )" CDEPEND=" - dev-libs/toml-f + dev-libs/toml-f:0/2 dev-libs/m_cli2 " @@ -99,6 +99,13 @@ src_compile() { fi } +src_test() { + "${BSDIR}"/fpm test --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" +} + src_install() { # Set prefix and pass all used env flags to avoid recompiling with default values "${BSDIR}"/fpm install --prefix "${ED}/usr" \
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 0e12c2266a4dd55e9df23841d9f430d69e5a2a05 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Nov 26 07:12:51 2022 + Commit: Sergey Torokhov yandex ru> CommitDate: Sat Nov 26 07:12:51 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e12c226 dev-util/fpm: add USE=openmp to build targets in parallel where possible Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0.ebuild | 24 +--- dev-util/fpm/metadata.xml | 3 +++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0.ebuild b/dev-util/fpm/fpm-0.7.0.ebuild index 2d1f62b6a..60e532ebc 100644 --- a/dev-util/fpm/fpm-0.7.0.ebuild +++ b/dev-util/fpm/fpm-0.7.0.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" +IUSE="openmp doc" RESTRICT="test" CDEPEND=" @@ -48,9 +48,27 @@ PATCHES="${FILESDIR}/${P}_fpm_toml.patch" BSDIR="build/bootstrap" # Bootstrap directory path +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +set_omp_flag() { + OMPFLAG="" + if use openmp ; then + case $(tc-getFC) in + *gfortran* ) + OMPFLAG="-fopenmp" ;; + * ) + die "Sorry, only GNU gfortran is currently supported in the ebuild" ;; + esac + fi +} + pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp fortran-2_pkg_setup python-any-r1_pkg_setup + set_omp_flag } src_prepare() { @@ -70,7 +88,7 @@ src_compile() { "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die # Use the bootstrap binary to build the feature complete fpm version - "${BSDIR}"/fpm build --compiler "$(tc-getFC)" --flag "${FCFLAGS} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + "${BSDIR}"/fpm build --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" @@ -84,7 +102,7 @@ src_compile() { src_install() { # Set prefix and pass all used env flags to avoid recompiling with default values "${BSDIR}"/fpm install --prefix "${ED}/usr" \ - --compiler "$(tc-getFC)" --flag "${FCFLAGS} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + --compiler "$(tc-getFC)" --flag "${FCFLAGS} ${OMPFLAG} -I/usr/include/toml-f -I/usr/include/m_cli2" \ --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" diff --git a/dev-util/fpm/metadata.xml b/dev-util/fpm/metadata.xml index f45acb901..fac9ec00a 100644 --- a/dev-util/fpm/metadata.xml +++ b/dev-util/fpm/metadata.xml @@ -5,6 +5,9 @@ torokhov-...@yandex.ru Sergey Torokhov + + OpenMP support to build targets in parallel where possible + fortran-lang/fpm
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/
commit: 1d1c6d8244bca3b591b13fbd38ce75b23af4e5ca Author: Sergey Torokhov yandex ru> AuthorDate: Thu Nov 24 13:13:31 2022 + Commit: Sergey Torokhov yandex ru> CommitDate: Thu Nov 24 13:13:31 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1d1c6d82 dev-util/fpm: replace 'doexe' with 'fpm install' Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/fpm-0.7.0.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-util/fpm/fpm-0.7.0.ebuild b/dev-util/fpm/fpm-0.7.0.ebuild index 54ba2be61..2d1f62b6a 100644 --- a/dev-util/fpm/fpm-0.7.0.ebuild +++ b/dev-util/fpm/fpm-0.7.0.ebuild @@ -82,8 +82,12 @@ src_compile() { } src_install() { - exeinto /usr/bin - doexe build/"$(tc-getFC)"_*/app/fpm + # Set prefix and pass all used env flags to avoid recompiling with default values + "${BSDIR}"/fpm install --prefix "${ED}/usr" \ + --compiler "$(tc-getFC)" --flag "${FCFLAGS} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) einstalldocs
[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/files/, dev-util/fpm/
commit: 92e3da05aaf62370b692bfcc6ba8bf718e3117c7 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Nov 19 00:07:06 2022 + Commit: Sergey Torokhov yandex ru> CommitDate: Sat Nov 19 00:07:06 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=92e3da05 dev-util/fpm: new package, version 0.7.0 Fortran package manager. It's strange but in src_compile the "${EPYTHON} ford" tries to call "${S}/ford" instead of python site-package like within dev-libs/fortran-stdlib when build HTML docs. Tests currently is disabled. Signed-off-by: Sergey Torokhov yandex.ru> dev-util/fpm/Manifest | 2 + dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch | 21 +++ dev-util/fpm/fpm-0.7.0.ebuild | 90 + dev-util/fpm/metadata.xml | 11 4 files changed, 124 insertions(+) diff --git a/dev-util/fpm/Manifest b/dev-util/fpm/Manifest new file mode 100644 index 0..ae6d0f021 --- /dev/null +++ b/dev-util/fpm/Manifest @@ -0,0 +1,2 @@ +DIST fpm-0.7.0.F90 985847 BLAKE2B 05d6acc336880ea0c2dcd01db9b5eb5790ee593d9d97b36c7dab231d96f564125293e944f4c7c1debcee1dace9a0709ca9dbec40535c2b7320f909023d561d0a SHA512 76e4a465f38375469ccad849f705837d90dc288df2ac101dfc6941f4fa676c3302f6f23bfd45037c7ce4bb5fac637f021373ff0756534d5cf762044709dbd8c0 +DIST fpm-0.7.0.tar.gz 169412 BLAKE2B 6895d91cb67a8d15e50025c298aed32e77966685a1db426b9437a5c441f7c365cec76a7836c83ff5a5299216a9392812ae832bfb72d5cd4263bcb60976d12b6e SHA512 ec18798e02b4fb3e403062c68f97bf34200559207ffc87dba3b8b801aef31cabefdcda29203a1405ed0231192316a1fab16ecff603b0bf9fab0cede0fe4506de diff --git a/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch new file mode 100644 index 0..08000553f --- /dev/null +++ b/dev-util/fpm/files/fpm-0.7.0_fpm_toml.patch @@ -0,0 +1,21 @@ +diff -Naur a/fpm.toml b/fpm.toml +--- a/fpm.toml b/fpm.toml +@@ -5,14 +5,9 @@ + maintainer = "" + copyright = "2020 fpm contributors" + +-[dependencies] +-[dependencies.toml-f] +-git = "https://github.com/toml-f/toml-f; +-rev = "e49f5523e4ee67db6628618864504448fb8c8939" +- +-[dependencies.M_CLI2] +-git = "https://github.com/urbanjost/M_CLI2.git; +-rev = "ea6bbffc1c2fb0885e994d37ccf0029c99b19f24" ++[build] ++external-modules = ["tomlf", "m_cli2"] ++link = ["toml-f","m_cli2"] + + [[test]] + name = "cli-test" diff --git a/dev-util/fpm/fpm-0.7.0.ebuild b/dev-util/fpm/fpm-0.7.0.ebuild new file mode 100644 index 0..77d005760 --- /dev/null +++ b/dev-util/fpm/fpm-0.7.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_STANDARD="2003" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Fortran Package Manager (fpm)" +HOMEPAGE="https://fpm.fortran-lang.org; +SRC_URI=" + https://github.com/fortran-lang/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/fortran-lang/fpm/releases/download/v${PV}/${P}.F90 +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" +RESTRICT="test" + +CDEPEND=" + dev-util/toml-f + dev-util/m_cli2 +" + +RDEPEND=" + ${CDEPEND} + dev-vcs/git +" + +DEPEND=" + ${CDEPEND} + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep ' + app-doc/ford[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( LICENSE PACKAGING.md README.md ) + +PATCHES="${FILESDIR}/${P}_fpm_toml.patch" + +BSDIR="build/bootstrap" # Bootstrap directory path + +pkg_setup() { + fortran-2_pkg_setup + python-any-r1_pkg_setup +} + +src_prepare() { + default + + mkdir -p "${BSDIR}" || die + cp "${DISTDIR}/${P}.F90" "${BSDIR}/" || die + + # Use favicon.png instead remote icon + sed -i -e 's#https://fortran-lang.org/assets/img/fortran_logo_512x512.png#favicon.png#' docs.md || die +} + +src_compile() { + default + + # Build a bootstrap binary from the single source version + "$(tc-getFC)" -J "${BSDIR}" -o "${BSDIR}"/fpm "${BSDIR}/${P}.F90" || die + + # Use the bootstrap binary to build the feature complete fpm version + "${BSDIR}"/fpm build --compiler "$(tc-getFC)" --flag "${FCFLAGS} -I/usr/include/toml-f -I/usr/include/m_cli2" \ + --c-compiler "$(tc-getCC)" --c-flag "${CFLAGS}" \ + --cxx-compiler "$(tc-getCXX)" --cxx-flag "${CXXFLAGS}" \ + --archiver="$(tc-getAR)" --link-flag "${LDFLAGS}" + + if use doc ; then + einfo "Build API documentation:" + ford docs.md || die + fi +} + +src_install() { + exeinto /usr/bin + doexe build/"$(tc-getFC)"_*/app/fpm + + use doc && HTML_DOCS=( "${S}"/fpm-doc/. ) + einstalldocs +} diff --git a/dev-util/fpm/metadata.xml b/dev-util/fpm/metadata.xml new file mode 100644 index