From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- sys-apps/hwloc/Manifest | 6 +-- sys-apps/hwloc/hwloc-2.3.0.ebuild | 98 --------------------------------------- sys-apps/hwloc/hwloc-2.5.0.ebuild | 2 +- sys-apps/hwloc/hwloc-2.6.0.ebuild | 2 +- 4 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 sys-apps/hwloc/hwloc-2.3.0.ebuild (limited to 'sys-apps/hwloc') diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index 08761daa70cc..1150689380d1 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,10 +1,8 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 -DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a -EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0 -EBUILD hwloc-2.5.0.ebuild 2927 BLAKE2B b55f392b146a4c650c6bff2efefbe486310d8b5bb89b356d4d890d5b3065f76ffd020458f104addc7dee721db55e87f92cb9e43c6b7fec8271f0d713c7a5519c SHA512 d1525f36a8e4bc523261414959ff71c48d5170fdf1d72dae8a748d5e5a4934e20c36054fae276c272234671bc0b93e83563e9f8ca5e5e1dca3a708ca611f02f9 -EBUILD hwloc-2.6.0.ebuild 2978 BLAKE2B 4c2bee72a5dc36d0f21a1bae9f30bcdb776841aec10ed1f85f310c381ac3e67e1dd2b7c9039b09350a9e3c695e8d53414269429d3ff065a0a860f06e77343f4f SHA512 e314467f21584298bd9143928e22f5a0208933ea16a7c2738d7acb0a4ddb802f7aed8395cfaa3a5592c4ab4d4b7db904b5706c513a82251b36c2987fe377a534 +EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B d31578704690fd2ff24293a7a0ce316c1e04aee68f6e86646b90af3985f0719207ceb5273074e023d078cfe7e6ab43f1b353aea369eac06cc8d7465aacb300ee SHA512 ac6f807ea342db2a296c352b98b92185dc4f8133271814984329afc2b86de88936d4c27b51fda98ddd91c0877f02225d023f6c75ded8f99bc51ac6665c0107d0 +EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B abf59e91fdbceb69f173417ebde9008a2e0db5d71a97dd722715c3a06afcef851664b4878d9e1b82e1ebe30c88eaf889b1d6b28d4768470e946ce6c76e375ffa SHA512 7be8ba3134564367ac352c0c3f17ec45f93a7d57b8a122f55310e3e0e293a7b8fbaab15a3ede77147db4cfe01aa0b2f973da25e34a092e0d8eccb23f4004a004 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317 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..000000000000 --- 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_enable static-libs static) - $(use_enable xml libxml2) - $(use_with X x) - ) - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - default - case ${ARCH} in - # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. - amd64|x86) - systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; - esac - mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die - bashcomp_alias hwloc-annotate \ - hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} - bashcomp_alias hwloc-annotate lstopo{,-no-graphics} - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-apps/hwloc/hwloc-2.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). diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild index e9b6ea7e9d16..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). -- cgit v1.2.3