sys-apps/hwloc: remove automagic behaviour of rocm/l0

And:
- fixed the icon file
- add doc flag to install doxygen documentation

Closes: https://bugs.gentoo.org/926862
Closes: https://bugs.gentoo.org/927627
Closes: https://bugs.gentoo.org/833345
Closes: https://bugs.gentoo.org/836663
Closes: https://github.com/gentoo/gentoo/pull/25837
Co-authored-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

5 files changed, 25 insertions, 2 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 2e75b1a6780c..ac69b1e1f682 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-25)
+# ROCm and Level-Zero are amd64-only at the moment
+sys-apps/hwloc -rocm -l0
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-04-20)
 # only keyworded for amd64 currently
 media-gfx/blender -gnome -oneapi -renderdoc -vulkan
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a079ffb0f50e..61a7f3d48fac 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-25)
+# ROCm and Level-Zero are amd64-only at the moment
+sys-apps/hwloc rocm l0
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-04-20)
 # only keyworded for amd64 currently
 media-gfx/blender gnome oneapi renderdoc vulkan
diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask
index 32f4f078b71d..50ae5ded22c6 100644
--- a/profiles/features/musl/package.use.mask
+++ b/profiles/features/musl/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2024-04-25)
+# No Level-Zero on musl
+sys-apps/hwloc l0
+
 # Paul Zander <negril.nx+gentoo@gmail.com> (2024-04-20)
 # Renderdoc masked on musl, bug #853856
 media-gfx/blender renderdoc
diff --git a/sys-apps/hwloc/hwloc-2.9.3.ebuild b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index ed032f53b9ab..4d0252d24ecc 100644
--- a/sys-apps/hwloc/hwloc-2.9.3.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev valgrind xml X video_cards_nvidia"
+IUSE="cairo +cpuid cuda debug doc l0 nvml +pci rocm static-libs svg udev valgrind xml X video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
 #         anyone with hardware is welcome to step up and help test to get it re-added.
@@ -25,11 +25,14 @@ RDEPEND="
 	>=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg(+)?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	doc? ( app-text/doxygen )
+	l0? ( dev-libs/level-zero:= )
 	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}]
 	)
+	rocm? ( dev-util/rocm-smi:= )
 	udev? ( virtual/libudev:= )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 	video_cards_nvidia? (
@@ -86,9 +89,13 @@ multilib_src_configure() {
 		--runstatedir="${EPREFIX}/run"
 		$(multilib_native_use_enable cuda)
 		$(multilib_native_use_enable video_cards_nvidia gl)
+		$(multilib_native_use_enable l0 levelzero)
+		$(multilib_native_use_enable rocm rsmi)
+		$(multilib_native_use_with rocm rocm "${ESYSROOT}/usr")
 		$(use_enable cairo)
 		$(use_enable cpuid)
 		$(use_enable debug)
+		$(use_enable doc doxygen)
 		$(use_enable udev libudev)
 		$(use_enable nvml)
 		$(use_enable pci)
@@ -110,11 +117,13 @@ multilib_src_install_all() {
 		;;
 	esac
 
+	use doc && dodoc -r doc/doxygen-doc/html
+
 	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
 	bashcomp_alias hwloc-annotate \
 		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
 	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
 
 	find "${ED}" -name '*.la' -delete || die
-	newicon "${DISTDIR}/lstopo.png" "${PN}"
+	newicon -s 512 "${DISTDIR}/lstopo.png" ${PN}.png
 }
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 083b6957c7ac..fc998e164476 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -18,10 +18,12 @@
 		<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="l0">Enable oneAPI Level Zero device discovery</flag>
 		<flag name="numa">Add support for numa memory allocation</flag>
 		<flag name="nvml">Enable the NVML device discovery</flag>
 		<flag name="pci">Enable PCI device discovery using libpci</flag>
 		<flag name="plugins">Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
+		<flag name="rocm">Enable AMD RSMI device discovery</flag>
 		<flag name="xml">use libxml2 for XML support, instead of a custom minimalistic support</flag>
 		<flag name="X">use the X Window System</flag>
 	</use>