mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 02:39:08 -07:00
dev-cpp/glog: Depend on >=dev-cpp/gtest-1.8.0.
dev-cpp/gmock has been merged into >=dev-cpp/gtest-1.8.0.
This commit is contained in:
committed by
Mike Gilbert
parent
49f1fe910e
commit
9150f19555
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user