[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fpm/

[Sergey Torokhov]

commit:     50af6bfa1e78a792c1d8d13658f3732bdb379805
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Nov 26 18:16:01 2022 +0000
Commit:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
CommitDate: Sat Nov 26 18:16:01 2022 +0000
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 <torokhov-s-a <AT> 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" \