commit: d2c1486d4cd317fe412514b843101377e093354b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Oct 5 13:55:17 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 5 17:44:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c1486d
net-irc/znc-clientbuffer: Fix build w/ cmake-4, use GNUInstallDirs Raise cmake_minimum_required to 3.31 Closes: https://bugs.gentoo.org/957454 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-irc/znc-clientbuffer/files/CMakeLists.txt | 7 ++++++- .../znc-clientbuffer-1.0.48-r1.ebuild | 22 +++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/net-irc/znc-clientbuffer/files/CMakeLists.txt b/net-irc/znc-clientbuffer/files/CMakeLists.txt index 92048a07b19d..d9c9f2daeb2c 100644 --- a/net-irc/znc-clientbuffer/files/CMakeLists.txt +++ b/net-irc/znc-clientbuffer/files/CMakeLists.txt @@ -1,8 +1,13 @@ # Autogenerated using znc-buildmod -v from net-irc/znc-1.8.2 -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.31) project(ExternalModules LANGUAGES CXX) + +include(GNUInstallDirs) + find_package(ZNC HINTS /usr/share/znc REQUIRED) add_library(module_clientbuffer MODULE clientbuffer.cpp) znc_setup_module(TARGET module_clientbuffer NAME clientbuffer) target_link_libraries(module_clientbuffer PRIVATE) + +install (TARGETS module_clientbuffer DESTINATION ${CMAKE_INSTALL_LIBDIR}/znc) diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild index f88d5036124e..83d56cff49c4 100644 --- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild +++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit cmake -DESCRIPTION="A ZNC module which provides client specific buffers" +DESCRIPTION="ZNC module which provides client specific buffers" HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer"; SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,23 +13,11 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -DEPEND=" - net-irc/znc:=" - +DEPEND="net-irc/znc:=" RDEPEND="${DEPEND}" +BDEPEND=">=dev-build/cmake-3.31" src_prepare() { - cp -v "${FILESDIR}/CMakeLists.txt" "${S}" || die + cp -v "${FILESDIR}/CMakeLists.txt" . || die cmake_src_prepare } - -src_compile() { - cmake_src_compile -} - -src_install() { - exeinto /usr/$(get_libdir)/znc - doexe "${BUILD_DIR}"/clientbuffer.so - - einstalldocs -}
