commit:     1f597d2400d70ce26bc824f1bb5269065ed7074c
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Fri Apr 19 17:32:12 2024 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 21:25:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f597d24

dev-libs/libfmt: add multilib support

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36325
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-10.0.0-r1.ebuild} | 5 ++---
 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-10.1.0-r1.ebuild} | 5 ++---
 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-10.1.1-r1.ebuild} | 5 ++---
 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-10.2.0-r1.ebuild} | 5 ++---
 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-10.2.1-r2.ebuild} | 4 ++--
 dev-libs/libfmt/{libfmt-9999.ebuild => libfmt-9.1.0-r2.ebuild}  | 7 +++----
 dev-libs/libfmt/libfmt-9999.ebuild                              | 4 ++--
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-10.0.0-r1.ebuild
similarity index 91%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-10.0.0-r1.ebuild
index 2dbd37cc402c..21279049b837 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-10.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,8 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
-       append-lfs-flags
+multilib_src_configure() {
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
                -DFMT_LIB_DIR="$(get_libdir)"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-10.1.0-r1.ebuild
similarity index 91%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-10.1.0-r1.ebuild
index 2dbd37cc402c..21279049b837 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-10.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,8 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
-       append-lfs-flags
+multilib_src_configure() {
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
                -DFMT_LIB_DIR="$(get_libdir)"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-10.1.1-r1.ebuild
similarity index 91%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-10.1.1-r1.ebuild
index 2dbd37cc402c..21279049b837 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-10.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,8 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
-       append-lfs-flags
+multilib_src_configure() {
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
                -DFMT_LIB_DIR="$(get_libdir)"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-10.2.0-r1.ebuild
similarity index 91%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-10.2.0-r1.ebuild
index 2dbd37cc402c..21279049b837 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-10.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,8 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
-       append-lfs-flags
+multilib_src_configure() {
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
                -DFMT_LIB_DIR="$(get_libdir)"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-10.2.1-r2.ebuild
similarity index 91%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-10.2.1-r2.ebuild
index 2dbd37cc402c..da45c0e71554 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-10.2.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,7 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
+multilib_src_configure() {
        append-lfs-flags
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
similarity index 81%
copy from dev-libs/libfmt/libfmt-9999.ebuild
copy to dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
index 2dbd37cc402c..b37fe02a5ea4 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
        inherit git-r3
 else
        SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
        S="${WORKDIR}/fmt-${PV}"
 fi
 
@@ -22,8 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
-       append-lfs-flags
+multilib_src_configure() {
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
                -DFMT_LIB_DIR="$(get_libdir)"

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild 
b/dev-libs/libfmt/libfmt-9999.ebuild
index 2dbd37cc402c..da45c0e71554 100644
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt";
@@ -22,7 +22,7 @@ SLOT="0/${PV}"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-src_configure() {
+multilib_src_configure() {
        append-lfs-flags
        local mycmakeargs=(
                -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"

Reply via email to