commit: 39a9bd70a1e8d20932d232d407d4eeeb7af13dda Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 7 09:07:36 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 7 09:09:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a9bd70
sys-block/ndctl: add 77 Bug: https://bugs.gentoo.org/907928 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-block/ndctl/Manifest | 1 + sys-block/ndctl/files/ndctl-77-iniparser4.patch | 19 ++++++ sys-block/ndctl/ndctl-77.ebuild | 80 +++++++++++++++++++++++++ 3 files changed, 100 insertions(+) diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest index f6b9352e6773..e65d156e47fa 100644 --- a/sys-block/ndctl/Manifest +++ b/sys-block/ndctl/Manifest @@ -2,3 +2,4 @@ DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b272 DIST ndctl-72.1.tar.gz 365324 BLAKE2B 2e061bd1357c0b422f728e8624106d93e9eed2f5c7795428b0c61d041ab45569aa8bb6eb52544360ad538be85f3b7f84f8c9ab1037a8ca5498c2e1a13fa22186 SHA512 7304e23121c99457fa6e22a399fb636f6a66d6d07b090463ec41e424687b06e7e8a1a18623ab9dd5783aaccfa09ff964e3477b63aaa4614ac60f6e6050452f12 DIST ndctl-75.tar.gz 415393 BLAKE2B f9081b09c2f4ad8a6bc9c53e792b8a49992c7089af09e39917efe0fceea800d81665a31bf14c8e2f6f83c57d1dccebb4513b9bb556a3e81c19c75fbc67e1d7e3 SHA512 0af960e43a363711fbdb5152bb670022bd9b2f6a269c153dd88dca4ad2dcc215679c354ebcc758e9376867462f82c21aebe62bc62ca27333dedf3a818f34b272 DIST ndctl-76.1.tar.gz 419651 BLAKE2B 52fdbb382a32005873e3be46d3c9b21c80e9ad53b5852c32d73d0ee966c61890d598d2b8d03fd0aa090970e5746daf52e91e70b9a79b328f1a2137a37bfb61a1 SHA512 76d32599df029969734276f8972f3f4bf701e471117c8a48d1f96b62c87a59ac54d59104ee62d1cbbb518a06a779677ca856df32ce6218d758a8c73daa3e5b06 +DIST ndctl-77.tar.gz 421255 BLAKE2B fcc9ed092d67a8ef86b60a487db5caca51f3ead43216da8df63f083ad016bd34058f0957702055faf3da967e54e70228fdb54fcd0536dc120a46719d7a1dc994 SHA512 cd1e37d015f209df446441da162d41bbca1b740d799b383c1147d3a3b1acc4e6dc4bcc1fda0e868f305e8a1698c969426c08d8a6222d8a0c8f3c94963b0ae36e diff --git a/sys-block/ndctl/files/ndctl-77-iniparser4.patch b/sys-block/ndctl/files/ndctl-77-iniparser4.patch new file mode 100644 index 000000000000..9df1782d51bd --- /dev/null +++ b/sys-block/ndctl/files/ndctl-77-iniparser4.patch @@ -0,0 +1,19 @@ +Adapt to dev-libs/iniparser being slotted in Gentoo. +--- a/meson.build ++++ b/meson.build +@@ -179,12 +179,12 @@ iniparser_headers = ['iniparser.h', 'dictionary.h'] + message('Looking for iniparser include headers', iniparser_headers) + + iniparserdir = include_directories(includedir / get_option('iniparserdir'), is_system:true) +-iniparser = cc.find_library('iniparser', required : (get_option('iniparserdir') != '') , ++iniparser = cc.find_library('iniparser4', required : (get_option('iniparserdir') != '') , + has_headers :iniparser_headers ,header_include_directories : iniparserdir) + + if not iniparser.found() +- iniparserdir = include_directories(includedir / 'iniparser', is_system:true) +- iniparser = cc.find_library('iniparser', required : true, has_headers : iniparser_headers, ++ iniparserdir = include_directories(includedir / 'iniparser4', is_system:true) ++ iniparser = cc.find_library('iniparser4', required : true, has_headers : iniparser_headers, + header_include_directories : iniparserdir) + endif + iniparser = declare_dependency(include_directories: iniparserdir, dependencies:iniparser) diff --git a/sys-block/ndctl/ndctl-77.ebuild b/sys-block/ndctl/ndctl-77.ebuild new file mode 100644 index 000000000000..ccdc44d26c19 --- /dev/null +++ b/sys-block/ndctl/ndctl-77.ebuild @@ -0,0 +1,80 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit udev meson bash-completion-r1 + +DESCRIPTION="Helper tools and libraries for managing non-volatile memory on Linux" +HOMEPAGE="https://github.com/pmem/ndctl"; +SRC_URI="https://github.com/pmem/ndctl/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 MIT CC0-1.0" +SLOT="0/6" +KEYWORDS="~amd64 ~x86" +IUSE="doc libtracefs systemd test" + +DEPEND=" + dev-libs/iniparser:0= + dev-libs/json-c:= + sys-apps/keyutils:= + sys-apps/kmod:= + sys-apps/util-linux:= + virtual/libudev:= + libtracefs? ( dev-libs/libtracefs:= ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + ) + sys-devel/libtool + virtual/pkgconfig +" + +RESTRICT="!test? ( test )" + +# tests require root access +RESTRICT+=" test" + +DOCS=( + README.md + CONTRIBUTING.md +) + +PATCHES=( + "${FILESDIR}"/${PN}-77-iniparser4.patch +) + +src_configure() { + local -a emesonargs=( + $(meson_feature systemd) + $(meson_feature libtracefs) + $(meson_feature doc docs) + -Dasciidoctor=disabled + -Dbashcompletiondir="$(get_bashcompdir)" + -Drootprefix=/usr + -Drootlibdir="/usr/$(get_libdir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # upstream doesn't install udev rules unless using systemd + use systemd || udev_dorules daxctl/90-daxctl-device.rules + + bashcomp_alias ndctl daxctl + bashcomp_alias ndctl cxl +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +}
