[gentoo-commits] repo/gentoo:master commit in: dev-cpp/benchmark/files/, dev-cpp/benchmark/

[Marek Szuba]

commit:     87062497878290a363a959c5538eb5efdcd85cef
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 15:24:46 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 16:47:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87062497

dev-cpp/benchmark: drop 1.5.6, 1.6.0

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-cpp/benchmark/Manifest                         |  2 --
 dev-cpp/benchmark/benchmark-1.5.6.ebuild           | 36 --------------------
 dev-cpp/benchmark/benchmark-1.6.0.ebuild           | 38 ----------------------
 .../files/benchmark-1.5.6-system_testdeps.patch    | 11 -------
 .../files/benchmark-1.6.0-disable_Werror.patch     | 12 -------
 .../files/benchmark-1.6.0-versioned_docdir.patch   |  9 -----
 6 files changed, 108 deletions(-)

diff --git a/dev-cpp/benchmark/Manifest b/dev-cpp/benchmark/Manifest
index d96cd79330ba..8c7d92a34184 100644
--- a/dev-cpp/benchmark/Manifest
+++ b/dev-cpp/benchmark/Manifest
@@ -1,3 +1 @@
-DIST benchmark-1.5.6.tar.gz 177911 BLAKE2B ea4e98cb98471b2b8e2371109b96017bc483459dc924deaa1d9770b065de946ea2d69ca36098c27283f15370699f2475448af1e205cfca3d9c64408f08c202a9 SHA512 b3c1fd4407d660456ae51abd7c427460a2c7b029ab6344e21bb61d3ec84e3b60638b7a719655aa04fb9ca639b6371e553e9de18539aca8dd38c361b4c6522538
-DIST benchmark-1.6.0.tar.gz 178527 BLAKE2B b31fdd2a00d80c63102ea81ed9d1392f243e0d6d67ebf7d1e1a3d20cf7702acc68a3ddd3edd6ccbcfe76c01438c492c15f4d0146689587ccf8a3dccd6043ed11 SHA512 83788f64322067cedca4e459dd2b4117a80d3dc480e1ce0a4d9c323827e13cb1969889a6049cd487dc28ecb0ff52c868a73492c738283ee1236e527b0ca8b11d
 DIST benchmark-1.6.1.tar.gz 184616 BLAKE2B bcbc69ae4c4f5f21ed8199f34faccf41a9b97d311aaeeba8cecb6acc47780c91d2cb41a1dadfe400accecd46f90f02211a219a0000739c122dc7398ae1fa76a7 SHA512 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67

diff --git a/dev-cpp/benchmark/benchmark-1.5.6.ebuild b/dev-cpp/benchmark/benchmark-1.5.6.ebuild
deleted file mode 100644
index 3c1508d4ecd1..000000000000
--- a/dev-cpp/benchmark/benchmark-1.5.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-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 ~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
-)
-
-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.6.0.ebuild b/dev-cpp/benchmark/benchmark-1.6.0.ebuild
deleted file mode 100644
index 79dd281a1d6d..000000000000
--- a/dev-cpp/benchmark/benchmark-1.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-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 ~arm ~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)
-		-DBENCHMARK_ENABLE_GTEST_TESTS=OFF
-		-DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF
-	)
-
-	use debug || append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}

diff --git a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch b/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
deleted file mode 100644
index 98aa94904075..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.5.6-system_testdeps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -307,7 +307,7 @@
-   if (BENCHMARK_ENABLE_GTEST_TESTS AND
-       NOT (TARGET gtest AND TARGET gtest_main AND
-            TARGET gmock AND TARGET gmock_main))
--    include(GoogleTest)
-+    find_package(GTest 1.11 REQUIRED)
-   endif()
-   add_subdirectory(test)
- endif()

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
deleted file mode 100644
index 8a3de98008ea..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-disable_Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 156e8b0c2a67..000000000000
--- a/dev-cpp/benchmark/files/benchmark-1.6.0-versioned_docdir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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()