14 files changed, 59 insertions, 154 deletions
diff --git a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
index e4991d2cc9d5..2a2a6f35d508 100644
--- a/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
+++ b/dev-cpp/cppdap/cppdap-0_pre20240802.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${CPPDAP_COMMIT}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc x86"
+KEYWORDS="amd64 arm arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/fast_float/Manifest b/dev-cpp/fast_float/Manifest
index c320ff548968..1139ede4f2e1 100644
--- a/dev-cpp/fast_float/Manifest
+++ b/dev-cpp/fast_float/Manifest
@@ -1,2 +1,3 @@
 DIST fast_float-7.0.0.tar.gz 103358 BLAKE2B 7334a74952aba9629e0cd0f3b49679ed8f9c84436d3e9b10438d09416341343efc34acc0f87283a20fff5866d1e5787f456ac8a37f0a918823369419378ddb53 SHA512 d6745c0f7d3b7fd31d710ca1a5b8a58506d0009dbf2e1a29c70483abcec2c2498a15a5efef203f39b43a9357a04c91e360080b7897fffdf68bf4ec561c40c77d
 DIST fast_float-8.0.0.tar.gz 120849 BLAKE2B 69b73e33b91ce24563f0931a02847d0e3d0253e457ca827f2224f80e4c390dcc639364e9fc8994d4e41489b0a2a9fa36cedbda45ea1c0ff1c8489c2f0b63f72e SHA512 b4cf0a4802fa26eba2cd371b243bf8f9b662019c957d6f50b43e23937fac06845a9d10db0d4381e74549712237a00c0cfbfc7483d3bdb1a9d3b2185f8a62ad25
+DIST fast_float-8.0.2.tar.gz 121232 BLAKE2B 5c2f16241c33bcda3bfdf696462250aae9b7fe23ccd080a26137db75a9e8158b3e7665df09f5e92e123087af37248a9a3acaf71a77010e77e06aa94bfb3e16d7 SHA512 0475d4a9100fda4cf0ba3a5f90090d2b86f4a472dbc125db57101b75555a05148965432d8258dd2a0cdffe97c10b27efe45baf9a8fe129f71d7a58b0dc705b4e
diff --git a/dev-cpp/fast_float/fast_float-8.0.0.ebuild b/dev-cpp/fast_float/fast_float-8.0.0.ebuild
index a1159186ae55..4e62e19610a1 100644
--- a/dev-cpp/fast_float/fast_float-8.0.0.ebuild
+++ b/dev-cpp/fast_float/fast_float-8.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fastfloat/fast_float/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="|| ( Apache-2.0 Boost-1.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/fast_float/fast_float-8.0.2.ebuild b/dev-cpp/fast_float/fast_float-8.0.2.ebuild
new file mode 100644
index 000000000000..a1159186ae55
--- /dev/null
+++ b/dev-cpp/fast_float/fast_float-8.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Fast and exact implementation of the C++ from_chars functions for number types"
+HOMEPAGE="https://github.com/fastfloat/fast_float"
+SRC_URI="https://github.com/fastfloat/fast_float/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Boost-1.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-cpp/doctest )"
+
+src_configure() {
+	local mycmakeargs=( -DFASTFLOAT_TEST=$(usex test) )
+
+	# Avoid passing these without USE=test to avoid cmake warning
+	# "Manually-specified variables were not used by the project"
+	if use test; then
+		mycmakeargs+=(
+			-DSYSTEM_DOCTEST=ON
+			# Unconditionally calls FetchContent
+			-DFASTFLOAT_SUPPLEMENTAL_TESTS=OFF
+		)
+		sed -i 's/-Werror//' tests/CMakeLists.txt || die
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/glaze/Manifest b/dev-cpp/glaze/Manifest
index e496b768fa19..b92846e3f9d6 100644
--- a/dev-cpp/glaze/Manifest
+++ b/dev-cpp/glaze/Manifest
@@ -1,2 +1 @@
-DIST glaze-4.4.3.tar.gz 555987 BLAKE2B 85ba2b1c3606e2d234ae15ff39c1a23daed511a42ff539c846635c6647a9446b9aabaf045135bb66894a2753343795149c7ceae3688c354254c2c0dbdbdbd585 SHA512 1ec8fd18ef716b4bc5fa1b3a9a7c7efc6da21a982a83cde20c65cbd12ba09e1e5d84e5d307ce0ef906e29bce302fde33dc2cca7aed2797e33452c8338ce3f372
 DIST glaze-5.2.1.tar.gz 581284 BLAKE2B 87b81b073955c0e97199e3de3083fb2c913438b25a469ac80184fc2c9af04119d015e523ebf53fea36bf91b6a055351362fe8670ac2e881aafd11bd2acc92851 SHA512 b68d3953feab1cb958242eba0457e4cf310cd0de80b7c5c2513722eedea0442199b7df40b414213047958d8aa1a1d0d8705bea77795b80a73c9ee6fb462abc88
diff --git a/dev-cpp/glaze/files/glaze-4.4.3-unbundle-asio.patch b/dev-cpp/glaze/files/glaze-4.4.3-unbundle-asio.patch
deleted file mode 100644
index 640bab929c39..000000000000
--- a/dev-cpp/glaze/files/glaze-4.4.3-unbundle-asio.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tests/asio_repe/CMakeLists.txt b/tests/asio_repe/CMakeLists.txt
-index 520a6fb..38d65ff 100644
---- a/tests/asio_repe/CMakeLists.txt
-+++ b/tests/asio_repe/CMakeLists.txt
-@@ -1,14 +1,8 @@
- project(asio_repe)
- 
--FetchContent_Declare(
--    asio
--    GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
--    GIT_TAG asio-1-30-1
--    GIT_SHALLOW TRUE
--)
--FetchContent_MakeAvailable(asio)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(asio GLOBAL IMPORTED_TARGET REQUIRED asio)
- 
- add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp)
- 
--target_include_directories(${PROJECT_NAME} PRIVATE include ${asio_SOURCE_DIR}/asio/include)
--target_link_libraries(${PROJECT_NAME} PRIVATE glz_test_exceptions)
-\ No newline at end of file
-+target_link_libraries(${PROJECT_NAME} PRIVATE glz_test_exceptions PkgConfig::asio)
diff --git a/dev-cpp/glaze/files/glaze-4.4.3-unbundle-ut2.patch b/dev-cpp/glaze/files/glaze-4.4.3-unbundle-ut2.patch
deleted file mode 100644
index bb269ac89217..000000000000
--- a/dev-cpp/glaze/files/glaze-4.4.3-unbundle-ut2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 1eeeb7f..9c4e0b7 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,17 +1,9 @@
- include(FetchContent)
- 
--FetchContent_Declare(
--  ut
--  GIT_REPOSITORY https://github.com/openalgz/ut
--  GIT_TAG v0.0.4
--  GIT_SHALLOW TRUE
--)
-+find_package(ut2-glaze REQUIRED)
- 
- message(STATUS "Fetching dependencies...")
- set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL TRUE)
--set(CMAKE_SKIP_INSTALL_RULES ON CACHE BOOL "" FORCE)
--FetchContent_MakeAvailable(ut)
--set(CMAKE_SKIP_INSTALL_RULES OFF CACHE BOOL "" FORCE)
- set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL FALSE)
- message(STATUS "...finished fetching dependencies.")
- 
-@@ -20,7 +12,7 @@ add_code_coverage_all_targets()
- 
- add_library(glz_test_common INTERFACE)
- target_compile_features(glz_test_common INTERFACE cxx_std_23)
--target_link_libraries(glz_test_common INTERFACE ut::ut glaze::glaze)
-+target_link_libraries(glz_test_common INTERFACE ut2-glaze::ut2-glaze glaze::glaze)
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-     target_compile_options(glz_test_common INTERFACE -fno-exceptions -fno-rtti)
-     if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-@@ -46,7 +38,7 @@ endif()
- 
- add_library(glz_test_exceptions INTERFACE)
- target_compile_features(glz_test_exceptions INTERFACE cxx_std_23)
--target_link_libraries(glz_test_exceptions INTERFACE ut::ut glaze::glaze)
-+target_link_libraries(glz_test_exceptions INTERFACE ut2-glaze::ut2-glaze glaze::glaze)
- if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-     target_compile_options(glz_test_exceptions INTERFACE)
-     target_compile_options(glz_test_exceptions INTERFACE -Wall -Wextra -pedantic)
diff --git a/dev-cpp/glaze/glaze-4.4.3.ebuild b/dev-cpp/glaze/glaze-4.4.3.ebuild
deleted file mode 100644
index 0ceffb27e694..000000000000
--- a/dev-cpp/glaze/glaze-4.4.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Extremely fast, in memory, JSON and interface library for modern C++"
-HOMEPAGE="https://github.com/stephenberry/glaze"
-SRC_URI="https://github.com/stephenberry/glaze/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/glaze-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples fuzzing test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-cpp/ut2-glaze
-		dev-cpp/asio
-		>=dev-cpp/eigen-3.4
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-build/cmake"
-
-# Build patches from Arniiiii: https://github.com/gentoo-mirror/ex_repo
-PATCHES=(
-	"${FILESDIR}/${P}-unbundle-ut2.patch"
-	"${FILESDIR}/${P}-unbundle-asio.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_INSTALL_RULES=OFF
-		-Dglaze_DEVELOPER_MODE=ON
-		-Dglaze_ENABLE_FUZZING=$(usex fuzzing ON OFF)
-		-Dglaze_BUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_TESTING=$(usex test ON OFF)
-
-		# my default:
-		-DFETCHCONTENT_QUIET=OFF
-		--log-level=DEBUG
-	)
-
-	cmake_src_configure
-
-}
-
-src_install() {
-	if use doc; then
-		einstalldocs
-	fi
-
-	cmake_src_install
-}
diff --git a/dev-cpp/glaze/glaze-5.2.1.ebuild b/dev-cpp/glaze/glaze-5.2.1.ebuild
index 16dc90659b14..cbeff4ec69d1 100644
--- a/dev-cpp/glaze/glaze-5.2.1.ebuild
+++ b/dev-cpp/glaze/glaze-5.2.1.ebuild
@@ -14,14 +14,14 @@ S="${WORKDIR}/glaze-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc examples fuzzing test"
+IUSE="examples fuzzing test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
-		dev-cpp/ut2-glaze
 		dev-cpp/asio
 		>=dev-cpp/eigen-3.4
+		dev-cpp/ut2-glaze
 	)
 "
 RDEPEND="${DEPEND}"
@@ -35,9 +35,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_INSTALL_RULES=OFF
 		-Dglaze_DEVELOPER_MODE=ON
-		-Dglaze_ENABLE_FUZZING=$(usex fuzzing ON OFF)
-		-Dglaze_BUILD_EXAMPLES=$(usex examples ON OFF)
-		-DBUILD_TESTING=$(usex test ON OFF)
+		-Dglaze_ENABLE_FUZZING=$(usex fuzzing)
+		-Dglaze_BUILD_EXAMPLES=$(usex examples)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
diff --git a/dev-cpp/glaze/metadata.xml b/dev-cpp/glaze/metadata.xml
index 6aa37735e053..35c09583b7b4 100644
--- a/dev-cpp/glaze/metadata.xml
+++ b/dev-cpp/glaze/metadata.xml
@@ -12,10 +12,13 @@
  <longdescription>
 			Yet another library for C++ for parsing JSON. Uses SIMD as well. In some benchmarks is better than simdjson.
 	</longdescription>
- 
+ <upstream>
+  <changelog>https://github.com/stephenberry/glaze/releases</changelog>
+  <bugs-to>https://github.com/stephenberry/glaze/issues</bugs-to>
+  <doc>https://stephenberry.github.io/glaze/</doc>
+ </upstream>
  <use>
   <flag name="fuzzing">Build fuzzers (not install)</flag>
-  <flag name="doc">Install README files</flag>
   <flag name="examples">Build examples (not install)</flag>
  </use>
  <origin>gentoo-staging</origin>
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 40e9314966f1..50bdf21a1491 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/ut2-glaze/metadata.xml b/dev-cpp/ut2-glaze/metadata.xml
index 0656ea38ebfc..510d961dfc49 100644
--- a/dev-cpp/ut2-glaze/metadata.xml
+++ b/dev-cpp/ut2-glaze/metadata.xml
@@ -13,9 +13,9 @@
 		Yet another stripped down fork of boost-ext ut2 (! not ut !).
 		ut2 is a library for testing using `constexpr` extensively in comparison to boost-ext/ut.
 	</longdescription>
- 
- <use>
-  <flag name="doc">Install README files</flag>
- </use>
+ <upstream>
+  <changelog>https://github.com/openalgz/ut/releases</changelog>
+  <bugs-to>https://github.com/openalgz/ut/issues</bugs-to>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/ut2-glaze/ut2-glaze-0.0.4.ebuild b/dev-cpp/ut2-glaze/ut2-glaze-0.0.4.ebuild
index b8ba90e5afeb..257a8c7e0af7 100644
--- a/dev-cpp/ut2-glaze/ut2-glaze-0.0.4.ebuild
+++ b/dev-cpp/ut2-glaze/ut2-glaze-0.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # it's a header-only lib, thus not cmake-multilib. However, examples and tests...
 inherit cmake
 
-DESCRIPTION="A stripped down fork of boost-ext ut2"
+DESCRIPTION="Stripped down fork of boost-ext ut2"
 HOMEPAGE="https://github.com/openalgz/ut"
 SRC_URI="https://github.com/openalgz/ut/archive/refs/tags/v${PV}.tar.gz -> ut2-openalgz-${PV}.tar.gz"
 
@@ -15,11 +15,9 @@ S="${WORKDIR}/ut-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test doc"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="dev-build/cmake"
-
 # Build patches from Arniiiii, https://github.com/gentoo-mirror/ex_repo
 PATCHES=(
 	"${FILESDIR}/${P}-optional-test.patch"
@@ -30,15 +28,7 @@ PATCHES=(
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_INSTALL_RULES=OFF
-		-DBUILD_TESTING=$(usex test ON OFF)
+		-DBUILD_TESTING=$(usex test)
 	)
 	cmake_src_configure
 }
-
-src_install() {
-	if use doc; then
-		einstalldocs
-	fi
-
-	cmake_src_install
-}
diff --git a/dev-cpp/waylandpp/waylandpp-1.0.0-r2.ebuild b/dev-cpp/waylandpp/waylandpp-1.0.0-r2.ebuild
index 27ada98d76b3..50556450cba4 100644
--- a/dev-cpp/waylandpp/waylandpp-1.0.0-r2.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-1.0.0-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 RDEPEND="