From 6fc3ca602655a9ce33261ef7521e4ee89b4eb0f6 Mon Sep 17 00:00:00 2001 From: John Einar Reitan Date: Fri, 8 Jul 2022 12:37:27 +0200 Subject: media-video/mkvtoolnix: Make dependency on qtsvg conditional Closes: https://bugs.gentoo.org/856991 Signed-off-by: John Einar Reitan Closes: https://github.com/gentoo/gentoo/pull/26280 Signed-off-by: Sam James --- media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild | 133 --------------------- media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild | 133 +++++++++++++++++++++ media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 2 +- 3 files changed, 134 insertions(+), 134 deletions(-) delete mode 100644 media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild create mode 100644 media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild (limited to 'media-video') diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild deleted file mode 100644 index 50ff6904bf4e..000000000000 --- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic multiprocessing qmake-utils xdg - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Tools to create, alter, and inspect Matroska files" -HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" - -LICENSE="GPL-2" -SLOT="0" -IUSE="dbus debug dvd gui nls pch test" -RESTRICT="!test? ( test )" - -# check NEWS.md for build system changes entries for boost/libebml/libmatroska -# version requirement updates and other packaging info -RDEPEND=" - >=dev-libs/boost-1.66:= - dev-libs/gmp:= - >=dev-libs/libebml-1.4.2:= - >=dev-libs/libfmt-8.0.1:= - >=dev-libs/pugixml-1.11:= - media-libs/flac:= - >=media-libs/libmatroska-1.6.3:= - media-libs/libogg:= - media-libs/libvorbis:= - sys-libs/zlib - dvd? ( media-libs/libdvdread:= ) - dev-qt/qtcore:5 - dev-qt/qtsvg:5 - gui? ( - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtmultimedia:5 - ) - app-text/cmark:0= - dbus? ( dev-qt/qtdbus:5 ) -" -DEPEND="${RDEPEND} - >=dev-cpp/nlohmann_json-3.9.1 - >=dev-libs/utfcpp-3.1.2 - test? ( dev-cpp/gtest ) -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-ruby/rake - virtual/pkgconfig - nls? ( - sys-devel/gettext - app-text/po4a - ) -" - -PATCHES=( - "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch - "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch - "${FILESDIR}"/${P}-fmt-9.patch -) - -src_prepare() { - default - - if [[ ${PV} == *9999 ]]; then - ./autogen.sh || die - fi - - # bug #692018 - sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die - - eautoreconf - - # 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) - $(use_enable dbus) - - # Qt (of some version) is always needed, even for non-GUI builds, - # to do e.g. MIME detection. See e.g. bug #844097. - # But most of the Qt deps are conditional on a GUI build. - --disable-qt6 - --enable-qt5 - $(use_enable gui) - --with-qmake="$(qt5_get_bindir)"/qmake - - $(use_with dvd dvdread) - $(use_with nls gettext) - $(usex nls "" --with-po4a-translate=false) - --disable-update-check - --disable-optimization - --with-boost="${ESYSROOT}"/usr - --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - rake V=1 -j$(makeopts_jobs) || die -} - -src_test() { - rake V=1 -j$(makeopts_jobs) tests:unit || die - rake V=1 -j$(makeopts_jobs) tests:run_unit || die -} - -src_install() { - DESTDIR="${D}" rake -j$(makeopts_jobs) install || die - - einstalldocs - dodoc NEWS.md - doman doc/man/*.1 -} diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild new file mode 100644 index 000000000000..f5a1084acaf8 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd gui nls pch test" +RESTRICT="!test? ( test )" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + >=dev-libs/boost-1.66:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.2:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.3:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + dev-qt/qtcore:5 + gui? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + ) + app-text/cmark:0= + dbus? ( dev-qt/qtdbus:5 ) +" +DEPEND="${RDEPEND} + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-ruby/rake + virtual/pkgconfig + nls? ( + sys-devel/gettext + app-text/po4a + ) +" + +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch + "${FILESDIR}"/${P}-fmt-9.patch +) + +src_prepare() { + default + + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + + eautoreconf + + # 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) + $(use_enable dbus) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --disable-qt6 + --enable-qt5 + $(use_enable gui) + --with-qmake="$(qt5_get_bindir)"/qmake + + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a-translate=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + dodoc NEWS.md + doman doc/man/*.1 +} diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 6e76d9b6573b..3b7b072da517 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -37,8 +37,8 @@ RDEPEND=" sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 - dev-qt/qtsvg:5 gui? ( + dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 -- cgit v1.2.3-65-gdbad