1 |
commit: 9150f19555a75e3d7e49930e5a8869bed3a27471 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Wed Apr 25 18:31:57 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 15:12:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9150f195 |
7 |
|
8 |
dev-cpp/glog: Depend on >=dev-cpp/gtest-1.8.0. |
9 |
|
10 |
dev-cpp/gmock has been merged into >=dev-cpp/gtest-1.8.0. |
11 |
|
12 |
dev-cpp/glog/glog-0.3.3-r1.ebuild | 7 ++----- |
13 |
dev-cpp/glog/glog-0.3.4-r1.ebuild | 7 ++----- |
14 |
dev-cpp/glog/glog-0.3.4.ebuild | 7 ++----- |
15 |
3 files changed, 6 insertions(+), 15 deletions(-) |
16 |
|
17 |
diff --git a/dev-cpp/glog/glog-0.3.3-r1.ebuild b/dev-cpp/glog/glog-0.3.3-r1.ebuild |
18 |
index 3b6207ec207..667d6572649 100644 |
19 |
--- a/dev-cpp/glog/glog-0.3.3-r1.ebuild |
20 |
+++ b/dev-cpp/glog/glog-0.3.3-r1.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2015 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI="4" |
27 |
@@ -16,10 +16,7 @@ IUSE="gflags static-libs unwind test" |
28 |
RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) |
29 |
unwind? ( sys-libs/libunwind )" |
30 |
DEPEND="${RDEPEND} |
31 |
- test? ( |
32 |
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] |
33 |
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] |
34 |
- )" |
35 |
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
36 |
|
37 |
src_prepare() { |
38 |
epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch |
39 |
|
40 |
diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild |
41 |
index 522feb232f9..ad7b6587ddb 100644 |
42 |
--- a/dev-cpp/glog/glog-0.3.4-r1.ebuild |
43 |
+++ b/dev-cpp/glog/glog-0.3.4-r1.ebuild |
44 |
@@ -1,4 +1,4 @@ |
45 |
-# Copyright 1999-2017 Gentoo Foundation |
46 |
+# Copyright 1999-2018 Gentoo Foundation |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
EAPI=6 |
50 |
@@ -18,10 +18,7 @@ RDEPEND=" |
51 |
gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) |
52 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )" |
53 |
DEPEND="${RDEPEND} |
54 |
- test? ( |
55 |
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] |
56 |
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] |
57 |
- )" |
58 |
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
59 |
|
60 |
PATCHES=( |
61 |
"${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch |
62 |
|
63 |
diff --git a/dev-cpp/glog/glog-0.3.4.ebuild b/dev-cpp/glog/glog-0.3.4.ebuild |
64 |
index a6e1d7719cb..a6b6ee4e3fb 100644 |
65 |
--- a/dev-cpp/glog/glog-0.3.4.ebuild |
66 |
+++ b/dev-cpp/glog/glog-0.3.4.ebuild |
67 |
@@ -1,4 +1,4 @@ |
68 |
-# Copyright 1999-2016 Gentoo Foundation |
69 |
+# Copyright 1999-2018 Gentoo Foundation |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
|
72 |
EAPI="5" |
73 |
@@ -17,10 +17,7 @@ IUSE="gflags static-libs unwind test" |
74 |
RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) |
75 |
unwind? ( sys-libs/libunwind )" |
76 |
DEPEND="${RDEPEND} |
77 |
- test? ( |
78 |
- >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] |
79 |
- >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] |
80 |
- )" |
81 |
+ test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" |
82 |
|
83 |
src_prepare() { |
84 |
epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch |