Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/
Date: Thu, 05 May 2016 19:48:43
Message-Id: 1462477692.37503fa10d6d5b5b48ba784bcd257d307b9c6d4e.mgorny@gentoo
1 commit: 37503fa10d6d5b5b48ba784bcd257d307b9c6d4e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 5 19:45:54 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu May 5 19:48:12 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37503fa1
7
8 media-video/avidemux: Fix global scope 'use' calls, #566542
9
10 media-video/avidemux/avidemux-2.6.8.ebuild | 6 +++---
11 media-video/avidemux/avidemux-9999.ebuild | 6 +++---
12 2 files changed, 6 insertions(+), 6 deletions(-)
13
14 diff --git a/media-video/avidemux/avidemux-2.6.8.ebuild b/media-video/avidemux/avidemux-2.6.8.ebuild
15 index c978ae6..d404c59 100644
16 --- a/media-video/avidemux/avidemux-2.6.8.ebuild
17 +++ b/media-video/avidemux/avidemux-2.6.8.ebuild
18 @@ -42,9 +42,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
19
20 S="${WORKDIR}/${MY_P}"
21
22 -processes="buildCli:avidemux/cli"
23 -use qt4 && processes+=" buildQt4:avidemux/qt4"
24 -
25 src_prepare() {
26 cmake-utils_src_prepare
27
28 @@ -81,6 +78,9 @@ src_configure() {
29 mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
30 fi
31
32 + processes="buildCli:avidemux/cli"
33 + use qt4 && processes+=" buildQt4:avidemux/qt4"
34 +
35 for process in ${processes} ; do
36 local build="${process%%:*}"
37
38
39 diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
40 index c978ae6..d404c59 100644
41 --- a/media-video/avidemux/avidemux-9999.ebuild
42 +++ b/media-video/avidemux/avidemux-9999.ebuild
43 @@ -42,9 +42,6 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
44
45 S="${WORKDIR}/${MY_P}"
46
47 -processes="buildCli:avidemux/cli"
48 -use qt4 && processes+=" buildQt4:avidemux/qt4"
49 -
50 src_prepare() {
51 cmake-utils_src_prepare
52
53 @@ -81,6 +78,9 @@ src_configure() {
54 mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
55 fi
56
57 + processes="buildCli:avidemux/cli"
58 + use qt4 && processes+=" buildQt4:avidemux/qt4"
59 +
60 for process in ${processes} ; do
61 local build="${process%%:*}"