[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     75c5987de0da8fe9425f3ca2270db6a8dea22c8a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 05:15:10 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 05:26:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c5987d

sys-apps/hwloc: rename useflag: libudev -> udev

USE=udev is enabled in profiles,
so this package is rarely built with udev support unless users opt-in,
yet without udev hwloc will try to manually parse udev raw files.

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/hwloc/hwloc-2.3.0.ebuild | 8 ++++----
 sys-apps/hwloc/hwloc-2.5.0.ebuild | 6 +++---
 sys-apps/hwloc/metadata.xml       | 1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild
index 6167e28c6bf..6756f4000ac 100644
--- a/sys-apps/hwloc/hwloc-2.3.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 LICENSE="BSD"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug gl libudev netloc nvml +pci static-libs svg xml X"
+IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
 # Anyone with hardware is welcome to step up and help test to get it re-added.
@@ -24,13 +24,13 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
 	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
-	libudev?	( virtual/libudev )
 	netloc?		( !sys-apps/netloc )
 	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
 	pci?		(
 				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
 			)
+	udev?	( virtual/libudev )
 	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
@@ -72,7 +72,7 @@ multilib_src_configure() {
 		$(use_enable cairo)
 		$(use_enable cpuid)
 		$(use_enable debug)
-		$(use_enable libudev)
+		$(use_enable udev libudev)
 		$(use_enable netloc)
 		$(use_enable nvml)
 		$(use_enable pci)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 639dc0bff21..6756f4000ac 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 LICENSE="BSD"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug gl libudev netloc nvml +pci static-libs svg xml X"
+IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
 # Anyone with hardware is welcome to step up and help test to get it re-added.
@@ -24,13 +24,13 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
 	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
-	libudev?	( virtual/libudev )
 	netloc?		( !sys-apps/netloc )
 	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
 	pci?		(
 				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
 			)
+	udev?	( virtual/libudev )
 	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
@@ -72,7 +72,7 @@ multilib_src_configure() {
 		$(use_enable cairo)
 		$(use_enable cpuid)
 		$(use_enable debug)
-		$(use_enable libudev)
+		$(use_enable udev libudev)
 		$(use_enable netloc)
 		$(use_enable nvml)
 		$(use_enable pci)

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index b84a415e26a..05112b3f179 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -18,7 +18,6 @@
   <flag name="cpuid">Enable the cpuid-based architecture specific support (x86 component)</flag>
   <flag name="cuda">Enable CUDA device discovery using libcudart</flag>
   <flag name="gl">Enable GL display device discovery (NVCtrl)</flag> 
-  <flag name="libudev">Enable the Linux libudev</flag>
   <flag name="netloc">Enable Netloc</flag>
   <flag name="numa">Add support for numa memory allocation</flag>
   <flag name="nvml">Enable the NVML device discovery</flag>