[gentoo-commits] repo/gentoo:master commit in: dev-cpp/abseil-cpp/

[Georgy Yakovlev]

commit:     e4e7440bf517fc618b6e4a2eaef92c7498a771f5
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 12:37:17 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 12:39:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e7440b

dev-cpp/abseil-cpp: remove -Werror

Closes: https://bugs.gentoo.org/744610
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-cpp/abseil-cpp/Manifest                   |  2 +-
 dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 8d35b49c47d..0fe1bbb983c 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,3 +1,3 @@
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.tar.gz 1783122 BLAKE2B cd72bd6df04ddef6e4190c40dcfc34f95f424c30f3a5018e8305e603de58d737e15c1e33239d11bba2e3c669d6b18770a2f9de3075685f6ba38de26fc6e572b8 SHA512 8ad89fb1e0d70fdd1df6ac996c186243af43842eb08d09efbb1b7bcdab617dd394aa4bf93644f0eacc05d2ddf3db78e2ebe3eb496cfa24ece919f197a3a624d6
-DIST gtest-fe4d5f10840c5f62b984364a4d41719f1bc079a2.tar.gz 868165 BLAKE2B 5b27ec77505847e5ff5662896c5203712cfed4b5c8ee9a190aeb1e84ee101b52b9e7c923284704b87320565b543ab574f630e38ff0d568ee3402e289c3a52e17 SHA512 84bfc8c8f3532ee7e6839094714361ae2c8c0748dba3ba050766729192b6dcebe794d1b8f51ab46abb1a306ac8e6669897e805cca906688fdb5c8228bf88830a
+DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b

diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
index 6b12c6d6920..0daa9c46bf7 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.ebuild
@@ -3,17 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit cmake python-any-r1
 
 # yes, it needs SOURCE, not just installed one
-GTEST_COMMIT="fe4d5f10840c5f62b984364a4d41719f1bc079a2"
+GTEST_COMMIT="aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e"
+GTEST_FILE="gtest-1.10.0_p20200702.tar.gz"
 
 DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
 HOMEPAGE="https://abseil.io"
 SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> gtest-${GTEST_COMMIT}.tar.gz"
+	https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE}"
 
 LICENSE="
 	Apache-2.0
@@ -25,7 +26,11 @@ IUSE="test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -42,6 +47,9 @@ src_prepare() {
 
 	# now generate cmake files
 	absl/copts/generate_copts.py || die
+
+	sed -i 's/-Werror//g' \
+		"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
 }
 
 src_configure() {