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

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

diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild
index 3b6207ec2075d34946f87e4486add5847da927d9..667d65726491c4751e6a6aa9d03c1623c47f239a 100644 (file)
--- 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 522feb232f90e7b8098e4630c8f1fcb3b15f96a7..ad7b6587ddb32814cd34d6e4581c75acc314cb81 100644 (file)
--- 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 a6e1d7719cb0f6183fc80cbc176f09fff65e7225..a6b6ee4e3fb4177dd2b5c8660e78c0fc3790f3e6 100644 (file)
--- 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