gentoo resync : 25.09.2021

5 files changed, 37 insertions, 34 deletions

diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index 7fa5369dd312..9c33f3f9b65a 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,8 +1,8 @@
 AUX benchmark-1.5.6-system_testdeps.patch 312 BLAKE2B 082c0db683594a33943daad3cd7f7f8a6b28631ea8ac9fbcce47209e1b7174b5b88f6516e7d8516f8b553819f7592ae038d6bd2bfc3b8db4bc477455a400f2a4 SHA512 bf48a1f87c2e5581bfc53dd64eb108df09c26468b97b90227354a2ce911c6ed1d5dedc1cc4e04d15178aa36423c8b20c95117331ab642c8211bdae09f271c6b5
-DIST benchmark-1.5.3.tar.gz 163465 BLAKE2B cea8929c5595be55e74e6232eb147a00c656cc5afe6f5b9d3d788de002c51c40c46012461a7c6840aff9e590ed4304f24a31249402bbbeae28ec443a433a2e53 SHA512 11f726686ad8b36870fc2a3542fad4c52a58df2eb580564dcfdfb154fe6ac00dbbf69c514395148d7ab11a45e40e869549cf971462c384f59cbae5fa60160e3b
-DIST benchmark-1.5.5.tar.gz 176710 BLAKE2B 394f8b34873ccd45100e3b1f58dd7819d443733d9224ff003a9410ca30d8bacc6c7736b74dd50623144767e840dbc3cd9ff819a60de6e22a00b1edaf802f0992 SHA512 91a2cdf0245625c657b9bb8d76c7d616a99eaed333e42b34ceff4e996b8fa6027b1c7313a815e7b441d2f6e2e1244c139a0911d585bf0d2e767ac3cea23a67d1
+AUX benchmark-1.6.0-disable_Werror.patch 461 BLAKE2B 3f286f7f8fc6dffd0a8c072ea9773046e816b972b27a510b2b31b0bf0447477c8dee3df5bca7a7ecfb112046856a00ba8e3e95ba14a8bc8652de7c37db0db854 SHA512 520d276314e4f0c59240521e909a0c1e7cb6cea107f291badde0def1f2f70b307f0fd3725ccbffd63cdfcda65605a208eeded46b9fc27746c50bc50c5049c3cb
+AUX benchmark-1.6.0-versioned_docdir.patch 303 BLAKE2B 7cc8c4d61bcbdefaef17cebf1107010e966dd35b69afe1cf762b3796d05b135d5cc2a85fb246ccda33e511628f0606a2d596e0f09e45d11f8e8f8154f42099ba SHA512 e704352323699a7827f4e125e5ea2989e02381d2984ad024f0712d95c8cc4772b167ad85d9e5d4ddd86541432a792ca2d9b7855c939a591fabd7d2ed6b25c3b5
 DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
-EBUILD benchmark-1.5.3.ebuild 646 BLAKE2B e52d1c59d0baa10accf07140fc6e86921947412b18e75e8119b74bbeaf468ef7cbaf10eb2819f1bc42e522cd89553fb268480e6ebf86d59a79a70eb80bc34cd1 SHA512 72f0128943a5fb9bd355a13e404bfcd3ee57535dbefc1cb82530ddda9af673646d197991cd5388203810db508af8bc68d233cf4879cd56a3bd4e401596658438
-EBUILD benchmark-1.5.5.ebuild 653 BLAKE2B 7f1603232d141f75d35b5da24cf9ed2b6ef4de0632f8969f09090bc7be55142a0bfc9f0596f0d3ba48760d70bfb105ffa8dbd4c5d79e9dc62222f200220db9d2 SHA512 7098dce776ea65d074c584e852e710cc66ad6e0482754c9175bda945bcd9879d3b4ebd69621787a26d04b9b916ff063bcf034443c501bc4c67181e862ef4ad68
+DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
 EBUILD benchmark-1.5.6.ebuild 796 BLAKE2B 0e64c039c1cf3e9c69515515b91fd5c5b72e7c712f97787a96bc84abec53376ffaecf27ea632614585e7035aa4583ab927405e0acfe69eb7e0e7934cc98c37ba SHA512 6ad73f38dab12b2646fe4e52d3cade4a04ff152591ebeee7e2addc12882fae9b4308b8be4fb80681f34bba73ec6d367000179d31484b4eba35e51033c707ee46
+EBUILD benchmark-1.6.0.ebuild 894 BLAKE2B 233b874bd7fdef833606eedb7753107cfeeef11c27c70b9b7c5f74682f82423e678546233487a2d0e6c11323dd92e47edef9f266c1d2f334efa1c5ecff6db9d5 SHA512 76e4cf6af0fdc787708751c5e4082fa261fcbbffabeba50f5e84fb1379cca2b2348445b99bc84ca0b75bed17a94fa3fb6f470f469697752ef23a788a82405d5d
 MISC metadata.xml 468 BLAKE2B 1cccded2d58d45121482aedc04732f83d8e1b034fa34eb037ae2e68922c6394b6ce7ad019cca64b0c2496e4328b124a9f06d9b8bba037e36e6f46f716acee9cf SHA512 c7a6087c885a8587799d32fcba2abdef1bac08eb7f6cb7ec195280b0464c962acdfe92cba1ca137bb049d895962bcbecc97b53818a24b84757263f90c345e094
diff --git a/dev-cpp/benchmark/benchmark-1.5.5.ebuild b/dev-cpp/benchmark/benchmark-1.5.5.ebuild
deleted file mode 100644
index fc246f0b80a0..000000000000
--- a/dev-cpp/benchmark/benchmark-1.5.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A microbenchmark support library"
-HOMEPAGE="https://github.com/google/benchmark"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBENCHMARK_ENABLE_TESTING=$(usex test)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/benchmark/benchmark-1.5.3.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
index 1463b00dc41b..1356d6aa2270 100644
--- a/dev-cpp/benchmark/benchmark-1.5.3.ebuild
+++ b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -11,10 +11,20 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug test"
+
 RESTRICT="!test? ( test )"
 
+# Version not in the tree yet
+#BDEPEND="test? ( >=dev-cpp/gtest-1.11.0 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.6-system_testdeps.patch
+	"${FILESDIR}"/${PN}-1.6.0-disable_Werror.patch
+	"${FILESDIR}"/${PN}-1.6.0-versioned_docdir.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBENCHMARK_ENABLE_TESTING=$(usex test)
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
new file mode 100644
index 000000000000..8a3de98008ea
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,9 +160,6 @@
+   add_cxx_compiler_flag(-Wall)
+   add_cxx_compiler_flag(-Wextra)
+   add_cxx_compiler_flag(-Wshadow)
+-  add_cxx_compiler_flag(-Werror RELEASE)
+-  add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
+-  add_cxx_compiler_flag(-Werror MINSIZEREL)
+   if (NOT BENCHMARK_ENABLE_TESTING)
+     # Disable warning when compiling tests as gtest does not use 'override'.
+     add_cxx_compiler_flag(-Wsuggest-override)
diff --git a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch b/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
new file mode 100644
index 000000000000..156e8b0c2a67
--- /dev/null
+++ b/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
@@ -0,0 +1,9 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -120,5 +120,5 @@
+ 
+   install(
+     DIRECTORY "${PROJECT_SOURCE_DIR}/docs/"
+-    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
++    DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
+ endif()