summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/media-video/mkvtoolnix-37.0.0')
-rw-r--r--metadata/md5-cache/media-video/mkvtoolnix-37.0.09
1 files changed, 9 insertions, 0 deletions
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
index 16d9a0d2418e..c2f2185b1cec 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-37.0.0
@@ -5,10 +5,19 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files
EAPI=7
HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
IUSE=debug nls pch test qt5
+<<<<<<< HEAD
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+=======
+KEYWORDS=~amd64 ~ppc ppc64 ~x86
+>>>>>>> next
LICENSE=GPL-2
RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.3.7:= >=dev-libs/libfmt-5.3.0:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.5.0:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus: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= )
SLOT=0
SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-37.0.0.tar.xz
+<<<<<<< HEAD
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=6af63343d07b9c9a92d7ca266b153c57
+=======
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e multiprocessing cac3169468f893670dac3e7cb940e045 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=dc25ac519cc1e3325681941bafcf609a
+>>>>>>> next