6 files changed, 79 insertions, 6 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 27f445ead167..2f2329133139 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index abae57791b41..356936ce334b 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -7,5 +7,5 @@ EBUILD antlr-cpp-2.7.7-r1.ebuild 2807 BLAKE2B e634333474fdf4c94bdf2aee57ff4e116f
 EBUILD antlr-cpp-2.7.7.ebuild 2775 BLAKE2B 0bf429b5ba9fce3e0a23b46837aaecf1570c77fa922f26a4070bd894230d025c45d593d77b105ff328a52c4eec0aacdda33c5f25f262a907e57c435c53a80636 SHA512 ddd74d4cdd861c3718bb96a56cdf1f400dfc0f9ad320656aef8ab508471e9d6472b80e6490113888f689be41a7a192bcf2b56e99a3d3cf10e4ebb8e779ca8e2d
 EBUILD antlr-cpp-3.5.2-r1.ebuild 450 BLAKE2B 0456a663c4d75c0a5788f38d810abfb034e240d172f17598226e1589722758675ce84d547cb43bbe9b5be97601aae180046ad1611788d8a011cd5db05ae2462c SHA512 122123894e3e58d371aeb898fe465791b28dd238a38ed1fa9f9fc645d7d51c2a05eddbb9a70ce534c3316ab3efd4cda8e358ec282564d4cd05a099c839b63d16
 EBUILD antlr-cpp-3.5.2.ebuild 510 BLAKE2B b6261b5e717ad42726cf56ff552e29ba6940f7ebd25725fc3d139fd35799e3a180f53ef5a8082fe205d7906c04f58253511b491294d1c02f415b70c0c93740d9 SHA512 50c661b440248ae8738f5f4ec42b7be07fcd0d24266eab4faa852c0c7267dadabcca7046e1dd333dbb973c69489fffa988d3dbb63e7c01f53555ff3ca105a621
-EBUILD antlr-cpp-4.7.1.ebuild 635 BLAKE2B f119f2e0d13dc9e6bb4872d5c2289ee22e5f4670c21c2a403d82fa337cc0f32e60f1faf47e8f7d9a8c825e6c5355959998f1587f3d3cba0f9e9668c16ac3e04b SHA512 8dc47072c4ff172a5aca7e2451643c9e236959f1b27e7e822c907d40d33f97435ddc2ce53c96edc3bfa1b416cbe13df4c118f013f1cbdbbe315d167ab567c44e
+EBUILD antlr-cpp-4.7.1.ebuild 634 BLAKE2B c5de64e2c3742a7ad37a54ddffc4d0c6450b704c4f54b2068ed36e157c0c64ba1151b80b8d171ba0f3b92638bb1e822d7f236a68483b5ead34964360585d9a83 SHA512 1813a27498b60afdebebce7456c8e81c59d7d92dc0e41bba52204d1a6b49e7eb2839c87d59439cdefed6135c435fcc1308306835d8323a4944eac936b5e1d343
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
index 44be13003a2e..597e1ad2dc4a 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-4.7.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.antlr.org/"
 SRC_URI="https://www.antlr.org/download/antlr4-cpp-runtime-${PV}-source.zip -> ${P}.zip"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/zip"
 
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 5dae1e2af5d8..a5a139bbd78e 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -11,6 +11,7 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
 EBUILD gtest-1.8.0-r1.ebuild 1673 BLAKE2B f138c41ebd9f4d2aacefd7b4f7b95d23f0916c8f3cbc603888b4e265dbc975cd57216b4aa55a6caf646a7a5896b447378cfd2c222b6d496a9d60f9a1d2c5aa92 SHA512 922d4d60ef662e5fbe67ed234bfa018599c51de0675b930a5fe93185f68bda2b64ca4d8bc78a5035e3b9aff5bba078ce808c60b7c36c38de67745c684872ceb6
 EBUILD gtest-1.8.0.ebuild 1636 BLAKE2B eb31dbe4408d1fb656408964cac946122485f5533b7a5d02a452c19ca05ad5599aff3314e13085739a06d6e49c08a1de6034d6efede0bab4fc6b2d13670608a0 SHA512 a8dc995a3684b79c869b6d97c8c5f8f67fda8e0f4ce3f8e29b32213d6dc3b224125782b462c42fa83e12eeae186a3ac2946bb3fe21714e3dcfd0e29c54c66c16
+EBUILD gtest-1.8.1-r1.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
-EBUILD gtest-9999.ebuild 1692 BLAKE2B e7925414d786b5dee7a5ad9a883cccf2f223d20ad2a58afed6a4bdefbdabc114b96c1e9b87d749595ee6681b6772cdebc83db8980b6d9a96395866e8645b5d11 SHA512 e8c4940ba012e5be45bc6fa565a5754774b97de5b86cffdef2b67e7454709c15f189ed9f1a26a2324ebd120019bbd37478400fb43d57f728c7e54815c688644f
+EBUILD gtest-9999.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
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
index 000000000000..50abe1209db9
--- /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 7a444173666d..50abe1209db9 100644
--- 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)