commit: 28feb5af19321157034340a7d816a2eb6a6b5d51 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Fri Mar 6 22:46:04 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 7 01:24:31 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28feb5af
dev-cpp/sol2: drop 3.3.1-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/sol2/Manifest | 1 - dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch | 17 ------ dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch | 16 ----- dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch | 31 ---------- dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch | 18 ------ dev-cpp/sol2/sol2-3.3.1-r1.ebuild | 68 ---------------------- 6 files changed, 151 deletions(-) diff --git a/dev-cpp/sol2/Manifest b/dev-cpp/sol2/Manifest index 998600ce8981..c28ffabc1c2d 100644 --- a/dev-cpp/sol2/Manifest +++ b/dev-cpp/sol2/Manifest @@ -1,2 +1 @@ -DIST sol2-3.3.1.tar.gz 8453954 BLAKE2B f9fced4f001a5f681598e45bf74cdf064f655c950be5b91789d2bf66c0180b5048610d3d4416c024a07db11d41fceaee786800c5ca1412811cbc1a449a894a9e SHA512 4404b124a4f331d77459c01a92cd73895301e7d3ef829a0285980f0138b9cc66782de3713d54f017d5aad7d8a11d23eeffbc5f3b39ccb4d4306a955711d385dd DIST sol2-3.5.0.tar.gz 8461779 BLAKE2B a86fe9313457d097bc078407d5e00e08ba9f6f9b898779a0c50891b3313db5a4a3fb22c660f79e8d419a4f020ff8d914e10144f2fbb2ede27b695ad697f4c8ff SHA512 5a6ec7e16dae05ad6abea02842f62db8f64935eda438d67b2c264cbee80cee6d82200bd060387c6df837fe9f212dbe22b2772af34df1ce8bd43296dd9429558d diff --git a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch deleted file mode 100644 index 9b9c9f101769..000000000000 --- a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch +++ /dev/null @@ -1,17 +0,0 @@ -Use the lua version selected by lua eclass - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -188,7 +188,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES)) - - string(TOLOWER ${SOL2_LUA_VERSION} NORMALIZED_LUA_VERSION) - # Find way to get Lua: build if requested, or attempt to build if no matching version is found -- if (SOL2_BUILD_LUA) -+ if (TRUE) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(LUA REQUIRED lua IMPORTED_TARGET) -+ set(LUA_LIBRARIES PkgConfig::LUA) -+ elseif (SOL2_BUILD_LUA) - find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION}) - elseif (NOT SOL2_LUA_VERSION) - find_package(LuaBuild REQUIRED) diff --git a/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch b/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch deleted file mode 100644 index 8f53144ad37c..000000000000 --- a/dev-cpp/sol2/files/sol2-3.3.0-catch-depend.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -23,12 +23,7 @@ - # # # # sol2 tests - - # # Dependencies --FetchContent_Declare( -- catch2 -- GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG devel --) --FetchContent_MakeAvailable(catch2) -+find_package(Catch2 REQUIRED) - - function(sol2_add_test_properties target-name) - target_link_libraries(${target-name} diff --git a/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch b/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch deleted file mode 100644 index 6782b05abf78..000000000000 --- a/dev-cpp/sol2/files/sol2-3.3.0-cmake-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -Install to share, it's header-only - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,7 +105,7 @@ target_include_directories(sol2 ${sol2-system-include} - configure_package_config_file( - cmake/sol2-config.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake" -- INSTALL_DESTINATION lib/cmake/sol2 -+ INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/sol2 - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - - write_basic_package_version_file( -@@ -121,7 +121,7 @@ if(SOL2_ENABLE_INSTALL) - - install(EXPORT sol2 - FILE sol2-targets.cmake -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2") -+ DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2") - - install(DIRECTORY include/sol - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -@@ -129,7 +129,7 @@ if(SOL2_ENABLE_INSTALL) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/cmake/sol2-config-version.cmake" -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/sol2") -+ DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/sol2") - endif() - - # # # sol2 Library - Single header target diff --git a/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch b/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch deleted file mode 100644 index 5d926a700979..000000000000 --- a/dev-cpp/sol2/files/sol2-3.3.1-fix-emplace.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f - -From: =?UTF-8?q?=E2=80=9CPaulo?= <[email protected]> -Date: Sat, 25 May 2024 01:52:59 -0300 -Subject: [PATCH] fix emplace - ---- a/include/sol/optional_implementation.hpp -+++ b/include/sol/optional_implementation.hpp -@@ -2191,7 +2191,8 @@ namespace sol { - static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args"); - - *this = nullopt; -- this->construct(std::forward<Args>(args)...); -+ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...); -+ return **this; - } - - /// Swaps this optional with the other. diff --git a/dev-cpp/sol2/sol2-3.3.1-r1.ebuild b/dev-cpp/sol2/sol2-3.3.1-r1.ebuild deleted file mode 100644 index 04c86b3588ee..000000000000 --- a/dev-cpp/sol2/sol2-3.3.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1,3,4} luajit ) -inherit cmake lua - -DESCRIPTION="Header-only C++ <-> Lua API wrapper" -HOMEPAGE="https://github.com/ThePhD/sol2"; -SRC_URI="https://github.com/ThePhD/sol2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="test" -REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND=" - ${LUA_DEPS} - test? ( - >=dev-cpp/catch-3 - ) -" -BDEPEND=" - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/sol2-3.3.0-werror.patch - "${FILESDIR}"/sol2-3.2.2-luajit-pkgconf.patch - "${FILESDIR}"/sol2-3.3.0-catch-depend.patch - "${FILESDIR}"/sol2-3.3.0-cmake-dir.patch - "${FILESDIR}"/sol2-3.3.0-dont-install-tests.patch - "${FILESDIR}"/sol2-3.3.1-fix-emplace.patch -) - -src_configure() { - sol2_configure_wrapper() { - local mycmakeargs=( - -DSOL2_BUILD_LUA=no - -DSOL2_TESTS=$(usex test) - -DSOL2_LUA_VERSION="${ELUA}" - ) - cmake_src_configure - } - lua_foreach_impl sol2_configure_wrapper -} - -src_compile() { - lua_foreach_impl cmake_src_compile -} - -src_test() { - sol2_test_wrapper() { - if [[ ${ELUA} == luajit ]]; then - einfo "Skipping test due to https://github.com/ThePhD/sol2/issues/1221"; - else - cmake_src_test - fi - } - lua_foreach_impl sol2_test_wrapper -} - -src_install() { - lua_foreach_impl cmake_src_install -}
