Adding metadata

8 files changed, 128 insertions, 114 deletions

diff --git a/dev-cpp/catch/catch-3.8.1.ebuild b/dev-cpp/catch/catch-3.8.1.ebuild
index d55de90c920e..ed77ec07524c 100644
--- a/dev-cpp/catch/catch-3.8.1.ebuild
+++ b/dev-cpp/catch/catch-3.8.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
diff --git a/dev-cpp/glaze/Manifest b/dev-cpp/glaze/Manifest
index a3bf2f9f984e..e496b768fa19 100644
--- a/dev-cpp/glaze/Manifest
+++ b/dev-cpp/glaze/Manifest
@@ -1 +1,2 @@
 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-5.2.1-unbundle-test-deps.patch b/dev-cpp/glaze/files/glaze-5.2.1-unbundle-test-deps.patch
new file mode 100644
index 000000000000..8ccf74af061f
--- /dev/null
+++ b/dev-cpp/glaze/files/glaze-5.2.1-unbundle-test-deps.patch
@@ -0,0 +1,64 @@
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 028b3994..0b105eb2 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.5
+-  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/tests/asio_repe/CMakeLists.txt b/tests/asio_repe/CMakeLists.txt
+index 1518b4e5..3cc27f67 100644
+--- a/tests/asio_repe/CMakeLists.txt
++++ b/tests/asio_repe/CMakeLists.txt
+@@ -1,14 +1,9 @@
+ project(asio_repe)
+ 
+-FetchContent_Declare(
+-    asio
+-    GIT_REPOSITORY https://github.com/chriskohlhoff/asio.git
+-    GIT_TAG asio-1-32-0
+-    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)
diff --git a/dev-cpp/glaze/glaze-5.2.1.ebuild b/dev-cpp/glaze/glaze-5.2.1.ebuild
new file mode 100644
index 000000000000..16dc90659b14
--- /dev/null
+++ b/dev-cpp/glaze/glaze-5.2.1.ebuild
@@ -0,0 +1,44 @@
+# 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}"
+
+# Unbundle test dependencies otherwise they are fetched from github at build time
+PATCHES=(
+	"${FILESDIR}/${P}-unbundle-test-deps.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)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/json11/json11-1.0.0-r1.ebuild b/dev-cpp/json11/json11-1.0.0-r1.ebuild
index 66b400e6f1bd..bcb8fbbb9bb9 100644
--- a/dev-cpp/json11/json11-1.0.0-r1.ebuild
+++ b/dev-cpp/json11/json11-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
+inherit cmake edo
 
 DESCRIPTION="A tiny JSON library for C++11"
 HOMEPAGE="https://github.com/dropbox/json11"
@@ -12,9 +12,25 @@ SRC_URI="https://github.com/dropbox/json11/archive/refs/tags/v${PV}.tar.gz -> ${
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-multiarch-install.patch
 	"${FILESDIR}"/${PN}-1.0.0-json11.pc-do-not-state-the-defaults.patch
 	"${FILESDIR}"/${PN}-1.0.0-include-cstdint.patch
 )
+
+src_configure() {
+	local mycmakeargs=(
+		-DJSON11_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_src_test
+
+	edo "${BUILD_DIR}"/json11_test
+}
diff --git a/dev-cpp/pystring/Manifest b/dev-cpp/pystring/Manifest
index b9b2b58cb8f5..f3fe371aabc1 100644
--- a/dev-cpp/pystring/Manifest
+++ b/dev-cpp/pystring/Manifest
@@ -1,2 +1 @@
-DIST pystring-1.1.3.tar.gz 18364 BLAKE2B caab1a3b1dc688ad6ecbb32e5e8139bb883a88b78ce8a021229924d57376e94b17d89277e2fccf4f7ec478c81ee9259c5e56848f4388c44b2eab9cfb841bcfb8 SHA512 a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6
 DIST pystring-1.1.4.tar.gz 19184 BLAKE2B 299e6feb10e2f12fa1e92fd1a7309b482769b4d0edea65f5f4bac06c6ae318d3464cf8acc2d6a899c28eb9073a396402b6d28e0950b51ac7f214da1a0a7ca521 SHA512 9c0460fea67885492f9b0d29a9ba312d960fd5e43577cdcfd47faf04397ff4b7e456ed68f1948b923d2f63f9922d576b93e4ca1a27376bcb6d29c683828acb01
diff --git a/dev-cpp/pystring/files/cmake.patch b/dev-cpp/pystring/files/cmake.patch
deleted file mode 100644
index bd4e01e6658b..000000000000
--- a/dev-cpp/pystring/files/cmake.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 4f653fc35421129eae8a2c424901ca7170059370 Mon Sep 17 00:00:00 2001
-From: Harry Mallon <harry.mallon@codex.online>
-Date: Thu, 15 Apr 2021 15:50:22 +0100
-Subject: [PATCH] Add a CMake configuration
-
----
- CMakeLists.txt                | 56 +++++++++++++++++++++++++++++++++++
- cmake/pystringConfig.cmake.in |  4 +++
- 2 files changed, 60 insertions(+)
- create mode 100644 CMakeLists.txt
- create mode 100644 cmake/pystringConfig.cmake.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..0081a83
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,56 @@
-+cmake_minimum_required(VERSION 3.2)
-+
-+option(BUILD_SHARED_LIBS "Create shared libraries if ON" OFF)
-+
-+project(pystring LANGUAGES CXX)
-+
-+# pystring library ======
-+
-+add_library(pystring
-+    pystring.cpp
-+    pystring.h
-+)
-+set_target_properties(pystring
-+    PROPERTIES
-+        PUBLIC_HEADER pystring.h
-+        SOVERSION 0.0)
-+
-+set(EXPORT_NAME "${PROJECT_NAME}Targets")
-+set(NAMESPACE "${PROJECT_NAME}::")
-+
-+# test ======
-+
-+include(CTest)
-+
-+if(BUILD_TESTING)
-+    add_executable(pystring_test
-+        test.cpp
-+        unittest.h
-+    )
-+
-+    target_link_libraries(pystring_test pystring)
-+
-+    add_test(NAME pystring_test COMMAND pystring_test)
-+endif()
-+
-+# install and cmake configs ======
-+
-+include(GNUInstallDirs)
-+install(TARGETS pystring
-+        EXPORT "${EXPORT_NAME}"
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+        INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pystring)
-+
-+include(CMakePackageConfigHelpers)
-+configure_package_config_file(cmake/pystringConfig.cmake.in
-+    ${CMAKE_CURRENT_BINARY_DIR}/pystringConfig.cmake
-+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring)
-+
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pystringConfig.cmake
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring)
-+
-+install(EXPORT "${EXPORT_NAME}"
-+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pystring
-+        NAMESPACE "${NAMESPACE}")
-diff --git a/cmake/pystringConfig.cmake.in b/cmake/pystringConfig.cmake.in
-new file mode 100644
-index 0000000..82e3995
---- /dev/null
-+++ b/cmake/pystringConfig.cmake.in
-@@ -0,0 +1,4 @@
-+@PACKAGE_INIT@
-+
-+include("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@.cmake")
-+check_required_components("@PROJECT_NAME@")
diff --git a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild b/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
deleted file mode 100644
index ccc4e19d1a1d..000000000000
--- a/dev-cpp/pystring/pystring-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ functions matching the interface and behavior of python string methods"
-HOMEPAGE="https://github.com/imageworks/pystring"
-
-if [[ "${PV}" == "9999" ]];  then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/imageworks/pystring.git"
-else
-	SRC_URI="https://github.com/imageworks/pystring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=(
-	# Patch to convert the project into cmake. Taken from:
-	# https://github.com/imageworks/pystring/pull/29
-	"${FILESDIR}/cmake.patch"
-)