commit: 665d92842f6478b2e91729e7e3397f94e43236b4 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sat Jan 31 13:17:17 2026 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sat Jan 31 13:17:17 2026 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=665d9284
net-misc/can-utils: add 2025.01 Closes: https://bugs.gentoo.org/968944 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> net-misc/can-utils/Manifest | 1 + net-misc/can-utils/can-utils-2025.01.ebuild | 33 ++++++++++++++++++++++ net-misc/can-utils/can-utils-9999-r3.ebuild | 29 +++++++++---------- .../files/can-utils-2025.01-cmake-set-policy.patch | 28 ++++++++++++++++++ 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/net-misc/can-utils/Manifest b/net-misc/can-utils/Manifest index 75dc509d47..6af426b8ba 100644 --- a/net-misc/can-utils/Manifest +++ b/net-misc/can-utils/Manifest @@ -1,2 +1,3 @@ DIST can-utils-2021.08.0.tar.gz 148133 BLAKE2B 591221990aeb2aebb73f4288dba80fa32c65b8c592aa35ccc9cfbd0a8e6a30beb4f5d838811ffd96eba393a7cd3d3fa2aee8ca7378c9c27c694a89da7e9e6ec4 SHA512 367dc19fc653abda0cd6f843f51487f0c538d691542a1a7f5acb87a82b72efb0da5351568de87cd7d3894eaa53b7271e56d8cb66fa2f55079ed0bb1e015dcd99 DIST can-utils-2023.03.tar.gz 172270 BLAKE2B 315a6eb4b891d6cf3265b9ea745780bdd118f74fc1fe080db47147260e96c506f0684c8b81096a297d36afe6abc9c5042d0d70c19d9df372d08153dee78880a7 SHA512 bf8f3e555bada4ce1e6f308b46daaab51664a0b6a1b793dc1a2aab46b44331f59635051eb3e75cb9b39999369a7fd463421a89ab60e74bc76ef2d84f6519c501 +DIST can-utils-2025.01.tar.gz 242822 BLAKE2B 10c8161d2f3933948ff3fbf7e0c3ca0b9e55f243397b6eef6458a3d97c91ebb5dc996426d417748bfee09c3831c4c9e30fee19a014b94c618a9f90ea97a4775e SHA512 bc5639c5d93af51cfb5920bc13efec2a660064d1809cb2cee9b234079d5288bc9db2bedf85fe841b8493f5554fbfbbe9f4bf5a88d8957f4a8ccdc3a1abf74153 diff --git a/net-misc/can-utils/can-utils-2025.01.ebuild b/net-misc/can-utils/can-utils-2025.01.ebuild new file mode 100644 index 0000000000..418536cc39 --- /dev/null +++ b/net-misc/can-utils/can-utils-2025.01.ebuild @@ -0,0 +1,33 @@ +# Copyright 2021-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd + +DESCRIPTION="SocketCAN userspace utilities and tools" +HOMEPAGE="https://github.com/linux-can/can-utils"; + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/linux-can/can-utils.git"; +else + SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="GPL-2" +SLOT="0" + +PATCHES=( + "${FILESDIR}/${P}-cmake-set-policy.patch" +) + +src_install() { + cmake_src_install + + systemd_dounit "${FILESDIR}/slcan.service" + systemd_install_serviced "${FILESDIR}/slcan.service.conf" + newconfd "${FILESDIR}/slcand.confd" slcand + newinitd "${FILESDIR}/slcand.initd" slcand +} diff --git a/net-misc/can-utils/can-utils-9999-r3.ebuild b/net-misc/can-utils/can-utils-9999-r3.ebuild index b12c3627c2..3d81fd442a 100644 --- a/net-misc/can-utils/can-utils-9999-r3.ebuild +++ b/net-misc/can-utils/can-utils-9999-r3.ebuild @@ -1,29 +1,26 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -EGIT_REPO_URI="https://github.com/linux-can/${PN}.git"; -EGIT_BRANCH="master" +inherit cmake systemd -inherit autotools git-r3 systemd +DESCRIPTION="SocketCAN userspace utilities and tools" +HOMEPAGE="https://github.com/linux-can/can-utils"; -DESCRIPTION="CAN userspace utilities and tools" -HOMEPAGE="https://github.com/linux-can/"; +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/linux-can/can-utils.git"; +else + SRC_URI="https://github.com/linux-can/can-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi LICENSE="GPL-2" SLOT="0" -src_prepare() { - eautoreconf -} - -# Default src_install + newconfd and newinitd src_install() { - - emake DESTDIR="${D}" install - - einstalldocs + cmake_src_install systemd_dounit "${FILESDIR}/slcan.service" systemd_install_serviced "${FILESDIR}/slcan.service.conf" diff --git a/net-misc/can-utils/files/can-utils-2025.01-cmake-set-policy.patch b/net-misc/can-utils/files/can-utils-2025.01-cmake-set-policy.patch new file mode 100644 index 0000000000..4e8b8a1903 --- /dev/null +++ b/net-misc/can-utils/files/can-utils-2025.01-cmake-set-policy.patch @@ -0,0 +1,28 @@ +https://github.com/linux-can/can-utils/commit/2da0c7e95eb15f8b8f84e7911c7bda96f3490409 +From: Takuya Wakazono <[email protected]> +Date: Mon, 19 Jan 2026 15:37:11 +0900 +Subject: [PATCH] cmake: set policy version to 3.10 + +This project does not rely on any behavior from CMake <3.10, and +compatibility with CMake <3.10 is expected to be removed in future +releases. + +https://cmake.org/cmake/help/v4.0/manual/cmake-policies.7.html#policies-introduced-by-cmake-3-10 + +``` +CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.10 will be removed from a future version of + CMake. + + Update the VERSION argument <min> value. Or, use the <min>...<max> syntax + to tell CMake that the project requires at least <min> but has been updated + to work with policies introduced by <max> or earlier. +``` +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.5...3.10) + + project(can-utils LANGUAGES C) +
