gentoo auto-resync : 09:10:2022 - 01:31:00

7 files changed, 8 insertions, 221 deletions

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index dadb6ccfc916..b45d6f6c4aa1 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,12 +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.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
-DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863
 DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b
-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 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
-EBUILD hwloc-2.8.0.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a
-MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
+EBUILD hwloc-1.11.13-r1.ebuild 2170 BLAKE2B c60546587b078379e46b409675d5e0efdd1ea7a19e08e2640d4119574212e55798274f776a25b9f326a4e97d47afed5a2e85c512b825cca040eb27cae6ff3ac6 SHA512 2d359bbef4c8689f96a0a3ad94a0db259fe62ecc4e95e5340f8c8284fccff896355d950988689189199ab67ecd9df3c1057311f2f78d36f9add5b2c4ffdc8613
+EBUILD hwloc-2.6.0-r1.ebuild 2974 BLAKE2B 7498ce7bf1f84a79837ccbd329c7283d0999736c235be8eb9354022dd0dfa950566bc31cd3a8c3951393e33a596ab99e331831db622b82efcfcec22886121765 SHA512 c55a5e9b2c59adbc2dcf2bfe70a2da041af0affb20f645f6dcab392006007a682e66db96a62c5988a4450cd905d0754ba7f25d744b89f573e621e8165bb0d913
+EBUILD hwloc-2.8.0-r1.ebuild 3221 BLAKE2B 693474de344b9f629c0815b29bc914bc3fde8c23275f5da518d04391cd02e1e7331df4fe3a5e578b2b73e672ab06889aff5844127bcf956ce0275e4eb6529c4a SHA512 3ee7e3013b97de25c24c68e1b04a0bddb0ceb4ba7202ec7ed8409e86120dde0566789f255eb02f633f3b96da092eea387d522ce9a1d5ef0e781bee6a78dffec5
+MISC metadata.xml 1661 BLAKE2B 11ace24114c7763a173d3175338aef1ade993df5e30df405eb4b94d9942ff712026f43bf19bb956cfbe6ea27b52af5746c64efbb0b752baf381ffc2eb5d58029 SHA512 a2a16701d2429b24a5d9dc4a6cff6a3d1a88e9d8e67d6d98a54915dc04c2db7b5ed1f23c798a2e4af9c1bf702529a165ca5f0ed046dc051c0aeb120c119ac6e5
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild
index 435ec3acffa0..fa0401fa01ac 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 # dev-util/nvidia-cuda-toolkit is always multilib
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${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] )
 	pci? (
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
deleted file mode 100644
index 763685d9bf37..000000000000
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 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 ~riscv 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/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild
index 8e0985a990dc..9fbd4c477c6c 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild
@@ -20,7 +20,7 @@ IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
 # 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}] )
+	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] )
 	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
deleted file mode 100644
index 88cb06eb1dfc..000000000000
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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 ~loong ~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
-}
diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index 88cb06eb1dfc..d496823096f3 100644
--- a/sys-apps/hwloc/hwloc-2.8.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,14 +12,14 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 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}] )
+	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? (
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 3ace2eda36bb..9b7c01dfe158 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="netloc">Enable Netloc</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>