diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 9e10274ecae18..1ab63af0f5bbb 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,10 +1,4 @@
 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.12.2.tar.bz2 5617977 BLAKE2B 225d457ae01bcde2f342a175b7ab33d51fcbf6cb8ce02306569368758975d620b3ad4070c87ba16196c3a2e772658a6b4f841ba586a5d2ef922c1e60f72402c1 SHA512 949d6c9d7b858ee58e477b15e6c06f57812872142fa1c7f3ef20aae2e4ef954135f839e8604404bfd0637fde99729c7d00211c8aee860dfde9ac60bba0e78aef
-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
-DIST hwloc-2.9.1.tar.bz2 6942860 BLAKE2B 6f0a0caa593683d76b52751b32d47a28509fc99e9ee4b8645257de054823328afe35e46ac5e264a8a6a9279e6c06129d6df096b7c2c491d90fc7d05ee0c011f5 SHA512 9c05b7b7c4e3cb5474efb6eb1a4bf3e5ad0f8d0480d043a11e695e4a1f5f6748abb96c7055c0f3b2bc36950dda247fbdd7dc02ec7c9debbfe2631e6ebb89d957
-DIST hwloc-2.9.2.tar.bz2 6976699 BLAKE2B 70737325888b87f90f95799490621e209864430813deff4731dbbbaa7be900d6d58fa874b3da5e851b553af00ba17e387762d3825bb9a592ffb311705b4a6833 SHA512 ed38bd608eac81d3182243f0b63c6da070be918fdd8c876ca35fd63cccb4e25684b28bb045d033c53cd7b53451795d28e05e0bd876a5a0231de06c76ace11fef
-DIST hwloc-2.9.3.tar.bz2 6986142 BLAKE2B db47dcf7fbedb67e3e339faf2f88326cc5b9838747b40774a6dbfc29bb9e52797ae9da9ae098168f70ff47cd7ff3e949a2294da52e91f2e45c0d9bc25bdbb1b7 SHA512 181a700ed036ecc8a6685e8023f3f6ba317b5fd3bb0699d9081e4627f375df7e9791148965d92f8152f6e7ea5c4ba7c581a0cad5a717d408725faae79777e267
 DIST lstopo.png 18008 BLAKE2B 5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75 SHA512 8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823
diff --git a/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild b/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild
deleted file mode 100644
index 8a374b5841644..0000000000000
--- a/sys-apps/hwloc/hwloc-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2025 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 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
-
-# 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.
-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] )
-	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="
-	>=dev-build/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() {
-	# bug #393467
-	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
-
-	if use cuda ; then
-		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 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-r2.ebuild b/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild
deleted file mode 100644
index f9fc65acf13d7..0000000000000
--- a/sys-apps/hwloc/hwloc-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2025 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 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 ~mips ppc ppc64 ~riscv ~sparc x86"
-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=">=dev-build/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
-	doicon "${DISTDIR}/lstopo.png"
-}
diff --git a/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild
deleted file mode 100644
index a304b20e52bee..0000000000000
--- a/sys-apps/hwloc/hwloc-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2025 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 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-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=">=dev-build/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
-	doicon "${DISTDIR}/lstopo.png"
-}
diff --git a/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild
deleted file mode 100644
index ba9ee109d7208..0000000000000
--- a/sys-apps/hwloc/hwloc-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2025 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 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 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="cairo +cpuid cuda debug nvml +pci 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:= )
-	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}
-	valgrind? ( dev-debug/valgrind )"
-# 2.69-r5 for --runstatedir
-BDEPEND=">=dev-build/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
-
-	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
-
-		# 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
-	newicon "${DISTDIR}/lstopo.png" "${PN}"
-}
diff --git a/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild
deleted file mode 100644
index 62411c2c67851..0000000000000
--- a/sys-apps/hwloc/hwloc-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2025 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 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 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="cairo +cpuid cuda debug nvml +pci 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:= )
-	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}
-	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
-
-		# 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
-	newicon "${DISTDIR}/lstopo.png" "${PN}"
-}
diff --git a/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild b/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild
deleted file mode 100644
index 9d76ef141c1d8..0000000000000
--- a/sys-apps/hwloc/hwloc-2.9.3-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2025 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"
-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
-
-	# bug #934428 #949986
-	if tc-is-gcc; then
-		eapply "${FILESDIR}/${PN}-2.11.2-fix-enable-gl.patch"
-	fi
-
-	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
-
-		# 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)
-		$(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
-}
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index fc998e1644765..20d71fb7afa11 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -24,6 +24,7 @@
 		<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="video_cards_nvidia">Enable GL display device discovery (NVCtrl)</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>