commit:     8409348e7e1b8e2a543ac2e2f5d51224ce53650f
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Mar  6 22:47:12 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 01:24:32 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8409348e

dev-cpp/cctz: drop 2.4, 2.4-r1

Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/233
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-cpp/cctz/Manifest                    |  1 -
 dev-cpp/cctz/cctz-2.4-r1.ebuild          | 34 ----------------
 dev-cpp/cctz/cctz-2.4.ebuild             | 30 ---------------
 dev-cpp/cctz/files/cctz-2.4-cmake4.patch | 66 --------------------------------
 4 files changed, 131 deletions(-)

diff --git a/dev-cpp/cctz/Manifest b/dev-cpp/cctz/Manifest
index 28ac5e20a36e..e6a6ac653cc8 100644
--- a/dev-cpp/cctz/Manifest
+++ b/dev-cpp/cctz/Manifest
@@ -1,2 +1 @@
-DIST cctz-2.4.tar.gz 222831 BLAKE2B 
c232b27cbfe5e45b6e1c51dd13c9a35c4a2e84b5d3e65ba6b4afb7683cac967a3b409382664a55d58ac67e53a1cf3dec9d97ecd59c5e2180c0eae4f71462fe33
 SHA512 
6d50fe5263b66f93bc3f9aee0da395352d0e95187e6a761afd1b82a461c127823fe93e06139e9d8989f24875b70de3058aab6e66639b408c7930f117e1815e5e
 DIST cctz-2.5.tar.gz 224961 BLAKE2B 
dc5e51dbcb9a6c3d497d3c89385ca6e6eedba9eaa00b378a9d1a488e7efb40d19afc38769893d8a56ea1a5198236a260045e2c19c5014b86e10566bd4dcfb12e
 SHA512 
e3eba96482b7745b145ecfd9b3b96b09d9120bde952dfdb66d625e642a463b87c74205b1813e3c4bd9b408410bb26fb095d034ca56a4953005bf0c988ccc741e

diff --git a/dev-cpp/cctz/cctz-2.4-r1.ebuild b/dev-cpp/cctz/cctz-2.4-r1.ebuild
deleted file mode 100644
index 67e9edecfc88..000000000000
--- a/dev-cpp/cctz/cctz-2.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for dealing with time zones and time conversion"
-HOMEPAGE="https://github.com/google/cctz";
-SRC_URI="https://github.com/google/cctz/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-       test? (
-               dev-cpp/gtest
-       )
-"
-
-PATCHES=(
-       "${FILESDIR}/${PN}-2.4-cmake4.patch"
-)
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_TESTING=$(usex test)
-               -DBUILD_BENCHMARK=OFF
-       )
-       cmake_src_configure
-}

diff --git a/dev-cpp/cctz/cctz-2.4.ebuild b/dev-cpp/cctz/cctz-2.4.ebuild
deleted file mode 100644
index 2a2a1f041c09..000000000000
--- a/dev-cpp/cctz/cctz-2.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ library for dealing with time zones and time conversion"
-HOMEPAGE="https://github.com/google/cctz";
-SRC_URI="https://github.com/google/cctz/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-       test? (
-               dev-cpp/gtest
-       )
-"
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_TESTING=$(usex test)
-               -DBUILD_BENCHMARK=OFF
-       )
-       cmake_src_configure
-}

diff --git a/dev-cpp/cctz/files/cctz-2.4-cmake4.patch 
b/dev-cpp/cctz/files/cctz-2.4-cmake4.patch
deleted file mode 100644
index 4c6ba8de6cc0..000000000000
--- a/dev-cpp/cctz/files/cctz-2.4-cmake4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://bugs.gentoo.org/951679
-https://github.com/google/cctz/commit/f62d7b7
-
-From f62d7b778289959fa117c13ce190387690400611 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <[email protected]>
-Date: Mon, 8 Jul 2024 16:07:59 +0200
-Subject: [PATCH] [cmake] Require CMake 3.16 (#292)
-
-Follow Google's OSS policy.
-Remove other code specific for CMake < 3.16
----
- CMakeLists.txt | 28 +++++++---------------------
- 1 file changed, 7 insertions(+), 21 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c0f2c58..0bf696b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,8 +1,6 @@
--cmake_minimum_required(VERSION 2.8.12)
--
--if (POLICY CMP0025)
--  cmake_policy(SET CMP0025 NEW)
--endif()
-+# 
https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md
-+# As of 2024-07-01, CMake 3.16 is the minimum supported version.
-+cmake_minimum_required(VERSION 3.16)
- 
- project(cctz)
- 
-@@ -51,20 +49,12 @@ if (BUILD_TESTING)
-   )
- endif()
- 
--# Starting from CMake >= 3.1, if a specific standard is required,
-+# If a specific standard is required,
- # it can be set from the command line with:
--#     cmake -DCMAKE_CXX_STANDARD=[11|14|17]
-+#     cmake -DCMAKE_CXX_STANDARD=[11|14|17|20|23]
- function(cctz_target_set_cxx_standard target)
-   set(cxx_standard 11)
--  if (CMAKE_VERSION VERSION_LESS "3.1")
--    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
--      target_compile_options(${target} PRIVATE -std=c++${cxx_standard})
--    endif()
--  elseif (CMAKE_VERSION VERSION_LESS "3.8")
--    set_property(TARGET ${target} PROPERTY CXX_STANDARD ${cxx_standard})
--  else()
--    target_compile_features(${target} PUBLIC cxx_std_${cxx_standard})
--  endif()
-+  target_compile_features(${target} PUBLIC cxx_std_${cxx_standard})
- endfunction()
- 
- if(APPLE)
-@@ -191,10 +181,6 @@ install(FILES cmake/${PROJECT_NAME}-config.cmake
-   DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
-   )
- 
--if (CMAKE_VERSION VERSION_LESS "3.8")
--  set(quiet_on_empty "")
--else()
--  set(quiet_on_empty QUIET_ON_EMPTY)
--endif()
-+set(quiet_on_empty QUIET_ON_EMPTY)
- 
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES ${quiet_on_empty})

Reply via email to