Gentoo Archives: gentoo-commits

From: Steve Dibb <beandog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
Date: Sat, 22 Jul 2017 18:47:08
Message-Id: 1500749190.d5b761aba683b18f4c8360fc18d82ab9ebc66c80.beandog@gentoo
1 commit: d5b761aba683b18f4c8360fc18d82ab9ebc66c80
2 Author: Steve Dibb <beandog <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 22 18:46:30 2017 +0000
4 Commit: Steve Dibb <beandog <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 22 18:46:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b761ab
7
8 media-video/mkvtoolnix:
9
10 bug 625936 - fix docbook configure on dash
11
12 Package-Manager: Portage-2.3.0, Repoman-2.3.1
13
14 .../mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch | 11 +++++++++++
15 .../{mkvtoolnix-13.0.0.ebuild => mkvtoolnix-13.0.0-r1.ebuild} | 4 ++++
16 2 files changed, 15 insertions(+)
17
18 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch b/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
19 new file mode 100644
20 index 00000000000..506c77ceb0f
21 --- /dev/null
22 +++ b/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
23 @@ -0,0 +1,11 @@
24 +--- mkvtoolnix-13.0.0/ac/ax_docbook.m4.orig 2017-07-22 12:35:22.680493773 -0600
25 ++++ mkvtoolnix-13.0.0/ac/ax_docbook.m4 2017-07-22 12:36:03.293495236 -0600
26 +@@ -8,7 +8,7 @@
27 +
28 + else
29 + AC_MSG_CHECKING([for DocBook XSL root directory])
30 +- for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/{sg,x}ml/docbook/xsl-stylesheets* 2> /dev/null`; do
31 ++ for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/sgml/docbook/xsl-stylesheets* /usr/share/xml/docbook/xsl-stylesheets* 2> /dev/null`; do
32 + if test -f "$i/manpages/docbook.xsl"; then
33 + DOCBOOK_ROOT="$i"
34 + break
35
36 diff --git a/media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
37 similarity index 97%
38 rename from media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild
39 rename to media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
40 index 210330dc6f2..d7ce7ee0c8c 100644
41 --- a/media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild
42 +++ b/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
43 @@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
44 test? ( dev-cpp/gtest )
45 "
46
47 +PATCHES=(
48 + "${FILESDIR}/${P}-ac-docbook.patch"
49 +)
50 +
51 pkg_pretend() {
52 # https://bugs.gentoo.org/419257
53 local ver=4.6