subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-apps\/hwloc\/"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2026-03-09 Thread Andreas Sturmlechner

commit: 6da4fe34c93278b0ba4acfe72a38650e8b8bb2ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  8 20:52:45 2026 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Mar  9 22:12:40 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da4fe34

sys-apps/hwloc: drop 1.11.13-r2

Bug: https://bugs.gentoo.org/914155
Bug: https://bugs.gentoo.org/942096
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sys-apps/hwloc/Manifest|  1 -
 sys-apps/hwloc/hwloc-1.11.13-r2.ebuild | 71 --
 sys-apps/hwloc/metadata.xml|  3 --
 3 files changed, 75 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 1ab63af0f5bb..66765f917ad5 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,4 +1,3 @@
-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 lstopo.png 18008 BLAKE2B 
5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75
 SHA512 
8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823

diff --git a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild
deleted file mode 100644
index cf7438c1aa1c..
--- a/sys-apps/hwloc/hwloc-1.11.13-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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"
-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/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
-
-# 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}] )
-   cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
-   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
-   pci? (
-   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-   )
-   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-   xml? ( >=dev-libs/libxml2-2.9.1-r4:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="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
-
-   ECONF_SOURCE=${S} econf \
-   --disable-opencl \
-   $(use_enable static-libs static) \
-   $(use_enable cairo) \
-   $(multilib_native_use_enable cuda) \
-   $(use_enable debug) \
-   $(multilib_native_use_enable gl) \
-   $(use_enable pci) \
-   $(use_enable plugins) \
-   $(use_enable numa libnuma) \
-   $(use_enable xml libxml2) \
-   $(use_with X x)
-}

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 20d71fb7afa1..1f4741f9df29 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-12-22 Thread Sam James

commit: 9003ab3ffec702303a71d17cbd34cb7e1e3f9ce5
Author: Paul Zander  gmail  com>
AuthorDate: Sun Dec 21 10:35:01 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 22 11:40:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9003ab3f

sys-apps/hwloc: drop 2.9.* 2.8.0-r2 2.6.0-r2

Signed-off-by: Paul Zander  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45111
Closes: https://github.com/gentoo/gentoo/pull/45111
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest  |   6 --
 sys-apps/hwloc/hwloc-2.6.0-r2.ebuild | 104 -
 sys-apps/hwloc/hwloc-2.8.0-r2.ebuild | 112 ---
 sys-apps/hwloc/hwloc-2.9.0-r1.ebuild | 112 ---
 sys-apps/hwloc/hwloc-2.9.1-r1.ebuild | 116 
 sys-apps/hwloc/hwloc-2.9.2-r1.ebuild | 120 -
 sys-apps/hwloc/hwloc-2.9.3-r2.ebuild | 142 ---
 sys-apps/hwloc/metadata.xml  |   1 +
 8 files changed, 1 insertion(+), 712 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 9e10274ecae1..1ab63af0f5bb 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 8a374b584164..
--- 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.

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-12-22 Thread Sam James

commit: 61348acb713baf433b62e4f92410e3648e0afc4a
Author: Paul Zander  gmail  com>
AuthorDate: Tue Nov 25 16:25:36 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 22 11:40:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61348acb

sys-apps/hwloc: add 2.12.2

Signed-off-by: Paul Zander  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45111
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest|   1 +
 sys-apps/hwloc/hwloc-2.12.2.ebuild | 141 +
 2 files changed, 142 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index d24c775741c4..9e10274ecae1 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,6 @@
 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

diff --git a/sys-apps/hwloc/hwloc-2.12.2.ebuild 
b/sys-apps/hwloc/hwloc-2.12.2.ebuild
new file mode 100644
index ..5dee3dd7cf68
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.12.2.ebuild
@@ -0,0 +1,141 @@
+# 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-12-22 Thread Sam James

commit: 9180e379e8a549487bef158360fff29182cd2612
Author: Paul Zander  gmail  com>
AuthorDate: Tue Nov 25 16:25:18 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 22 11:40:34 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9180e379

sys-apps/hwloc: support CUDA_PATH

Allows slotted nvidia-cuda-toolkit

Signed-off-by: Paul Zander  gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45111
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 69f61c8ebbfb..9a372821db75 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -71,11 +71,13 @@ multilib_src_configure() {
fi
 
if use cuda ; then
-   append-cflags "-I${ESYSROOT}/opt/cuda/include"
-   append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+   append-cflags "-I${CUDA_PATH:-${ESYSROOT}/opt/cuda}/include"
+   append-cxxflags "-I${CUDA_PATH:-${ESYSROOT}/opt/cuda}/include"
 
local -x LDFLAGS="${LDFLAGS}"
-   append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+   append-ldflags 
"-L${CUDA_PATH:-${ESYSROOT}/opt/cuda}/$(get_libdir)"
+
+   cuda_add_sandbox
fi
 
export ac_cv_header_valgrind_valgrind_h=$(multilib_native_usex valgrind)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-21 Thread Arthur Zamarin

commit: 2d9de0d953245bd4a826b210ac112ce27a899806
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun 21 18:57:45 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun 21 18:57:45 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9de0d9

sys-apps/hwloc: Stabilize 2.11.2-r1 ppc, #957778

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 27f1efa2b16e..0dca5c5efb61 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-20 Thread Sam James

commit: 804eda06fdb386f331fd7b4e9ab83970f8fef21a
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 21 06:50:18 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 21 06:50:18 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804eda06

sys-apps/hwloc: Stabilize 2.11.2-r1 arm, #957778

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 95333b79b161..27f1efa2b16e 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-14 Thread Sam James

commit: 53d200bdc44b16c9a4797bc52e85446b38b8dcd2
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 14 10:04:57 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 14 10:04:57 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d200bd

sys-apps/hwloc: Stabilize 2.11.2-r1 x86, #957778

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 30701b1e9785..95333b79b161 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-14 Thread Sam James

commit: ceeb8765ca07933293a3b25fb57e8da941089e45
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 14 09:47:22 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 14 09:47:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceeb8765

sys-apps/hwloc: Stabilize 2.11.2-r1 amd64, #957778

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index c8cfa87d45b6..30701b1e9785 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-10 Thread Sam James

commit: 34e9bd9f416792dd5142c97a1ffa3f2bb9348b95
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 11 01:27:49 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 11 01:27:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e9bd9f

sys-apps/hwloc: Stabilize 2.11.2-r1 ppc64, #957778

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 977cba350093..89369f553225 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-06-10 Thread Sam James

commit: d69115451740808ef43e5e38f24233f049c22dc4
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 11 01:27:50 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 11 01:27:50 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6911545

sys-apps/hwloc: Stabilize 2.11.2-r1 arm64, #957778

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.11.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
index 89369f553225..c8cfa87d45b6 100644
--- a/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2025-04-21 Thread Viorel Munteanu

commit: d670e3893da51f62d61e4d54712bda97f264856a
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Mon Apr 21 15:22:22 2025 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Apr 21 15:25:41 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d670e389

sys-apps/hwloc: Stabilize 2.9.3-r1 arm64, #942096

Signed-off-by: Viorel Munteanu  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 8cb15d78d7cf..374a87a59a34 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv 
sparc x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/, sys-apps/hwloc/files/

2025-03-12 Thread Sam James

commit: 321179fc6b5e87990d0a9a54d868a63774e9a345
Author: Paul Zander  gmail  com>
AuthorDate: Tue Mar 11 13:45:45 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 12 09:43:22 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321179fc

sys-apps/hwloc: fix enable-gl [LTO]

Closes: https://bugs.gentoo.org/949986
Closes: https://bugs.gentoo.org/934428
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../hwloc/files/hwloc-2.11.2-fix-enable-gl.patch   | 27 ++
 sys-apps/hwloc/hwloc-2.11.2.ebuild |  7 +-
 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild   |  7 +-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch 
b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch
new file mode 100644
index ..25e2b2c8f791
--- /dev/null
+++ b/sys-apps/hwloc/files/hwloc-2.11.2-fix-enable-gl.patch
@@ -0,0 +1,27 @@
+From fe2eb291c5d91a02f01a051de150acfe37598ade Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Tue, 11 Mar 2025 14:36:05 +0100
+Subject: [PATCH] fix enable-gl
+
+Disable -Wno-error=lto-type-mismatch for broken AC_CHECK_LIB
+
+Bug: https://bugs.gentoo.org/949986
+Bug: https://bugs.gentoo.org/934428
+Signed-off-by: Paul Zander 
+
+diff --git a/config/hwloc.m4 b/config/hwloc.m4
+index 832ab39..4149089 100644
+--- a/config/hwloc.m4
 b/config/hwloc.m4
+@@ -1488,7 +1488,7 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
+hwloc_gl_happy=no])
+ 
+ AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [
+-  AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], 
[hwloc_gl_happy=no], [-lXext -lX11])
++  AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], 
[hwloc_gl_happy=no], [-lXext -lX11 -Wno-error=lto-type-mismatch])
+ ], [hwloc_gl_happy=no])
+ 
+ if test "x$hwloc_gl_happy" = "xyes"; then
+-- 
+2.48.1
+

diff --git a/sys-apps/hwloc/hwloc-2.11.2.ebuild 
b/sys-apps/hwloc/hwloc-2.11.2.ebuild
index e3e3e1709236..eb948e32bdb0 100644
--- a/sys-apps/hwloc/hwloc-2.11.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,6 +54,11 @@ 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
 }
 

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 8282112e6b86..8cb15d78d7cf 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,6 +54,11 @@ 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
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-12-08 Thread Patrick Lauer

commit: 889e96dac826e70bea0a7c0b151220863f9aebd2
Author: Patrick Lauer  gentoo  org>
AuthorDate: Sun Dec  8 10:31:17 2024 +
Commit: Patrick Lauer  gentoo  org>
CommitDate: Sun Dec  8 11:00:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889e96da

sys-apps/hwloc: add 2.11.2

Signed-off-by: Patrick Lauer  gentoo.org>

 sys-apps/hwloc/Manifest|   1 +
 sys-apps/hwloc/hwloc-2.11.2.ebuild | 133 +
 2 files changed, 134 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 48bc8e36e176..d24c775741c4 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,4 +1,5 @@
 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

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 ..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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-11-25 Thread Sam James

commit: 5b0eb96c19dc5275b911cb20ed1dd0481f7bf609
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 25 23:06:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 25 23:06:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0eb96c

sys-apps/hwloc: Stabilize 2.9.3-r1 ppc64, #942096

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 66eef0d7578c..8282112e6b86 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv 
sparc x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-11-24 Thread Sam James

commit: 1db654dd7f4cc1102e3500dae6f9edbb067e53b6
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov 24 11:01:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov 24 11:01:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db654dd

sys-apps/hwloc: Stabilize 2.9.3-r1 x86, #942096

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 75493176b9ca..66eef0d7578c 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv 
sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-11-23 Thread Sam James

commit: df38306424847d6b611bdbfb70c678f71406c9a7
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 23 16:54:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 23 16:54:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df383064

sys-apps/hwloc: Stabilize 2.9.3-r1 ppc, #942096

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 5b7f89dbe637..75493176b9ca 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-11-23 Thread Sam James

commit: 85cc461be042e6c884e33e106420c88bffb71b3a
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 23 16:27:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 23 16:27:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cc461b

sys-apps/hwloc: Stabilize 2.9.3-r1 sparc, #942096

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index a8180e551640..5b7f89dbe637 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-07-14 Thread James Le Cuirot

commit: 39cfbad180ae995291775b31cd232460e5726b61
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jul 14 10:39:38 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jul 14 10:39:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39cfbad1

sys-apps/hwloc: Keyword 2.9.3-r1 for ~m68k

The tests do not pass, but they don't on amd64 either.

Signed-off-by: James Le Cuirot  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 84c0ef23b8f9..1618bce42de0 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2024-04-27 Thread Michał Górny

commit: 617b4e195fc8e3b2bd6a8c19077b13a71ca47d90
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Apr 27 10:37:31 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 27 10:42:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617b4e19

sys-apps/hwloc: Update XDG icon cache

Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.3-r1.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
index 4d0252d24ecc..84c0ef23b8f9 100644
--- a/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools bash-completion-r1 cuda desktop flag-o-matic systemd 
toolchain-funcs multilib-minimal
+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"
@@ -127,3 +127,11 @@ multilib_src_install_all() {
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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-12-14 Thread Sam James

commit: e4fc79da6821cba79b6ce96e19186e107a39fa4f
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 06:32:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 06:32:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fc79da

sys-apps/hwloc: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 9b7c01dfe158..049c06df6e60 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -25,4 +25,7 @@
   use libxml2 for XML support, instead of a custom 
minimalistic support
   use the X Window System
 
+
+  open-mpi/hwloc
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-12-14 Thread Sam James

commit: 1d88f52306c63cade6b4700a3338a8eb826816f1
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 06:33:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 06:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d88f523

sys-apps/hwloc: fix metadata indentation

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/metadata.xml | 54 ++---
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 049c06df6e60..083b6957c7ac 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -1,31 +1,31 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-
-  [email protected]
-  Gentoo Cluster Project
-
- 
-  The Portable Hardware Locality (hwloc) software package provides a portable 
abstraction 
-  (across OS, versions, architectures, ...) of the hierarchical topology of 
modern architectures,
-  including NUMA memory nodes, sockets, shared caches, cores and simultaneous 
multithreading. 
-  It also gathers various system attributes such as cache and memory 
information. 
-  It primarily aims at helping applications with gathering information about 
modern computing 
-  hardware so as to exploit it accordingly and efficiently.
-
-
-  Enable the Cairo back-end of hwloc's lstopo command
-  Enable the cpuid-based architecture specific support (x86 
component)
-  Enable CUDA device discovery using libcudart
-  Enable GL display device discovery (NVCtrl) 
-  Add support for numa memory allocation
-  Enable the NVML device discovery
-  Enable PCI device discovery using libpci
-  Build hwloc components as plugins so that the hwloc 
core library does not directly depend on their dependencies (for instance the 
libpci library)
-  use libxml2 for XML support, instead of a custom 
minimalistic support
-  use the X Window System
-
-
-  open-mpi/hwloc
-
+   
+   [email protected]
+   Gentoo Cluster Project
+   
+
+   The Portable Hardware Locality (hwloc) software package provides a 
portable abstraction 
+   (across OS, versions, architectures, ...) of the hierarchical topology 
of modern architectures,
+   including NUMA memory nodes, sockets, shared caches, cores and 
simultaneous multithreading. 
+   It also gathers various system attributes such as cache and memory 
information. 
+   It primarily aims at helping applications with gathering information 
about modern computing 
+   hardware so as to exploit it accordingly and efficiently.
+   
+   
+   Enable the Cairo back-end of hwloc's lstopo 
command
+   Enable the cpuid-based architecture specific 
support (x86 component)
+   Enable CUDA device discovery using 
libcudart
+   Enable GL display device discovery 
(NVCtrl) 
+   Add support for numa memory allocation
+   Enable the NVML device discovery
+   Enable PCI device discovery using libpci
+   Build hwloc components as plugins so that 
the hwloc core library does not directly depend on their dependencies (for 
instance the libpci library)
+   use libxml2 for XML support, instead of a 
custom minimalistic support
+   use the X Window System
+   
+   
+   open-mpi/hwloc
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-12-08 Thread Arthur Zamarin

commit: 7e10f9a26e3c48438e4199ec43e3c63435c83ad4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  8 08:40:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  8 08:40:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e10f9a2

sys-apps/hwloc: Stabilize 2.9.2 amd64, #913825

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index 388caada1c77..e5ed1f8bf9eb 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-12-08 Thread Arthur Zamarin

commit: 819b502c10e6fdbbdb545485c4e8a226c7a3df35
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  8 08:39:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  8 08:39:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819b502c

sys-apps/hwloc: Stabilize 2.9.2 ppc, #913825

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index 5ff8d3de8ac6..388caada1c77 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-09-13 Thread Sam James

commit: 7852d7a47a8c2f8c68c063680c38aa4c12a3d04d
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 14 03:15:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 14 03:15:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7852d7a4

sys-apps/hwloc: add 2.9.3

Bug: https://bugs.gentoo.org/914155
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.9.3.ebuild | 120 ++
 2 files changed, 121 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 847d17c63532..48bc8e36e176 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,4 +4,5 @@ DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 
33f75987ee904d5ee9c62268695a2f7f59b0adc
 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.9.3.ebuild 
b/sys-apps/hwloc/hwloc-2.9.3.ebuild
new file mode 100644
index ..bba11e871c3f
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.9.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 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 ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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-util/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 LDFL

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-09-07 Thread Sam James

commit: 4773b3abb97294ad7ff8db9633bfedd5f60a3f69
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  7 23:02:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  7 23:02:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4773b3ab

sys-apps/hwloc: Stabilize 2.9.2 arm, #913825

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index bba11e871c3f..a7b9acd3b37b 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-09-07 Thread Sam James

commit: e3d61969cd43d4196cdc658ce5240a6d3bd0ab3e
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  7 23:02:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  7 23:02:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d61969

sys-apps/hwloc: Stabilize 2.9.2 sparc, #913825

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index 6c955cd82ce7..abe9d6e83c11 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-09-07 Thread Sam James

commit: 3043f0710d482708ac5ef1e50778dbf49c581a36
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  7 23:02:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  7 23:02:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3043f071

sys-apps/hwloc: Stabilize 2.9.2 arm64, #913825

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index a7b9acd3b37b..6c955cd82ce7 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-08-02 Thread Sam James

commit: a4c9d39b9b576da4333fc330a9d7433500ba5c34
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 17:51:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 17:51:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c9d39b

sys-apps/hwloc: Stabilize 2.9.1 ppc, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 3d98b5a1dba0..0d497dee6013 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-07 Thread Sam James

commit: fd66f0f66a2201cab26eefd07d05f25069062af1
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul  7 21:21:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul  7 21:21:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd66f0f6

sys-apps/hwloc: Stabilize 2.9.1 arm64, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 667f4f573642..3d98b5a1dba0 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-04 Thread Sam James

commit: 6736c3dd7d98f74f04017d9eefb1e73a9c126bba
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:32:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:32:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6736c3dd

sys-apps/hwloc: Stabilize 2.9.1 amd64, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index c50317cfed5e..667f4f573642 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-04 Thread Sam James

commit: c0034784e20499c046ce9eda7343d549406066b0
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:23:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:23:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0034784

sys-apps/hwloc: Stabilize 2.9.1 x86, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 0ee2c62c183a..47af7ecfdc6f 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-04 Thread Sam James

commit: f92dc85706848d2345c7dd823cec4dbdb6f7a707
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:23:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92dc857

sys-apps/hwloc: Stabilize 2.9.1 sparc, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 87858b596a3d..0ee2c62c183a 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-04 Thread Sam James

commit: c00c7a232c775876029de852e52e666b26d6bc12
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:23:21 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:23:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00c7a23

sys-apps/hwloc: Stabilize 2.9.1 arm, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 47af7ecfdc6f..9eb621277f33 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-07-04 Thread Sam James

commit: 61414e9da40a499bd4f4f81e2cdb46b7d310b71b
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul  4 22:23:22 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul  4 22:23:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61414e9d

sys-apps/hwloc: Stabilize 2.9.1 ppc64, #909660

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 9eb621277f33..c50317cfed5e 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -13,7 +13,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 ~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 valgrind xml X 
video_cards_nvidia"
 
 # opencl: opencl support dropped with x11-drivers/ati-drivers being removed 
(bug #582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-06-29 Thread Sam James

commit: f1371232497e5f41f1d45cdf7244d5e4d26ae03f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 29 08:50:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 29 08:54:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1371232

sys-apps/hwloc: add 2.9.2

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.9.2.ebuild | 116 ++
 2 files changed, 117 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 3d7d2fca960b..847d17c63532 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,4 +3,5 @@ DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 
96099ae3527e11a83adc068e07756752d2effa3
 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 lstopo.png 18008 BLAKE2B 
5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75
 SHA512 
8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
new file mode 100644
index ..87858b596a3d
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2023 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 ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+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-util/valgrind )"
+# 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 LDFLAG

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-06-29 Thread Sam James

commit: 3e586780d4202c271e2fe78cdc73fdc80d790e61
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 29 08:53:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 29 08:54:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e586780

fixup! sys-apps/hwloc: add 2.9.2

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.2.ebuild | 22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.2.ebuild 
b/sys-apps/hwloc/hwloc-2.9.2.ebuild
index 87858b596a3d..bba11e871c3f 100644
--- a/sys-apps/hwloc/hwloc-2.9.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.2.ebuild
@@ -8,8 +8,10 @@ inherit autotools bash-completion-r1 cuda desktop flag-o-matic 
systemd toolchain
 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";
+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"
@@ -19,7 +21,8 @@ IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev 
valgrind xml X vide
 # 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}]
+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}] )
@@ -33,12 +36,13 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
x11-drivers/nvidia-drivers[static-libs]
x11-libs/libXext
x11-libs/libX11
-   )"
-DEPEND="${RDEPEND}
-   valgrind? ( dev-util/valgrind )"
-# 2.69-r5 for --runstatedir
-BDEPEND=">=sys-devel/autoconf-2.69-r5
-   virtual/pkgconfig"
+   )
+"
+DEPEND="
+   ${RDEPEND}
+   valgrind? ( dev-util/valgrind )
+"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-06-19 Thread Pacho Ramos

commit: 0d1243b13cbabd55458c75712bb8f65d9dc2cbfd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Jun 19 13:30:13 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Jun 19 13:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1243b1

sys-apps/hwloc: Fix icon installation

Thanks-to: Alfred Wingate
Thanks-to: i.Dark_Templar
Closes: https://bugs.gentoo.org/833345
Signed-off-by: Pacho Ramos  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index b94b31bd6a7a..87858b596a3d 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -112,5 +112,5 @@ multilib_src_install_all() {
bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
 
find "${ED}" -name '*.la' -delete || die
-   doicon "${DISTDIR}/lstopo.png"
+   newicon "${DISTDIR}/lstopo.png" "${PN}"
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-05-15 Thread Sam James

commit: 0f303d8963f676ef2da6050e556ab3cfa06f035c
Author: Sam James  gentoo  org>
AuthorDate: Tue May 16 03:13:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 16 03:35:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f303d89

sys-apps/hwloc: add Valgrind annotation support

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.9.1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
index 0a38757abeb5..b94b31bd6a7a 100644
--- a/sys-apps/hwloc/hwloc-2.9.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -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 ~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"
+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.
@@ -34,7 +34,8 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
x11-libs/libXext
x11-libs/libX11
)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   valgrind? ( dev-util/valgrind )"
 # 2.69-r5 for --runstatedir
 BDEPEND=">=sys-devel/autoconf-2.69-r5
virtual/pkgconfig"
@@ -65,6 +66,9 @@ multilib_src_configure() {
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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2023-04-04 Thread Sam James

commit: 00657de96624331698cd378831d611d797403591
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr  5 01:12:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr  5 01:12:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00657de9

sys-apps/hwloc: add 2.9.1

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.9.1.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 84a6c2b68c33..3d7d2fca960b 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,4 +2,5 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 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 lstopo.png 18008 BLAKE2B 
5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75
 SHA512 
8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823

diff --git a/sys-apps/hwloc/hwloc-2.9.1.ebuild 
b/sys-apps/hwloc/hwloc-2.9.1.ebuild
new file mode 100644
index ..0a38757abeb5
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.9.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 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 ~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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-12-14 Thread Sam James

commit: 7df4841e245062753bf4704d28a11227b36a1ce7
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 00:51:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 00:52:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df4841e

sys-apps/hwloc: add 2.9.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.9.0.ebuild | 112 ++
 2 files changed, 113 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 80bbce2f89c6..84a6c2b68c33 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,4 +1,5 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 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 lstopo.png 18008 BLAKE2B 
5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75
 SHA512 
8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823

diff --git a/sys-apps/hwloc/hwloc-2.9.0.ebuild 
b/sys-apps/hwloc/hwloc-2.9.0.ebuild
new file mode 100644
index ..fb949fd83e80
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.9.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2022 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 ~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=(
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-12-04 Thread Pacho Ramos

commit: d8d1957c3ae62f4f6677bd6ccee9f4df01ab4523
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 14:29:31 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 14:49:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8d1957c

sys-apps/hwloc: Install icon

No revbump as it is a minor change, hopefully most people will simply get it
fixed in next bumps then. Use upstream android png icon over svg as it has a
high enough resolution and text looks misaligned in svg icon.

Closes: https://bugs.gentoo.org/833345
Signed-off-by: Pacho Ramos  gentoo.org>

 sys-apps/hwloc/Manifest  | 1 +
 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 5404e01ac9d9..80bbce2f89c6 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,4 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 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 lstopo.png 18008 BLAKE2B 
5468cc81f9ee4b9a4dd28bd9334edd7f4e7d4ff394caf09228b4e860ab924bb80114b977b1b1125cd180478967d2f3bbde50435522b77a8314f823b1c2678e75
 SHA512 
8a8a6e62c3089a8d77f592a348ad87fca14a84bdecd889760a37bef8e65c876594b91091aac2f54ca3cca855a02459fe1c960909ccd0ddea1ff77c95bb171823

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index ffa2bf4b6edf..58a9f8a6769c 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=8
 
-inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs 
multilib-minimal
+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";
+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"
@@ -107,4 +108,5 @@ multilib_src_install_all() {
bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
 
find "${ED}" -name '*.la' -delete || die
+   doicon "${DISTDIR}/lstopo.png"
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-09 Thread Agostino Sarubbo

commit: 37dc2a530160fbaf3793c53b37bf9e0738a60820
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:54:42 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:54:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dc2a53

sys-apps/hwloc: Stabilize 2.8.0-r1 x86, #876208

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index d5aa8b612b41..ffa2bf4b6edf 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-09 Thread Agostino Sarubbo

commit: 92832f77457a377b68d50a9bbe644138c932746b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:52:42 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:52:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92832f77

sys-apps/hwloc: Stabilize 2.8.0-r1 sparc, #876208

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index 8575f79a457f..d5aa8b612b41 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-09 Thread Agostino Sarubbo

commit: 189696040afa469f8d8d8f3d476a18f7011d7618
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:51:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:51:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18969604

sys-apps/hwloc: Stabilize 2.8.0-r1 ppc64, #876208

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index 23f368b96658..8575f79a457f 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-09 Thread Agostino Sarubbo

commit: c35e7cfaa009d1774cf8bca29e31379246f6f88d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Oct  9 08:47:22 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Oct  9 08:47:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c35e7cfa

sys-apps/hwloc: Stabilize 2.8.0-r1 amd64, #876208

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index c74d0c27bbc6..23f368b96658 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-08 Thread Arthur Zamarin

commit: ae6d69dabe70e378e846fb485c2bcdd954bc1f48
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Oct  9 05:22:32 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Oct  9 05:22:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae6d69da

sys-apps/hwloc: Stabilize 2.8.0-r1 ppc, #876208

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index d496823096f3..c74d0c27bbc6 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-08 Thread Arthur Zamarin

commit: 921cb65fc0b7da51620e80e5c600b7af0216d1a6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct  8 19:49:36 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Oct  8 19:49:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921cb65f

sys-apps/hwloc: Stabilize 2.8.0-r1 arm64, #876208

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index c38365ef5334..d496823096f3 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-08 Thread Arthur Zamarin

commit: 273668b93d4285f9c88db64d1d298dd2ee73cb44
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Oct  8 19:49:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Oct  8 19:49:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273668b9

sys-apps/hwloc: Stabilize 2.8.0-r1 arm, #876208

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index aaa0e78004e5..c38365ef5334 100644
--- a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-08 Thread Sam James

commit: 48c2961afe23e97cf9a98075500db4f1df81297d
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 18:53:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 18:53:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48c2961a

sys-apps/hwloc: drop 2.5.0, 2.7.1-r1

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest  |   2 -
 sys-apps/hwloc/hwloc-2.5.0.ebuild|  98 ---
 sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 110 ---
 sys-apps/hwloc/metadata.xml  |   1 -
 4 files changed, 211 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 76f8a6d1754d..5404e01ac9d9 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,3 @@
 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

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..
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-10-08 Thread Sam James

commit: 9c6c19b5b643fc8e4a8136e020a19cac5a4bed03
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 18:54:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 18:54:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6c19b5

sys-apps/hwloc: fix MissingUseDepDefault on cairo

Closes: https://bugs.gentoo.org/875947
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/{hwloc-1.11.13.ebuild => hwloc-1.11.13-r1.ebuild} | 2 +-
 sys-apps/hwloc/{hwloc-2.6.0.ebuild => hwloc-2.6.0-r1.ebuild} | 2 +-
 sys-apps/hwloc/{hwloc-2.8.0.ebuild => hwloc-2.8.0-r1.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild
similarity index 96%
rename from sys-apps/hwloc/hwloc-1.11.13.ebuild
rename to 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.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild
similarity index 97%
rename from sys-apps/hwloc/hwloc-2.6.0.ebuild
rename to 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.8.0.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
similarity index 97%
rename from sys-apps/hwloc/hwloc-2.8.0.ebuild
rename to sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
index 88cb06eb1dfc..aaa0e78004e5 100644
--- a/sys-apps/hwloc/hwloc-2.8.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild
@@ -19,7 +19,7 @@ IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev 
xml X video_cards_n
 # 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? (

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-07-08 Thread Sam James

commit: a051c48631a1c48e4b9009cd5a9791942baca5a3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  9 05:14:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  9 05:57:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a051c486

sys-apps/hwloc: add 2.8.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.8.0.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 075870899733..76f8a6d1754d 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,3 +2,4 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 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

diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild 
b/sys-apps/hwloc/hwloc-2.8.0.ebuild
new file mode 100644
index ..88cb06eb1dfc
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.8.0.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 ~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"
+   $(

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-05-19 Thread WANG Xuerui

commit: 6a4b4acb0644b67e61c03e1406323ef2857151b5
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu May 19 10:35:30 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Thu May 19 10:35:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4b4acb

sys-apps/hwloc: keyword 2.7.1-r1 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
index cbdf2d374fb6..88cb06eb1dfc 100644
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -12,7 +12,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 ~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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-03-26 Thread Sam James

commit: d34c7332b61487eaf07b76f0302d27ad000cec9d
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 01:33:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 01:33:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d34c7332

sys-apps/hwloc: capitalise DESCRIPTION

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild  | 4 ++--
 sys-apps/hwloc/hwloc-2.5.0.ebuild| 4 ++--
 sys-apps/hwloc/hwloc-2.6.0.ebuild| 4 ++--
 sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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
index 31d754e4390d..cbdf2d374fb6 100644
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -6,7 +6,7 @@ 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"
+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";

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-03-26 Thread Sam James

commit: 9a77fe1a2b17992a4e907907107f7c2f5218cc74
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 27 01:32:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 27 01:32:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a77fe1a

sys-apps/hwloc: drop now-no-op USE=gl

Already replaced by video_cards_nvidia.

Bug: https://bugs.gentoo.org/544708
Fixes: 99ec29149b8f511a4e99586d14ed6f11cdc5ed8d
Fixes: 816974ce2310b4843fca5e34a0d7add3aa67a057
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
index 132b2e9fc5e2..31d754e4390d 100644
--- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -13,7 +13,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 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X 
video_cards_nvidia"
+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.

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-03-24 Thread Sam James

commit: 99ec29149b8f511a4e99586d14ed6f11cdc5ed8d
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 25 03:49:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 25 03:54:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec2914

sys-apps/hwloc: fixup nvidia dependencies

- USE=tools isn't needed for nvidia-drivers (thanks Ionen!)
- addpredict for nvidia to avoid sandbox violation
- Add additional USE=video_cards_nvidia deps (only for this case, not in 
general)

Signed-off-by: Sam James  gentoo.org>

 .../{hwloc-2.7.1.ebuild => hwloc-2.7.1-r1.ebuild}  | 25 ++
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.7.1.ebuild 
b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
similarity index 81%
rename from sys-apps/hwloc/hwloc-2.7.1.ebuild
rename to sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
index 7b677fb68d16..132b2e9fc5e2 100644
--- a/sys-apps/hwloc/hwloc-2.7.1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild
@@ -15,9 +15,10 @@ 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 nvml +pci static-libs svg udev xml X 
video_cards_nvidia"
 
-# 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}]
+# 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}] )
@@ -25,15 +26,17 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
-   udev? ( virtual/libudev )
+   udev? ( virtual/libudev:= )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-   video_cards_nvidia? ( x11-drivers/nvidia-drivers[static-libs,tools] )"
+   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
-"
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+   virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 
@@ -49,6 +52,10 @@ 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"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2022-03-24 Thread Sam James

commit: 816974ce2310b4843fca5e34a0d7add3aa67a057
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 24 23:56:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 24 23:57:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816974ce

sys-apps/hwloc: add 2.7.1

Closes: https://bugs.gentoo.org/544708
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.7.1.ebuild | 103 ++
 2 files changed, 104 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 5ed805213b31..075870899733 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/sys-apps/hwloc/hwloc-2.7.1.ebuild 
b/sys-apps/hwloc/hwloc-2.7.1.ebuild
new file mode 100644
index ..7b677fb68d16
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.7.1.ebuild
@@ -0,0 +1,103 @@
+# 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 gl nvml +pci static-libs svg udev xml X 
video_cards_nvidia"
+
+# 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:= )
+   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,tools] )"
+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 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)
+   $

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-27 Thread Sam James

commit: 9029f9e333c22334a68be8e9a12f89a8321fd347
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Dec 27 13:54:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 27 22:25:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9029f9e3

sys-apps/hwloc: stable 2.6.0 for sparc, bug #829992

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index 822b36f4490d..b35442059218 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Arthur Zamarin

commit: e219eda7a3715f64b1992c8a0ef2a14a5bd83f7b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 26 20:50:42 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 26 20:50:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e219eda7

sys-apps/hwloc: Stabilize 2.6.0 arm64, #829992

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index 6a8c508b0e79..822b36f4490d 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 
~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Sam James

commit: 57ba3cd02a5b72b668492388cd75cd22dd4988ce
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 26 19:04:05 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 26 19:04:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ba3cd0

sys-apps/hwloc: Stabilize 2.6.0 arm, #829992

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index 10ed6f5ab726..6a8c508b0e79 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Arthur Zamarin

commit: 6fb7070ef138346b1906608b33bbc8c0d4b17daa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 26 18:41:45 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 26 18:41:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb7070e

sys-apps/hwloc: Stabilize 2.6.0 ppc64, #829992

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index f09902ba8b2b..10ed6f5ab726 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Arthur Zamarin

commit: 1705817bb67759a758b8ac2f748fd8b5648b55e6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 26 18:39:55 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 26 18:39:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1705817b

sys-apps/hwloc: Stabilize 2.6.0 ppc, #829992

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index 7ff575fef20d..f09902ba8b2b 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Agostino Sarubbo

commit: 09a2a2a73f35beb7d83162835a440eb316694597
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 26 08:08:04 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 26 08:08:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a2a2a7

sys-apps/hwloc: x86 stable wrt bug #829992

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index e3514bf668db..7ff575fef20d 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-26 Thread Agostino Sarubbo

commit: 0fc1a5d0f30d54757386dcdc083b21ec8582939e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Dec 26 08:07:33 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Dec 26 08:07:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fc1a5d0

sys-apps/hwloc: amd64 stable wrt bug #829992

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
index e9b6ea7e9d16..e3514bf668db 100644
--- a/sys-apps/hwloc/hwloc-2.6.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -13,7 +13,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 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86 ~amd64-linux ~x86-linux"
 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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-25 Thread Sam James

commit: faf0e3366f5223ea82b9508be828f08a9e321426
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 26 03:41:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 26 03:41:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faf0e336

sys-apps/hwloc: drop 2.3.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |  1 -
 sys-apps/hwloc/hwloc-2.3.0.ebuild | 98 ---
 2 files changed, 99 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 014c8ec08907..5ed805213b31 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,4 +1,3 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 
684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688
 SHA512 
9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 
96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46
 SHA512 
3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df

diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild 
b/sys-apps/hwloc/hwloc-2.3.0.ebuild
deleted file mode 100644
index f98a08eb4cda..
--- a/sys-apps/hwloc/hwloc-2.3.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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_en

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-12-25 Thread Sam James

commit: 63fbd80f3d9e65be22103b9c170a5e8e81286b57
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 26 03:41:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 26 03:41:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fbd80f

sys-apps/hwloc: Stabilize 2.5.0 arm64, #829991

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 62f46fe05946..a62d172fdecd 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv sparc x86 
~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-11-30 Thread Arthur Zamarin

commit: 6eee6ae50a446cfa0c4c25e76e92fba5cce26fa8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Dec  1 05:47:42 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Dec  1 05:47:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eee6ae5

sys-apps/hwloc: Stabilize 2.5.0 ppc, #811852

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index d62c7bc73b1c..62f46fe05946 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv sparc 
x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-11-30 Thread Arthur Zamarin

commit: 057e4aa75dd7dba9049b313a3960db1bfb3b6ea2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Dec  1 05:47:38 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Dec  1 05:47:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057e4aa7

sys-apps/hwloc: Stabilize 2.5.0 ppc64, #811852

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 0134baeceb16..d62c7bc73b1c 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv sparc 
x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-10-29 Thread Sam James

commit: 9eba4c8d45a806d2e757c67b832e991608143029
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 22:30:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 22:43:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eba4c8d

sys-apps/hwloc: add 2.6.0

We drop netloc support as it's about to be removed upstream.

Bug: https://github.com/open-mpi/hwloc/issues/478
Closes: https://bugs.gentoo.org/796797
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |   1 +
 sys-apps/hwloc/hwloc-2.6.0.ebuild | 104 ++
 2 files changed, 105 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 3f39e4ffc93..014c8ec0890 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,4 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 
684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688
 SHA512 
9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
+DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 
96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46
 SHA512 
3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df

diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild 
b/sys-apps/hwloc/hwloc-2.6.0.ebuild
new file mode 100644
index 000..e9b6ea7e9d1
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -0,0 +1,104 @@
+# 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 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+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="
+   >=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() {
+   # 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-10-19 Thread Sam James

commit: a2bdbe294a9387f9a745bb6b5cadbca9f80a80fa
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Oct 18 16:45:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 20 00:10:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2bdbe29

sys-apps/hwloc: stable 2.5.0 for sparc, bug #811852

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 745862c705b..0134baeceb1 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-10-14 Thread Agostino Sarubbo

commit: 742a95ecb3419d97ee1cbc2fbbc342e2d2f91666
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 15 06:00:28 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 15 06:00:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742a95ec

sys-apps/hwloc: x86 stable wrt bug #811852

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 9734432631f..745862c705b 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-10-14 Thread Agostino Sarubbo

commit: d04e88e6c06c6e48d996b6833195df933cdec2ac
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct 14 13:39:12 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct 14 13:39:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d04e88e6

sys-apps/hwloc: amd64 stable wrt bug #811852

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 81d347a6b75..9734432631f 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv ~sparc 
~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-10-13 Thread Sam James

commit: 3a7cdbedcd41a84169cf1a50d04653f196212dee
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 13 20:34:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 13 20:34:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7cdbed

sys-apps/hwloc: Stabilize 2.5.0 arm, #811852

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 7142d8ae3ff..81d347a6b75 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-07-14 Thread Marek Szuba

commit: 1354ba08fde99f786a2edb5ebe8df89daa920e0e
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jul 14 22:12:37 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 14 22:45:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1354ba08

sys-apps/hwloc-1.11.13: update EAPI 6 -> 7

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 151384ff11a..e6046bb1b54 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
+inherit autotools cuda flag-o-matic multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)
 
@@ -32,8 +32,8 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
 DOCS=( AUTHORS NEWS README VERSION )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-07-05 Thread Marek Szuba

commit: 8c61c91ec6f6b8dd5a59f68b395ba60995adfe59
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul  5 10:25:33 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul  5 13:24:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c61c91e

sys-apps/hwloc: keyword 2.5.0 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index f98a08eb4cd..7142d8ae3ff 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,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"
+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).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-06-14 Thread Georgy Yakovlev

commit: 85bf86f0ee5b866e8e67271ff283e933368148af
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jun 15 05:25:51 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jun 15 05:27:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bf86f0

sys-apps/hwloc: EPREFIX -> ESYSROOT for cuda

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 6 +++---
 sys-apps/hwloc/hwloc-2.3.0.ebuild   | 6 +++---
 sys-apps/hwloc/hwloc-2.5.0.ebuild   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index f9b7aae544d..151384ff11a 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 6756f4000ac..f98a08eb4cd 100644
--- a/sys-apps/hwloc/hwloc-2.3.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild
@@ -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=(

diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild 
b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index 6756f4000ac..f98a08eb4cd 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -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=(

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-06-14 Thread Georgy Yakovlev

commit: 75c5987de0da8fe9425f3ca2270db6a8dea22c8a
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Tue Jun 15 05:15:10 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Tue Jun 15 05:26:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c5987d

sys-apps/hwloc: rename useflag: libudev -> udev

USE=udev is enabled in profiles,
so this package is rarely built with udev support unless users opt-in,
yet without udev hwloc will try to manually parse udev raw files.

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/hwloc/hwloc-2.3.0.ebuild | 8 
 sys-apps/hwloc/hwloc-2.5.0.ebuild | 6 +++---
 sys-apps/hwloc/metadata.xml   | 1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild 
b/sys-apps/hwloc/hwloc-2.3.0.ebuild
index 6167e28c6bf..6756f4000ac 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}"
 
@@ -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
index 639dc0bff21..6756f4000ac 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -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}"
 
@@ -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/metadata.xml b/sys-apps/hwloc/metadata.xml
index b84a415e26a..05112b3f179 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -18,7 +18,6 @@
   Enable the cpuid-based arc

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2021-06-14 Thread Sam James

commit: 3b1873b49fd822d1cb3575e8e80bb9ca5c923261
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 15 03:52:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 15 04:03:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1873b4

sys-apps/hwloc: add 2.5.0

Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/Manifest   |  1 +
 sys-apps/hwloc/hwloc-2.5.0.ebuild | 98 +++
 2 files changed, 99 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 8a16dd2b5ea..3f39e4ffc93 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,2 +1,3 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
+DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 
684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688
 SHA512 
9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd

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 000..639dc0bff21
--- /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 libudev netloc nvml +pci static-libs svg 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] )
+   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}]
+   )
+   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${EPREFIX}/opt/cuda/include"
+   append-cppflags "-I${EPREFIX}/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${EPREFIX}/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 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-12-11 Thread Sergei Trofimovich

commit: 5dc87071b33cfe90ad019694c3b7171c1b056b43
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 11 09:01:39 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 11 09:08:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc87071

sys-apps/hwloc: explicitly disable opencl

Reported-by: Luke-Jr
Closes: https://bugs.gentoo.org/744646
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index ad6e5746054..8417f7fabee 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -57,6 +57,7 @@ multilib_src_configure() {
fi
 
ECONF_SOURCE=${S} econf \
+   --disable-opencl \
$(use_enable static-libs static) \
$(use_enable cairo) \
$(multilib_native_use_enable cuda) \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-12-11 Thread Sergei Trofimovich

commit: 7edeb0e317aaeb2eb1960ce549cdc7bf7acec0b8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 11 09:03:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 11 09:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edeb0e3

sys-apps/hwloc: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/Manifest   |  2 -
 sys-apps/hwloc/hwloc-1.11.10.ebuild   | 70 ---
 sys-apps/hwloc/hwloc-1.11.2-r1.ebuild | 69 --
 3 files changed, 141 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index d68e9a55e66..b04188380a6 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,6 +1,4 @@
-DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41
 SHA512 
9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 
3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c
 SHA512 
3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
deleted file mode 100644
index c3630b9ccaa..000
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic toolchain-funcs versionator 
multilib-minimal
-
-MY_PV=v$(get_version_component_range 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/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
-
-# 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}] )
-   cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
-   pci? (
-   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-   )
-   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   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"${EPREFIX}"/opt/cuda/include
-   append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-12-11 Thread Sergei Trofimovich

commit: ee03c1dda0f188cd496f83590274124b8ec902bf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Dec 11 09:05:23 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Dec 11 09:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee03c1dd

sys-apps/hwloc: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/Manifest   |  2 -
 sys-apps/hwloc/hwloc-2.0.4.ebuild | 67 ---
 sys-apps/hwloc/hwloc-2.1.0.ebuild | 83 ---
 3 files changed, 152 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index b04188380a6..8a16dd2b5ea 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,4 +1,2 @@
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
-DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 
3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c
 SHA512 
3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c

diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild 
b/sys-apps/hwloc/hwloc-2.0.4.ebuild
deleted file mode 100644
index c412bfedcf4..000
--- a/sys-apps/hwloc/hwloc-2.0.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
-
-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 cuda debug gl +pci plugins svg static-libs 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] )
-   pci? (
-   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-   )
-   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   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"${EPREFIX}"/opt/cuda/include
-   append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
-   fi
-
-   ECONF_SOURCE=${S} econf \
-   --disable-opencl \
-   $(use_enable static-libs static) \
-   $(use_enable cairo) \
-   $(multilib_native_use_enable cuda) \
-   $(use_enable debug) \
-   $(multilib_native_use_enable gl) \
-   $(use_enable pci) \
-   $(use_enable plugins) \
-   $(use_enable xml libxml2) \
-   $(use_with X x)
-}

diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild 
b/sys-apps/hwloc/hwloc-2.1.0.ebuild
deleted file mode 100644
index d996e67548a..000
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-11-05 Thread Georgy Yakovlev

commit: dadadaf7df6321b7ae80cc28404c2e31968df393
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Nov  5 08:14:25 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Nov  5 08:33:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadadaf7

sys-apps/hwloc: timeout bump to 2.3.0, fix multiple issues

fixed bash completion installation and aliases
fixed rustatedir, previosly it pointed to /var/lib/hwloc/run
dropped USE=plugins, disabled ltdl dep.
add missing nvml dependency
only install systemd unit on *86/64 arches.
use BDEPEND for some deps.

Closes: https://bugs.gentoo.org/727174
Closes: https://bugs.gentoo.org/723018
Closes: https://bugs.gentoo.org/711890
Closes: https://bugs.gentoo.org/724622
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/hwloc/Manifest   |  1 +
 sys-apps/hwloc/hwloc-2.3.0.ebuild | 98 +++
 2 files changed, 99 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 592f63c97ac..d68e9a55e66 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -3,3 +3,4 @@ DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 
3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c
 SHA512 
3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
+DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 
60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe
 SHA512 
ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c

diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild 
b/sys-apps/hwloc/hwloc-2.3.0.ebuild
new file mode 100644
index 000..6167e28c6bf
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 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 libudev netloc nvml +pci static-libs svg 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] )
+   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}]
+   )
+   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${EPREFIX}/opt/cuda/include"
+   append-cppflags "-I${EPREFIX}/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${EPREFIX}/opt/cuda/$(get_libdir)"
+   fi
+
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-05 Thread Agostino Sarubbo

commit: 7eca9fd674314a6fda42460708eae2333de43e5d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Aug  5 13:51:54 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Aug  5 13:51:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eca9fd6

sys-apps/hwloc: amd64 stable wrt bug #711888

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index f3d9bd8ae5c..ba8a446c93f 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-04 Thread Sam James

commit: c9f6d9282191c714846507b8300bf02a7a6feadc
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  4 15:07:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  4 15:10:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f6d928

sys-apps/hwloc: arm stable (bug #711888)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 23de054b8fa..f3d9bd8ae5c 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-02 Thread Sergei Trofimovich

commit: d822b5d934d24267327836b9109a70ba8fda0db0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug  2 12:43:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug  2 12:43:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d822b5d9

sys-apps/hwloc: stable 1.11.13 for sparc

stable wrt bug #711888

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index da8c4991701..23de054b8fa 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-02 Thread Sergei Trofimovich

commit: bb66f2fb093f74bf5e08e0fe9f2c427e3f226d93
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug  2 12:03:31 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug  2 12:04:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb66f2fb

sys-apps/hwloc: stable 1.11.13 for ppc64

stable wrt bug #711888

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 693a0287369..da8c4991701 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-02 Thread Sergei Trofimovich

commit: 93551f02424a40f0b1c4e9e0c84c4180f3952df2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug  2 11:41:34 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug  2 11:41:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93551f02

sys-apps/hwloc: stable 1.11.13 for ppc

stable wrt bug #711888

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 8e4535e6335..693a0287369 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-08-02 Thread Sergei Trofimovich

commit: fcedf053510e5992ffa41b5c1a2fe9e589bd26c4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Aug  2 11:39:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Aug  2 11:39:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcedf053

sys-apps/hwloc: stable 1.11.13 for hppa

stable wrt bug #711888

Package-Manager: Portage-3.0.1, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index c516245e9a9..8e4535e6335 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-07-30 Thread Sam James

commit: b1f4fd2e47737b1f630b2c25adb4ffa0e1f6ae99
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 30 22:43:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 30 22:43:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f4fd2e

sys-apps/hwloc: arm64 stable (bug #711888)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 6d4a1f6d102..c516245e9a9 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-05-18 Thread Guilherme Amadio

commit: 918b39ceba3190aa076cc30517d1c589077d5ba5
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Mon May 18 15:59:08 2020 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Mon May 18 15:59:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918b39ce

sys-apps/hwloc: fix on prefix

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Guilherme Amadio  gentoo.org>

 sys-apps/hwloc/hwloc-2.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild 
b/sys-apps/hwloc/hwloc-2.1.0.ebuild
index ebd90793781..7c50207b278 100644
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -78,6 +78,6 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
default
-   systemd_dounit "${D}/usr/share/hwloc/hwloc-dump-hwdata.service"
-   find "${D}" -name '*.la' -delete || die
+   systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
+   find "${ED}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-05-11 Thread Alexys Jacob

commit: f226a1b982a2d3d34c74d65fc21d6ab9e7912871
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Apr 10 17:28:01 2020 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon May 11 16:03:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f226a1b9

sys-apps/hwloc: new version

Closes: https://bugs.gentoo.org/699076
Closes: https://bugs.gentoo.org/698620
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14785
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-apps/hwloc/Manifest   |  1 +
 sys-apps/hwloc/hwloc-2.1.0.ebuild | 83 +++
 sys-apps/hwloc/metadata.xml   | 13 --
 3 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 8d842bb46d7..592f63c97ac 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,3 +2,4 @@ DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
+DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 
3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c
 SHA512 
3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501

diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild 
b/sys-apps/hwloc/hwloc-2.1.0.ebuild
new file mode 100644
index 000..ebd90793781
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools 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="http://www.open-mpi.org/projects/hwloc/";
+SRC_URI="http://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 plugins static-libs 
svg 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] )
+   libudev?( virtual/libudev )
+   netloc? ( !sys-apps/netloc )
+   pci?(
+   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+   
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+   )
+   plugins?( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+   xml?( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+   default
+   eautoreconf
+
+   if use cuda ; then
+   append-cflags "-I${EPREFIX}/opt/cuda/include"
+   append-cppflags "-I${EPREFIX}/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${EPREFIX}/opt/cuda/$(get_libdir)"
+   fi
+
+   local myconf=(
+   --disable-opencl
+   --enable-shared
+   $(multilib_native_use_enable cuda)
+   $(multilib_native_use_enable gl)
+   $(use_enable cairo)
+   $(use_enable cpuid)
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-05-08 Thread Alexys Jacob

commit: 8bdb2a075697c4c4720f44bfba13b07850f211c1
Author: Alexey Sokolov  google  com>
AuthorDate: Fri May  8 00:55:56 2020 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri May  8 08:23:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdb2a07

sys-apps/hwloc: update homepage

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alexey Sokolov  google.com>
Closes: https://github.com/gentoo/gentoo/pull/15701
Signed-off-by: Alexys Jacob  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.10.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.13.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.2-r1.ebuild | 4 ++--
 sys-apps/hwloc/hwloc-2.0.4.ebuild | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index fdf1744dfe1..6eb8bb41080 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic toolchain-funcs versionator 
multilib-minimal
 MY_PV=v$(get_version_component_range 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+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/5"

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index e16d3cf3a0c..5ea06899c88 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal 
toolchain-funcs
 MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+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/5"

diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index acb852ae7cd..48b8f6e46a3 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -8,8 +8,8 @@ inherit flag-o-matic cuda autotools-multilib multilib 
toolchain-funcs versionato
 MY_PV=v$(get_version_component_range 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+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/5"

diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild 
b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index e62701d2393..b70355bd1d6 100644
--- a/sys-apps/hwloc/hwloc-2.0.4.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -8,8 +8,8 @@ inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal 
toolchain-funcs
 MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+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"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2020-02-13 Thread David Seifert

commit: 7bc60a157a00be0187159f7de6bd2422553d2c8d
Author: David Seifert  gentoo  org>
AuthorDate: Thu Feb 13 21:38:53 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Feb 13 21:38:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc60a15

sys-apps/hwloc: [QA] inherit toolchain-funcs.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/hwloc/hwloc-1.11.10.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.13.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.2-r1.ebuild | 2 +-
 sys-apps/hwloc/hwloc-2.0.4.ebuild | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index 196184c7059..fdf1744dfe1 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools cuda flag-o-matic versionator multilib-minimal
+inherit autotools cuda flag-o-matic toolchain-funcs versionator 
multilib-minimal
 
 MY_PV=v$(get_version_component_range 1-2)
 

diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 2ad20e19677..e16d3cf3a0c 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
+inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)
 

diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index 4961615eb9b..4230766967a 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit flag-o-matic cuda autotools-multilib multilib versionator
+inherit flag-o-matic cuda autotools-multilib multilib toolchain-funcs 
versionator
 
 MY_PV=v$(get_version_component_range 1-2)
 

diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild 
b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index 2219e2260c8..e62701d2393 100644
--- a/sys-apps/hwloc/hwloc-2.0.4.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
+inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
 
 MY_PV=v$(ver_cut 1-2)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2019-06-12 Thread Justin Bronder

commit: c234db0293d0ffe7b8b9e7e1892c50aa68b19028
Author: Justin Bronder  gentoo  org>
AuthorDate: Wed Jun 12 21:14:39 2019 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Wed Jun 12 21:16:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234db02

Partial Revert "sys-apps/hwloc: cleanup old"

This reverts commit de690876c21341951f7fa9aef5e66c26222862dd as I didn't
noticed that arm64 alone had marked 1.11.10 as stable.

Signed-off-by: Justin Bronder  gentoo.org>

 sys-apps/hwloc/Manifest |  1 +
 sys-apps/hwloc/hwloc-1.11.10.ebuild | 70 +
 2 files changed, 71 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index a0b1ddc5070..8d842bb46d7 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,4 @@
+DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41
 SHA512 
9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
new file mode 100644
index 000..e2f6d1687b8
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic versionator multilib-minimal
+
+MY_PV=v$(get_version_component_range 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
+
+# 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}] )
+   cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
+   pci? (
+   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+   )
+   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+   default
+   eautoreconf
+
+   if use cuda ; then
+   append-cflags -I"${EPREFIX}"/opt/cuda/include
+   append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
+   fi
+
+   ECONF_SOURCE=${S} econf \
+   $(use_enable static-libs static) \
+   $(use_enable cairo) \
+   $(multilib_native_use_enable cuda) \
+   $(use_enable debug) \
+   $(multilib_native_use_enable gl) \
+   $(use_enable pci) \
+   $(use_enable plugins) \
+   $(use_enable numa libnuma) \
+   $(use_enable xml libxml2) \
+   $(use_with X x)
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2019-06-12 Thread Justin Bronder

commit: 53900ce01ef1ebc1d17d2874b63866b8f336c607
Author: Justin Bronder  gentoo  org>
AuthorDate: Wed Jun 12 17:51:48 2019 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Wed Jun 12 18:13:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53900ce0

sys-apps/hwloc: bump 2.0.4 and update subslot

Fixes:
https://bugs.gentoo.org/684348
https://bugs.gentoo.org/684378

Signed-off-by: Justin Bronder  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 sys-apps/hwloc/Manifest  | 2 +-
 sys-apps/hwloc/{hwloc-2.0.2-r1.ebuild => hwloc-2.0.4.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 12eb34c8231..dfa24bea433 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,4 +2,4 @@ DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b
 DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 
57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d
 SHA512 
cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 
9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044
 SHA512 
f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
-DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 
868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8
 SHA512 
b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
+DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce

diff --git a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-2.0.4.ebuild
similarity index 99%
rename from sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
rename to sys-apps/hwloc/hwloc-2.0.4.ebuild
index 57d0a74d2dd..42cab5ea370 100644
--- a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
 
SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
 
 LICENSE="BSD"
-SLOT="0/5"
+SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +pci plugins svg static-libs xml X"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2019-06-12 Thread Justin Bronder

commit: b7862e51501b96d277626ca3d8644352861b5bd3
Author: Justin Bronder  gentoo  org>
AuthorDate: Wed Jun 12 18:12:15 2019 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Wed Jun 12 18:13:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7862e51

sys-apps/hwloc:  bump 1.11.13

Fixes https://bugs.gentoo.org/684378

Signed-off-by: Justin Bronder  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 sys-apps/hwloc/Manifest   | 2 +-
 sys-apps/hwloc/{hwloc-1.11.11.ebuild => hwloc-1.11.13.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index f7eac3e571c..a0b1ddc5070 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,3 @@
-DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 
57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d
 SHA512 
cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
+DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B 
a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f
 SHA512 
dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce

diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild 
b/sys-apps/hwloc/hwloc-1.11.13.ebuild
similarity index 98%
rename from sys-apps/hwloc/hwloc-1.11.11.ebuild
rename to sys-apps/hwloc/hwloc-1.11.13.ebuild
index 971dfae0ef6..f3a4a7fc25a 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2019-06-12 Thread Justin Bronder

commit: de690876c21341951f7fa9aef5e66c26222862dd
Author: Justin Bronder  gentoo  org>
AuthorDate: Wed Jun 12 17:54:06 2019 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Wed Jun 12 18:13:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de690876

sys-apps/hwloc: cleanup old

Signed-off-by: Justin Bronder  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 sys-apps/hwloc/Manifest |  2 --
 sys-apps/hwloc/hwloc-1.11.10.ebuild | 70 -
 sys-apps/hwloc/hwloc-1.11.7.ebuild  | 70 -
 3 files changed, 142 deletions(-)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index dfa24bea433..f7eac3e571c 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,5 +1,3 @@
-DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41
 SHA512 
9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 
57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d
 SHA512 
cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
-DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 
9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044
 SHA512 
f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 
0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4
 SHA512 
c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
deleted file mode 100644
index e2f6d1687b8..000
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic versionator multilib-minimal
-
-MY_PV=v$(get_version_component_range 1-2)
-
-DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
-
-# 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}] )
-   cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
-   pci? (
-   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-   )
-   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
-   default
-   eautoreconf
-
-   if use cuda ; then
-   append-cflags -I"${EPREFIX}"/opt/cuda/include
-   append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
-   fi
-
-   ECONF_SOURCE=${S} econf \
-   $(use_enable static-libs static) \
-   $(use_enable cairo) \
-   $(multilib_native_use_enable cuda) \
-   $(use_enable debug) \
-   $(multilib_native_use_enable gl) \
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2019-04-15 Thread Justin Bronder

commit: 9377a0a43cb2a4bc366efe449419659200dc3d08
Author: Justin Bronder  gentoo  org>
AuthorDate: Mon Apr 15 20:00:48 2019 +
Commit: Justin Bronder  gentoo  org>
CommitDate: Mon Apr 15 20:00:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9377a0a4

sys-apps/hwloc: explicitly disable opencl

Per #683216, OpenCL will get picked up automatically.

Signed-off-by: Justin Bronder  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-apps/hwloc/{hwloc-2.0.2.ebuild => hwloc-2.0.2-r1.ebuild} | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild 
b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
similarity index 88%
rename from sys-apps/hwloc/hwloc-2.0.2.ebuild
rename to sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
index 971dfae0ef6..57d0a74d2dd 100644
--- a/sys-apps/hwloc/hwloc-2.0.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,13 +14,11 @@ 
SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
 LICENSE="BSD"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
+IUSE="cairo cuda debug gl +pci plugins svg static-libs 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.
 
-# 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}] )
cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
@@ -30,7 +28,6 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
)
plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -57,6 +54,7 @@ multilib_src_configure() {
fi
 
ECONF_SOURCE=${S} econf \
+   --disable-opencl \
$(use_enable static-libs static) \
$(use_enable cairo) \
$(multilib_native_use_enable cuda) \
@@ -64,7 +62,6 @@ multilib_src_configure() {
$(multilib_native_use_enable gl) \
$(use_enable pci) \
$(use_enable plugins) \
-   $(use_enable numa libnuma) \
$(use_enable xml libxml2) \
$(use_with X x)
 }

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2018-10-13 Thread Mikle Kolyada

commit: 1dc7c47d4902fe1949725365284fc18543537753
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 13 10:02:58 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 13 10:07:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc7c47d

sys-apps/hwloc: Drop non-existing media-video/nvidia-settings

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 sys-apps/hwloc/hwloc-1.11.10.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.11.ebuild   | 4 ++--
 sys-apps/hwloc/hwloc-1.11.2-r1.ebuild | 4 ++--
 sys-apps/hwloc/hwloc-1.11.7.ebuild| 4 ++--
 sys-apps/hwloc/hwloc-2.0.2.ebuild | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild 
b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index 83dab218d51..e2f6d1687b8 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 
xml X"
 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] 
media-video/nvidia-settings ) )
+   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]

diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild 
b/sys-apps/hwloc/hwloc-1.11.11.ebuild
index 99b6fa5187f..971dfae0ef6 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 
xml X"
 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] 
media-video/nvidia-settings ) )
+   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]

diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild 
b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index 2f6751aa3ce..cb05149d393 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 
xml X"
 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] 
media-video/nvidia-settings ) )
+   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]

diff --git a/sys-apps/hwloc/hwloc-1.11.7.ebuild 
b/sys-apps/hwloc/hwloc-1.11.7.ebuild
index 1978df29ec2..d0ae4427089 100644
--- a/sys-apps/hwloc/hwloc-1.11.7.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 
xml X"
 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] 
media-video/nvidia-settings ) )
+   gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
pci? (
>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]

diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild 
b/sys-apps/hwloc/hwloc-2.0.2.ebuild
index 99b6fa5187f..971dfae0ef6 100644
--- a/sys-apps/hwloc/hwloc-2.0.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public Licens

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2018-09-06 Thread Georgy Yakovlev

commit: e893bba7963ae1963a1b657f0c1b829b07d796c6
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Thu Sep  6 22:11:00 2018 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Thu Sep  6 22:11:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e893bba7

sys-apps/hwloc: fix MY_PV for 1.11.11 and 2.0.2

Closes: https://bugs.gentoo.org/665326
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/hwloc/hwloc-1.11.11.ebuild | 2 +-
 sys-apps/hwloc/hwloc-2.0.2.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild 
b/sys-apps/hwloc/hwloc-1.11.11.ebuild
index cedd15f02d9..99b6fa5187f 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
 
-MY_PV=v$(ver_rs 1-2)
+MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
 HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";

diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild 
b/sys-apps/hwloc/hwloc-2.0.2.ebuild
index cedd15f02d9..99b6fa5187f 100644
--- a/sys-apps/hwloc/hwloc-2.0.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
 
-MY_PV=v$(ver_rs 1-2)
+MY_PV=v$(ver_cut 1-2)
 
 DESCRIPTION="displays the hardware topology in convenient formats"
 HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";

[gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/

2018-09-05 Thread Alexey Shvetsov

commit: 22c0b91257b9ca896137ed32b14731dfb3c502c0
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Wed Sep  5 20:47:15 2018 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Wed Sep  5 20:47:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c0b912

sys-apps/hwloc: Version bump

Closes: https://bugs.gentoo.org/658486
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 sys-apps/hwloc/Manifest |  2 ++
 sys-apps/hwloc/hwloc-1.11.11.ebuild | 70 +
 sys-apps/hwloc/hwloc-2.0.2.ebuild   | 70 +
 3 files changed, 142 insertions(+)

diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 9237c888db0..12eb34c8231 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,3 +1,5 @@
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 
4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41
 SHA512 
9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
+DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 
57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d
 SHA512 
cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 
29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967
 SHA512 
aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 
9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044
 SHA512 
f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
+DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 
868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8
 SHA512 
b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef

diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild 
b/sys-apps/hwloc/hwloc-1.11.11.ebuild
new file mode 100644
index 000..cedd15f02d9
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.11.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal
+
+MY_PV=v$(ver_rs 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/";
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2";
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs 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.
+
+# 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}] )
+   cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+   gl? ( || ( x11-drivers/nvidia-drivers[static-libs,tools] 
media-video/nvidia-settings ) )
+   pci? (
+   >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+   >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+   )
+   plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+   numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+   xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+   default
+   eautoreconf
+
+   if use cuda ; then
+   append-cflags -I"${EPREFIX}"/opt/cuda/include
+   append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
+   fi
+
+   ECONF_SOURCE=${S} econf \
+   $(use_enable static-libs static) \
+   $(use_enable cairo) \
+   $(multilib_native_use_enable cuda) \
+   $(use_enable debug) \
+   $(multilib_native_use_enab

1 2 >

1 - 100 of 115 matches

Mail list logo