5 files changed, 8 insertions, 130 deletions
diff --git a/dev-libs/cpuinfo/Manifest b/dev-libs/cpuinfo/Manifest
index 12584620e035..db8196184b99 100644
--- a/dev-libs/cpuinfo/Manifest
+++ b/dev-libs/cpuinfo/Manifest
@@ -1,12 +1,7 @@
-AUX cpuinfo-2022.03.26-gentoo.patch 1268 BLAKE2B 182386f080c1aca057dc91cc878236ce589233f47173e2c4eb3421505be18c24171b9c58f2c8a50f6b54992761513cd864070734dd74bf411fcc9585b8c17454 SHA512 bea50072b201d7120c8163ebca975e2101399fadb3ed4b8828dc20afdfbdab5040683219ddfbecc7bc694def2b30efa2bec256311c8ac3cd7d1ab67591295e84
 AUX cpuinfo-2023.01.13-test.patch 432 BLAKE2B 31cb0cb7b75445651a2d82143bdfce28f636ab4692c3c4f4f503646b61af952c8599f17192d15ff43d20ad9a0a4cc26410057efd44aa9b9837ff1cdba319663d SHA512 e6a730137c621946a7839b3273e163382ad35a8881f0fd848e70f3fe02820a3196044a235f5d301e0443e2d376321ff17f3256f8aa27e1ae66fc220bbf6f0d96
 AUX cpuinfo-2023.11.04-gentoo.patch 1246 BLAKE2B 67f451ec281e6f46c54406e0238df3cc79db669cf3113aa629e04688c3f64e59c7afff7d09b40239443336cdda1a379068ab08a9e7c80b1d7f138b78c783c1ec SHA512 f95f407b7c40786f731116c21fb87597445c21efd6ac8a12ee4d8f186b5fcf23eb05d0a8cc51040bf23f1e02b6bd80bff59316395403e5af5715cdcf1b2a41d0
-DIST cpuinfo-2022.03.26.tar.gz 3503965 BLAKE2B 03607ea04de156907d230dc9f009d72bf6d36ae7391c190c68dbc3f9a4c395e8ec72f935f6ae032d6b1341432278df3aee6f9fe7f7cad1b82784ecec5084d373 SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c
-DIST cpuinfo-2022.08.19.tar.gz 3512624 BLAKE2B 909ebde6c522d514641dcbe16586bc972327b8564cb12fa6db25b8978a0a840e627154430f97dd37f024ea4f36a45db8ca5033e6e076390383dd9b35307bed5f SHA512 b3342ce0a1f842084ff53efdfd15c44586ac7cd36249211e2925d84aa1f33ee8d6f76cd62ea20e91d8b908c3c8afda5a47516008b69749504024b9813a623ee2
-DIST cpuinfo-2023.01.13.tar.gz 3513605 BLAKE2B eee9765f30b1dca6f39fb0b1f387f5e1cfaf544e5c9b256391aea913c5b67a012ef45f5afecfcda4a34ab64ca8da2f20e37db58cb4d463f8e312a04965cd40df SHA512 96bd11d3453e98cf1130f0862614e813861e20111655f8c472f29f17048a07d712b4f84b511760fdee995cf3d695112371af0c21cbd144ee3fb6fb6153dd2829
 DIST cpuinfo-2023.11.04.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c
-EBUILD cpuinfo-2022.03.26-r1.ebuild 894 BLAKE2B e4d7b5c15f660e5e23afdc4c4f89df0af6211ff45429911875a7e4464cdf5eef633ee563e15626481428143788d8b2d63e76f89b38da007ee0ef44c0c711d9c7 SHA512 34d863c1bd6abbd2607e7ddeeb44f648c8b24f4c50d3d1909450e5c0e465ef28689d57e55af31caf03e725a3421a5d6b86a9f1422eb7dc96cb23cdc86c775c91
-EBUILD cpuinfo-2022.08.19.ebuild 906 BLAKE2B 5395cf008fb40443b8929f8c83680164bee23844c437bab9cb5d9110df146db12b3f3bee957cdaeaa880c0bf1efe74e0ae93527a4e54a3e20bcb9c58fbb5ef98 SHA512 45528b7df2699a5e3818813e0e5ee3941a17e456e7da2c5c8855a4b65d896a1b261944e3c143f6c7500a1b231d41aee2cb48031b12b6b35b781ed21de795e371
-EBUILD cpuinfo-2023.01.13.ebuild 937 BLAKE2B af15c89bba1ebff2538cc46b68c612da31e6d45b94e0bd9d7ba6b84ab959166d31492c421b6e1eb6216dab1dba7c79b1b197e8a10a6bcb25a1daf963cdf8208c SHA512 4b96b40ea10605871748b5832940c63d22b79ba27222bcd8593a793c2b79a9b200ae3834d1b53e8d01b8fbbc072806bac46bf5005ef8870afc7815d5b43b84ce
+DIST cpuinfo-2024.10.22.tar.gz 3516672 BLAKE2B 4f99781081ae7c0736bac35d8f589918be1466763d57d0b0661c7cdf8a24fccee61d87acae314714bad09da2a15d96d9725b7c2b7a6a9945bb320f96c31b3eb7 SHA512 02dd70f0b95c2cb6d8af4e33072f63f5d72d2314796033ae68bb6b37cb7db18d43dd2cdfedafc896dec0614dbeec9ab507f765f3d958fbda8c0ab3e3a191a87c
 EBUILD cpuinfo-2023.11.04.ebuild 736 BLAKE2B 883ccf95df3baa412d39215bbcc9ccd2de465d9c5ebed51c091aa589577b634ae0425cca6c8b74079c6f184c1f63ff26cbe6343508c302a94acae032633f4e3e SHA512 2c4572611e132e9b803cf2d86390436cbedc2dd9e8ba5a7855ec27b6b9af4ba462dcd1f6e2aa93054a34900f9896b268858755a95d6a5dde36777974bfe00d99
+EBUILD cpuinfo-2024.10.22.ebuild 748 BLAKE2B e589071a63a684ecdcff2fbfc93151945b7fd0603a135fce1da06d7258a3b196146bdbe9e1f0f0f5de49e54b3267eee71b092cde4b6a8ffb600967927bfd73d9 SHA512 8286b0644207c80239ddeb8e9f513d7e1078219cce345faf23778768ceba97e296f2b9fb205bb648a8bce1b8c1d1f6e9c5b736e1a7b3f23355d01a2a3599890b
 MISC metadata.xml 328 BLAKE2B 160050e4c013753fd69c5a153bf5c63d0627fb2dc96f170f5d2d4a9585b53771fb32866db5a99c27a878402c54c2f10ff43a56718acec5afd5e7b6827c8884d1 SHA512 032c753ed917179bba2cb457ee87b3a8ce6941032138d4cdf59ff764907da93c779fd1ff01a36778d99fefa89f0a2fdf43d1871a9db9e82d6ecfdcbe8bb198fe
diff --git a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild b/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild
deleted file mode 100644
index 07d77a29af2f..000000000000
--- a/dev-libs/cpuinfo/cpuinfo-2022.08.19.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-CommitId=8ec7bd91ad0470e61cf38f618cc1f270dede599c
-
-DESCRIPTION="CPU INFOrmation library"
-HOMEPAGE="https://github.com/pytorch/cpuinfo/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2022.03.26-gentoo.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard
-	sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \
-		CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPUINFO_BUILD_BENCHMARKS=OFF
-		-DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild b/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild
deleted file mode 100644
index 3b0ec9465234..000000000000
--- a/dev-libs/cpuinfo/cpuinfo-2023.01.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-CommitId=6481e8bef08f606ddd627e4d3be89f64d62e1b8a
-
-DESCRIPTION="CPU INFOrmation library"
-HOMEPAGE="https://github.com/pytorch/cpuinfo/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2022.03.26-gentoo.patch
-	"${FILESDIR}"/${P}-test.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard
-	sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \
-		CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPUINFO_BUILD_BENCHMARKS=OFF
-		-DCPUINFO_BUILD_UNIT_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild b/dev-libs/cpuinfo/cpuinfo-2024.10.22.ebuild
index fc964a2ae125..768918495cbc 100644
--- a/dev-libs/cpuinfo/cpuinfo-2022.03.26-r1.ebuild
+++ b/dev-libs/cpuinfo/cpuinfo-2024.10.22.ebuild
@@ -1,16 +1,18 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 inherit cmake
 
-CommitId=b40bae27785787b6dd70788986fd96434cf90ae2
+CommitId=d6860c477c99f1fce9e28eb206891af3c0e1a1d7
 
 DESCRIPTION="CPU INFOrmation library"
 HOMEPAGE="https://github.com/pytorch/cpuinfo/"
 SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
 	-> ${P}.tar.gz"
 
+S="${WORKDIR}"/${PN}-${CommitId}
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -19,20 +21,11 @@ IUSE="test"
 BDEPEND="test? ( dev-cpp/gtest )"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}"/${PN}-${CommitId}
-
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-2023.11.04-gentoo.patch
+	"${FILESDIR}"/${PN}-2023.01.13-test.patch
 )
 
-src_prepare() {
-	cmake_src_prepare
-
-	# >=dev-cpp/gtest-1.13.0 depends on building with at least C++14 standard
-	sed -i -e 's/CXX_STANDARD 11/CXX_STANDARD 14/' \
-		CMakeLists.txt || die "sed failed"
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DCPUINFO_BUILD_BENCHMARKS=OFF
diff --git a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch b/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch
deleted file mode 100644
index b7163d9e06e0..000000000000
--- a/dev-libs/cpuinfo/files/cpuinfo-2022.03.26-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt	2022-05-09 22:00:05.453640876 +0200
-+++ b/CMakeLists.txt	2022-05-09 22:01:11.621691380 +0200
-@@ -94,12 +94,6 @@
- 
- IF(CPUINFO_BUILD_MOCK_TESTS OR CPUINFO_BUILD_UNIT_TESTS)
-   IF(CPUINFO_SUPPORTED_PLATFORM AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
--    MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
--    CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
--    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
--      WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download")
--    EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build .
--      WORKING_DIRECTORY "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download")
-     SET(GOOGLETEST_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest" CACHE STRING "Google Test source directory")
-   ENDIF()
- ENDIF()
-@@ -309,9 +303,6 @@
-       IF(MSVC AND NOT CPUINFO_RUNTIME_TYPE STREQUAL "static")
-         SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-       ENDIF()
--      ADD_SUBDIRECTORY(
--        "${GOOGLETEST_SOURCE_DIR}"
--        "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest")
-     ENDIF()
-   ENDIF()
- ENDIF()