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

[Pacho Ramos]

commit:     d8d1957c3ae62f4f6677bd6ccee9f4df01ab4523
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 14:29:31 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 14:49:21 2022 +0000
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 <pacho <AT> 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"
 }