[gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/

[Tim Harder]

commit:     bb35d1ccc29329753aa594642be4cfba175cf9f9
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 20:49:23 2018 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 20:59:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb35d1cc

media-video/mkvtoolnix: use system libs for libfmt, utfcpp, and nlohmann_json

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 .../{mkvtoolnix-9999.ebuild => mkvtoolnix-29.0.0-r1.ebuild}        | 7 ++++---
 media-video/mkvtoolnix/mkvtoolnix-9999.ebuild                      | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild
similarity index 95%
copy from media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild
index 865f816c46c..b47988527a7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
 else
        SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz";
-       KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -21,11 +21,10 @@ IUSE="debug nls pch test qt5"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
-# TODO: package fmt (http://fmtlib.net/)
 RDEPEND="
+       dev-libs/libfmt:=
        >=dev-libs/boost-1.49.0:=
        >=dev-libs/libebml-1.3.5:=
-       dev-libs/jsoncpp:=
        dev-libs/pugixml
        media-libs/flac
        >=media-libs/libmatroska-1.4.8:=
@@ -45,6 +44,8 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
+       dev-cpp/nlohmann_json
+       dev-libs/utfcpp
        dev-ruby/rake
        virtual/pkgconfig
        dev-libs/libxslt

diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 865f816c46c..3036925897d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -21,11 +21,10 @@ IUSE="debug nls pch test qt5"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
 # version requirement updates and other packaging info
-# TODO: package fmt (http://fmtlib.net/)
 RDEPEND="
+       dev-libs/libfmt:=
        >=dev-libs/boost-1.49.0:=
        >=dev-libs/libebml-1.3.5:=
-       dev-libs/jsoncpp:=
        dev-libs/pugixml
        media-libs/flac
        >=media-libs/libmatroska-1.4.8:=
@@ -45,6 +44,8 @@ RDEPEND="
        )
 "
 DEPEND="${RDEPEND}
+       dev-cpp/nlohmann_json
+       dev-libs/utfcpp
        dev-ruby/rake
        virtual/pkgconfig
        dev-libs/libxslt