gentoo resync : 15.06.2021

5 files changed, 113 insertions, 14 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index e7b6a13ef0f7..48f0afa89172 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,6 +1,8 @@
 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.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
-EBUILD hwloc-1.11.13.ebuild 2165 BLAKE2B e766b7fb29a3e4aa00b34459d5c816453f06e2e24bc37ad46c5200d937554c481d9a9b5cdde9551acd37d81ae2e21459e6aa1703ed673a4c3d8847779b8bf149 SHA512 178e36c137fa475c58f5748fef83794c23d4aecb1737d054f4146a5b25cc3fc732fe6166b2ac8645c916ed8addb60bef4a77f45853c54b3e6f3d3e1a8222e0bc
-EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea
-MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
+DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
+EBUILD hwloc-1.11.13.ebuild 2168 BLAKE2B bcab74bebc629a2749bbb6577dc73c2acde8bad4a356456b731f0898df24b8698e0cea6d388495b27934995fd298875e23cd54a7bd103771579166faddeaf31f SHA512 e7d42be1f8d54b9149d4ee105fc6e4e9097a6b488d9dbb4a4d9f04b9f2d4f8e3452eea6aa7706b991900f26b2f4ae08a6419e8267661648e494850de7be39fab
+EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
+EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
+MISC metadata.xml 1703 BLAKE2B c5f42e16f680cf88bd41907ab37ce4df2da9ee08a52a26559688df97ad92773830f084cc6f358862096f24930f69982cfa7f2fb1baa0ea1373b7359f96565f4e SHA512 590d0cb5b6819359159152dab18bc12c65c5f70c0a75658a760d7f2bb97ef4e18045130a6167f5ecc41f08e92a179f6dd51abe34f35db3338e4539948913daf0
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index f9b7aae544d1..151384ff11a5 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -43,8 +43,8 @@ src_prepare() {
 	eautoreconf
 
 	if use cuda ; then
-		append-cflags -I"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/opt/cuda/include
+		append-cflags -I"${ESYSROOT}"/opt/cuda/include
+		append-cppflags -I"${ESYSROOT}"/opt/cuda/include
 	fi
 }
 
@@ -53,7 +53,7 @@ multilib_src_configure() {
 
 	if use cuda ; then
 		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
+		append-ldflags -L"${ESYSROOT}"/opt/cuda/$(get_libdir)
 	fi
 
 	ECONF_SOURCE=${S} econf \
diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild
index 6167e28c6bfc..f98a08eb4cda 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}"
 
@@ -48,8 +48,8 @@ src_prepare() {
 	eautoreconf
 
 	if use cuda ; then
-		append-cflags "-I${EPREFIX}/opt/cuda/include"
-		append-cppflags "-I${EPREFIX}/opt/cuda/include"
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
 	fi
 }
 
@@ -58,7 +58,7 @@ multilib_src_configure() {
 
 	if use cuda ; then
 		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags "-L${EPREFIX}/opt/cuda/$(get_libdir)"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
 	fi
 
 	local myconf=(
@@ -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
new file mode 100644
index 000000000000..f98a08eb4cda
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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.
+
+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] )
+	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}"
+
+# 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
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable netloc)
+		$(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
+}
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index b84a415e26af..05112b3f1798 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>