Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/mkvtoolnix: ChangeLog mkvtoolnix-7.5.0.ebuild
Date: Sun, 08 Feb 2015 23:45:42
Message-Id: 20150208234537.B1738115A7@oystercatcher.gentoo.org
1 radhermit 15/02/08 23:45:37
2
3 Modified: ChangeLog mkvtoolnix-7.5.0.ebuild
4 Log:
5 Use array for configure options.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.215 media-video/mkvtoolnix/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.215&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.215&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.214&r2=1.215
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v
19 retrieving revision 1.214
20 retrieving revision 1.215
21 diff -u -r1.214 -r1.215
22 --- ChangeLog 31 Jan 2015 14:27:20 -0000 1.214
23 +++ ChangeLog 8 Feb 2015 23:45:37 -0000 1.215
24 @@ -1,6 +1,9 @@
25 # ChangeLog for media-video/mkvtoolnix
26 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.214 2015/01/31 14:27:20 yngwin Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.215 2015/02/08 23:45:37 radhermit Exp $
29 +
30 + 08 Feb 2015; Tim Harder <radhermit@g.o> mkvtoolnix-7.5.0.ebuild:
31 + Use array for configure options.
32
33 31 Jan 2015; Ben de Groot <yngwin@g.o> mkvtoolnix-7.5.0.ebuild:
34 Point directly to Qt5 tools to fix bug #532600, and actually build
35
36
37
38 1.5 media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?r1=1.4&r2=1.5
43
44 Index: mkvtoolnix-7.5.0.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- mkvtoolnix-7.5.0.ebuild 31 Jan 2015 14:27:20 -0000 1.4
51 +++ mkvtoolnix-7.5.0.ebuild 8 Feb 2015 23:45:37 -0000 1.5
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2015 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.4 2015/01/31 14:27:20 yngwin Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.5 2015/02/08 23:45:37 radhermit Exp $
57
58 EAPI=5
59 WX_GTK_VER="3.0"
60 @@ -81,15 +81,17 @@
61
62 if use qt5 ; then
63 # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
64 - myconf+="--with-moc=/usr/$(get_libdir)/qt5/bin/moc
65 - --with-uic=/usr/$(get_libdir)/qt5/bin/uic
66 - --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
67 - --with-mkvtoolnix-gui"
68 + myconf+=(
69 + --with-moc=/usr/$(get_libdir)/qt5/bin/moc
70 + --with-uic=/usr/$(get_libdir)/qt5/bin/uic
71 + --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
72 + --with-mkvtoolnix-gui
73 + )
74 fi
75
76 if use wxwidgets ; then
77 need-wxwidgets unicode
78 - myconf+="--with-wx-config=${WX_CONFIG}"
79 + myconf+=( --with-wx-config=${WX_CONFIG} )
80 fi
81
82 econf \
83 @@ -97,7 +99,7 @@
84 $(use_enable qt5 qt) \
85 $(use_enable wxwidgets) \
86 $(usex pch "" --disable-precompiled-headers) \
87 - ${myconf} \
88 + "${myconf[@]}" \
89 --disable-optimization \
90 --docdir="${EPREFIX}"/usr/share/doc/${PF} \
91 --with-boost="${EPREFIX}"/usr \