5 files changed, 121 insertions, 9 deletions
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 1150689380d1..217dd6f94f2a 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,9 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
-EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
-EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B d31578704690fd2ff24293a7a0ce316c1e04aee68f6e86646b90af3985f0719207ceb5273074e023d078cfe7e6ab43f1b353aea369eac06cc8d7465aacb300ee SHA512 ac6f807ea342db2a296c352b98b92185dc4f8133271814984329afc2b86de88936d4c27b51fda98ddd91c0877f02225d023f6c75ded8f99bc51ac6665c0107d0
-EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B abf59e91fdbceb69f173417ebde9008a2e0db5d71a97dd722715c3a06afcef851664b4878d9e1b82e1ebe30c88eaf889b1d6b28d4768470e946ce6c76e375ffa SHA512 7be8ba3134564367ac352c0c3f17ec45f93a7d57b8a122f55310e3e0e293a7b8fbaab15a3ede77147db4cfe01aa0b2f973da25e34a092e0d8eccb23f4004a004
+DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
+EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05
+EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2
+EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707
+EBUILD hwloc-2.7.1-r1.ebuild 3213 BLAKE2B a89a29b783826055bbd57bcf191405c39bb9ad2ca049a4157d284abf176cac1cc8f3a3593ea9e0cae67cba1e70effdbeefb8196d35bab73b608dec4f3b5dc123 SHA512 2e5891623a4fe6ad9d66669aeceb70bdbeac36123854dcb0332229c7b8921c4bfcb38638acb4e9942c11139242181217b609439e8929ebb753092f1bcf7a0b93
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index e6046bb1b546..435ec3acffa0 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools cuda flag-o-matic multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+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"
 
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index a62d172fdecd..763685d9bf37 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs m
 
 MY_PV="v$(ver_cut 1-2)"
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+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"
 
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index b35442059218..8e0985a990dc 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs m
 
 MY_PV="v$(ver_cut 1-2)"
 
-DESCRIPTION="displays the hardware topology in convenient formats"
+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"
 
diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..cbdf2d374fb6
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs 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"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev 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:= )
+	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}] )
+	video_cards_nvidia? (
+		x11-drivers/nvidia-drivers[static-libs]
+		x11-libs/libXext
+		x11-libs/libX11
+	)"
+DEPEND="${RDEPEND}"
+# 2.69-r5 for --runstatedir
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	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
+
+	local myconf=(
+		--disable-opencl
+
+		# netloc is deprecated upstream, about to be removed
+		# bug #796797
+		--disable-netloc
+
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable video_cards_nvidia gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(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
+
+	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
+}