Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/
Date: Wed, 30 Aug 2017 19:43:48
Message-Id: 1504122218.fc6106c0ad6b8131593495eed7e50b9f08493987.polynomial-c@gentoo
1 commit: fc6106c0ad6b8131593495eed7e50b9f08493987
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 30 19:37:37 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 30 19:43:38 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6106c0
7
8 media-sound/clementine: gmock was integrated in gtest.
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 media-sound/clementine/clementine-1.3.1-r5.ebuild | 7 +++++--
13 media-sound/clementine/clementine-1.3.1-r6.ebuild | 5 ++++-
14 media-sound/clementine/clementine-9999.ebuild | 5 ++++-
15 3 files changed, 13 insertions(+), 4 deletions(-)
16
17 diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild b/media-sound/clementine/clementine-1.3.1-r5.ebuild
18 index 6302ee6eb6c..cd30faab0d3 100644
19 --- a/media-sound/clementine/clementine-1.3.1-r5.ebuild
20 +++ b/media-sound/clementine/clementine-1.3.1-r5.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 +# Copyright 1999-2017 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -75,7 +75,10 @@ DEPEND="${COMMON_DEPEND}
28 virtual/pkgconfig
29 sys-devel/gettext
30 dev-qt/qttest:4
31 - dev-cpp/gmock
32 + || (
33 + dev-cpp/gtest
34 + dev-cpp/gmock
35 + )
36 amazoncloud? ( dev-cpp/sparsehash )
37 box? ( dev-cpp/sparsehash )
38 dropbox? ( dev-cpp/sparsehash )
39
40 diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
41 index 583af09c1e7..d3063f97f2b 100644
42 --- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
43 +++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
44 @@ -75,7 +75,10 @@ DEPEND="${COMMON_DEPEND}
45 virtual/pkgconfig
46 sys-devel/gettext
47 dev-qt/qttest:4
48 - dev-cpp/gmock
49 + || (
50 + dev-cpp/gtest
51 + dev-cpp/gmock
52 + )
53 amazoncloud? ( dev-cpp/sparsehash )
54 box? ( dev-cpp/sparsehash )
55 dropbox? ( dev-cpp/sparsehash )
56
57 diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
58 index 7c4e4dee814..d331bd69315 100644
59 --- a/media-sound/clementine/clementine-9999.ebuild
60 +++ b/media-sound/clementine/clementine-9999.ebuild
61 @@ -77,7 +77,10 @@ DEPEND="${COMMON_DEPEND}
62 virtual/pkgconfig
63 sys-devel/gettext
64 dev-qt/qttest:4
65 - dev-cpp/gmock
66 + || (
67 + dev-cpp/gtest
68 + dev-cpp/gmock
69 + )
70 box? ( dev-cpp/sparsehash )
71 dropbox? ( dev-cpp/sparsehash )
72 googledrive? ( dev-cpp/sparsehash )