commit: e13676e8268af90a01655b3f778105d018ac8a44 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 17 19:02:31 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 25 19:50:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13676e8
dev-cpp/cpp-hocon: treeclean Closes: https://bugs.gentoo.org/957225 (pkgremoved) Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-cpp/cpp-hocon/Manifest | 1 - dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild | 40 ----------------- .../cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch | 48 -------------------- .../files/cpp-hocon-0.3.0-use-system-catch.patch | 51 ---------------------- dev-cpp/cpp-hocon/metadata.xml | 11 ----- profiles/package.mask | 6 --- 6 files changed, 157 deletions(-) diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest deleted file mode 100644 index c0c1e3b2e223..000000000000 --- a/dev-cpp/cpp-hocon/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cpp-hocon-0.3.0.tar.gz 159032 BLAKE2B a5503d28d4740c78ad13836d5e7c60fc56b06d8f60f3d977a1db1008e0e90e159f2bef4d9737215684a4318b3c6d0a5efa20da1c14cd94ceacdb597bc5eaaab8 SHA512 de997e6d90330f901863b7da0d6f6e069a31e052b6f31c1e3009a9559c863f08879ecf4e202c763ec32567dd3a1e436ff5d3bf0b3009a085ef3ee95e5ca6c7e5 diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild deleted file mode 100644 index abd20825b7c9..000000000000 --- a/dev-cpp/cpp-hocon/cpp-hocon-0.3.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake prefix - -DESCRIPTION="Provides C++ support for the HOCON configuration file format" -HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"; -SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/boost:=[nls] - >=dev-libs/leatherman-0.9.3:= -" -DEPEND="${DEPEND} - test? ( dev-cpp/catch:1 )" - -#PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch ) -PATCHES=( "${FILESDIR}"/${PN}-0.3.0-use-system-catch.patch ) - -src_prepare() { - cmake_src_prepare - - eprefixify lib/tests/CMakeLists.txt -} - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch deleted file mode 100644 index 8e0ddb924a46..000000000000 --- a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ - string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER) - string(TOLOWER ${PROJECT_C_NAME} PROJECT_NAME_LOWER) - -+include(GNUInstallDirs) -+ - # Common cmake setup - if (NOT CMAKE_BUILD_TYPE) - message(STATUS "Defaulting to a release build.") -@@ -42,7 +44,7 @@ - set(BOOST_COMPONENTS regex) - endif() - --list(APPEND BOOST_COMPONENTS thread date_time chrono system program_options) -+list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options) - - # Add other dependencies - find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -77,7 +77,10 @@ - set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true) - - add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>) --set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") -+set_target_properties( -+ lib${PROJECT_NAME} -+ PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" -+ OUTPUT_NAME ${PROJECT_NAME}) - target_link_libraries(lib${PROJECT_NAME} - ${LEATHERMAN_LIBRARIES} - ${Boost_LIBRARIES} -@@ -88,7 +91,11 @@ - symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h") - - # This correctly handles DLL installation on Windows. --leatherman_install(lib${PROJECT_NAME}) --install(DIRECTORY inc/hocon DESTINATION include) -+install( -+ TARGETS lib${PROJECT_NAME} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(DIRECTORY inc/hocon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - add_subdirectory(tests) diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch deleted file mode 100644 index 0964e3e7bc7a..000000000000 --- a/dev-cpp/cpp-hocon/files/cpp-hocon-0.3.0-use-system-catch.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://bugs.gentoo.org/823419 - -Wanted to make this "proper" but Catch2 lacks a pkgconfig file (or a CMake one) -and it's easier to just do this for now. - -Based on patch version of sed commands from upstream bug -(https://github.com/puppetlabs/cpp-hocon/issues/132) and -Fedora (https://src.fedoraproject.org/rpms/cpp-hocon/blob/rawhide/f/cpp-hocon.spec#_76). - -Makes tests conditional too. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,12 +16,16 @@ if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif() - --enable_testing() -- - # Leatherman setup --set(LEATHERMAN_COMPONENTS locale catch nowide util) -+set(LEATHERMAN_COMPONENTS locale nowide util) - find_package(Leatherman REQUIRED COMPONENTS ${LEATHERMAN_COMPONENTS}) - -+option(BUILD_TESTING "Build test suite (needs Catch)" ON) -+ -+if(BUILD_TESTING) -+ enable_testing() -+endif() -+ - ## Before we find any packages, we want to pull in the common leatherman options, as they can affect commonly-used packages. - include(options) - ## Pull in common cflags setting from leatherman. Don't override CMAKE_CXX_FLAGS at the project root to avoid impacting 3rd party code. ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -91,4 +91,6 @@ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h" - leatherman_install(lib${PROJECT_NAME}) - install(DIRECTORY inc/hocon DESTINATION include) - --add_subdirectory(tests) -+if (BUILD_TESTING) -+ add_subdirectory(tests) -+endif() ---- a/lib/tests/CMakeLists.txt -+++ b/lib/tests/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Setup compiling the test executable. C++ compile flags are inherited from the parent directory. --include_directories(${LEATHERMAN_CATCH_INCLUDE}) -+include_directories(@GENTOO_PORTAGE_EPREFIX@/usr/include/catch) - - set(TEST_CASES - concatenation_test.cc diff --git a/dev-cpp/cpp-hocon/metadata.xml b/dev-cpp/cpp-hocon/metadata.xml deleted file mode 100644 index 1d7fa0d17ad1..000000000000 --- a/dev-cpp/cpp-hocon/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Matthew Thode</name> - </maintainer> - <upstream> - <remote-id type="github">puppetlabs/cpp-hocon</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 24e58400722e..4c04dbe661ef 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -226,12 +226,6 @@ dev-libs/libdynd dev-libs/libflatarray dev-libs/redis-ipc -# Andreas Sturmlechner <[email protected]> (2025-08-27) -# EAPI-7 cmake.eclass straggler libraries without revdeps. -# If you need them, raise your hand by doing the necessary EAPI-8 porting. -# Bugs #957225, #957238. Removal on 2025-09-26. -dev-cpp/cpp-hocon - # Andreas Sturmlechner <[email protected]> (2025-08-27) # Qt5 based and still EAPI-7, last release from 2016, broken Qt6 "support" # in upstream repo. Needs someone to pick up the pieces of upstream's
