From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C20A138334 for ; Sun, 15 Sep 2019 11:36:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4C6DE0857; Sun, 15 Sep 2019 11:36:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1334E0857 for ; Sun, 15 Sep 2019 11:36:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B345334B1D2 for ; Sun, 15 Sep 2019 11:36:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A0D7744 for ; Sun, 15 Sep 2019 11:36:28 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1568547363.47675f57b279b0e994178dfef192f7028a4ef96a.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mkvtoolnix/mkvtoolnix-9999.ebuild X-VCS-Directories: media-video/mkvtoolnix/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 47675f57b279b0e994178dfef192f7028a4ef96a X-VCS-Branch: master Date: Sun, 15 Sep 2019 11:36:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d44e5c8-278f-41d1-824f-e533b2db5375 X-Archives-Hash: 14da13c73fe44d36d9e253afca1d8f42 commit: 47675f57b279b0e994178dfef192f7028a4ef96a Author: David Seifert gentoo org> AuthorDate: Sun Sep 15 11:36:03 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Sep 15 11:36:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47675f57 media-video/mkvtoolnix: Update live ebuild Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 60 +++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index c91b87e7c61..5fa94680172 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,15 +1,17 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit toolchain-funcs versionator multiprocessing qmake-utils xdg +EAPI=7 -if [[ ${PV} == "9999" ]] ; then +inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" - inherit git-r3 + EGIT_SUBMODULES=() + inherit autotools git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" @@ -22,14 +24,14 @@ 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 RDEPEND=" - >=dev-libs/libfmt-5.3.0:= - >=dev-libs/boost-1.49.0:= + dev-libs/boost:= >=dev-libs/libebml-1.3.7:= - dev-libs/pugixml - media-libs/flac + >=dev-libs/libfmt-5.3.0:= + dev-libs/pugixml:= + media-libs/flac:= >=media-libs/libmatroska-1.5.0:= - media-libs/libogg - media-libs/libvorbis + media-libs/libogg:= + media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( @@ -46,35 +48,33 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/nlohmann_json dev-libs/utfcpp + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt dev-ruby/rake virtual/pkgconfig - dev-libs/libxslt - app-text/docbook-xsl-stylesheets nls? ( sys-devel/gettext app-text/po4a ) - test? ( dev-cpp/gtest ) " -DOCS="AUTHORS NEWS.md README.md" - -pkg_pretend() { - # https://bugs.gentoo.org/419257 - local ver=4.6 - local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support." - if ! version_is_at_least ${ver} $(gcc-version); then - eerror ${msg} - die ${msg} - fi -} - src_prepare() { xdg_src_prepare - [[ ${PV} == "9999" ]] && { ./autogen.sh || die; } + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # remove bundled libs + rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die } src_configure() { + # bug 692322, use system dev-libs/utfcpp + append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp + local myeconfargs=( $(use_enable debug) $(usex pch "" --disable-precompiled-headers) @@ -83,9 +83,8 @@ src_configure() { $(usex nls "" --with-po4a-translate=false) --disable-update-check --disable-optimization - --docdir="${EPREFIX}"/usr/share/doc/${PF} - --with-boost="${EPREFIX}"/usr - --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) ) if use qt5 ; then @@ -114,5 +113,6 @@ src_install() { DESTDIR="${D}" rake -j$(makeopts_jobs) install || die einstalldocs + dodoc NEWS.md doman doc/man/*.1 }