[gentoo-commits] repo/gentoo:master commit in: media-sound/clementine/

[Lars Wendler]

commit:     fc6106c0ad6b8131593495eed7e50b9f08493987
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 19:37:37 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 19:43:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6106c0

media-sound/clementine: gmock was integrated in gtest.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-sound/clementine/clementine-1.3.1-r5.ebuild | 7 +++++--
 media-sound/clementine/clementine-1.3.1-r6.ebuild | 5 ++++-
 media-sound/clementine/clementine-9999.ebuild     | 5 ++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild 
b/media-sound/clementine/clementine-1.3.1-r5.ebuild
index 6302ee6eb6c..cd30faab0d3 100644
--- a/media-sound/clementine/clementine-1.3.1-r5.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,7 +75,10 @@ DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        sys-devel/gettext
        dev-qt/qttest:4
-       dev-cpp/gmock
+       || (
+               dev-cpp/gtest
+               dev-cpp/gmock
+       )
        amazoncloud? ( dev-cpp/sparsehash )
        box? ( dev-cpp/sparsehash )
        dropbox? ( dev-cpp/sparsehash )

diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild 
b/media-sound/clementine/clementine-1.3.1-r6.ebuild
index 583af09c1e7..d3063f97f2b 100644
--- a/media-sound/clementine/clementine-1.3.1-r6.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -75,7 +75,10 @@ DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        sys-devel/gettext
        dev-qt/qttest:4
-       dev-cpp/gmock
+       || (
+               dev-cpp/gtest
+               dev-cpp/gmock
+       )
        amazoncloud? ( dev-cpp/sparsehash )
        box? ( dev-cpp/sparsehash )
        dropbox? ( dev-cpp/sparsehash )

diff --git a/media-sound/clementine/clementine-9999.ebuild 
b/media-sound/clementine/clementine-9999.ebuild
index 7c4e4dee814..d331bd69315 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -77,7 +77,10 @@ DEPEND="${COMMON_DEPEND}
        virtual/pkgconfig
        sys-devel/gettext
        dev-qt/qttest:4
-       dev-cpp/gmock
+       || (
+               dev-cpp/gtest
+               dev-cpp/gmock
+       )
        box? ( dev-cpp/sparsehash )
        dropbox? ( dev-cpp/sparsehash )
        googledrive? ( dev-cpp/sparsehash )