dev-cpp/gtest: EAPI=7

This allows the cmake eclass to use BDEPEND, so the host cmake can be
used without having to cross-compile it.

Signed-off-by: David Michael <dm0@redhat.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
new file mode 100644 (file)
index 0000000..50abe12
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == "9999" ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/google/googletest"
+else
+       SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+       S="${WORKDIR}"/googletest-release-${PV}
+fi
+
+DESCRIPTION="Google C++ Testing Framework"
+HOMEPAGE="https://github.com/google/googletest"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="!dev-cpp/gmock"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
+       "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
+)
+
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       sed -i -e '/set(cxx_base_flags /s:-Werror::' \
+               googletest/cmake/internal_utils.cmake || die "sed failed!"
+}
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DBUILD_GMOCK=ON
+               -DINSTALL_GTEST=ON
+
+               # tests
+               -Dgmock_build_tests=$(usex test)
+               -Dgtest_build_tests=$(usex test)
+               -DPYTHON_EXECUTABLE="${PYTHON}"
+       )
+       cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+       einstalldocs
+
+       if use doc; then
+               docinto googletest
+               dodoc -r googletest/docs/.
+               docinto googlemock
+               dodoc -r googlemock/docs/.
+       fi
+
+       if use examples; then
+               docinto examples
+               dodoc googletest/samples/*.{cc,h}
+       fi
+}

diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 7a444173666d5c51b06b17aa92826d9ca188b90b..50abe1209db9cf31abe5b0b752a1246da1b19e33 100644 (file)
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
@@ -47,7 +47,6 @@ multilib_src_configure() {
        local mycmakeargs=(
                -DBUILD_GMOCK=ON
                -DINSTALL_GTEST=ON
-               -DBUILD_SHARED_LIBS=ON
 
                # tests
                -Dgmock_build_tests=$(usex test)