dev-libs/libfmt: version bump 3.0.2, add multilib support

Closes: https://github.com/gentoo/gentoo/pull/4930
Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index ed842be51a854dde6816d6a21970fd510f31d0f4..f72a5013ebf6dceddf35857170764c9acac9e561 100644 (file)
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1 +1,2 @@
 DIST libfmt-3.0.1.tar.gz 606603 SHA256 dce62ab75a161dd4353a98364feb166d35e7eea382169d59d9ce842c49c55bad SHA512 daf5dfb2fe63eb611983fa248bd2182c6202cf1c4f0fc236f357040fce8e87ad531cdf59090306bb313ea333d546e516f467b385e05094e696d0ca091310aad6 WHIRLPOOL 775f9dc9228fbd429e4dbad90d536b69542fb583e44dba9eda950267bae82938b2703726481ff02fbab0cb9efe78b46501f4b82e20cfef550313b7653f6cb963
+DIST libfmt-3.0.2.tar.gz 608369 SHA256 fa4a062897b2f3712badfdb8583e6d938252e1156cb5705c3af87705dfef3957 SHA512 50f5a25d1a10fd5b265f3811fa11886b9efdae2952f2aefc9f22c87c1a748128369f4d530b320e5e9c67c745cdab4607d1cb08940f4cf968300dee22e1150117 WHIRLPOOL 8aca672c5a7da8b1d427c7729fd8fe8523e32a1df62b8fd1652da3c71779cee7a59ebefce16abb0c4f28c66d1b9777e085903aa6773f237286ac118172625a6e

diff --git a/dev-libs/libfmt/libfmt-3.0.2.ebuild b/dev-libs/libfmt/libfmt-3.0.2.ebuild
new file mode 100644 (file)
index 0000000..bbb6860
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-3.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="BSD-2"
+IUSE="test"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]] ; then
+       EGIT_REPO_URI="git://github.com/fmtlib/fmt.git"
+       inherit git-r3
+else
+       SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+       S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+               -DFMT_LIB_DIR="$(get_libdir)"
+               -DFMT_TEST=$(usex test)
+               -DBUILD_SHARED_LIBS=ON
+       )
+       cmake-utils_src_configure
+}

diff --git a/dev-libs/libfmt/libfmt-9999.ebuild b/dev-libs/libfmt/libfmt-9999.ebuild
index aa04d6331efef169b86ad071b88bac2c0ae07e5a..bbb6860e2b7cc2890cce581427ab32fe350460ed 100644 (file)
--- a/dev-libs/libfmt/libfmt-9999.ebuild
+++ b/dev-libs/libfmt/libfmt-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-multilib
 
 DESCRIPTION="Small, safe and fast formatting library"
 HOMEPAGE="https://github.com/fmtlib/fmt"
@@ -24,8 +24,10 @@ fi
 DEPEND=""
 RDEPEND=""
 
-src_configure() {
+multilib_src_configure() {
        local mycmakeargs=(
+               -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+               -DFMT_LIB_DIR="$(get_libdir)"
                -DFMT_TEST=$(usex test)
                -DBUILD_SHARED_LIBS=ON
        )