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

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

2024-04-01 Thread Sam James

commit: 419bad959a2b9c6602edb8dde565365cbc7322a0
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Mar 21 10:18:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  1 07:17:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=419bad95

media-video/mkvtoolnix: drop 82.0

Closes: https://bugs.gentoo.org/927380
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35851
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest   |   2 -
 media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild | 134 --
 2 files changed, 136 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index e9d8ebdda53e..a8dfdb18eba3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,7 +1,5 @@
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 
5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cffca1b0e72e16357b579ce8dbee42
 SHA512 
b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 
64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0
 SHA512 
d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 
37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5
 SHA512 
3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
-DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B 
a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223
 SHA512 
fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
-DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 
53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a
 SHA512 
abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95
 DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B 
f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5
 SHA512 
e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
 DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 
3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0f8fd05f37bcaf4f
 SHA512 
6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7

diff --git a/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
deleted file mode 100644
index de1b5ed169c7..
--- a/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 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} == * ]] ; then
-   inherit git-r3
-
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   EGIT_SUBMODULES=()
-else
-   inherit verify-sig
-
-   SRC_URI="
-   https://mkvtoolnix.download/sources/${P}.tar.xz
-   verify-sig? ( 
https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
-   "
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-   VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
-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="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="
-   app-text/cmark:0=
-   dev-libs/boost:=
-   dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.5:=
-   >=dev-libs/libfmt-8.0.1:=
-   >=dev-libs/pugixml-1.11
-   >=dev-qt/qtbase-6.2:6[dbus]
-   media-libs/flac:=
-   >=media-libs/libmatroska-1.7.1:=
-   media-libs/libogg
-   media-libs/libvorbis
-   sys-libs/zlib
-   dvd? ( media-libs/libdvdread:= )
-   gui? (
-   >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
-   >=dev-qt/qtmultimedia-6.2:6
-   >=dev-qt/qtsvg-6.2:6
-   )
-"
-DEPEND="${RDEPEND}
-

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

2024-04-01 Thread Sam James

commit: 8de73ec9de78a5fb682033e708171fe98c78aee2
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Mar 21 10:17:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr  1 07:17:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de73ec9

media-video/mkvtoolnix: add 83.0

Bug: https://bugs.gentoo.org/927380
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest|   2 +
 .../files/mkvtoolnix-83.0.0-fix-disable-gui.patch  |  88 +
 media-video/mkvtoolnix/mkvtoolnix-83.0.ebuild  | 139 +
 3 files changed, 229 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 3f890c6e5ab0..e9d8ebdda53e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,5 @@ DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 
64bf3cd1872e3b67c6932ed29527e1dff2f
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 
37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5
 SHA512 
3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
 DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B 
a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223
 SHA512 
fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
 DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 
53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a
 SHA512 
abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95
+DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B 
f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5
 SHA512 
e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
+DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 
3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0f8fd05f37bcaf4f
 SHA512 
6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7

diff --git 
a/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
new file mode 100644
index ..015a92fbd78f
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-83.0.0-fix-disable-gui.patch
@@ -0,0 +1,88 @@
+https://bugs.gentoo.org/927380
+
+Allow non-gui builds to configure without gui dependencies.
+
+--- a/ac/qt6.m4
 b/ac/qt6.m4
+@@ -113,13 +113,15 @@ HEADERS = configure.h
+ SOURCES = configure.cpp
+ EOT
+ 
+-  "$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
+-  result2=$?
++  if test x"$enable_gui" = xyes; then
++"$QMAKE6" -makefile -nocache $QMAKE_SPEC configure.pro 2>&5 > /dev/null
++result2=$?
+ 
+-  if test $result2 != 0; then
+-cd "$old_wd"
+-AC_MSG_RESULT(no: not all of the required Qt6 modules were found (needed: 
core gui widgets network concurrent svg multimedia))
+-return
++if test $result2 != 0; then
++  cd "$old_wd"
++  AC_MSG_RESULT(no: not all of the required Qt6 modules were found 
(needed: core gui widgets network concurrent svg multimedia))
++  return
++fi
+   fi
+ 
+   if test -f Makefile.Release; then
+@@ -135,7 +137,7 @@ EOT
+ 
+   cd "$old_wd"
+ 
+-  if test $result != 0 -o $result2 != 0 -o $result3 != 0; then
++  if test $result != 0 -o $result3 != 0; then
+ AC_MSG_CHECKING(for Qt 6)
+ AC_MSG_RESULT(no: qmake6 couldn't be run for a dummy project)
+ 
+@@ -169,9 +171,15 @@ EOT
+ 
+   qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH"
+ 
+-  QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 
's/^DEFINES *= *//'`"
+-  QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' 
"$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 
's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ 
]]*//g' -e 's/\$([[^)]]*)//g'`"
+-  QT_INCFLAGS="`$ac_cv_path_EGREP '^INCPATH *=' "$qmake_dir/Makefile" | sed 
-e 's/^INCPATH *= *//'`"
++  if test x"$enable_gui" = xyes; then
++QT_CFLAGS="`$ac_cv_path_EGREP '^DEFINES *=' "$qmake_dir/Makefile" | sed 
's/^DEFINES *= *//'`"
++QT_CFLAGS="$QT_CFLAGS `$ac_cv_path_EGREP '^CXXFLAGS *=' 
"$qmake_dir/Makefile" | sed -e 's/^CXXFLAGS *= *//' -e 's/-pipe//g' -e 
's/-O.//g' -e 's/ -f[[a-z]][[^ ]]*//g' -e 's/ -W[[^ ]]*//g' -e 's/-std=[[^ 
]]*//g' -e 's/\$([[^)]]*)//g'`"
++QT_INCFLAGS="`$ac_cv_path_EGREP

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

2024-03-20 Thread Sam James

commit: d58120752680b16a1f1aaf64618d4e7bcf3ee040
Author: Alfred Wingate  protonmail  com>
AuthorDate: Wed Mar  6 23:59:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 21 02:45:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5812075

media-video/mkvtoolnix: add 82.0

Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 2 ++
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-82.0.ebuild} | 4 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 44bec592490f..a2d9dd8cb63b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,3 +5,5 @@ DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 
6178b65ce57b1ab897c91a456fa9887499e
 DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 
6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672
 SHA512 
47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 
64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0
 SHA512 
d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 
37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5
 SHA512 
3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
+DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B 
a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223
 SHA512 
fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f
+DIST mkvtoolnix-82.0.tar.xz.sig 833 BLAKE2B 
53c96149a41a46892cfeb43ca786cd8c166747e508f3fa2aceca9520652741f738adad5f6e8809f97c5086d678bcd15d4f95f1ca964df5465b450679eb18eb2a
 SHA512 
abea27631ea4f08182e86f99f1a8e38769e0ebc5a5d66426da7024348e6d00c0044644c107a982d902142167805c4771d318cc4ec66e4d9cea115a92806e8e95

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
similarity index 97%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
index 1f14599ac81e..de1b5ed169c7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-82.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
app-text/cmark:0=
dev-libs/boost:=
dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.4:=
+   >=dev-libs/libebml-1.4.5:=
>=dev-libs/libfmt-8.0.1:=
>=dev-libs/pugixml-1.11
>=dev-qt/qtbase-6.2:6[dbus]

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 1f14599ac81e..de1b5ed169c7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ RDEPEND="
app-text/cmark:0=
dev-libs/boost:=
dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.4:=
+   >=dev-libs/libebml-1.4.5:=
>=dev-libs/libfmt-8.0.1:=
>=dev-libs/pugixml-1.11
>=dev-qt/qtbase-6.2:6[dbus]

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

2024-03-20 Thread Sam James

commit: 48f388d6c36be1da4a135c98bc9bca8656660736
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Mar  7 01:01:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 21 02:45:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48f388d6

media-video/mkvtoolnix: drop 72.0.0, 75.0.0, 80.0

Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35645
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   4 -
 media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild | 132 ---
 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 135 ---
 media-video/mkvtoolnix/mkvtoolnix-80.0.ebuild   | 167 
 4 files changed, 438 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a2d9dd8cb63b..3f890c6e5ab0 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,4 @@
-DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
-DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B 
d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58
 SHA512 
eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 
5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cffca1b0e72e16357b579ce8dbee42
 SHA512 
b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
-DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 
6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d
 SHA512 
066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
-DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 
6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672
 SHA512 
47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
 DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 
64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0
 SHA512 
d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
 DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 
37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5
 SHA512 
3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
 DIST mkvtoolnix-82.0.tar.xz 11067168 BLAKE2B 
a910898b4097ee8115f3354653d65d913e28fc0271c2869a72d4b0f70a6a17848b28c33ae0aee4d88b42bb911bf6d825211c723c47f7c1eee0f5204705e12223
 SHA512 
fd384bfc4350e972f44e2b488fb066641cf7e73860f179d4423a548f870521ad8414f53a98f67ad8809f261657fe378c5bed96069620a73be511bcd31dfa933f

diff --git a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
deleted file mode 100644
index f04b8591f71a..
--- a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
+++ /dev/null
@@ -1,132 +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} == * ]] ; 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:=
-   dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.4:=
-   >=dev-libs/libfmt-8.0.1:=
-   >=dev-libs/pugixml-1.11:=
-   media-libs/flac:=
-   >=media-libs/libmatroska-1.7.1:=
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   sys-libs/zlib
-   dvd? ( media-libs/libdvdread:= )
-   dev-qt/qtcore:5
-

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

2024-01-20 Thread Sam James

commit: a9ae80b11bf8af4e3f7811f427b4512563f14440
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Dec 14 22:48:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 11:48:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ae80b1

media-video/mkvtoolnix: remove patches and qt5 from live ebuild

* Two out of three patches are now obselete and the last one was just
  making QtDBus optional. Just remove all for less maintenance burden at
  the expense of a minor regression in customizability.

Closes: https://bugs.gentoo.org/919915
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34288
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 55 ++-
 1 file changed, 11 insertions(+), 44 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 20d89f9877dc..1f14599ac81e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd gui nls qt6 pch test"
+IUSE="debug dvd gui nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -39,31 +39,17 @@ RDEPEND="
>=dev-libs/libebml-1.4.4:=
>=dev-libs/libfmt-8.0.1:=
>=dev-libs/pugixml-1.11
+   >=dev-qt/qtbase-6.2:6[dbus]
media-libs/flac:=
>=media-libs/libmatroska-1.7.1:=
media-libs/libogg
media-libs/libvorbis
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
-   !qt6? (
-   dev-qt/qtcore:5
-   dbus? ( dev-qt/qtdbus: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
-   )
-   )
-   qt6? (
-   dev-qt/qtbase:6[dbus?]
-   gui? (
-   dev-qt/qtbase:6[concurrent,gui,network,widgets]
-   dev-qt/qtmultimedia:6
-   dev-qt/qtsvg:6
-   )
+   gui? (
+   >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+   >=dev-qt/qtmultimedia-6.2:6
+   >=dev-qt/qtsvg-6.2:6
)
 "
 DEPEND="${RDEPEND}
@@ -86,12 +72,6 @@ if [[ ${PV} != * ]] ; then
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
 fi
 
-PATCHES=(
-   "${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
-   "${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
-   "${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch
-)
-
 src_prepare() {
default
 
@@ -115,7 +95,6 @@ src_configure() {
local myeconfargs=(
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
-   $(use_enable dbus)
$(use_enable gui)
$(use_with dvd dvdread)
$(use_with nls gettext)
@@ -124,24 +103,12 @@ src_configure() {
--disable-optimization
--with-boost="${ESYSROOT}"/usr
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-   )
 
-   # 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.
-   if use qt6; then
-   myeconfargs+=(
-   --enable-qt6
-   --disable-qt5
-   --with-qmake6="$(qt6_get_bindir)"/qmake
-   )
-   else
-   myeconfargs+=(
-   --disable-qt6
-   --enable-qt5
-   --with-qmake="$(qt5_get_bindir)"/qmake
-   )
-   fi
+   # 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.
+   --with-qmake6="$(qt6_get_bindir)"/qmake
+   )
 
# Work around bug #904710.
use nls || export ac_cv_path_PO4A=

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

2024-01-20 Thread Sam James

commit: 27191d1add420a81fbb978f751b5d3535752feb3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Thu Dec 14 22:36:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 11:48:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27191d1a

media-video/mkvtoolnix: add 81.0

Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest   |   2 +
 media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild | 167 ++
 2 files changed, 169 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f85d77ed670b..44bec592490f 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,5 @@ DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B 
d9c32a453ac1f07e201b99fdcaaa5e553
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 
5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cffca1b0e72e16357b579ce8dbee42
 SHA512 
b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
 DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 
6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d
 SHA512 
066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
 DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 
6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672
 SHA512 
47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d
+DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 
64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0
 SHA512 
d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
+DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 
37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5
 SHA512 
3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb

diff --git a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
new file mode 100644
index ..20d89f9877dc
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2023 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} == * ]] ; then
+   inherit git-r3
+
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   EGIT_SUBMODULES=()
+else
+   inherit verify-sig
+
+   SRC_URI="
+   https://mkvtoolnix.download/sources/${P}.tar.xz
+   verify-sig? ( 
https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+   "
+   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+   VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
+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 qt6 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="
+   app-text/cmark:0=
+   dev-libs/boost:=
+   dev-libs/gmp:=
+   >=dev-libs/libebml-1.4.4:=
+   >=dev-libs/libfmt-8.0.1:=
+   >=dev-libs/pugixml-1.11
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.7.1:=
+   media-libs/libogg
+   media-libs/libvorbis
+   sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
+   !qt6? (
+   dev-qt/qtcore:5
+   dbus? ( dev-qt/qtdbus: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
+   )
+   )
+   qt6? (
+   dev-qt/qtbase:6[dbus?]
+   gui? (
+   dev-qt/qtbase:6[concurrent,gui,network,widgets]
+   dev-qt/qtmultimedia:6
+   dev-qt/qtsvg:6
+   )
+   )
+"
+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
+

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

2023-12-13 Thread Sam James

commit: ebf68d134946a79adc16422461ddb51fc45f8cdc
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Nov 19 13:19:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 14 04:22:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf68d13

media-video/mkvtoolnix: add 80.0

Closes: https://bugs.gentoo.org/914337
Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33922
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest|  2 +
 .../files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch | 29 
 .../files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch | 31 
 .../files/mkvtoolnix-80.0.0-optional-qtdbus.patch  | 70 ++
 ...vtoolnix-.ebuild => mkvtoolnix-80.0.ebuild} | 84 +++---
 media-video/mkvtoolnix/mkvtoolnix-.ebuild  | 84 +++---
 6 files changed, 248 insertions(+), 52 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d51ec57a4d96..f85d77ed670b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,5 @@
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
 DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B 
d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58
 SHA512 
eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
 DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 
5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cffca1b0e72e16357b579ce8dbee42
 SHA512 
b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0
+DIST mkvtoolnix-80.0.tar.xz 11056764 BLAKE2B 
6178b65ce57b1ab897c91a456fa9887499e683619654b2a7f8fbcd8b7d98f04dd831d2c875da85a644357ec8c8de3b408394f7b29def9203f35a28ec19513a0d
 SHA512 
066c10a9112ca0cdb59567235aae70e94ccab25b0e2d6156f4ba1090e102614b07c37eb0116a9ee540b2ed8f4b9d58a699f553b974a3f2636c65241915b3b6bc
+DIST mkvtoolnix-80.0.tar.xz.sig 833 BLAKE2B 
6c08689419877da7f3f16b8453a44f837792f5e7f3de7fb8574597dee3317ffadf2418cae82949a7585ab53cf1e0a60391ba898fc4607290d678501c3ffd4672
 SHA512 
47df9f0199275873b300b229fc91d14d5ab93c423e4fb8f31055b84619ae00609850ccb77f6d84c8eb3e4afee76acbe3e0779d03f3041d01d598f462788c618d

diff --git 
a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
new file mode 100644
index ..d31731a266f8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
@@ -0,0 +1,29 @@
+From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Tue, 21 Nov 2023 01:10:23 +0200
+Subject: [PATCH] Fix detection of QtDBus and QtMultimedia
+
+* Sometimes you may have qtdbus and qtmultimedia present at the same
+  time.
+
+Signed-off-by: Alfred Wingate 
+--- a/ac/qt6.m4
 b/ac/qt6.m4
+@@ -95,10 +95,12 @@ EOT
+ 
+ if test $result2 != 0; then
+   continue
+-elif test $qt_module = dbus; then
++fi
++if test $qt_module = dbus; then
+   qmake_qt_ui="$qmake_qt_ui dbus"
+   AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
+-elif test $qt_module = multimedia; then
++fi
++if test $qt_module = multimedia; then
+   qmake_qt_ui="$qmake_qt_ui multimedia"
+ fi
+   done
+-- 
+2.43.0
+

diff --git 
a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
new file mode 100644
index ..203721aedcff
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,31 @@
+From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001
+From: Alfred Wingate 
+Date: Mon, 20 Nov 2023 23:41:06 +0200
+Subject: [PATCH] Only check for uic in qt5 if gui is enabled
+
+We should only check for UIC (provided by qtwidgets) if we're building the GUI.
+
+Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
+for e.g. MIME type detection since 59.0.0), but the rest of Qt
+(like qtwidgets) is only needed for the GUI build.
+
+The build system incorrectly unconditionally checks for UIC. We fix it here
+to only check for it when doing a GUI build.
+
+https://bugs.gentoo.org/844097
+
+Signed-off-by: Alfred Wingate 
+--- a/ac/qt5.m4
 b/ac/qt5.m4
+@@ -63,7 +63,7 @@ check_qt5() {
+ AC_MSG_RESULT(no: could not find the rcc executable)
+

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

2023-09-07 Thread Sam James

commit: d6f298a59ff501a75f18c80db5a27fba9f6d2e11
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  7 23:27:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  7 23:27:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f298a5

media-video/mkvtoolnix: Stabilize 77.0 x86, #913811

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild
index 0a91f9315cf6..d8fe3faed440 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2023-06-05 Thread Alexis Ballier

commit: 518931607896bcaf7ceff676ed6875dd5ee790b5
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun  5 09:51:09 2023 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun  5 09:51:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51893160

media-video/mkvtoolnix: bump to 77.0

Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest   |   1 +
 media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 7ad17337daf3..d51ec57a4d96 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1,3 @@
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
 DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B 
d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58
 SHA512 
eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08
+DIST mkvtoolnix-77.0.tar.xz 11044004 BLAKE2B 
5aa43e155c1318dc6c3fd4418fb59ec498ad488a8459cf0aefa0bc0660ff93dd51f2699642ea633695fbf76ae1b4b6cffca1b0e72e16357b579ce8dbee42
 SHA512 
b310077cfaddef3163c732943f1aaf7e63fb9f7efb19fdb27a35e2d0ad92dfc4536ea29366b44745f3f918703b02e2d52edb63369c23540df1312f3d54c06bb0

diff --git a/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild
new file mode 100644
index ..4637f4ccbfb9
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-77.0.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2023 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} == * ]] ; 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:=
+   dev-libs/gmp:=
+   >=dev-libs/libebml-1.4.4:=
+   >=dev-libs/libfmt-8.0.1:=
+   >=dev-libs/pugixml-1.11:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.7.1:=
+   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
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]]; 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)
+

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

2023-05-27 Thread Sam James

commit: fc7252fdb8ab1944dd3ff1e2a8402ecb6517c71f
Author: Sam James  gentoo  org>
AuthorDate: Sat May 27 16:06:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 27 16:06:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7252fd

media-video/mkvtoolnix: Stabilize 75.0.0 ppc64, #906742

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 31d2b2840f17..19b76609dc6a 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2023-05-27 Thread Sam James

commit: d216cfbca6ee33eff871cd4fb742dff45ade9da7
Author: Sam James  gentoo  org>
AuthorDate: Sat May 27 12:45:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 27 12:45:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d216cfbc

media-video/mkvtoolnix: Stabilize 75.0.0 ppc, #906742

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 5b81cce1dbf4..31d2b2840f17 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2023-05-19 Thread Sam James

commit: dc4cdaa344cbf81eb4ed7e7d1da70e3c3da85339
Author: Sam James  gentoo  org>
AuthorDate: Fri May 19 17:44:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 19 17:44:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4cdaa3

media-video/mkvtoolnix: Stabilize 75.0.0 amd64, #906742

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 0fa5123f5a59..5b81cce1dbf4 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2023-05-19 Thread Sam James

commit: 155cc7180f5d69ec5213ccb1a4d11d6bc591473d
Author: Sam James  gentoo  org>
AuthorDate: Fri May 19 17:44:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 19 17:44:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155cc718

media-video/mkvtoolnix: Stabilize 75.0.0 x86, #906742

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 4637f4ccbfb9..0fa5123f5a59 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2023-05-06 Thread James Le Cuirot

commit: 48bbea71141237cb25eaf68128549a9ed539ea33
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat May  6 09:47:39 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat May  6 09:47:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bbea71

media-video/mkvtoolnix: Work around issue when building with USE=-nls

This issue was only evident when LINGUAS included a supported language
other than English, such as ru.

Closes: https://bugs.gentoo.org/904710
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 5 -
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 628d982c71e9..4637f4ccbfb9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -104,13 +104,16 @@ src_configure() {
 
$(use_with dvd dvdread)
$(use_with nls gettext)
-   $(usex nls "" --with-po4a=false)
+   #$(use_with nls po4a)
--disable-update-check
--disable-optimization
--with-boost="${ESYSROOT}"/usr
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
 
+   # Work around bug #904710.
+   use nls || export ac_cv_path_PO4A=
+
econf "${myeconfargs[@]}"
 }
 

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 628d982c71e9..4637f4ccbfb9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -104,13 +104,16 @@ src_configure() {
 
$(use_with dvd dvdread)
$(use_with nls gettext)
-   $(usex nls "" --with-po4a=false)
+   #$(use_with nls po4a)
--disable-update-check
--disable-optimization
--with-boost="${ESYSROOT}"/usr
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
 
+   # Work around bug #904710.
+   use nls || export ac_cv_path_PO4A=
+
econf "${myeconfargs[@]}"
 }

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

2023-04-18 Thread James Le Cuirot

commit: b66358b9cffb35803714f28d1ec817b2dfa26373
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Apr 18 22:17:11 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Apr 18 22:17:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66358b9

media-video/mkvtoolnix: Version bump to 75.0.0

This fixes the build with Ruby 3.2.

Also deals with unknown --with-po4a-translate configure option.

Bug: https://bugs.gentoo.org/895138
Closes: https://bugs.gentoo.org/903727
Signed-off-by: James Le Cuirot  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-75.0.0.ebuild}   | 4 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f07ffbf4fa32..7ad17337daf3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1 +1,2 @@
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c
+DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B 
d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58
 SHA512 
eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
similarity index 97%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
index 23a2e80da85d..628d982c71e9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,7 +104,7 @@ src_configure() {
 
$(use_with dvd dvdread)
$(use_with nls gettext)
-   $(usex nls "" --with-po4a-translate=false)
+   $(usex nls "" --with-po4a=false)
--disable-update-check
--disable-optimization
--with-boost="${ESYSROOT}"/usr

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 23a2e80da85d..628d982c71e9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,7 +104,7 @@ src_configure() {
 
$(use_with dvd dvdread)
$(use_with nls gettext)
-   $(usex nls "" --with-po4a-translate=false)
+   $(usex nls "" --with-po4a=false)
--disable-update-check
--disable-optimization
--with-boost="${ESYSROOT}"/usr

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

2022-12-21 Thread Sam James

commit: e11bcad09de071ceadee864c02e570e01c4b9415
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 21 22:20:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 22:25:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11bcad0

media-video/mkvtoolnix: add gitlab upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/metadata.xml 
b/media-video/mkvtoolnix/metadata.xml
index 047ba8b96207..f305037837b0 100644
--- a/media-video/mkvtoolnix/metadata.xml
+++ b/media-video/mkvtoolnix/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   media-vi...@gentoo.org
-   Gentoo Video project
-
+   
+   media-vi...@gentoo.org
+   Gentoo Video project
+   
+   
+   mbunkus/mkvtoolnix
+

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

2022-12-21 Thread Sam James

commit: 9a1717b73714ceb943d856f3ebecca766a1dbd9a
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 21 22:19:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 22:25:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1717b7

media-video/mkvtoolnix: drop 69.0.0, 71.1.0

Bug: https://bugs.gentoo.org/886919
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   2 -
 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 132 
 media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild | 132 
 3 files changed, 266 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index b09f634b7895..f07ffbf4fa32 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1 @@
-DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B 
aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1
 SHA512 
c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
-DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 
6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41
 SHA512 
f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
 DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
deleted file mode 100644
index e5b9d5f42fc2..
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ /dev/null
@@ -1,132 +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} == * ]] ; 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:=
-   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
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} == * ]]; 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
-

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

2022-12-18 Thread Arthur Zamarin

commit: 9ffe059ad62d6be988324142337cd39070deb3b9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 21:12:57 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 21:12:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffe059a

media-video/mkvtoolnix: Stabilize 72.0.0 ppc, #886919

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
index 6ce1e8e93ed1..f04b8591f71a 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-12-18 Thread Arthur Zamarin

commit: dd29914989a3b002522476fd976b1eb868b5cb34
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 21:12:54 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 21:12:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd299149

media-video/mkvtoolnix: Stabilize 72.0.0 amd64, #886919

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
index 1cd88f7b2a02..6ce1e8e93ed1 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ppc64 x86"
+   KEYWORDS="amd64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-11-14 Thread Alexis Ballier

commit: 0e0fff830f99e57f3509349e4c8d4f821f64b41c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Nov 14 16:33:30 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Nov 14 16:33:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e0fff83

media-video/mkvtoolnix: bump to 72.0.0

Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild | 132 
 2 files changed, 133 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6334b56ee408..b09f634b7895 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1,3 @@
 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B 
aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1
 SHA512 
c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
 DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 
6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41
 SHA512 
f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
+DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 
2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97
 SHA512 
dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c

diff --git a/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
new file mode 100644
index ..23a2e80da85d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-72.0.0.ebuild
@@ -0,0 +1,132 @@
+# 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} == * ]] ; 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:=
+   dev-libs/gmp:=
+   >=dev-libs/libebml-1.4.4:=
+   >=dev-libs/libfmt-8.0.1:=
+   >=dev-libs/pugixml-1.11:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.7.1:=
+   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
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]]; 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)

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

2022-11-12 Thread Arthur Zamarin

commit: 79ac78cbe641e3ab4f5682ec646e33595b98969f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 12 16:06:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 12 16:06:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ac78cb

media-video/mkvtoolnix: Stabilize 69.0.0 ppc64, #868030

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
index cf89a61512dd..e5b9d5f42fc2 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-11-12 Thread Arthur Zamarin

commit: 41693b715267e450221a1be7c8a3f66ba62eb5ec
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 12 16:06:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 12 16:06:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41693b71

media-video/mkvtoolnix: Stabilize 69.0.0 ppc, #868030

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
index 4bbb7f6d269c..cf89a61512dd 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-10-30 Thread Sam James

commit: 4fb991e6e19c270aad5fee6a069b034f2a8e1d20
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 30 07:53:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 30 09:26:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb991e6

media-video/mkvtoolnix: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28032
Signed-off-by: Sam James  gentoo.org>

 .../mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch | 293 -
 1 file changed, 293 deletions(-)

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
deleted file mode 100644
index a0e3c1780db9..
--- a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
+++ /dev/null
@@ -1,293 +0,0 @@
-https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9
-https://bugs.gentoo.org/856700
-
-From: Moritz Bunkus 
-Date: Thu, 7 Jul 2022 13:11:34 +0200
-Subject: [PATCH] fix compilation with fmt v9.0.0
-
-Prior to v9 all types that were outputtable via `operator<<` to
-`std::ostream` could be formatted. v9 changed that to require explicit
-tagging of those types that should work this way. This commit adds
-those tags for the types that are currently formatted via fmt.
-
-Fixes #3366.
 a/src/common/aac.h
-+++ b/src/common/aac.h
-@@ -221,3 +221,7 @@ protected:
- using parser_cptr = std::shared_ptr;
- 
- } // namespace mtx::aac
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/bcp47.h
-+++ b/src/common/bcp47.h
-@@ -176,3 +176,8 @@ struct hash {
- };
- 
- } // namespace mtx::bcp47
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : 
ostream_formatter {};
-+template <> struct fmt::formatter  : 
ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/bluray/track_chapter_names.cpp
-+++ b/src/common/bluray/track_chapter_names.cpp
-@@ -18,6 +18,7 @@
- #include "common/bluray/track_chapter_names.h"
- #include "common/bluray/util.h"
- #include "common/debugging.h"
-+#include "common/path.h"
- #include "common/qt.h"
- #include "common/xml/xml.h"
- 
 a/src/common/error.h
-+++ b/src/common/error.h
-@@ -45,3 +45,7 @@ operator <<(std::ostream ,
- }
- 
- }
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/fourcc.h
-+++ b/src/common/fourcc.h
-@@ -83,3 +83,7 @@ operator <<(std::ostream ,
-   out << fourcc.str();
-   return out;
- }
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/kax_analyzer.h
-+++ b/src/common/kax_analyzer.h
-@@ -239,3 +239,7 @@ public:
-   virtual void debug_abort_process();
- };
- using console_kax_analyzer_cptr = std::shared_ptr;
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/math_fwd.h
-+++ b/src/common/math_fwd.h
-@@ -18,6 +18,11 @@
- using mtx_mp_rational_t = 
boost::multiprecision::number;
- using mtx_mp_int_t  = 
boost::multiprecision::number;
- 
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : ostream_formatter {};
-+template <> struct fmt::formatter  : ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
-+
- namespace mtx {
- 
- // This conversion function exists to work around incomplete
 a/src/common/mm_io_x.h
-+++ b/src/common/mm_io_x.h
-@@ -155,3 +155,16 @@ operator <<(std::ostream ,
- }
- 
- }}
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter: 
ostream_formatter {};
-+template <> struct fmt::formatter: 
ostream_formatter {};
-+template <> struct fmt::formatter   : 
ostream_formatter {};
-+template <> struct fmt::formatter : 
ostream_formatter {};
-+template <> struct fmt::formatter   : 
ostream_formatter {};
-+template <> struct fmt::formatter: 
ostream_formatter {};
-+template <> struct fmt::formatter : 
ostream_formatter {};
-+template <> struct fmt::formatter   : 
ostream_formatter {};
-+template <> struct fmt::formatter  : 
ostream_formatter {};
-+template <> struct fmt::formatter: 
ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/opus.h
-+++ b/src/common/opus.h
-@@ -91,3 +91,9 @@ operator <<(std::ostream ,
- }
- 
- }
-+
-+#if FMT_VERSION >= 9
-+template <> struct fmt::formatter : 
ostream_formatter {};
-+template <> struct fmt::formatter  : 
ostream_formatter {};
-+template <> struct fmt::formatter: 
ostream_formatter {};
-+#endif  // FMT_VERSION >= 9
 a/src/common/path.h
-+++ b/src/common/path.h
-@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const 
);
-

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

2022-10-28 Thread Sam James

commit: b9c110cc37fa362e7a4bd9d0ace799ee2e2996e0
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 17:52:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 18:47:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c110cc

media-video/mkvtoolnix: drop versions

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest|   6 -
 .../files/mkvtoolnix-49.0.0-qt5dbus.patch  |  32 -
 .../files/mkvtoolnix-56.1.0-optlevel.patch |  15 ---
 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild| 131 
 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild| 121 ---
 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild| 124 ---
 media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild| 126 ---
 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild| 132 
 media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild | 133 -
 9 files changed, 820 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 68ec6cca8e30..6334b56ee408 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,2 @@
-DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
-DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
-DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
-DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede
 SHA512 
252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
-DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 
815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c
 SHA512 
eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
-DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B 
e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d
 SHA512 
fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B 
aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1
 SHA512 
c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
 DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 
6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41
 SHA512 
f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
deleted file mode 100644
index 1c59b2c3827a..
--- a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 a/ac/qt5.m4   2020-07-31 11:25:31.371508129 -0500
-+++ b/ac/qt5.m4   2020-07-31 11:30:14.967322450 -0500
-@@ -14,6 +14,11 @@
- AC_ARG_WITH([qt_pkg_config],
-   AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for 
detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
-   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
-+AC_ARG_ENABLE([dbus],
-+  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being 
included in build (yes)]),
-+  [],[enable_dbus=yes])
-+
-+
- 
- if test x"$enable_qt" = "xyes" -a \
-   '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
-@@ -169,11 +174,13 @@
-   AC_MSG_RESULT(no: not found by pkg-config)
- fi
- 
--if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
--  PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
--  if test x"$dbus_found" =

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

2022-10-27 Thread Alexis Ballier

commit: 695c0f4d61d1b8a44019a604811a583c5f62cefe
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Oct 27 12:26:47 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Oct 27 12:30:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=695c0f4d

media-video/mkvtoolnix: bump to 71.1.0

Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-71.1.0.ebuild}   | 4 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 62108a0898e9..68ec6cca8e30 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,3 +5,4 @@ DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5
 DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 
815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c
 SHA512 
eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
 DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B 
e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d
 SHA512 
fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B 
aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1
 SHA512 
c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
+DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 
6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41
 SHA512 
f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
similarity index 97%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
index 0f9ef7d7a056..23a2e80da85d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-71.1.0.ebuild
@@ -27,11 +27,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
dev-libs/boost:=
dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.2:=
+   >=dev-libs/libebml-1.4.4:=
>=dev-libs/libfmt-8.0.1:=
>=dev-libs/pugixml-1.11:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.6.3:=
+   >=media-libs/libmatroska-1.7.1:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-libs/zlib

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 0f9ef7d7a056..23a2e80da85d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -27,11 +27,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
dev-libs/boost:=
dev-libs/gmp:=
-   >=dev-libs/libebml-1.4.2:=
+   >=dev-libs/libebml-1.4.4:=
>=dev-libs/libfmt-8.0.1:=
>=dev-libs/pugixml-1.11:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.6.3:=
+   >=media-libs/libmatroska-1.7.1:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-libs/zlib

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

2022-09-02 Thread Sam James

commit: 988e39210a9f72848ac406c389e551c36d6fc3d8
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 05:26:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 05:26:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988e3921

media-video/mkvtoolnix: Stabilize 69.0.0 amd64, #868030

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
index cca351cc1337..d08f7cea93a7 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-09-02 Thread Sam James

commit: 7651dab6089bab652ceee2e653743a6ca48192f2
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep  3 05:26:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep  3 05:26:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7651dab6

media-video/mkvtoolnix: Stabilize 69.0.0 x86, #868030

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
index 3b7b072da517..cca351cc1337 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-07-10 Thread Sam James

commit: 1f9ee9eb28ce9dc6fe40fc6507de5d43e4d81e8c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 10 19:24:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 10 19:24:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9ee9eb

media-video/mkvtoolnix: add 69.0.0

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild | 132 
 2 files changed, 133 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index dc16db59057a..62108a0898e9 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,3 +4,4 @@ DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76f
 DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede
 SHA512 
252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
 DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 
815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c
 SHA512 
eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
 DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B 
e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d
 SHA512 
fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
+DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B 
aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1
 SHA512 
c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c

diff --git a/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
new file mode 100644
index ..3b7b072da517
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-69.0.0.ebuild
@@ -0,0 +1,132 @@
+# 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} == * ]] ; 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
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]]; 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

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

2022-07-08 Thread Sam James

commit: 6fc3ca602655a9ce33261ef7521e4ee89b4eb0f6
Author: John Einar Reitan  gmail  com>
AuthorDate: Fri Jul  8 10:37:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  8 21:51:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc3ca60

media-video/mkvtoolnix: Make dependency on qtsvg conditional

Closes: https://bugs.gentoo.org/856991
Signed-off-by: John Einar Reitan  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26280
Signed-off-by: Sam James  gentoo.org>

 .../{mkvtoolnix-68.0.0-r2.ebuild => mkvtoolnix-68.0.0-r3.ebuild}| 2 +-
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
similarity index 99%
rename from media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
index 50ff6904bf4e..f5a1084acaf8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.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

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 6e76d9b6573b..3b7b072da517 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.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

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

2022-07-08 Thread Sam James

commit: 1063b9d95ade7f16ad30d27d2d09d0b39d76eb86
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  8 07:44:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  8 07:44:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1063b9d9

media-video/mkvtoolnix: sync live

Signed-off-by: Sam James  gentoo.org>

 .../{mkvtoolnix-68.0.0-r1.ebuild => mkvtoolnix-68.0.0-r2.ebuild} | 1 -
 media-video/mkvtoolnix/mkvtoolnix-.ebuild| 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
similarity index 99%
rename from media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
index 1f997ac7d980..50ff6904bf4e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r2.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
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:=

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 0939d7201a9b..6e76d9b6573b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
+   dev-qt/qtsvg:5
gui? (
dev-qt/qtgui:5
dev-qt/qtnetwork:5

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

2022-07-08 Thread Sam James

commit: f540e45e45c69b1ea77737aaeae82338c7cae4b6
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  8 07:27:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  8 07:41:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f540e45e

media-video/mkvtoolnix: fix build with newer fmt; add missing qtsvg dep

Closes: https://bugs.gentoo.org/856700
Signed-off-by: Sam James  gentoo.org>

 .../mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch | 293 +
 ...x-68.0.0.ebuild => mkvtoolnix-68.0.0-r1.ebuild} |   2 +
 2 files changed, 295 insertions(+)

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
new file mode 100644
index ..a0e3c1780db9
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
@@ -0,0 +1,293 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9
+https://bugs.gentoo.org/856700
+
+From: Moritz Bunkus 
+Date: Thu, 7 Jul 2022 13:11:34 +0200
+Subject: [PATCH] fix compilation with fmt v9.0.0
+
+Prior to v9 all types that were outputtable via `operator<<` to
+`std::ostream` could be formatted. v9 changed that to require explicit
+tagging of those types that should work this way. This commit adds
+those tags for the types that are currently formatted via fmt.
+
+Fixes #3366.
+--- a/src/common/aac.h
 b/src/common/aac.h
+@@ -221,3 +221,7 @@ protected:
+ using parser_cptr = std::shared_ptr;
+ 
+ } // namespace mtx::aac
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/bcp47.h
 b/src/common/bcp47.h
+@@ -176,3 +176,8 @@ struct hash {
+ };
+ 
+ } // namespace mtx::bcp47
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : 
ostream_formatter {};
++template <> struct fmt::formatter  : 
ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/bluray/track_chapter_names.cpp
 b/src/common/bluray/track_chapter_names.cpp
+@@ -18,6 +18,7 @@
+ #include "common/bluray/track_chapter_names.h"
+ #include "common/bluray/util.h"
+ #include "common/debugging.h"
++#include "common/path.h"
+ #include "common/qt.h"
+ #include "common/xml/xml.h"
+ 
+--- a/src/common/error.h
 b/src/common/error.h
+@@ -45,3 +45,7 @@ operator <<(std::ostream ,
+ }
+ 
+ }
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/fourcc.h
 b/src/common/fourcc.h
+@@ -83,3 +83,7 @@ operator <<(std::ostream ,
+   out << fourcc.str();
+   return out;
+ }
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/kax_analyzer.h
 b/src/common/kax_analyzer.h
+@@ -239,3 +239,7 @@ public:
+   virtual void debug_abort_process();
+ };
+ using console_kax_analyzer_cptr = std::shared_ptr;
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/math_fwd.h
 b/src/common/math_fwd.h
+@@ -18,6 +18,11 @@
+ using mtx_mp_rational_t = 
boost::multiprecision::number;
+ using mtx_mp_int_t  = 
boost::multiprecision::number;
+ 
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : ostream_formatter {};
++template <> struct fmt::formatter  : ostream_formatter {};
++#endif  // FMT_VERSION >= 9
++
+ namespace mtx {
+ 
+ // This conversion function exists to work around incomplete
+--- a/src/common/mm_io_x.h
 b/src/common/mm_io_x.h
+@@ -155,3 +155,16 @@ operator <<(std::ostream ,
+ }
+ 
+ }}
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter: 
ostream_formatter {};
++template <> struct fmt::formatter: 
ostream_formatter {};
++template <> struct fmt::formatter   : 
ostream_formatter {};
++template <> struct fmt::formatter : 
ostream_formatter {};
++template <> struct fmt::formatter   : 
ostream_formatter {};
++template <> struct fmt::formatter: 
ostream_formatter {};
++template <> struct fmt::formatter : 
ostream_formatter {};
++template <> struct fmt::formatter   : 
ostream_formatter {};
++template <> struct fmt::formatter  : 
ostream_formatter {};
++template <> struct fmt::formatter: 
ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/opus.h
 b/src/common/opus.h
+@@ -91,3 +91,9 @@ operator <<(std::ostream ,
+ }
+ 
+ }
++
++#if FMT_VERSION >= 9
++template <> struct fmt::formatter : 
ostream_formatter {};
++template <> struct fmt::formatter  : 
ostream_formatter {};
++template <> struct fmt::formatter: 
ostream_formatter {};
++#endif  // FMT_VERSION >= 9
+--- a/src/common/path.h
 b/src/common/path.h
+@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const 
);

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

2022-07-07 Thread Alexis Ballier

commit: ce892b6275735a10109b1724bf65aaa924e11f03
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul  7 14:17:33 2022 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul  7 14:25:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce892b62

media-video/mkvtoolnix: bump to 68.0.0

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild | 132 
 2 files changed, 133 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 696b51f30dc3..dc16db59057a 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,4 @@ DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c
 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
 DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede
 SHA512 
252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
 DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 
815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c
 SHA512 
eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
+DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B 
e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d
 SHA512 
fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838

diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild
new file mode 100644
index ..cc6409014b5c
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild
@@ -0,0 +1,132 @@
+# 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} == * ]] ; 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/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
+)
+
+src_prepare() {
+   default
+
+   if [[ ${PV} == * ]]; 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

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

2022-07-06 Thread Sam James

commit: a06e4f4abc7cd3d83f1eb2605cd23d5d281d6237
Author: Nick H  gmail  com>
AuthorDate: Wed Jul  6 18:37:54 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  6 19:29:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06e4f4a

media-video/mkvtoolnix: libfmt version limit

Closes: https://bugs.gentoo.org/856700
Signed-off-by: Nick Herman  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26243
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 1 +
 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 1 +
 media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild | 1 +
 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 1 +
 4 files changed, 4 insertions(+)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
index cd70327db014..d249b81b99d8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
>=dev-libs/boost-1.66:=
>=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
+   =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:=

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index 0b4de7083e3b..664482898d27 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
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:=

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

2022-05-31 Thread Jakov Smolić

commit: dd03600c42bbd3683341cd212596991efc0b083f
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May 31 11:04:50 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May 31 11:04:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd03600c

media-video/mkvtoolnix: Stabilize 67.0.0 ppc, #848561

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index 24f4c4056a8f..0b4de7083e3b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-05-31 Thread Agostino Sarubbo

commit: b84ee857f8e1ab8028b061b66652971346795c55
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 31 08:52:38 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 31 08:52:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84ee857

media-video/mkvtoolnix: ppc64 stable wrt bug #848561

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index d0e4dd717e44..24f4c4056a8f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-05-31 Thread Jakov Smolić

commit: ae58177c64597676f183a5321f013df52cee4660
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue May 31 07:06:16 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue May 31 07:06:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae58177c

media-video/mkvtoolnix: Stabilize 67.0.0 amd64, #848561

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index d6c978a14197..d0e4dd717e44 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-05-30 Thread Sam James

commit: 290f1cdd500bc91763ccae698daa5306800c1d2e
Author: Sam James  gentoo  org>
AuthorDate: Mon May 30 23:29:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 30 23:29:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=290f1cdd

media-video/mkvtoolnix: Stabilize 67.0.0 x86, #848561

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index 0939d7201a9b..d6c978a14197 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-05-17 Thread Sam James

commit: b9b366048e6e81d451c2210e20f25e7085d7025e
Author: Sam James  gentoo  org>
AuthorDate: Wed May 18 02:10:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 18 02:10:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9b36604

media-video/mkvtoolnix: add comment re --enable-qt5

Bug: https://bugs.gentoo.org/844097
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 7 ++-
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index e228b9bbe6b3..0939d7201a9b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -92,10 +92,15 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
-   $(use_enable gui)
+
+   # 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)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index e228b9bbe6b3..0939d7201a9b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -92,10 +92,15 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
-   $(use_enable gui)
+
+   # 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)

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

2022-05-17 Thread Sam James

commit: 4bfec4188daa52de0eb9d27c483fec11dfed3540
Author: Sam James  gentoo  org>
AuthorDate: Wed May 18 02:08:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 18 02:08:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfec418

media-video/mkvtoolnix: sync live ebuild

Bug: https://bugs.gentoo.org/844097
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 48 +++
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 6bb7e14ab307..e228b9bbe6b3 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic multiprocessing qmake-utils xdg
 
@@ -19,36 +19,37 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch test"
+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/libebml-1.4.0:=
-   >=dev-libs/libfmt-6.1.0:=
-   dev-libs/libpcre2:=
-   dev-libs/pugixml:=
+   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-apps/file
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtmultimedia: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
-   dev-libs/utfcpp
+   >=dev-cpp/nlohmann_json-3.9.1
+   >=dev-libs/utfcpp-3.1.2
test? ( dev-cpp/gtest )
 "
 BDEPEND="
@@ -62,16 +63,20 @@ BDEPEND="
)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
+PATCHES=(
+   "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
+   "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+)
 
 src_prepare() {
-   xdg_src_prepare
+   default
+
if [[ ${PV} == * ]]; then
./autogen.sh || die
fi
 
-   # https://bugs.gentoo.org/692018
-   sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+   # bug #692018
+   sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
 
eautoreconf
 
@@ -80,16 +85,17 @@ src_prepare() {
 }
 
 src_configure() {
-   # bug 692322, use system dev-libs/utfcpp
+   # 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)
+   $(use_enable gui)
--disable-qt6
--enable-qt5
-   --with-qmake=$(qt5_get_bindir)/qmake
+   --with-qmake="$(qt5_get_bindir)"/qmake
$(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)

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

2022-05-17 Thread Sam James

commit: e20ef76c972a6bfbb900f5d8c36239013b288cd2
Author: Sam James  gentoo  org>
AuthorDate: Wed May 18 02:07:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 18 02:07:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20ef76c

media-video/mkvtoolnix: add 67.0.0

Quoting same comments I put in the patch:
"""
We should only check for UIC (provided by qtwidgets) if we're building the GUI.

Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
for e.g. MIME type detection since 59.0.0), but the rest of Qt
(like qtwidgets) is only needed for the GUI build.

The build system incorrectly unconditionally checks for UIC. We fix it here
to only check for it when doing a GUI build.

First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson 
duane  duanerobertson.com
Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: 
Sam James  gentoo.org>
"""

Closes: https://bugs.gentoo.org/844097
Signed-off-by: Duane Robertson  duanerobertson.com>
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest|   1 +
 .../files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch |  76 +
 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild| 126 +
 3 files changed, 203 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 55b203cc0880..696b51f30dc3 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7c
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
 DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede
 SHA512 
252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
+DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 
815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c
 SHA512 
eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997

diff --git 
a/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
new file mode 100644
index ..a5f5fd2009b8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
@@ -0,0 +1,76 @@
+https://bugs.gentoo.org/844097
+
+We should only check for UIC (provided by qtwidgets) if we're building the GUI.
+
+Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
+for e.g. MIME type detection since 59.0.0), but the rest of Qt
+(like qtwidgets) is only needed for the GUI build.
+
+The build system incorrectly unconditionally checks for UIC. We fix it here
+to only check for it when doing a GUI build.
+
+First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson 
du...@duanerobertson.com
+Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: 
Sam James 
+--- a/ac/qt5.m4
 b/ac/qt5.m4
+@@ -51,7 +51,6 @@ check_qt5() {
+   AC_PATH_PROG(LCONVERT, lconvert,, [$qt_searchpath])
+   AC_PATH_PROG(MOC, moc,, [$qt_searchpath])
+   AC_PATH_PROG(RCC, rcc,, [$qt_searchpath])
+-  AC_PATH_PROG(UIC, uic,, [$qt_searchpath])
+ 
+   if test x"$MOC" = x; then
+ AC_MSG_CHECKING(for Qt 5)
+@@ -62,11 +61,6 @@ check_qt5() {
+ AC_MSG_CHECKING(for Qt 5)
+ AC_MSG_RESULT(no: could not find the rcc executable)
+ return
+-
+-  elif test x"$UIC" = x; then
+-AC_MSG_CHECKING(for Qt 5)
+-AC_MSG_RESULT(no: could not find the uic executable)
+-return
+   fi
+ 
+
+
+--- a/ac/qt_common.m4
 b/ac/qt_common.m4
+@@ -5,6 +5,37 @@ fi
+ if test x"$enable_gui" = xyes; then
+   BUILD_GUI=yes
+ 
++  # Copied from ac/qt6.m4.
++  qmake_properties="`mktemp`"
++
++  "$QMAKE" -query > "$qmake_properties"
++
++  qmake_ver="`$ac_cv_path_EGREP '^QT_VERSION:' "$qmake_properties" | sed 
's/^QT_VERSION://'`"
++
++  AC_MSG_CHECKING(for qmake's version)
++  if test -z "qmake_ver"; then
++AC_MSG_RESULT(unknown; please contact the author)
++return
++  elif ! check_version $qt_min_ver $qmake_ver; then

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

2022-01-02 Thread Jakov Smolić

commit: 972b071d361f7b2750f44b2caa778537bd812cff
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Jan  2 10:52:29 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Jan  2 10:54:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972b071d

media-video/mkvtoolnix: Stabilize 61.0.0 amd64, #829472

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index a854389b084f..cd4d49f2c426 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ppc ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-01-01 Thread Sam James

commit: add757338e612d6f8896f7201859bc396b2ceda9
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 05:45:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 05:49:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add75733

media-video/mkvtoolnix: add 64.0.0

Closes: https://bugs.gentoo.org/829022
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild | 125 
 2 files changed, 126 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 49693a8e0528..55b203cc0880 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
+DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B 
f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede
 SHA512 
252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844

diff --git a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
new file mode 100644
index ..7e1ffe9d6374
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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/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
+)
+
+src_prepare() {
+   xdg_src_prepare
+
+   if [[ ${PV} == * ]]; then
+   ./autogen.sh || die
+   fi
+
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i 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)
+   $(use_enable gui)
+   --disable-qt6
+   --enable-qt5
+

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

2022-01-01 Thread Sam James

commit: 84f476221bbb9c791e70a8c97ef160a250f8ec8a
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 00:02:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 00:02:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84f47622

media-video/mkvtoolnix: Stabilize 61.0.0 x86, #829472

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index 424a9a786ee0..a854389b084f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ppc ppc64 ~x86"
+   KEYWORDS="~amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-01-01 Thread Arthur Zamarin

commit: b4797f057c61af21c103fa3a73d43c0aaae49504
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  1 17:39:09 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  1 17:39:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4797f05

media-video/mkvtoolnix: Stabilize 61.0.0 ppc64, #829472

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index 05b2fdd29fbf..424a9a786ee0 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2022-01-01 Thread Arthur Zamarin

commit: 888969d6bb2ea16138740514ad886e8cc5377a83
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan  1 16:38:28 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan  1 16:38:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888969d6

media-video/mkvtoolnix: Stabilize 61.0.0 ppc, #829472

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index 11a26571c2ed..05b2fdd29fbf 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-09-19 Thread Andreas K. Hüttel

commit: 1e6a189ff59cd772bc17898f11d0b5f95da4fa8b
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Sep 19 07:08:52 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Sep 19 07:12:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6a189f

media-video/mkvtoolnix: Remove old

Bug: https://bugs.gentoo.org/767823
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Huettel  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 -
 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 130 
 2 files changed, 131 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 2e5babb0e20..49693a8e052 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,4 +1,3 @@
-DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
deleted file mode 100644
index d19aae2ddc8..000
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == * ]] ; 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 nls pch qt5 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.60:=
-   >=dev-libs/libebml-1.4.0:=
-   >=dev-libs/libfmt-6.1.0:=
-   dev-libs/libpcre2:=
-   dev-libs/pugixml:=
-   media-libs/flac:=
-   >=media-libs/libmatroska-1.6.0:=
-   media-libs/libogg:=
-   media-libs/libvorbis:=
-   sys-apps/file
-   sys-libs/zlib
-   dvd? ( media-libs/libdvdread:= )
-   qt5? (
-   dev-qt/qtcore: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
-   dev-libs/utfcpp
-   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-49.0.0-qt5dbus.patch )
-
-src_prepare() {
-   xdg_src_prepare
-   if [[ ${PV} == * ]]; then
-   ./autogen.sh || die
-   fi
-
-   # https://bugs.gentoo.org/692018
-   sed -e 's/pandoc/diSaBlEd/' -i 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)
-   $(use_enable qt5 qt)
-

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

2021-09-07 Thread Sam James

commit: 064a7a1de3cdaa5ed6425e1d18e5d94d0a195632
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep  8 03:09:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  8 03:09:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064a7a1d

media-video/mkvtoolnix: fix UnusedInherits

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 2 +-
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
index 4947246fe52..11a26571c2e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
 
 if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index cd70327db01..6bb7e14ab30 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+inherit autotools flag-o-matic multiprocessing qmake-utils xdg
 
 if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;

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

2021-09-07 Thread Sam James

commit: f3d9f46d46f4bbe583e7fda943fca07310b31226
Author: John Einar Reitan  gmail  com>
AuthorDate: Thu Sep  2 06:56:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep  8 03:08:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3d9f46d

media-video/mkvtoolnix: bump to 61.0.0

Bug: https://bugs.gentoo.org/806791
Signed-off-by: John Einar Reitan  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22188
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild | 123 
 2 files changed, 124 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 86f40e12905..2e5babb0e20 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
+DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B 
de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1
 SHA512 
9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582

diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
new file mode 100644
index 000..4947246fe52
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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 nls pch test gui"
+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/libebml-1.4.0:=
+   >=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
+   dev-libs/pugixml:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.6.3:=
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   sys-apps/file
+   sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
+   dev-qt/qtcore: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
+   dev-libs/utfcpp
+   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 )
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; then
+   ./autogen.sh || die
+   fi
+
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i 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)
+   $(use_enable gui)

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

2021-08-24 Thread Agostino Sarubbo

commit: 6cc048375ad470577de8d2e54d3ca3fb5a664ef5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 24 11:41:38 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 24 11:41:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc04837

media-video/mkvtoolnix: ppc64 stable wrt bug #809137

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
index 9b52c4f3c0c..33522f391c0 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-08-24 Thread Agostino Sarubbo

commit: 5f897dddf0045596a6b3e5a2bed3af407ec95d08
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 24 11:40:58 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 24 11:40:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f897ddd

media-video/mkvtoolnix: ppc stable wrt bug #809137

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
index 30635c1d9b0..9b52c4f3c0c 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-08-24 Thread Agostino Sarubbo

commit: bb43dc622824d27129fca190971df9f03f402cfb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 24 11:39:55 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 24 11:39:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb43dc62

media-video/mkvtoolnix: amd64 stable wrt bug #809137

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
index 9400c4947f3..30635c1d9b0 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-08-23 Thread Agostino Sarubbo

commit: a334b71c72765269de07dbd2775b8e420c6b8f44
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 23 22:16:04 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 23 22:16:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a334b71c

media-video/mkvtoolnix: x86 stable wrt bug #809137

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
index dbc45d73af8..9400c4947f3 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-08-03 Thread Alexis Ballier

commit: 285f1f1ad7318c0a46af79697de1f51786d74486
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Aug  3 12:53:57 2021 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug  3 13:37:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285f1f1a

media-video/mkvtoolnix: do not feed invalid configure switches

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 9 +
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 9 +
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
index 54bd36069ef..cd70327db01 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -89,6 +89,7 @@ src_configure() {
$(use_enable dbus)
--disable-qt6
--enable-qt5
+   --with-qmake=$(qt5_get_bindir)/qmake
$(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)
@@ -98,14 +99,6 @@ src_configure() {
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
 
-   # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-   myeconfargs+=(
-   --with-moc=$(qt5_get_bindir)/moc
-   --with-uic=$(qt5_get_bindir)/uic
-   --with-rcc=$(qt5_get_bindir)/rcc
-   --with-qmake=$(qt5_get_bindir)/qmake
-   )
-
econf "${myeconfargs[@]}"
 }
 

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 54bd36069ef..cd70327db01 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -89,6 +89,7 @@ src_configure() {
$(use_enable dbus)
--disable-qt6
--enable-qt5
+   --with-qmake=$(qt5_get_bindir)/qmake
$(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)
@@ -98,14 +99,6 @@ src_configure() {
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
 
-   # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-   myeconfargs+=(
-   --with-moc=$(qt5_get_bindir)/moc
-   --with-uic=$(qt5_get_bindir)/uic
-   --with-rcc=$(qt5_get_bindir)/rcc
-   --with-qmake=$(qt5_get_bindir)/qmake
-   )
-
econf "${myeconfargs[@]}"
 }

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

2021-08-03 Thread Alexis Ballier

commit: 2aec44868aca30ce8f391400c38253c0431c2c2f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Aug  3 12:42:36 2021 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug  3 13:37:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aec4486

media-video/mkvtoolnix: drop qt5 useflag

It is now mandatory.

Closes: https://bugs.gentoo.org/806256
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 39 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 47 -
 2 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
index 5f25e814916..54bd36069ef 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd nls pch test"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -37,16 +37,14 @@ RDEPEND="
sys-apps/file
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
-   qt5? (
-   dev-qt/qtcore: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 )
-   )
+   dev-qt/qtcore: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
@@ -89,7 +87,8 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable dbus)
-   $(use_enable qt5 qt)
+   --disable-qt6
+   --enable-qt5
$(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)
@@ -99,15 +98,13 @@ src_configure() {
--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
)
 
-   if use qt5 ; then
-   # ac/qt5.m4 finds default Qt version set by qtchooser, bug 
#532600
-   myeconfargs+=(
-   --with-moc=$(qt5_get_bindir)/moc
-   --with-uic=$(qt5_get_bindir)/uic
-   --with-rcc=$(qt5_get_bindir)/rcc
-   --with-qmake=$(qt5_get_bindir)/qmake
-   )
-   fi
+   # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+   myeconfargs+=(
+   --with-moc=$(qt5_get_bindir)/moc
+   --with-uic=$(qt5_get_bindir)/uic
+   --with-rcc=$(qt5_get_bindir)/rcc
+   --with-qmake=$(qt5_get_bindir)/qmake
+   )
 
econf "${myeconfargs[@]}"
 }

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index d84291b2803..54bd36069ef 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,34 +19,32 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
+IUSE="dbus debug dvd 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.60:=
+   >=dev-libs/boost-1.66:=
>=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
dev-libs/libpcre2:=
dev-libs/pugixml:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.6.0:=
+   >=media-libs/libmatroska-1.6.3:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-apps/file
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
-   qt5? (
-   dev-qt/qtcore: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 )
-   )
+   dev-qt/qtcore: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? (

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

2021-08-03 Thread Alexis Ballier

commit: a4fbc8aab5bc4e5575f125a184331ca6112175e8
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Aug  3 06:41:41 2021 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug  3 07:35:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4fbc8aa

media-video/mkvtoolnix: bump to 60.0.0

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest|   1 +
 .../files/mkvtoolnix-58.0.0-qt5dbus.patch  |  37 ++
 media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild| 130 +
 3 files changed, 168 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 409aac68cdd..86f40e12905 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1,3 @@
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
+DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 
094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea
 SHA512 
90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
new file mode 100644
index 000..fb94686d27e
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
@@ -0,0 +1,37 @@
+Index: mkvtoolnix-58.0.0/ac/qt5.m4
+===
+--- mkvtoolnix-58.0.0.orig/ac/qt5.m4
 mkvtoolnix-58.0.0/ac/qt5.m4
+@@ -98,12 +98,14 @@ check_qt5() {
+   return
+ fi
+ 
+-if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+-  PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+-  if test x"$dbus_found" = xyes; then
+-with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+-AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
+-  fi
++if test x"$enable_dbus" = xyes; then
++  if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++  PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++  if test x"$dbus_found" = xyes; then
++  
with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++  AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++  fi
++  fi
+ fi
+ 
+ with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 
's/,/ /g'`"
+@@ -244,6 +246,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
+ AC_ARG_WITH([qt_pkg_config],
+   AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for 
detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being 
included in build (yes)]),
++  [],[enable_dbus=yes])
++
++
+ 
+ have_qt5=no
+ 

diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
new file mode 100644
index 000..5f25e814916
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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 nls pch qt5 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/libebml-1.4.0:=
+   >=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
+

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

2021-06-22 Thread David Seifert

commit: 0f0beec5684e2ab8c1da179577009e2252ef8b2f
Author: David Seifert  gentoo  org>
AuthorDate: Tue Jun 22 20:43:35 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jun 22 20:43:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0beec5

media-video/mkvtoolnix: drop versions

Signed-off-by: David Seifert  gentoo.org>

 media-video/mkvtoolnix/Manifest |   6 --
 media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 119 -
 media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild | 121 --
 media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild | 121 --
 media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild | 126 ---
 media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild | 130 ---
 media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 131 
 7 files changed, 754 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 1ec5e55465b..409aac68cdd 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,8 +1,2 @@
-DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
-DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
-DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
-DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018
 SHA512 
087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
-DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B 
ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437
 SHA512 
ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
-DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 
805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b
 SHA512 
7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6
 DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99

diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
deleted file mode 100644
index f29330b7108..000
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   EGIT_SUBMODULES=()
-   inherit autotools 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="debug nls pch test qt5"
-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:=
-   >=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:=
-

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

2021-05-29 Thread Sam James

commit: d4e38ab005751799430e9e831c68fc838c0fc1cd
Author: Sam James  gentoo  org>
AuthorDate: Sun May 30 05:14:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 30 05:14:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e38ab0

media-video/mkvtoolnix: Stabilize 51.0.0 ppc, #777687

Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
index 1b3e8abc5a4..d19aae2ddc8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-05-29 Thread Agostino Sarubbo

commit: ca7430d555f501c70f15b1fcb40611cb1cfcb6f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May 29 08:42:51 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May 29 08:42:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7430d5

media-video/mkvtoolnix: ppc64 stable wrt bug #777687

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
index cc1eb577f43..1b3e8abc5a4 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-05-28 Thread Sam James

commit: 63c3ff1cf7c798b0d1e79b3c288c81f2412ce8a3
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 19:54:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 28 19:54:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63c3ff1c

media-video/mkvtoolnix: add 57.0.0

Closes: https://bugs.gentoo.org/792678
Signed-off-by: Sam James  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 131 
 2 files changed, 132 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ee6c609ee2f..1ec5e55465b 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -5,3 +5,4 @@ DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a
 DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B 
ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437
 SHA512 
ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
 DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 
805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b
 SHA512 
7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6
+DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B 
e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18
 SHA512 
583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99

diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
new file mode 100644
index 000..dbc45d73af8
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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 nls pch qt5 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.60:=
+   >=dev-libs/libebml-1.4.0:=
+   >=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
+   dev-libs/pugixml:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.6.3:=
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   sys-apps/file
+   sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
+   qt5? (
+   dev-qt/qtcore: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
+   dev-libs/utfcpp
+   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-49.0.0-qt5dbus.patch
+   "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; then
+   ./autogen.sh || die
+   fi
+
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i 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)
+

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

2021-05-28 Thread Agostino Sarubbo

commit: a2ed5424d6f7ce539713835ff1583f414112b0d5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 28 19:40:00 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 28 19:40:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ed5424

media-video/mkvtoolnix: x86 stable wrt bug #777687

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
index 90999e1cc65..cc1eb577f43 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-05-28 Thread Agostino Sarubbo

commit: 3282f9e976c247809db7dce748ea07639a6ba01b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 28 12:01:26 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 28 12:01:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3282f9e9

media-video/mkvtoolnix: amd64 stable wrt bug #777687

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
index d84291b2803..90999e1cc65 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2021-05-23 Thread Andrew Savchenko

commit: bae380256f345d9a79a0941b6259b8fb700fbf5e
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun May 23 07:16:28 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun May 23 07:23:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae38025

media-video/mkvtoolnix: fix OOM during build

Apply upstream patch[1] to drop iso639_language_list.cpp
optimization level to 0 due to special nature of this source file.

[1] https://gitlab.com/mbunkus/mkvtoolnix/-
/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a

Closes: https://bugs.gentoo.org/786978
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 .../mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch | 15 +++
 media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild   |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
new file mode 100644
index 000..c0f91deed69
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
@@ -0,0 +1,15 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
+https://bugs.gentoo.org/786978#c10
+diff --git a/Rakefile b/Rakefile
+index 
8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a
 100644
+--- a/Rakefile
 b/Rakefile
+@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args|
+ # Even -O1 causes compilation time & memory usage to skyrocket,
+ # possibly exponentially, with the number of entries to
+ # emplace_back() into the vector.
+-flags.gsub!(%r{ -O\d+ }, ' -O0 ')
++flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0')
+   end
+ 
+   args = [

diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
index c093e341ab9..dbc45d73af8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -64,7 +64,8 @@ BDEPEND="
)
 "
 
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
+   "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
 
 src_prepare() {
xdg_src_prepare

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

2021-04-17 Thread Pacho Ramos

commit: 634e77cb261a9f2303e2bb23f4a1dedd6c984b51
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Apr 17 19:32:51 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Apr 17 20:08:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634e77cb

media-video/mkvtoolnix: Needs newer libmatroska

Closes: https://bugs.gentoo.org/782547
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
index 95315efb574..c093e341ab9 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-libs/libpcre2:=
dev-libs/pugixml:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.6.0:=
+   >=media-libs/libmatroska-1.6.3:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-apps/file

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

2021-04-10 Thread Thomas Raschbacher

commit: 62d0c1ab7c56dde2601985c9703454da77ebf69c
Author: Thomas Raschbacher  gentoo  org>
AuthorDate: Sat Apr 10 09:18:09 2021 +
Commit: Thomas Raschbacher  gentoo  org>
CommitDate: Sat Apr 10 09:18:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d0c1ab

media-video/mkvtoolnix: version bump

Closes: https://bugs.gentoo.org/777684
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Raschbacher  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index de8bf2fb9e8..ee6c609ee2f 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,3 +4,4 @@ DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543e
 DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018
 SHA512 
087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
 DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B 
ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437
 SHA512 
ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
 DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
+DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 
805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b
 SHA512 
7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6

diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
new file mode 100644
index 000..95315efb574
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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 nls pch qt5 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.60:=
+   >=dev-libs/libebml-1.4.0:=
+   >=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
+   dev-libs/pugixml:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.6.0:=
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   sys-apps/file
+   sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
+   qt5? (
+   dev-qt/qtcore: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
+   dev-libs/utfcpp
+   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-49.0.0-qt5dbus.patch )
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; then
+   ./autogen.sh || die
+   fi
+
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i 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 ""

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

2020-10-22 Thread Alexis Ballier

commit: bb1d34a545a8031e91f2f36d23cc5b5fb6a25330
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Oct 22 12:22:04 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Oct 22 12:22:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb1d34a5

media-video/mkvtoolnix: bump to 51.0.0

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index c98e88454bf..de8bf2fb9e8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,4 @@ DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f130
 DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
 DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018
 SHA512 
087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
 DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B 
ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437
 SHA512 
ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea
+DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B 
c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69
 SHA512 
2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e

diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
new file mode 100644
index 000..d84291b2803
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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 nls pch qt5 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.60:=
+   >=dev-libs/libebml-1.4.0:=
+   >=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
+   dev-libs/pugixml:=
+   media-libs/flac:=
+   >=media-libs/libmatroska-1.6.0:=
+   media-libs/libogg:=
+   media-libs/libvorbis:=
+   sys-apps/file
+   sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
+   qt5? (
+   dev-qt/qtcore: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
+   dev-libs/utfcpp
+   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-49.0.0-qt5dbus.patch )
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; then
+   ./autogen.sh || die
+   fi
+
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i 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)
+

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

2020-10-07 Thread Agostino Sarubbo

commit: f69b53d8e681d8154a0f1eecbf02b61cfbafb23f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct  7 06:42:25 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct  7 06:42:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69b53d8

media-video/mkvtoolnix: amd64 stable wrt bug #745753

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
index f0be41cce41..2675734b7ef 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ppc ppc64 ~x86"
+   KEYWORDS="amd64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-10-01 Thread Sergei Trofimovich

commit: 47e3eea9bd0803dda918283133526254a692363b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct  1 22:57:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct  1 22:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e3eea9

media-video/mkvtoolnix: stable 49.0.0 for ppc

stable wrt bug #745753

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
index 2d9b97a2dce..f0be41cce41 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+   KEYWORDS="~amd64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-10-01 Thread Sergei Trofimovich

commit: 31e38eb1416bd8c6f2f19c1a2c2f8079d393cacc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct  1 22:44:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct  1 22:55:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e38eb1

media-video/mkvtoolnix: stable 49.0.0 for ppc64

stable wrt bug #745753

Package-Manager: Portage-3.0.8, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
index 7456a1ad02d..2d9b97a2dce 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-09-30 Thread Alexis Ballier

commit: 144eb6b46b41f5dec53c855f2b0b15ed68c1da63
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep 30 17:08:11 2020 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep 30 17:08:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144eb6b4

media-video/mkvtoolnix: bump to 50.0.0.

Fix automagic on pandoc

Closes: https://bugs.gentoo.org/692018
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-50.0.0.ebuild}   | 4 
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 
 3 files changed, 9 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d97e8224243..c98e88454bf 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abe
 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
 DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
 DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018
 SHA512 
087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
+DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B 
ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437
 SHA512 
ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild
similarity index 96%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild
index 7456a1ad02d..d84291b2803 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-50.0.0.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
>=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
dev-libs/pugixml:=
media-libs/flac:=
>=media-libs/libmatroska-1.6.0:=
@@ -71,6 +72,9 @@ src_prepare() {
./autogen.sh || die
fi
 
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+
eautoreconf
 
# remove bundled libs

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 7456a1ad02d..d84291b2803 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -28,6 +28,7 @@ RDEPEND="
>=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
+   dev-libs/libpcre2:=
dev-libs/pugixml:=
media-libs/flac:=
>=media-libs/libmatroska-1.6.0:=
@@ -71,6 +72,9 @@ src_prepare() {
./autogen.sh || die
fi
 
+   # https://bugs.gentoo.org/692018
+   sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
+
eautoreconf
 
# remove bundled libs

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

2020-09-07 Thread Sergei Trofimovich

commit: 14315a14a070da58eb8dec5f31aa2d1acc817fd8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 08:37:40 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 08:47:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14315a14

media-video/mkvtoolnix: stable 48.0.0 for ppc64

stable wrt bug #733568

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 4c5fa1a2b75..8b911a01ce1 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-09-07 Thread Sergei Trofimovich

commit: 919e06905bc8f31c62fb07bc2d5af57895d28783
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 08:10:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 08:20:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919e0690

media-video/mkvtoolnix: stable 48.0.0 for ppc

stable wrt bug #733568

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 4de6b68ba82..4c5fa1a2b75 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-08-21 Thread Agostino Sarubbo

commit: 264021bb041aa1d466b1bc30c0a792739a635732
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Aug 22 05:50:03 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Aug 22 05:50:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264021bb

media-video/mkvtoolnix: x86 stable wrt bug #733568

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 152c14dec85..4de6b68ba82 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-08-20 Thread Thomas Deutschmann

commit: f78a96cb4bcaab84cb31ea3bd69753f6bf8fc68f
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Aug 15 13:59:09 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 20 19:02:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78a96cb

media-video/mkvtoolnix: bump to 49.0.0

Also introduce USE flag to make dbus support optional.

Bug: https://bugs.gentoo.org/737252
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17132
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/mkvtoolnix/Manifest|  1 +
 .../files/mkvtoolnix-49.0.0-qt5dbus.patch  | 32 ++
 ...oolnix-.ebuild => mkvtoolnix-49.0.0.ebuild} | 13 ++---
 media-video/mkvtoolnix/mkvtoolnix-.ebuild  | 13 ++---
 4 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6504d272652..d97e8224243 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
 DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d
+DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 
2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018
 SHA512 
087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch 
b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
new file mode 100644
index 000..1c59b2c3827
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
@@ -0,0 +1,32 @@
+--- a/ac/qt5.m4   2020-07-31 11:25:31.371508129 -0500
 b/ac/qt5.m4   2020-07-31 11:30:14.967322450 -0500
+@@ -14,6 +14,11 @@
+ AC_ARG_WITH([qt_pkg_config],
+   AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for 
detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being 
included in build (yes)]),
++  [],[enable_dbus=yes])
++
++
+ 
+ if test x"$enable_qt" = "xyes" -a \
+   '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
+@@ -169,11 +174,13 @@
+   AC_MSG_RESULT(no: not found by pkg-config)
+ fi
+ 
+-if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+-  PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+-  if test x"$dbus_found" = xyes; then
+-with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+-AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++if test x"$enable_dbus" = xyes; then
++  if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++if test x"$dbus_found" = xyes; then
++  with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++  AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++fi
+   fi
+ fi

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
similarity index 90%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
index 4f1a6f2c045..7456a1ad02d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+inherit autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
 
 if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
EGIT_SUBMODULES=()
-   inherit autotools git-r3
+   inherit git-r3
 else

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

2020-08-18 Thread Agostino Sarubbo

commit: 70adad6e6483f8ecabae40409f1edc755f52bb50
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug 18 11:13:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug 18 11:13:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70adad6e

media-video/mkvtoolnix: amd64 stable wrt bug #733568

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index 4f1a6f2c045..152c14dec85 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2020-06-29 Thread Tim Harder

commit: 8e05f0f393d74d74fa467fe0130944dd9a31b92a
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Jun 30 02:44:41 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Jun 30 02:44:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e05f0f3

media-video/mkvtoolnix: remove old

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   4 -
 media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild | 119 
 media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild | 119 
 media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild | 119 
 media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild | 119 
 5 files changed, 480 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bdec2ee13e2..6504d272652 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,7 +1,3 @@
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
-DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396
 SHA512 
2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
-DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921
 SHA512 
dec32df70aeb53ecdfb8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
-DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 
6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595
 SHA512 
373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
-DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 
22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b
 SHA512 
8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
 DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d

diff --git a/media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
deleted file mode 100644
index 6c3ac899f3d..000
--- a/media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == * ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   EGIT_SUBMODULES=()
-   inherit autotools 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="debug nls pch test qt5"
-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.60:=
-   >=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=
-   )
-"
-DEPEND="${RDEPEND}
-   dev-cpp/nlohmann_json
-   dev-libs/utfcpp
-   test? (

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

2020-06-29 Thread Tim Harder

commit: ed8f6329562e0ba8bdd61a4264535fb08b13892f
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Jun 30 02:43:33 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Jun 30 02:43:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8f6329

media-video/mkvtoolnix: version bump to 48.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-48.0.0.ebuild}   | 4 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a142bf3c4e8..bdec2ee13e2 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,3 +4,4 @@ DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362
 DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 
6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595
 SHA512 
373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
 DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 
22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b
 SHA512 
8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d
+DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 
995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739
 SHA512 
33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
similarity index 97%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
index eb57b01c0ba..4f1a6f2c045 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-48.0.0.ebuild
@@ -26,11 +26,11 @@ RESTRICT="!test? ( test )"
 # version requirement updates and other packaging info
 RDEPEND="
>=dev-libs/boost-1.60:=
-   >=dev-libs/libebml-1.3.7:=
+   >=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
dev-libs/pugixml:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.5.0:=
+   >=media-libs/libmatroska-1.6.0:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-apps/file

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index eb57b01c0ba..4f1a6f2c045 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -26,11 +26,11 @@ RESTRICT="!test? ( test )"
 # version requirement updates and other packaging info
 RDEPEND="
>=dev-libs/boost-1.60:=
-   >=dev-libs/libebml-1.3.7:=
+   >=dev-libs/libebml-1.4.0:=
>=dev-libs/libfmt-6.1.0:=
dev-libs/pugixml:=
media-libs/flac:=
-   >=media-libs/libmatroska-1.5.0:=
+   >=media-libs/libmatroska-1.6.0:=
media-libs/libogg:=
media-libs/libvorbis:=
sys-apps/file

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

2020-06-15 Thread Tim Harder

commit: 307c9e6ca344faaac4821398b5a00fc6f6558dbb
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Jun 15 09:22:25 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Jun 15 09:46:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307c9e6c

media-video/mkvtoolnix: version bump to 47.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-47.0.0.ebuild} | 6 --
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 6 --
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 723e4a9d5e5..a142bf3c4e8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,4 @@ DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300
 DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921
 SHA512 
dec32df70aeb53ecdfb8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
 DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 
6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595
 SHA512 
373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
 DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 
22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b
 SHA512 
8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c
+DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 
7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8
 SHA512 
dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild
similarity index 95%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild
index 6c3ac899f3d..eb57b01c0ba 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-47.0.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug nls pch test qt5"
+IUSE="debug dvd nls pch test qt5"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
>=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.3.7:=
-   >=dev-libs/libfmt-5.3.0:=
+   >=dev-libs/libfmt-6.1.0:=
dev-libs/pugixml:=
media-libs/flac:=
>=media-libs/libmatroska-1.5.0:=
@@ -35,6 +35,7 @@ RDEPEND="
media-libs/libvorbis:=
sys-apps/file
sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -80,6 +81,7 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable qt5 qt)
+   $(use_with dvd dvdread)
$(use_with nls gettext)
$(usex nls "" --with-po4a-translate=false)
--disable-update-check

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 6c3ac899f3d..eb57b01c0ba 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ 
https://gitlab.com/mbunkus/mkvtoolnix;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug nls pch test qt5"
+IUSE="debug dvd nls pch test qt5"
 RESTRICT="!test? ( test )"
 
 # check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
>=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.3.7:=
-   >=dev-libs/libfmt-5.3.0:=
+   >=dev-libs/libfmt-6.1.0:=
dev-libs/pugixml:=
media-libs/flac:=
>=media-libs/libmatroska-1.5.0:=
@@ -35,6 +35,7 @@ RDEPEND="
media-libs/libvorbis:=
sys-apps/file
sys-libs/zlib
+   dvd? ( media-libs/libdvdread:= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -80,6 +81,7 @@ src_configure() {
$(use_enable debug)
$(usex pch "" --disable-precompiled-headers)
$(use_enable qt5 qt)
+

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

2020-05-14 Thread Tim Harder

commit: 3e7c5e3a8c9a8fc9612022ca7b61eeafb8a66472
Author: Tim Harder  gentoo  org>
AuthorDate: Fri May 15 04:35:00 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri May 15 05:05:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7c5e3a

media-video/mkvtoolnix: version bump to 46.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 8152a75da35..723e4a9d5e5 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abe
 DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396
 SHA512 
2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
 DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921
 SHA512 
dec32df70aeb53ecdfb8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
 DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 
6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595
 SHA512 
373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc
+DIST mkvtoolnix-46.0.0.tar.xz 7505996 BLAKE2B 
22c0a3951241ec87c6004c2ed9eaf43d217a219572f48f9c47ed26625276ede180b25018f7f561f36f68e8fdf484f9cd1d51b5d6faf109916ecbfc1bc34c372b
 SHA512 
8c88ba82a5b3eeb1eda2e1387a9beac1c3265761e189088d51464a4f6af0a9e6ba299254bbe84253ed7c832f2c4642513751617c928f1fdc52d8d7b286b6974c

diff --git a/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
new file mode 100644
index 000..6c3ac899f3d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-46.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   EGIT_SUBMODULES=()
+   inherit autotools 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="debug nls pch test qt5"
+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.60:=
+   >=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=
+   )
+"
+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
+   nls? (
+   sys-devel/gettext
+   app-text/po4a
+   )
+"
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; 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)
+   $(use_enable qt5 qt)
+   $(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)
+   )
+
+   if use qt5 ;

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

2020-04-05 Thread Tim Harder

commit: ba7df7c8836f2638c31ddd23c226c427ccffd3f5
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Apr  5 08:21:13 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Apr  5 10:02:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7df7c8

media-video/mkvtoolnix: version bump to 45.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 69a8891979c..8152a75da35 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396
 SHA512 
2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
 DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921
 SHA512 
dec32df70aeb53ecdfb8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663
+DIST mkvtoolnix-45.0.0.tar.xz 7500448 BLAKE2B 
6725ac716a8882e061c31d05670d6fe5fe5900755b8e1fb0bc089c6d42529120fec9053925505f51d0453a06e46be502680321225375f2013ea3908f0ce92595
 SHA512 
373400c66ad8ea70b775d946842783c241fea04f4c5c9628f1652e45128e34abc41037045cbd47b83e70e350a338e5dc188cf0b51662726e0ff2e8288f0423dc

diff --git a/media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild
new file mode 100644
index 000..6c3ac899f3d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-45.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   EGIT_SUBMODULES=()
+   inherit autotools 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="debug nls pch test qt5"
+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.60:=
+   >=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=
+   )
+"
+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
+   nls? (
+   sys-devel/gettext
+   app-text/po4a
+   )
+"
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; 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)
+   $(use_enable qt5 qt)
+   $(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)
+   )
+
+   if use qt5 ; then
+   # ac/qt5.m4 finds default Qt version set by qtchooser, bug

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

2020-01-31 Thread Tim Harder

commit: 489662e542080996f1bd074127ede13efb37e180
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Jan 31 08:48:11 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Jan 31 08:49:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489662e5

media-video/mkvtoolnix: version bump to 43.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild | 119 
 2 files changed, 120 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 96fd2c94923..69a8891979c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1,3 @@
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
 DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396
 SHA512 
2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a
+DIST mkvtoolnix-43.0.0.tar.xz 7486252 BLAKE2B 
b74577627e503cf7f5f83232ef7b0cf362384dbd4867247d2945a8b93317e7ec87ba778e7cf7b691ae9c33812d5df2a9c0a7c95fb601e3c8baaeb06a6bc7a921
 SHA512 
dec32df70aeb53ecdfb8b773a3f61bb224d630536ba41e36d9687c3b66ae47347c85d8c8d75763d270b7605c6b7010b0bb04c4bdb1e6d6b624c85edeb663

diff --git a/media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild
new file mode 100644
index 000..6c3ac899f3d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-43.0.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   EGIT_SUBMODULES=()
+   inherit autotools 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="debug nls pch test qt5"
+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.60:=
+   >=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=
+   )
+"
+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
+   nls? (
+   sys-devel/gettext
+   app-text/po4a
+   )
+"
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; 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)
+   $(use_enable qt5 qt)
+   $(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)
+   )
+
+   if use qt5 ; then
+   # ac/qt5.m4 finds default Qt version set by qtchooser, bug 
#532600
+   myeconfargs+=(
+   --with-moc=$(qt5_get_bindir)/moc
+   --with-uic=$(qt5_get_bindir)/uic
+   --with-rcc=$(qt5_get_bindir)/rcc
+   --with-qmake=$(qt5_get_bindir)/qmake
+   )
+   fi
+
+   econf

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

2020-01-17 Thread Tim Harder

commit: f37b388f5dd1320574978b65e73050db79e8b89b
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Jan 18 03:35:57 2020 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Jan 18 03:38:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37b388f

media-video/mkvtoolnix: version bump to 42.0.0

Closes: https://bugs.gentoo.org/704944
Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest   | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-42.0.0.ebuild}   | 4 ++--
 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f8060cf05b4..96fd2c94923 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1 +1,2 @@
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8
+DIST mkvtoolnix-42.0.0.tar.xz 7486620 BLAKE2B 
e364f2522013b3705484c5e0ad60600300ea82cc7b8bdc15d9e1f107329abd3b22a873d687328df8177a66eb7b6103fb89de62eb038d180d70dd16f5af155396
 SHA512 
2dfe267c6b9bc3c976637a18df3da04d7e82dd46d7134ab041959615f090afb2996eb2b15277f36cb257cac7cb5304451e131c0ec6aa608ff10c80c5fec9702a

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
similarity index 97%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
index 99b70cef63e..6c3ac899f3d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-42.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ 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:=
+   >=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.3.7:=
>=dev-libs/libfmt-5.3.0:=
dev-libs/pugixml:=

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 99b70cef63e..6c3ac899f3d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ 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:=
+   >=dev-libs/boost-1.60:=
>=dev-libs/libebml-1.3.7:=
>=dev-libs/libfmt-5.3.0:=
dev-libs/pugixml:=

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

2019-12-15 Thread David Seifert

commit: 492f5b27c8a64cd89e7f4372c802484f4869856d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Dec 15 20:53:08 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Dec 15 20:53:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=492f5b27

media-video/mkvtoolnix: Remove old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 -
 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 119 
 2 files changed, 120 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index f97e0a11504..f8060cf05b4 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1 @@
-DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 
9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f
 SHA512 
aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
 DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
deleted file mode 100644
index 83ca04cff73..000
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   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="debug nls pch test qt5"
-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/libfmt-5.3.0:=
-   >=dev-libs/boost-1.49.0:=
-   >=dev-libs/libebml-1.3.7:=
-   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=
-   )
-"
-DEPEND="${RDEPEND}
-   dev-cpp/nlohmann_json
-   dev-libs/utfcpp
-   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} == "" ]] && { ./autogen.sh || die; }
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable debug)
-   $(usex pch "" --disable-precompiled-headers)
-   $(use_enable qt5 qt)
-   $(use_with nls gettext)
-   $(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)
-   )
-
-   if use qt5 ; then
-   # ac/qt5.m4 finds default Qt version set by qtchooser, bug 
#532600
-   myeconfargs+=(
-   --with-moc=$(qt5_get_bindir)/moc
-   --with-uic=$(qt5_get_bindir)/uic
-   --with-rcc=$(qt5_get_bindir)/rcc
-   --with-qmake=$(qt5_get_bindir)/qmake
-   )
-   fi
-
-   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

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

2019-09-29 Thread Sergei Trofimovich

commit: dac7e6cb88da5cc1d1990f4ec7005e6db44cbc38
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 29 19:28:08 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 29 20:54:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac7e6cb

media-video/mkvtoolnix: stable 37.0.0 for ppc, bug #695492

Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
index dd854d6fd51..86458d82bd8 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ppc64 ~x86"
+   KEYWORDS="~amd64 ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-09-26 Thread Sergei Trofimovich

commit: 7193e69242cb685bb9a36c53801200d91b3225ae
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Sep 26 06:51:31 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Sep 26 06:51:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7193e692

media-video/mkvtoolnix: stable 37.0.0 for ppc64, bug #695498

Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
index 5fa94680172..dd854d6fd51 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-09-15 Thread David Seifert

commit: a1d52f4db6dc9837c834ac676b602142e83a3ced
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep 15 11:36:06 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep 15 11:36:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d52f4d

media-video/mkvtoolnix: Version bump to 37.0.0

* Remove C++ compiler check for ancient versions of GCC

Bug: https://bugs.gentoo.org/662788
Bug: https://bugs.gentoo.org/692322
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild | 118 
 2 files changed, 119 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index bbb2f025093..f97e0a11504 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1 +1,2 @@
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 
9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f
 SHA512 
aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98
+DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 
4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e
 SHA512 
196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8

diff --git a/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
new file mode 100644
index 000..5fa94680172
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-37.0.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   EGIT_SUBMODULES=()
+   inherit autotools 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="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/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=
+   )
+"
+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
+   nls? (
+   sys-devel/gettext
+   app-text/po4a
+   )
+"
+
+src_prepare() {
+   xdg_src_prepare
+   if [[ ${PV} == * ]]; 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)
+   $(use_enable qt5 qt)
+   $(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)
+   )
+
+   if use qt5 ; then
+   # ac/qt5.m4 finds default Qt version set by qtchooser, bug 
#532600
+   myeconfargs+=(
+   --with-moc=$(qt5_get_bindir)/moc
+   --with-uic=$(qt5_get_bindir)/uic
+   --with-rcc=$(qt5_get_bindir)/rcc
+   --with-qmake=$(qt5_get_bindir)/qmake
+   )
+   fi
+
+   econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+   rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+   rake V=1 -j$(makeopts_jobs) tests:unit || die
+

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

2019-09-15 Thread David Seifert

commit: 47675f57b279b0e994178dfef192f7028a4ef96a
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep 15 11:36:03 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep 15 11:36:03 2019 +
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-.ebuild | 60 +--
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index c91b87e7c61..5fa94680172 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.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} == "" ]] ; then
+inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+
+if [[ ${PV} == * ]] ; 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} == "" ]] && { ./autogen.sh || die; }
+   if [[ ${PV} == * ]]; 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
 }

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

2019-07-28 Thread Andreas Sturmlechner

commit: 4d83cf5cda8277e7fb1c2f85f581b6dd95b3f9c7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 28 21:04:20 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 28 21:20:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d83cf5c

media-video/mkvtoolnix: Drio 29.0.0

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 -
 media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild | 129 
 2 files changed, 130 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ef883a191c6..bbb2f025093 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1 @@
-DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761
 SHA512 
bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 
9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f
 SHA512 
aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98

diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
deleted file mode 100644
index e8f9a9bf09e..000
--- a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   inherit git-r3
-else
-   SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-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="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/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:=
-   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
-   )
-"
-DEPEND="${RDEPEND}
-   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() {
-   default
-   [[ ${PV} == "" ]] && { ./autogen.sh || die; }
-}
-
-src_configure() {
-   local myeconfargs=(
-   $(use_enable debug)
-   $(usex pch "" --disable-precompiled-headers)
-   $(use_enable qt5 qt)
-   $(use_with nls gettext)
-   $(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)
-   )
-
-   if use qt5 ; then
-   # ac/qt5.m4 finds default Qt version set by qtchooser, bug 
#532600
-   myeconfargs+=(
-   --with-moc=$(qt5_get_bindir)/moc
-   --with-uic=$(qt5_get_bindir)/uic
-   --with-rcc=$(qt5_get_bindir)/rcc
-   --with-qmake=$(qt5_get_bindir)/qmake
-   )
-   fi
-
-   econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-   rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-   rake V=1 -j$(makeopts_jobs) tests:unit || die
-   rake

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

2019-07-23 Thread Agostino Sarubbo

commit: fd096e6c24bdd6ea07200df23c4a3d82040b8f53
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jul 23 08:22:57 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jul 23 08:22:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd096e6c

media-video/mkvtoolnix: amd64 stable wrt bug #689688

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 1871608434b..3fabd7e2dcc 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ppc ~ppc64 x86"
+   KEYWORDS="amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-07-21 Thread Sergei Trofimovich

commit: bb719989598eeefd2c11e2aa408b483a0e386a1f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul 21 08:23:47 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul 21 08:23:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb719989

media-video/mkvtoolnix: stable 35.0.0 for ppc, bug #689688

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 7cb3dce6c6e..1871608434b 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+   KEYWORDS="~amd64 ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-07-18 Thread Thomas Deutschmann

commit: 70fb25c4696970255ee208fb7787c97e2e09eb76
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jul 18 14:28:51 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jul 18 14:32:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fb25c4

media-video/mkvtoolnix: x86 stable (bug #689688)

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 67e541fbc01..7cb3dce6c6e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then
inherit git-r3
 else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+   KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-07-18 Thread Kent Fredric

commit: fe66a31616cb092ac45085c21508d0c8365955ee
Author: Kent Fredric  gentoo  org>
AuthorDate: Thu Jul 18 13:15:32 2019 +
Commit: Kent Fredric  gentoo  org>
CommitDate: Thu Jul 18 13:18:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe66a316

media-video/mkvtoolnix: Drop ~x86-fbsd

- Dropping due to lack of activity in dependency keywording via po4a

Bug: https://bugs.gentoo.org/614180
Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="x86-fbsd"
Signed-off-by: Kent Fredric  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild | 2 +-
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
index da56ecf9444..e8f9a9bf09e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; 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 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 8f7b2cf6763..c91b87e7c61 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"

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

2019-06-30 Thread Pacho Ramos

commit: 96409616430ab2063296de939c6c8d31d9664685
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 30 12:30:12 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 30 12:36:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96409616

media-video/mkvtoolnix: Newer libfmt needed, use xdg.eclass

Closes: https://bugs.gentoo.org/688620
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
index 8837542e21d..67e541fbc01 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
+inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
@@ -22,7 +22,7 @@ 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:=
+   >=dev-libs/libfmt-5.3.0:=
>=dev-libs/boost-1.49.0:=
>=dev-libs/libebml-1.3.7:=
dev-libs/pugixml
@@ -70,7 +70,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-   default
+   xdg_src_prepare
[[ ${PV} == "" ]] && { ./autogen.sh || die; }
 }
 
@@ -116,15 +116,3 @@ src_install() {
einstalldocs
doman doc/man/*.1
 }
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

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

2019-06-30 Thread Pacho Ramos

commit: 66a6a69fd47e096b477e553fb6b25323c36c43eb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 30 12:32:41 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 30 12:36:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a6a69f

media-video/mkvtoolnix: Drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mkvtoolnix/Manifest |   4 -
 media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild | 130 
 media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild | 130 
 media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild | 130 
 media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild | 130 
 5 files changed, 524 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 50fe7822725..ef883a191c6 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,6 +1,2 @@
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761
 SHA512 
bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
-DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558
 SHA512 
0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
-DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
-DIST mkvtoolnix-32.0.0.tar.xz 7282928 BLAKE2B 
cf051474c3e4735f5c3fdda44bd9065539ea6333ad4683f61b1a7d8ecc6fab2e45bd0ae37f82acdbc11c01704c319356d2baa9fdfe1e8e48ffcf65b05f484836
 SHA512 
a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a
-DIST mkvtoolnix-33.1.0.tar.xz 7286068 BLAKE2B 
2ff55bf8fa1e1356144931e1586783ccbc937ce8f7048e85a8ca0a29c69f419a4a1f43eecdc606674d3314c642e58a06c98900e4fc5e7069a30806c61401f646
 SHA512 
40023a1d2c1c27fd5f490ec017852304442bee2c2ae2d62cf042c3fba56652ed7489a2b0ad9d5dd0fa57eb0af99a49a93d85836f57cb9417868356874a83
 DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 
9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f
 SHA512 
aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98

diff --git a/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild
deleted file mode 100644
index 01b2b95c89b..000
--- a/media-video/mkvtoolnix/mkvtoolnix-30.1.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   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="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:=
-   >=dev-libs/boost-1.49.0:=
-   >=dev-libs/libebml-1.3.5:=
-   dev-libs/pugixml
-   media-libs/flac
-   >=media-libs/libmatroska-1.4.8:=
-   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
-   )
-"
-DEPEND="${RDEPEND}
-   dev-cpp/nlohmann_json
-   dev-libs/utfcpp
-   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

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

2019-06-30 Thread Pacho Ramos

commit: d95278e742a78676a701c1822b86395f1e013482
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jun 30 12:31:53 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jun 30 12:36:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95278e7

media-video/mkvtoolnix: Sync with latest version

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-.ebuild | 18 +++---
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 2bc8fa7624c..8f7b2cf6763 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
+inherit toolchain-funcs versionator multiprocessing qmake-utils xdg
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
@@ -22,7 +22,7 @@ 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:=
+   >=dev-libs/libfmt-5.3.0:=
>=dev-libs/boost-1.49.0:=
>=dev-libs/libebml-1.3.7:=
dev-libs/pugixml
@@ -70,7 +70,7 @@ pkg_pretend() {
 }
 
 src_prepare() {
-   default
+   xdg_src_prepare
[[ ${PV} == "" ]] && { ./autogen.sh || die; }
 }
 
@@ -116,15 +116,3 @@ src_install() {
einstalldocs
doman doc/man/*.1
 }
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

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

2019-06-22 Thread Tim Harder

commit: 7647d3df48b471f29cd62c263fc4789b852b90c7
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Jun 22 22:39:43 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Jun 22 22:40:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7647d3df

media-video/mkvtoolnix: version bump to 35.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ba929656486..50fe7822725 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,3 +3,4 @@ DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf
 DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
 DIST mkvtoolnix-32.0.0.tar.xz 7282928 BLAKE2B 
cf051474c3e4735f5c3fdda44bd9065539ea6333ad4683f61b1a7d8ecc6fab2e45bd0ae37f82acdbc11c01704c319356d2baa9fdfe1e8e48ffcf65b05f484836
 SHA512 
a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a
 DIST mkvtoolnix-33.1.0.tar.xz 7286068 BLAKE2B 
2ff55bf8fa1e1356144931e1586783ccbc937ce8f7048e85a8ca0a29c69f419a4a1f43eecdc606674d3314c642e58a06c98900e4fc5e7069a30806c61401f646
 SHA512 
40023a1d2c1c27fd5f490ec017852304442bee2c2ae2d62cf042c3fba56652ed7489a2b0ad9d5dd0fa57eb0af99a49a93d85836f57cb9417868356874a83
+DIST mkvtoolnix-35.0.0.tar.xz 7297244 BLAKE2B 
9a7cd015b00fe46f165903b8b6f9317489548aa9a352c85727296ee0638506336028231b115a9270388a4ede1a088a4bdba16156600341c51bd5a2ae557b181f
 SHA512 
aa109be9da3f0bd119d9315b9ea136d3c1532d0f351c5a052dcc7ad67a4dcec9d8fec69a0c9358790abfcb6eeaee47fad4af2a0506bef39cfd5c8466f90bdf98

diff --git a/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
new file mode 100644
index 000..8837542e21d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-35.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   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="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:=
+   >=dev-libs/boost-1.49.0:=
+   >=dev-libs/libebml-1.3.7:=
+   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=
+   )
+"
+DEPEND="${RDEPEND}
+   dev-cpp/nlohmann_json
+   dev-libs/utfcpp
+   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() {
+   default
+   [[ ${PV} == "" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   $(usex pch "" --disable-precompiled-headers)
+   $(use_enable qt5 qt)
+   $(use_with nls gettext)
+   $(usex nls "" --with-po4a-translate=false)
+   --disable-update-check
+   --disable-optimization
+   --docdir="${EPREFIX}"/usr/share/doc/${PF}
+   --with-boost="${EPREFIX}"/usr
+

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

2019-04-21 Thread Tim Harder

commit: 7b9bb0e0275b72738bcf443d2192d8e5e347d3d2
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Apr 18 22:07:37 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Apr 21 08:20:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b9bb0e0

media-video/mkvtoolnix: version bump to 33.1.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index d1aceef702c..ba929656486 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,3 +2,4 @@ DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f
 DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558
 SHA512 
0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
 DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
 DIST mkvtoolnix-32.0.0.tar.xz 7282928 BLAKE2B 
cf051474c3e4735f5c3fdda44bd9065539ea6333ad4683f61b1a7d8ecc6fab2e45bd0ae37f82acdbc11c01704c319356d2baa9fdfe1e8e48ffcf65b05f484836
 SHA512 
a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a
+DIST mkvtoolnix-33.1.0.tar.xz 7286068 BLAKE2B 
2ff55bf8fa1e1356144931e1586783ccbc937ce8f7048e85a8ca0a29c69f419a4a1f43eecdc606674d3314c642e58a06c98900e4fc5e7069a30806c61401f646
 SHA512 
40023a1d2c1c27fd5f490ec017852304442bee2c2ae2d62cf042c3fba56652ed7489a2b0ad9d5dd0fa57eb0af99a49a93d85836f57cb9417868356874a83

diff --git a/media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild
new file mode 100644
index 000..8837542e21d
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-33.1.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   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="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:=
+   >=dev-libs/boost-1.49.0:=
+   >=dev-libs/libebml-1.3.7:=
+   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=
+   )
+"
+DEPEND="${RDEPEND}
+   dev-cpp/nlohmann_json
+   dev-libs/utfcpp
+   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() {
+   default
+   [[ ${PV} == "" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   $(usex pch "" --disable-precompiled-headers)
+   $(use_enable qt5 qt)
+   $(use_with nls gettext)
+   $(usex nls "" --with-po4a-translate=false)
+   --disable-update-check
+   --disable-optimization
+   --docdir="${EPREFIX}"/usr/share/doc/${PF}
+   --with-boost="${EPREFIX}"/usr
+

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

2019-03-28 Thread Tim Harder

commit: b3044f824cd8c49df8635e0880861e5ae6737f31
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Mar 28 06:50:00 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Mar 28 07:02:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3044f82

media-video/mkvtoolnix: version bump to 32.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest | 1 +
 .../mkvtoolnix/{mkvtoolnix-.ebuild => mkvtoolnix-32.0.0.ebuild} | 6 +++---
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 0098c13b74c..d1aceef702c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761
 SHA512 
bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558
 SHA512 
0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
 DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7
+DIST mkvtoolnix-32.0.0.tar.xz 7282928 BLAKE2B 
cf051474c3e4735f5c3fdda44bd9065539ea6333ad4683f61b1a7d8ecc6fab2e45bd0ae37f82acdbc11c01704c319356d2baa9fdfe1e8e48ffcf65b05f484836
 SHA512 
a209360fcad3164ebf127b7a54542b2b791318cef1ac8acbb24e64458bd9fe693ea6fa2b44b6e85504decab9668296637d9d4ce706effcf6a9f0d7bdea64793a

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
similarity index 95%
copy from media-video/mkvtoolnix/mkvtoolnix-.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
index a37117dd09e..8837542e21d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-32.0.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; 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 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
@@ -24,10 +24,10 @@ IUSE="debug nls pch test qt5"
 RDEPEND="
dev-libs/libfmt:=
>=dev-libs/boost-1.49.0:=
-   >=dev-libs/libebml-1.3.5:=
+   >=dev-libs/libebml-1.3.7:=
dev-libs/pugixml
media-libs/flac
-   >=media-libs/libmatroska-1.4.8:=
+   >=media-libs/libmatroska-1.5.0:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index a37117dd09e..2bc8fa7624c 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -24,10 +24,10 @@ IUSE="debug nls pch test qt5"
 RDEPEND="
dev-libs/libfmt:=
>=dev-libs/boost-1.49.0:=
-   >=dev-libs/libebml-1.3.5:=
+   >=dev-libs/libebml-1.3.7:=
dev-libs/pugixml
media-libs/flac
-   >=media-libs/libmatroska-1.4.8:=
+   >=media-libs/libmatroska-1.5.0:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file

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

2019-03-23 Thread Pacho Ramos

commit: 5347ff5ea7bc93625ad79075df6d6bbb4aed652c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Mar 23 12:03:01 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Mar 23 12:25:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5347ff5e

media-video/mkvtoolnix: Needs to be rebuilt with cmark soname bumps

Bug: https://bugs.gentoo.org/679230
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild | 2 +-
 media-video/mkvtoolnix/mkvtoolnix-.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
index 01b2b95c89b..59cbce24aca 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtconcurrent:5
dev-qt/qtmultimedia:5
-   app-text/cmark
+   app-text/cmark:0=
)
 "
 DEPEND="${RDEPEND}

diff --git a/media-video/mkvtoolnix/mkvtoolnix-.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
index 3036925897d..a37117dd09e 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ RDEPEND="
dev-qt/qtwidgets:5
dev-qt/qtconcurrent:5
dev-qt/qtmultimedia:5
-   app-text/cmark
+   app-text/cmark:0=
)
 "
 DEPEND="${RDEPEND}

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

2019-03-04 Thread Tim Harder

commit: 25f22fe8bebe2b0bf84e88056f1e7e4cfb065a47
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Mar  4 21:56:31 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Mar  4 22:01:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f22fe8

media-video/mkvtoolnix: version bump to 31.0.0

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest |   1 +
 media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index cf9d3163207..e518c95d28c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,3 +4,4 @@ DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 
325a0a250db8c6c833b01e6bb613044ca2
 DIST mkvtoolnix-23.0.0.tar.xz 4729056 BLAKE2B 
a264b482f141de502fb4c4aadcdc0ec1ed4e34d2ddc906d8d1f6a0b1ea76511a590ab9d90e035955aa138512877848752185012b8e7e1aeed3007c186c796190
 SHA512 
3c9072b54a4076e6fb934d40a2c2554dfa1316de1cb8d74ab262b0584eda1e679324aaf690195f68590413f9d3ca34d5d2a1f9f5545de065fe2db892eee19ffb
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761
 SHA512 
bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558
 SHA512 
0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
+DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7

diff --git a/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
new file mode 100644
index 000..01b2b95c89b
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-31.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs versionator multiprocessing xdg-utils qmake-utils 
gnome2-utils
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
+   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="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:=
+   >=dev-libs/boost-1.49.0:=
+   >=dev-libs/libebml-1.3.5:=
+   dev-libs/pugixml
+   media-libs/flac
+   >=media-libs/libmatroska-1.4.8:=
+   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
+   )
+"
+DEPEND="${RDEPEND}
+   dev-cpp/nlohmann_json
+   dev-libs/utfcpp
+   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() {
+   default
+   [[ ${PV} == "" ]] && { ./autogen.sh || die; }
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_enable debug)
+   $(usex pch "" --disable-precompiled-headers)
+   $(use_enable qt5 qt)
+   $(use_with nls gettext)
+   $(usex nls "" --with-po4a-translate=false)
+   --disable-update-check
+   --disable-optimization
+   --docdir="${EPREFIX}"/usr/share/doc/${PF}
+   --with-boost="${EPREFIX}"/usr
+

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

2019-03-04 Thread Tim Harder

commit: 4a2e04fd504893084a4420beef7d9f3e69ecee87
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Mar  4 21:59:44 2019 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Mar  4 22:01:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2e04fd

media-video/mkvtoolnix: remove old

Signed-off-by: Tim Harder  gentoo.org>

 media-video/mkvtoolnix/Manifest|   4 -
 media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild| 110 -
 media-video/mkvtoolnix/mkvtoolnix-21.0.0-r1.ebuild | 123 ---
 media-video/mkvtoolnix/mkvtoolnix-22.0.0.ebuild| 123 ---
 media-video/mkvtoolnix/mkvtoolnix-23.0.0.ebuild| 123 ---
 media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild | 130 -
 6 files changed, 613 deletions(-)

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index e518c95d28c..0098c13b74c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,7 +1,3 @@
-DIST mkvtoolnix-19.0.0.tar.xz 4616780 BLAKE2B 
72eb3b1a34bbed0d492098c02c1f60c7ce7f0ea6a8fbff6b88bd9d7af5891dda8c8adb9a0f856c65106fb430b481183ce74b9369590cd4dcfe881d7db84eb06d
 SHA512 
dd18eeffc8a5210ca3c8a287321ad106f63cff8fbe5ad3891460aab7e60f2d5261a3f335f3991524a95724861288593cfb3bd9df6829a2f7751f6a1fdaba0ca6
-DIST mkvtoolnix-21.0.0.tar.xz 4682788 BLAKE2B 
52d9920fc5b735f7d8af1f6e60828f143a914ce7cd7c635daacb6d2da584b0158f80e0f4d39824130b0c8fcc83b7c3a1215b2e965cb8b47b2b297df2d78414d5
 SHA512 
881e0c38eee2d36ab9dea5ccaa8ad74e0076cdc13606f873ab58bfeeec09c05e947529d3bad665b1d4df6a816faca30e8a685bc19115f90c18dac3c1ae27c252
-DIST mkvtoolnix-22.0.0.tar.xz 4714712 BLAKE2B 
325a0a250db8c6c833b01e6bb613044ca21b4061cbbd516ee6c60388b17c9c3759cf9759af0e2c23091d8044fd86358122e0739bf7d6133be9befca37c6d0294
 SHA512 
59d299f21d484dc529dafe81a35d3351e4f57abf6a2d8889692d95b9b9ffacdca9b55a3cf373b147f3ff12595590bf98f49af5d22d311b9b2d03f12a4bba00a6
-DIST mkvtoolnix-23.0.0.tar.xz 4729056 BLAKE2B 
a264b482f141de502fb4c4aadcdc0ec1ed4e34d2ddc906d8d1f6a0b1ea76511a590ab9d90e035955aa138512877848752185012b8e7e1aeed3007c186c796190
 SHA512 
3c9072b54a4076e6fb934d40a2c2554dfa1316de1cb8d74ab262b0584eda1e679324aaf690195f68590413f9d3ca34d5d2a1f9f5545de065fe2db892eee19ffb
 DIST mkvtoolnix-29.0.0.tar.xz 7051380 BLAKE2B 
8f5694abdbeb95c13e3a97740e3e81c02f1408116f1bdf96e8199bba0408e03278cac0bee0506b4b0aedc0a0417d61e13f31af716942faa9dbe61d16eb1d0761
 SHA512 
bfb5e31fdd43dbb1c3a54a9b82af414abd43f8edad1cc87e5118f8c1781185470152163fda828303c58db97df27c8037b7fa64e2077c69e3204d5080f0248dae
 DIST mkvtoolnix-30.1.0.tar.xz 7274296 BLAKE2B 
0b0c7a9954269d0c6f071bd808ddf18eaf2d004dc2d8cf209f7021624458a9a29a7f705ad08446bd769b3a4e73732a3b2a269385868041fd887eff1d92c07558
 SHA512 
0c29a7a246b7e7ddccbb7ec51d7dd45d06530e01d7f1c8fa901b1a94dc6c7d9db0890009f200c3bebee572e24c826f7c05a53c16e8d11cfac2c68a3d13b96a53
 DIST mkvtoolnix-31.0.0.tar.xz 7282492 BLAKE2B 
1c0d4a6de81ddb1953e3f7997ef62ffeeb9562cacaf5df33320cd8f2263d6303986c3a1a129e9b6ac986efd4a290046aba41e38ae1ed83e7eec00dab099a19fc
 SHA512 
085bc7d5a2b2e692d584bef5f31aab8dc25883cc93d9f2b2c35ea6356d64536763b6e9f7cef2dbaf1b789e73c05cb5f9e76ce76c54f034aa9d46c30983d1a5b7

diff --git a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild 
b/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
deleted file mode 100644
index 6b922bc0c05..000
--- a/media-video/mkvtoolnix/mkvtoolnix-19.0.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git;
-   inherit git-r3
-else
-   SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz;
-   KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-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="debug 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/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:=
-   media-libs/libogg
-   media-libs/libvorbis
-   sys-apps/file
-   sys-libs/zlib
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtmultimedia:5
-   )
-"
-DEPEND="${RDEPEND}
-   dev-ruby/rake
-   sys-devel/gettext
-   virtual/pkgconfig
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets

1 2 >

1 - 100 of 178 matches

Mail list logo