gentoo resync : 09.03.2018

4 files changed, 12 insertions, 19 deletions

diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 74ae4c9b33a6..f57739d54774 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,7 +2,7 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146
-EBUILD clementine-1.3.1_p20171113.ebuild 4950 BLAKE2B 7c0efc0ab1517acb1d9aa21e115e0907afc0c806803066544f91482a7b183820a2c5927ba0c2dbc89c9590be399edcdecbef455e1c95e51e66131377c05fc116 SHA512 04cff9e9a96eb11d3bccabc1f95fd705eaf84593de06211faeb85876ae3b4ef595afb34f97ad526d377b53a307eccb8bc9a31b90da22ecdc1271a129ccf9a9cf
-EBUILD clementine-1.3.1_p20180219.ebuild 5581 BLAKE2B b3829dd28ba74a66dfd6c45efebc1a5c8760a6c5b4d6c886d14a9ff9a385327a377b1bbaf03f06748a7e2ce9a6d09413cace3c6731787c0756d52fa6a60938e2 SHA512 b829f3736e8442b1ceb14f973e8bdc66e67cb8afa8d76436f55910c169e3bc74450428e522a47cfa37bfc0e96e8cf3bd9b43e4de865b9347c76662fd17d4b9d2
-EBUILD clementine-9999.ebuild 5551 BLAKE2B 669d11a55c9fc16754e7ce28437639ac2b957b60608f95110cb567350c55637396a8242186d15a27bc36e4c32a7db1f695cbc392c42fcaf6760865a1180f0606 SHA512 930d60dc71320e140b939080b33ef2a1d10123645e837440483aadca27a55b52b6c6761d12c1d52a6729d066e7c22d49b077ea54b3020041f84694191fac596e
+EBUILD clementine-1.3.1_p20171113.ebuild 4924 BLAKE2B 09cd8a038fccadaf0a023e1092e4c38047bc398f9d1239aa67a96fe216a0c8642719613da76171d6a9f30e49e916d943b207eb8436f69f1a4a6a623aec0a4706 SHA512 f12a7cad0d39622df4b1ef47f7a4844c97957ab802f25d43a489fbbd7d722d644c336436153f297f52d2d3397241d0002606b13a71cbd2dc52564e2d7164d453
+EBUILD clementine-1.3.1_p20180219.ebuild 5572 BLAKE2B e17a5eefb07b64db960211662ccbe2db81fbdf666f3a38e999becef3ec75eb300db3978f5e60fb48994cb0997035576520108985858aeedf563622cd0b144851 SHA512 66320677b9e59c3064a76c120e3baf13f797317a2846e3d3b76dbf93bc33e71bb7db22049bb4a47f8ca4edce4057098d1784e43b288ff68c56dabd6f48a37e18
+EBUILD clementine-9999.ebuild 5542 BLAKE2B d53c697df82d75b78745a7b3bf682a3e0062babe7656e8fb86c1dcd3bd1da96b5f004af5315eaeab134eb7c053a6e216621b668ec47449fb130547550ba1487e SHA512 c18099280c91ac11269535b9a5c0cc4dbee9895c4ff90687a25a217ff6b4461e587628667a1068cc68eb97139072be833510ab34f6e6910fc12b5c0eb84ca9e9
 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4
diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
index 6abef56f6306..7210f9e8b91b 100644
--- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild
@@ -70,10 +70,7 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
+	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
index 1b51036575ce..0cbf9b6da163 100644
--- a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild
@@ -80,12 +80,10 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
-	dev-libs/boost:=
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
 	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
 	sys-devel/gettext
 	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 38adae3d11b3..16065b58a5a9 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -43,8 +43,6 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -80,12 +78,12 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( sys-fs/udisks:2 )
 "
 DEPEND="${COMMON_DEPEND}
-	|| (
-		>=dev-cpp/gtest-1.8.0
-		dev-cpp/gmock
-	)
-	dev-libs/boost:=
+	>=dev-cpp/gtest-1.8.0
+	dev-libs/boost
 	dev-qt/linguist-tools:5
+	dev-qt/qtopengl:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
 	sys-devel/gettext
 	virtual/pkgconfig
 	box? ( dev-cpp/sparsehash )