commit: 4b7879ee9c88ae3bcb8f00952c75400ee1be4912 Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Tue Jun 17 12:00:26 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 22 09:52:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7879ee
dev-cpp/glaze: drop old Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Part-of: https://github.com/gentoo/gentoo/pull/42640 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-cpp/glaze/Manifest | 1 - .../glaze/files/glaze-4.4.3-unbundle-asio.patch | 23 --------- dev-cpp/glaze/files/glaze-4.4.3-unbundle-ut2.patch | 41 --------------- dev-cpp/glaze/glaze-4.4.3.ebuild | 59 ---------------------- 4 files changed, 124 deletions(-) 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 -}
