[gentoo-commits] repo/gentoo:master commit in: dev-cpp/glog/

[Mike Gilbert]

commit:     9150f19555a75e3d7e49930e5a8869bed3a27471
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Apr 25 18:31:57 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 15:12:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9150f195

dev-cpp/glog: Depend on >=dev-cpp/gtest-1.8.0.

dev-cpp/gmock has been merged into >=dev-cpp/gtest-1.8.0.

 dev-cpp/glog/glog-0.3.3-r1.ebuild | 7 ++-----
 dev-cpp/glog/glog-0.3.4-r1.ebuild | 7 ++-----
 dev-cpp/glog/glog-0.3.4.ebuild    | 7 ++-----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild 
b/dev-cpp/glog/glog-0.3.3-r1.ebuild
index 3b6207ec207..667d6572649 100644
--- a/dev-cpp/glog/glog-0.3.3-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -16,10 +16,7 @@ IUSE="gflags static-libs unwind test"
 RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
        unwind? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}
-       test? (
-               >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-               >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-       )"
+       test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch

diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild 
b/dev-cpp/glog/glog-0.3.4-r1.ebuild
index 522feb232f9..ad7b6587ddb 100644
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild
+++ b/dev-cpp/glog/glog-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,7 @@ RDEPEND="
        gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
        unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
-       test? (
-               >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-               >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-       )"
+       test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch

diff --git a/dev-cpp/glog/glog-0.3.4.ebuild b/dev-cpp/glog/glog-0.3.4.ebuild
index a6e1d7719cb..a6b6ee4e3fb 100644
--- a/dev-cpp/glog/glog-0.3.4.ebuild
+++ b/dev-cpp/glog/glog-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,10 +17,7 @@ IUSE="gflags static-libs unwind test"
 RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] )
        unwind? ( sys-libs/libunwind )"
 DEPEND="${RDEPEND}
-       test? (
-               >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}]
-               >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
-       )"
+       test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch