gentoo auto-resync : 25:04:2024 - 23:59:45

3 files changed, 15 insertions, 4 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 83e763c45d73..bd2428cc524e 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -13,5 +13,5 @@ EBUILD hwloc-2.8.0-r1.ebuild 3347 BLAKE2B 1d710770ae307d094836510624b21ef7456284
 EBUILD hwloc-2.9.0.ebuild 3354 BLAKE2B 2ac727a791a190be894516476acfc8c51e1fc7f6fb772b70537c64c0aff45017e6b9b66d58445ed01c78bc205cff080c70d5a59d16641d52218962233e611816 SHA512 f3bf07b6348cb6f8f84ad5e4d8cdc0358ef78ef646fb56c58f116339e4aa97e76b1baee790fef20b26f116e2d230d3748a1688f2e4e40f4db1399280b72b01bb
 EBUILD hwloc-2.9.1.ebuild 3551 BLAKE2B 8a5346c1f12001a97b0e47e4a66ac7c8dcec15176114c04efd82ce6003ed109b96528372119b7a47ddb62c6a936b20addf65ae8a7dda583e34e3a1d0d0c71252 SHA512 c3e60438091e31dabc4434f03dbb82b56dc954078d2651e3641cd7df65bff13c35a596f79e08da984cfaa5d26e221a96fa42305b8a73e73d7234ebdbbbb3f9f3
 EBUILD hwloc-2.9.2.ebuild 3502 BLAKE2B 16701d42c4e2a57c948d9b0e6770c01f5772efea1c17c06b345988ebebef284491d108acbab29fd2c1e383b7ad420f331b157c69db698eacc2596edc39bb4bc0 SHA512 0f4ec32e65df85fc7b6e76ddd6591b5593955b766104154d98074a3ce5340a97541d4427794af16609df787b4957688d4333d00ddb9871383716d080fb518bdc
-EBUILD hwloc-2.9.3.ebuild 3509 BLAKE2B c61ba5940e38f25bdc1d85a862b01dc76ed65a92702a453934bc6ef496de4060d60adab1a420efdfb08bf39f19b4611b2336521321e2878cdc54119d39e7da1a SHA512 6c8433a26faf9f6cb5ec5129d9e8ae5fe88a024684ebb66babf7edbc2c95bf1088892b5598bf7f03e1c036c3e28692145e5f882dd521841df07558904fbeb3d3
-MISC metadata.xml 1740 BLAKE2B 726a8e6319d8aa6d409fcca4cfd4c4f1009c02a7ef8f045d46bd89ed1714bfa7a5137520d6e8f12a0d174b41b4e4ca14da3bd2beb41f5d1a51b11418e3e3ba7a SHA512 4ce31388d80c46a19174315bfdd1026dfd5020f74f153ae139aaa4aecd8646e4407cc3dc5629a994455344d70f5e1fe1542497df791a82fa283b21f9b7d98992
+EBUILD hwloc-2.9.3-r1.ebuild 3835 BLAKE2B 96c70d66db79fdc069d2b9f6ac8eeea5fdc17060790284db73f8d076f362d0279dff2ecb07dfc22a6cd115b117dbf2cadd72a9957a4f06836ffcf0875f604e25 SHA512 713baefe872f9957681992a59d46d38c36bccc86dd687660f8aad95111e2fd394e77299dca1053b4a4d1c2042ba1703a924ff663c852b367515ab3416ba47f28
+MISC metadata.xml 1867 BLAKE2B b6eb3112a3fa477986a423c6cddc4207ccfe2e5a97cef855541c51640dd7b216159810dd748db8072bc65d0ed9ca6526cae9c867ca3d692d4058bdcd4a49ad2c SHA512 99c7bfb6c92c71a9a43c752bb4fbb82a8389d2238c7d2178b7d53fe59f6d086460999ac6e42eea95eada66903559b66ee311acf18c7a01537b573544a900dbec
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>