From a693a49d235bea057923bcbc2ee6a40cce4bb060 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Jun 2023 15:42:35 +0100 Subject: gentoo auto-resync : 07:06:2023 - 15:42:35 --- sys-block/Manifest.gz | Bin 10854 -> 10857 bytes sys-block/ndctl/Manifest | 11 ++-- sys-block/ndctl/files/ndctl-77-iniparser4.patch | 19 ++++++ sys-block/ndctl/metadata.xml | 3 + sys-block/ndctl/ndctl-72.1.ebuild | 74 ---------------------- sys-block/ndctl/ndctl-75.ebuild | 74 ---------------------- sys-block/ndctl/ndctl-76.1.ebuild | 2 +- sys-block/ndctl/ndctl-77-r1.ebuild | 80 ++++++++++++++++++++++++ 8 files changed, 108 insertions(+), 155 deletions(-) create mode 100644 sys-block/ndctl/files/ndctl-77-iniparser4.patch delete mode 100644 sys-block/ndctl/ndctl-72.1.ebuild delete mode 100644 sys-block/ndctl/ndctl-75.ebuild create mode 100644 sys-block/ndctl/ndctl-77-r1.ebuild (limited to 'sys-block') diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz index 5cc750cb6e44..f7d84710fb7b 100644 Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ diff --git a/sys-block/ndctl/Manifest b/sys-block/ndctl/Manifest index 203752304a1a..adbef0058ee0 100644 --- a/sys-block/ndctl/Manifest +++ b/sys-block/ndctl/Manifest @@ -1,10 +1,9 @@ AUX ndctl-71.1-bash-completion-configure.patch 1717 BLAKE2B 167bc8e1bdb8fb9c31451c7ca7ed0edd28ecdc03185a06d96b125a604b34816df1927788d5208d229704778c356d26cd41b2d031af29e66686d0dbd0c2206f74 SHA512 b688bc49e413cb41c0b611f304a91f074a99fbcd60393c18d36435a7e3fa0a4326bf2107ff731adda96d0f14b57cf37d265de6156e903f43beec225cf8a7474f +AUX ndctl-77-iniparser4.patch 1117 BLAKE2B b0b6b9bb08e50114e14efd008ec4814323c18bcfda8ba40a4068d389e95bb45100349102895952fe7a04f4b4c0109b9920bc263250fffcee9ca7713a27555a19 SHA512 208fad9fa9048153ab189eee5e900d812b572c085ee8ef424308bce06c98760b1eb36a26d39e86617eda613d6ad09728fe6ab7a9cc395f244dd3e3a2086567e3 DIST ndctl-71.1.tar.gz 330512 BLAKE2B 582f29fb649f33a48b5412bfefc15de2b1f765b27251d1b8a472d8c7705d671acbd6bf646f737baf8556d8fda39db68242f44e11225d7305e95f5d2ec5931f31 SHA512 92fb06ca64455775ce0b89ba0846f70235e02fe3502e2a8a55a858f76f87cb90ae98f5bf01620e5884f667ea78ee2bee2cd9e7a85ffa8f8d9c456e9282ca9ebc -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 EBUILD ndctl-71.1-r2.ebuild 1250 BLAKE2B 32a258fed028d6f3f17259b3377283373fc364c407bd6e925d4e15fda59402475f1a812d9a79656dccf7984cdbb0715a3b6ed118f466a1933b9d3037d1ae502f SHA512 a6b3797439595ed62a73e598d938d3c6213855e8771ee1b9e3d51ff2d6dfa5ccb70f110006ab26eb54fdd0c4d000b00ec55970eb2458db51d4d6484fbcb5666f -EBUILD ndctl-72.1.ebuild 1400 BLAKE2B 7e02ccfdf667d270256678c3dd8afe0518b509144578ca32c823a49d49f163172f889fcbff25894ef05b2bd17b6f8828abd376a2da86dbf1c51c99e688a7be0a SHA512 965f02e6ac8d466e0b4e221a9557c30eb2b569287de8f9d4bbb5982da0d143f45a1d7fa72560d4933594ac65d881380ec7a0b4991e4fe71175198cdb91d3644d -EBUILD ndctl-75.ebuild 1372 BLAKE2B a1639041550fa11087a0bedd32ab8a0c75d5bfdcbe19f253715d3aa503b1008d1c373c5fc33185453fc425f0fcbba3144c382196fe70c4cf13db74898704874f SHA512 8507e9155fbf638fd2d0802a7b3cb7d57f32c80ff76651a68a86042c975b70fb14248ad8b51ce984953e632850341a6a1a361d8d644dbb9a2347091262cd995c -EBUILD ndctl-76.1.ebuild 1452 BLAKE2B ce0deb4113c7f2f8a34d589e25c0b3ebc2a4bb6c186cf03f9861f77d5d20cc589f867b323358b1ba813b6286981ac5f6845552245cd44269040b26b695f39d1c SHA512 7c606d3334aea35dfd7068569c0dcc7af0e416ddb00cc8cfe773a688a016d6e5fedaebe74b969c2cd70ea59f52fb9afd07e2acb39ced36305eb879f6e0a2e5c1 -MISC metadata.xml 361 BLAKE2B eef98b25da1ba05528453d68ee6bfe25f58c6bc095be81f01b550420b77ec3833395afd56c85561e161529a007d17c2547bdacdaa64edd622b75ca484fbeeddd SHA512 9c27af00e37fd91238dc75ac4b885cbb00b71495bb370f5fcbd270a255d360099057e3ad0bdb28c4a2725571bcafebd3aca33b69933bfc88274fa3c7dddc339d +EBUILD ndctl-76.1.ebuild 1451 BLAKE2B b527f8bc9ece821efac013ce60cd52b8686f0388fa871a3f05fdb4694c7989496a1f0e62a2a535d9744406bd26a920a1a930693cd1caf1d3d6fb0496491f8955 SHA512 9f6bc78b71302cd9c79e0f492bacfe5d52cdfa76069ab824be592acabd396124f1f8d0f0797d83bb6f2f15f5896f252abda6fb0f87edb79c2cf9ea19184907e8 +EBUILD ndctl-77-r1.ebuild 1506 BLAKE2B 60f3d7e3ca9416b7f8e4b33a56761b1cf7a2dde6e3de8f071fadd0ebab6594be3e5b82ccfa4d4d55eb07f49d168d9620626b85b098e654060033ce76b0247a89 SHA512 e9956e86b88104f1e10e7fb24b60fae5f1a9b125f60899b1c9cbd6d32d5b49701663ca1f1f892ffa05b74b12f495e38f5a488bd1c15c7971d66f294d2fcd7e75 +MISC metadata.xml 436 BLAKE2B 3f983885d379715e13598b0bbbb2e5475933f1debad5f3e08ac6888cf16dd99602aff181143942e003715772cb23f56d33bd9a49029b313a051db13a8ceef3ed SHA512 a424dd40bf1b1da02ef1fa37d688a9e6216abd2f59950bb1484fd65a5d752093fc9f3d243ca4c91e899867cc72fcc913d53b51d6c8240d29633d320610160ddb 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/metadata.xml b/sys-block/ndctl/metadata.xml index 0c16d62874c0..003cade583fe 100644 --- a/sys-block/ndctl/metadata.xml +++ b/sys-block/ndctl/metadata.xml @@ -8,4 +8,7 @@ Use dev-libs/libtracefs to build cxl-monitor binary + + pmem/ndctl + diff --git a/sys-block/ndctl/ndctl-72.1.ebuild b/sys-block/ndctl/ndctl-72.1.ebuild deleted file mode 100644 index 47d1a8e6a3bc..000000000000 --- a/sys-block/ndctl/ndctl-72.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit udev autotools 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="systemd test" - -DEPEND=" - dev-libs/iniparser:0= - dev-libs/json-c:= - sys-apps/keyutils:= - sys-apps/kmod:= - sys-apps/util-linux:= - virtual/libudev:= - systemd? ( sys-apps/systemd:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - 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}/ndctl-71.1-bash-completion-configure.patch" -) - -src_prepare() { - default - printf 'm4_define([GIT_VERSION], [%s])' "${PV}" > version.m4 || die - sed -e '/git-version-gen/ d' -i Makefile.am || die - eautoreconf -} - -src_configure() { - econf \ - --with-bash-completion-dir="$(get_bashcompdir)" \ - --with-udevrulesdir=$(get_udevdir)/rules.d \ - $(use_with systemd) \ - --disable-asciidoctor -} - -src_test() { - emake check -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die - - bashcomp_alias ndctl daxctl - bashcomp_alias ndctl cxl -} diff --git a/sys-block/ndctl/ndctl-75.ebuild b/sys-block/ndctl/ndctl-75.ebuild deleted file mode 100644 index 6c45f09b498f..000000000000 --- a/sys-block/ndctl/ndctl-75.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 systemd test" - -DEPEND=" - dev-libs/iniparser:0= - dev-libs/json-c:= - sys-apps/keyutils:= - sys-apps/kmod:= - sys-apps/util-linux:= - virtual/libudev:= - 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 -) - -src_configure() { - local -a emesonargs=( - $(meson_feature systemd) - $(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 -} diff --git a/sys-block/ndctl/ndctl-76.1.ebuild b/sys-block/ndctl/ndctl-76.1.ebuild index e080d73a7e20..7070e5950e3f 100644 --- a/sys-block/ndctl/ndctl-76.1.ebuild +++ b/sys-block/ndctl/ndctl-76.1.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 ~x86" IUSE="doc libtracefs systemd test" DEPEND=" diff --git a/sys-block/ndctl/ndctl-77-r1.ebuild b/sys-block/ndctl/ndctl-77-r1.ebuild new file mode 100644 index 000000000000..bc23fbb0b714 --- /dev/null +++ b/sys-block/ndctl/ndctl-77-r1.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:4= + 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 +} -- cgit v1.2.3