gentoo auto-resync : 09:12:2024 - 02:07:41

2 files changed, 135 insertions, 0 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 164fa8c76140..c17f61ba6c6e 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,6 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
+DIST hwloc-2.11.2.tar.bz2 5592269 BLAKE2B e4764883eb3678fba6d6bd30fba27d68bd15cefccfcbc9d628573447f5f507a348e197d5003cc016fd4e27da05dc8c0ebd8644a4530f8499016d255c62602fc2 SHA512 488bfdeb32d2b98cffc43a537e87422d70abcc2bc029e4b5c911fc3e37189a9213dc8efd5552e2fda0d2b03d4ec25ebd45e0680dd129da046798750c5f5eb72f
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b
 DIST hwloc-2.9.0.tar.bz2 6923168 BLAKE2B 8451d24a2685b1e52b93a21a0fd43cb93564e03a4a3d1708ffe021dd59e701b50088b7202a1e50358c23e19278cc0526f0064b5ec79ca5152697e1380549e6e0 SHA512 45705d30c8a974c6afd998559cd1195e7e478cf01b669ad60c06baeac9d17c5cd163eb00ad12c2187889e9a7ea96ff6d5a3cb414e8e6de7f00a6fa10eb8c7507
@@ -8,6 +9,7 @@ DIST hwloc-2.9.2.tar.bz2 6976699 BLAKE2B 70737325888b87f90f95799490621e209864430
 DIST hwloc-2.9.3.tar.bz2 6986142 BLAKE2B db47dcf7fbedb67e3e339faf2f88326cc5b9838747b40774a6dbfc29bb9e52797ae9da9ae098168f70ff47cd7ff3e949a2294da52e91f2e45c0d9bc25bdbb1b7 SHA512 181a700ed036ecc8a6685e8023f3f6ba317b5fd3bb0699d9081e4627f375df7e9791148965d92f8152f6e7ea5c4ba7c581a0cad5a717d408725faae79777e267
 DIST lstopo.png 18008 BLAKE2B 5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75 SHA512 8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823
 EBUILD hwloc-1.11.13-r1.ebuild 2164 BLAKE2B 48b1516072987098c610f1de0cb8f59f19b8d5ad13a72b0fb382ab8ff5292177b563db5e6b3db451838824477b57e2f16b1d9e9c618c248218862bc7af9ce1c5 SHA512 7ba0f9ddec1fb25cfbadf63eec2d68feca43a2436a675816aaf760e42ae4ae766e3842a45c8343b93d4c02f142bfb8e9ddc9d2ffbb641de58b7da1c43f996360
+EBUILD hwloc-2.11.2.ebuild 3838 BLAKE2B 8c17838926d6cdc010bbe6ea38ad7f0a8344ecaac83ca78d5af91b80367377b1f5e967b2e9acd13a31e444c5bfe9a5a08db723ded428167750e4251b368747a9 SHA512 4db63c019e40cc8caf45aa17bddd819c6486dd13e25dc362603d332190fdbeb8203cf9e66fe9271a7ea2eff3f16efc2e7d374f7f13c2356d28112973e1db4f58
 EBUILD hwloc-2.6.0-r1.ebuild 2968 BLAKE2B 393891bc266c754647a2433c3d17046090e3b9eae4b627eaa4c749012711c9ef1d42f50435e211052175e3ee83931f0f01abf297bec60eebad85d74d3fe508f3 SHA512 6768f80f09b2cb4dbac35727a09ec2df3104d7e5cc06b8b33131190938571050047766aecf0b922dcc1580f8db9e0d116b21f2d534a4a4566dd1f5b300b1546f
 EBUILD hwloc-2.8.0-r1.ebuild 3341 BLAKE2B a71739e448497cc53f3482a30f944e553b2a5ec14d43a98a4fe7cb6e6530eed65768c6113df6d4951c9f16e10e703312a4373f2cb4d764be4ae58b1a40b56eec SHA512 a4f4d54b329f1f4040e8b305b56330fa78c16f4b8548068bc052ff42eea42f769aa2a35b95830aa36adfda42208598e80f8ef6dbbaf12623f9e5185644c9a3c1
 EBUILD hwloc-2.9.0.ebuild 3348 BLAKE2B 4e5139cf1b957d7cbff0bd7d04fbb4ef3dd967a770edbc9ca489502d0dec4f63f1713f21b53c89d3073790d6bfefc2057e1329383c45a4eecbcf35dbff6661fd SHA512 e0a8f546089a220470c740d4bf7012633169d08c7f0c7df24a4b710ae881b681cdc65adb5d79a82d28d4e274d9f5e26dccf5e0793e85a2902042797bf72a5ec9
diff --git a/sys-apps/hwloc/hwloc-2.11.2.ebuild b/sys-apps/hwloc/hwloc-2.11.2.ebuild
new file mode 100644
index 000000000000..e3e3e1709236
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.11.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 cuda desktop flag-o-matic systemd toolchain-funcs xdg-utils multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+DESCRIPTION="Displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="
+	https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
+	https://raw.githubusercontent.com/open-mpi/hwloc/master/contrib/android/assets/lstopo.png
+"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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.
+# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4
+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? (
+		x11-drivers/nvidia-drivers[static-libs]
+		x11-libs/libXext
+		x11-libs/libX11
+	)
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #393467
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+	if use video_cards_nvidia ; then
+		addpredict /dev/nvidiactl
+	fi
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	export ac_cv_header_valgrind_valgrind_h=$(multilib_native_usex valgrind)
+	export ac_cv_have_decl_RUNNING_ON_VALGRIND=$(multilib_native_usex valgrind)
+
+	local myconf=(
+		--disable-opencl
+
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--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)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	case ${ARCH} in
+		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+		;;
+	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 -s 512 "${DISTDIR}/lstopo.png" ${PN}.png
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}