From c956c264bdc853972b72016b752683468881af25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 9 Oct 2022 01:31:00 +0100 Subject: gentoo auto-resync : 09:10:2022 - 01:31:00 --- sys-apps/Manifest.gz | Bin 49389 -> 49382 bytes sys-apps/hwloc/Manifest | 12 +- sys-apps/hwloc/hwloc-1.11.13-r1.ebuild | 71 +++++++++ sys-apps/hwloc/hwloc-1.11.13.ebuild | 71 --------- sys-apps/hwloc/hwloc-2.5.0.ebuild | 98 ------------- sys-apps/hwloc/hwloc-2.6.0-r1.ebuild | 104 +++++++++++++ sys-apps/hwloc/hwloc-2.6.0.ebuild | 104 ------------- sys-apps/hwloc/hwloc-2.7.1-r1.ebuild | 110 -------------- sys-apps/hwloc/hwloc-2.8.0-r1.ebuild | 110 ++++++++++++++ sys-apps/hwloc/hwloc-2.8.0.ebuild | 110 -------------- sys-apps/hwloc/metadata.xml | 1 - sys-apps/iproute2/Manifest | 4 +- sys-apps/iproute2/iproute2-5.19.0-r2.ebuild | 213 --------------------------- sys-apps/iproute2/iproute2-5.19.0-r3.ebuild | 217 ++++++++++++++++++++++++++++ sys-apps/iproute2/iproute2-9999.ebuild | 4 + 15 files changed, 512 insertions(+), 717 deletions(-) create mode 100644 sys-apps/hwloc/hwloc-1.11.13-r1.ebuild delete mode 100644 sys-apps/hwloc/hwloc-1.11.13.ebuild delete mode 100644 sys-apps/hwloc/hwloc-2.5.0.ebuild create mode 100644 sys-apps/hwloc/hwloc-2.6.0-r1.ebuild delete mode 100644 sys-apps/hwloc/hwloc-2.6.0.ebuild delete mode 100644 sys-apps/hwloc/hwloc-2.7.1-r1.ebuild create mode 100644 sys-apps/hwloc/hwloc-2.8.0-r1.ebuild delete mode 100644 sys-apps/hwloc/hwloc-2.8.0.ebuild delete mode 100644 sys-apps/iproute2/iproute2-5.19.0-r2.ebuild create mode 100644 sys-apps/iproute2/iproute2-5.19.0-r3.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 10d5a5fee490..07046211ec23 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index dadb6ccfc916..b45d6f6c4aa1 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,12 +1,8 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 -DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df -DIST hwloc-2.7.1.tar.bz2 6810477 BLAKE2B 26706b8835954b8baa9028eaf2da0f8ae6e57d1841d68daaa04d58a7b24a67e4e171eb439b8dbfb589a70eb1b5cced51f12a99bb7132591919c902374f89025f SHA512 35de85de3f5e75de30b5ac72d2c118dcb990a2427c9812910a03772857181fd7259a27352b34a968186d02ffc811644c3411d84ee37f2d0ff9b83628951b4863 DIST hwloc-2.8.0.tar.bz2 6896344 BLAKE2B 33f75987ee904d5ee9c62268695a2f7f59b0adc2e1601fc4407f525664b78a7fab04c75823ce9d190c8cb9ffc0ce983d7137555625d47bc1451a2d0c6f330055 SHA512 025c8ebc2945bdf696cc66fe2cfea0195694713a6098603fb4eaeac409d2f6c3386a7c2b4d7f3758d828f6b621e7f06ffb5745224cb1df2f8ff4f19b2a8a4a7b -EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B e055e5b7624f56f54352a39649a51dba5dfe2e6cfddcdf83ef6496f9e88a8ed7b417c47d0e6a6cb5ebbd18619514b8497ceae74ca7df7fa236b86f4cb108e170 SHA512 6684246ba36711860baee3429c7976c6a719b63b2999cacbe7135450d8954082ed282485bb2f68a82c0fc67f78231c6f1c63626adc09f38a50197be8ef142e05 -EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 10a2be87fa805d97886e1e9261506af1e027314a68bac3656babfaadbe7273cb91a01ca9706ea9f284b015b8ec0b776f648a6c3461d3ce05147086a6b0fdd75c SHA512 5d0aab779a86fdd409bdaa98fff362824b301675db065859022fbff2a55f4f1a88263cadb85af9470e4915c5cc5c8a34e7e5f2d1376480fbd0b9ed46363ca7e2 -EBUILD hwloc-2.6.0.ebuild 2971 BLAKE2B 79a488a0e115c7f26a80b007088f8c14fc44d894b47637b0f2f9315082496361926165319e2e71ca21383406ea482f09c7dd6054ab4a198bc6c1e13605fbec1c SHA512 bf4432b8a655a23ae2faee3f1139d2beba90389f98df232a3999f4b86c73f01fa22c33e6350bd70817bc14e23f93115aba02cb9a9d5dae78ae1e023021b91707 -EBUILD hwloc-2.7.1-r1.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a -EBUILD hwloc-2.8.0.ebuild 3220 BLAKE2B 3db9e6c805c4b3d9edcfb82d004fc7b3e6b9b09464cc7b0c8ed66636a3471f09a93504614f5326a9eeaebd62fcdf50c95c072ba9c847cac2492e13746819ed9a SHA512 dfd57d3a33c5ebe9523fdc00cb1890c07aae9163df98a6ec262d63c12006a4c57b841f03a3fd6e47ecfa486b45a91521f1cc8a76f2eb69b22ae146c813d3094a -MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317 +EBUILD hwloc-1.11.13-r1.ebuild 2170 BLAKE2B c60546587b078379e46b409675d5e0efdd1ea7a19e08e2640d4119574212e55798274f776a25b9f326a4e97d47afed5a2e85c512b825cca040eb27cae6ff3ac6 SHA512 2d359bbef4c8689f96a0a3ad94a0db259fe62ecc4e95e5340f8c8284fccff896355d950988689189199ab67ecd9df3c1057311f2f78d36f9add5b2c4ffdc8613 +EBUILD hwloc-2.6.0-r1.ebuild 2974 BLAKE2B 7498ce7bf1f84a79837ccbd329c7283d0999736c235be8eb9354022dd0dfa950566bc31cd3a8c3951393e33a596ab99e331831db622b82efcfcec22886121765 SHA512 c55a5e9b2c59adbc2dcf2bfe70a2da041af0affb20f645f6dcab392006007a682e66db96a62c5988a4450cd905d0754ba7f25d744b89f573e621e8165bb0d913 +EBUILD hwloc-2.8.0-r1.ebuild 3221 BLAKE2B 693474de344b9f629c0815b29bc914bc3fde8c23275f5da518d04391cd02e1e7331df4fe3a5e578b2b73e672ab06889aff5844127bcf956ce0275e4eb6529c4a SHA512 3ee7e3013b97de25c24c68e1b04a0bddb0ceb4ba7202ec7ed8409e86120dde0566789f255eb02f633f3b96da092eea387d522ce9a1d5ef0e781bee6a78dffec5 +MISC metadata.xml 1661 BLAKE2B 11ace24114c7763a173d3175338aef1ade993df5e30df405eb4b94d9942ff712026f43bf19bb956cfbe6ea27b52af5746c64efbb0b752baf381ffc2eb5d58029 SHA512 a2a16701d2429b24a5d9dc4a6cff6a3d1a88e9d8e67d6d98a54915dc04c2db7b5ed1f23c798a2e4af9c1bf702529a165ca5f0ed046dc051c0aeb120c119ac6e5 diff --git a/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild new file mode 100644 index 000000000000..fa0401fa01ac --- /dev/null +++ b/sys-apps/hwloc/hwloc-1.11.13-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 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 ~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}" +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/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild deleted file mode 100644 index 435ec3acffa0..000000000000 --- a/sys-apps/hwloc/hwloc-1.11.13.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 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 ~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}" -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/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild deleted file mode 100644 index 763685d9bf37..000000000000 --- a/sys-apps/hwloc/hwloc-2.5.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal - -MY_PV="v$(ver_cut 1-2)" - -DESCRIPTION="Displays the hardware topology in convenient formats" -HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" -SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X" - -# opencl support dropped with x11-drivers/ati-drivers being removed (#582406). -# Anyone with hardware is welcome to step up and help test to get it re-added. - -RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] - - cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) - netloc? ( !sys-apps/netloc ) - nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) - pci? ( - >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] - >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] - ) - udev? ( virtual/libudev ) - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" - -# 2.69-r5 for --runstatedir -BDEPEND=" - >=sys-devel/autoconf-2.69-r5 - virtual/pkgconfig -" - -PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) -DOCS=( AUTHORS NEWS README VERSION ) - -src_prepare() { - default - eautoreconf - - if use cuda ; then - append-cflags "-I${ESYSROOT}/opt/cuda/include" - append-cppflags "-I${ESYSROOT}/opt/cuda/include" - fi -} - -multilib_src_configure() { - export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467 - - if use cuda ; then - local -x LDFLAGS="${LDFLAGS}" - append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)" - fi - - local myconf=( - --disable-opencl - --disable-plugin-ltdl - --enable-plugins - --enable-shared - --runstatedir="${EPREFIX}/run" - $(multilib_native_use_enable cuda) - $(multilib_native_use_enable gl) - $(use_enable cairo) - $(use_enable cpuid) - $(use_enable debug) - $(use_enable udev libudev) - $(use_enable netloc) - $(use_enable nvml) - $(use_enable pci) - $(use_enable static-libs static) - $(use_enable xml libxml2) - $(use_with X x) - ) - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - default - case ${ARCH} in - # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. - amd64|x86) - systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; - esac - mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die - bashcomp_alias hwloc-annotate \ - hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} - bashcomp_alias hwloc-annotate lstopo{,-no-graphics} - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild new file mode 100644 index 000000000000..9fbd4c477c6c --- /dev/null +++ b/sys-apps/hwloc/hwloc-2.6.0-r1.ebuild @@ -0,0 +1,104 @@ +# 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 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 cairo) + $(use_enable cpuid) + $(use_enable debug) + $(use_enable udev libudev) + $(use_enable nvml) + $(use_enable pci) + $(use_enable static-libs static) + $(use_enable xml libxml2) + $(use_with X x) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + default + + case ${ARCH} in + # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. + amd64|x86) + systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; + esac + + mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die + bashcomp_alias hwloc-annotate \ + hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} + bashcomp_alias hwloc-annotate lstopo{,-no-graphics} + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild deleted file mode 100644 index 8e0985a990dc..000000000000 --- a/sys-apps/hwloc/hwloc-2.6.0.ebuild +++ /dev/null @@ -1,104 +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 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 cairo) - $(use_enable cpuid) - $(use_enable debug) - $(use_enable udev libudev) - $(use_enable nvml) - $(use_enable pci) - $(use_enable static-libs static) - $(use_enable xml libxml2) - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - default - - case ${ARCH} in - # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. - amd64|x86) - systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;; - esac - - mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die - bashcomp_alias hwloc-annotate \ - hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} - bashcomp_alias hwloc-annotate lstopo{,-no-graphics} - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild b/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild deleted file mode 100644 index 88cb06eb1dfc..000000000000 --- a/sys-apps/hwloc/hwloc-2.7.1-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal - -MY_PV="v$(ver_cut 1-2)" -DESCRIPTION="Displays the hardware topology in convenient formats" -HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" -SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia" - -# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406). -# anyone with hardware is welcome to step up and help test to get it re-added. -# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4 -RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}] - cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) - pci? ( - >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] - >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] - ) - udev? ( virtual/libudev:= ) - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( - x11-drivers/nvidia-drivers[static-libs] - x11-libs/libXext - x11-libs/libX11 - )" -DEPEND="${RDEPEND}" -# 2.69-r5 for --runstatedir -BDEPEND=">=sys-devel/autoconf-2.69-r5 - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) - -DOCS=( AUTHORS NEWS README VERSION ) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - # bug #393467 - export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" - - if use video_cards_nvidia ; then - addpredict /dev/nvidiactl - fi - - if use cuda ; then - append-cflags "-I${ESYSROOT}/opt/cuda/include" - append-cppflags "-I${ESYSROOT}/opt/cuda/include" - - local -x LDFLAGS="${LDFLAGS}" - append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)" - fi - - local myconf=( - --disable-opencl - - # netloc is deprecated upstream, about to be removed - # bug #796797 - --disable-netloc - - --disable-plugin-ltdl - --enable-plugins - --enable-shared - --runstatedir="${EPREFIX}/run" - $(multilib_native_use_enable cuda) - $(multilib_native_use_enable video_cards_nvidia gl) - $(use_enable cairo) - $(use_enable cpuid) - $(use_enable debug) - $(use_enable udev libudev) - $(use_enable nvml) - $(use_enable pci) - $(use_enable static-libs static) - $(use_enable xml libxml2) - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - default - - case ${ARCH} in - # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. - amd64|x86) - systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" - ;; - esac - - mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die - bashcomp_alias hwloc-annotate \ - hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} - bashcomp_alias hwloc-annotate lstopo{,-no-graphics} - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild b/sys-apps/hwloc/hwloc-2.8.0-r1.ebuild new file mode 100644 index 000000000000..d496823096f3 --- /dev/null +++ b/sys-apps/hwloc/hwloc-2.8.0-r1.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" + $(multilib_native_use_enable cuda) + $(multilib_native_use_enable video_cards_nvidia gl) + $(use_enable cairo) + $(use_enable cpuid) + $(use_enable debug) + $(use_enable udev libudev) + $(use_enable nvml) + $(use_enable pci) + $(use_enable static-libs static) + $(use_enable xml libxml2) + $(use_with X x) + ) + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_install_all() { + default + + case ${ARCH} in + # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. + amd64|x86) + systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" + ;; + esac + + mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die + bashcomp_alias hwloc-annotate \ + hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} + bashcomp_alias hwloc-annotate lstopo{,-no-graphics} + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sys-apps/hwloc/hwloc-2.8.0.ebuild b/sys-apps/hwloc/hwloc-2.8.0.ebuild deleted file mode 100644 index 88cb06eb1dfc..000000000000 --- a/sys-apps/hwloc/hwloc-2.8.0.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal - -MY_PV="v$(ver_cut 1-2)" -DESCRIPTION="Displays the hardware topology in convenient formats" -HOMEPAGE="https://www.open-mpi.org/projects/hwloc/" -SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0/15" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cairo +cpuid cuda debug nvml +pci static-libs svg udev xml X video_cards_nvidia" - -# opencl: opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406). -# anyone with hardware is welcome to step up and help test to get it re-added. -# video-cards_nvidia: libXext/libX11 deps are only here, see HWLOC_GL_REQUIRES usage in config/hwloc.m4 -RDEPEND=">=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}] - cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - nvml? ( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] ) - pci? ( - >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] - >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] - ) - udev? ( virtual/libudev:= ) - xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) - video_cards_nvidia? ( - x11-drivers/nvidia-drivers[static-libs] - x11-libs/libXext - x11-libs/libX11 - )" -DEPEND="${RDEPEND}" -# 2.69-r5 for --runstatedir -BDEPEND=">=sys-devel/autoconf-2.69-r5 - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) - -DOCS=( AUTHORS NEWS README VERSION ) - -src_prepare() { - default - - eautoreconf -} - -multilib_src_configure() { - # bug #393467 - export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" - - if use video_cards_nvidia ; then - addpredict /dev/nvidiactl - fi - - if use cuda ; then - append-cflags "-I${ESYSROOT}/opt/cuda/include" - append-cppflags "-I${ESYSROOT}/opt/cuda/include" - - local -x LDFLAGS="${LDFLAGS}" - append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)" - fi - - local myconf=( - --disable-opencl - - # netloc is deprecated upstream, about to be removed - # bug #796797 - --disable-netloc - - --disable-plugin-ltdl - --enable-plugins - --enable-shared - --runstatedir="${EPREFIX}/run" - $(multilib_native_use_enable cuda) - $(multilib_native_use_enable video_cards_nvidia gl) - $(use_enable cairo) - $(use_enable cpuid) - $(use_enable debug) - $(use_enable udev libudev) - $(use_enable nvml) - $(use_enable pci) - $(use_enable static-libs static) - $(use_enable xml libxml2) - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myconf[@]}" -} - -multilib_src_install_all() { - default - - case ${ARCH} in - # hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit. - amd64|x86) - systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" - ;; - esac - - mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die - bashcomp_alias hwloc-annotate \ - hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology} - bashcomp_alias hwloc-annotate lstopo{,-no-graphics} - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml index 3ace2eda36bb..9b7c01dfe158 100644 --- a/sys-apps/hwloc/metadata.xml +++ b/sys-apps/hwloc/metadata.xml @@ -18,7 +18,6 @@ Enable the cpuid-based architecture specific support (x86 component) Enable CUDA device discovery using libcudart Enable GL display device discovery (NVCtrl) - Enable Netloc Add support for numa memory allocation Enable the NVML device discovery Enable PCI device discovery using libpci diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 4845304aa4a6..6bc23705f50c 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -10,6 +10,6 @@ DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f DIST iproute2-5.19.0.tar.xz 892696 BLAKE2B ee287065d7c33c0fa97f0fc130bb3a4a3ad5ac9417ad74ce8489e64ec146ff97749d79bb6563043c8835eab91a51631576441d450693cb50808ad0d37b2ea648 SHA512 eb0fffb153f7cecc89b5573b7fc211d67fb1c06789fd3b0aec75ba5032521d53c51ccc52db7367e41397993df50244af84763b0b1d5a76d9dfccf013c010131b EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266 -EBUILD iproute2-5.19.0-r2.ebuild 5905 BLAKE2B c2a923a7692a512cb339c418e3e5170726e674fe738371ed98e779241366907c77d37562e7415e5e47836c723c73eb5f3e6495afb3611cb842a489c2f709746c SHA512 242b99edbc82efc65dedd4931c26c40aad724bd86ceb7d20c4eda6da1af98185dfee94ecc06c67f5473480aea62634a06f704878898fdeedf8d800e9630990a5 -EBUILD iproute2-9999.ebuild 5836 BLAKE2B afeb0039dcb5b37589dd0699fc61a296c923662f7645ddb68f214f8da4a0cbcec0d14fcee0475bdc66aa4daed55258d1e9b93c4a852fde90c9fed4fea7fa6678 SHA512 a6cac0966de86b61dac9d338222765378e7a91b6b8b123e1edb894b777da33b9137e0b75f53e9cfa0ee163c7c4754f07a74c7652e1f2a9425c83fe8614291484 +EBUILD iproute2-5.19.0-r3.ebuild 6020 BLAKE2B 86761a5001746be00a658445202a5135a448f46b22f7e07ede80be9c870779da16f8677e4c2544bf100e3dd4ff5d7c4fe2714866f8367469cb26aa965d58c4b0 SHA512 2910286974fb7a5630c824b934efb41045fbe361ebd366d0e143a09c648ab332ccb9314e0174409b65f7fbb66a3f7912841f87c875a34858aa8c22bb2f0f2d74 +EBUILD iproute2-9999.ebuild 5951 BLAKE2B 88d5f8622e202a4fab367d17ad8dd92b1fe5c28acdc525398856f99a943f1058066cc4a61b094a6b997683f4306ec81b34a9c5b8281e4c195e3aa3f50d148ddc SHA512 5734f8baa085cbac1f5793bb8f70d12890dddf8e66748c9fdab68dabd08c21123311d88d49a8dcaf3a0f53147c097483134124124687b337a4a89a1922832014 MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed diff --git a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild b/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild deleted file mode 100644 index f0a6ca796fa7..000000000000 --- a/sys-apps/iproute2/iproute2-5.19.0-r2.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" - inherit git-r3 -else - SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="kernel routing and traffic control utilities" -HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr" - -# We could make libmnl optional, but it's tiny, so eh -RDEPEND=" - !net-misc/arpd - !minimal? ( net-libs/libmnl:= ) - atm? ( net-dialup/linux-atm ) - berkdb? ( sys-libs/db:= ) - bpf? ( dev-libs/libbpf:= ) - caps? ( sys-libs/libcap ) - elf? ( virtual/libelf:= ) - iptables? ( >=net-firewall/iptables-1.4.20:= ) - libbsd? ( dev-libs/libbsd ) - nfs? ( net-libs/libtirpc:= ) - selinux? ( sys-libs/libselinux ) -" -# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876) -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-3.16 -" -BDEPEND=" - app-arch/xz-utils - >=sys-devel/bison-2.4 - sys-devel/flex - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 - "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 - #"${FILESDIR}"/${PN}-5.1.0-portability.patch - "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch - "${FILESDIR}"/${P}-musl.patch - "${FILESDIR}"/${P}-setns-check.patch - "${FILESDIR}"/${PN}-default-color-auto.patch -) - -src_prepare() { - default - - # Fix version if necessary - local versionfile="include/version.h" - if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then - einfo "Fixing version string" - sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ - -i ${versionfile} || die - fi - - # echo -n is not POSIX compliant - sed 's@echo -n@printf@' -i configure || die - - sed -i \ - -e '/^CC :\?=/d' \ - -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ - -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ - -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ - -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ - Makefile || die - - # Build against system headers - rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc - sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die - - if use minimal ; then - sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die - fi -} - -src_configure() { - tc-export AR CC PKG_CONFIG - - # This sure is ugly. Should probably move into toolchain-funcs at some point. - local setns - pushd "${T}" >/dev/null || die - printf '#include \nint main(){return setns(0, 0);}\n' > test.c || die - if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then - setns=y - else - setns=n - fi - - echo 'int main(){return 0;}' > test.c || die - if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then - sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die - fi - popd >/dev/null || die - - # run "configure" script first which will create "config.mk"... - # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) - edo ./configure --libbpf_force $(usex bpf on off) - - # Remove the definitions made by configure and allow them to be overridden - # by USE flags below. - # We have to do the cheesy only-sed-if-disabled because otherwise - # the *_FLAGS etc stuff found by configure will be used but result - # in a broken build. - if ! use berkdb ; then - sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die - fi - - if ! use caps ; then - sed -i -e '/HAVE_CAP/d' config.mk || die - fi - - if use minimal ; then - sed -i -e '/HAVE_MNL/d' config.mk || die - fi - - if ! use elf ; then - sed -i -e '/HAVE_ELF/d' config.mk || die - fi - - if ! use nfs ; then - sed -i -e '/HAVE_RPC/d' config.mk || die - fi - - if ! use selinux ; then - sed -i -e '/HAVE_SELINUX/d' config.mk || die - fi - - if ! use libbsd ; then - sed -i -e '/HAVE_LIBBSD/d' config.mk || die - fi - - # ...Now switch on/off requested features via USE flags - # this is only useful if the test did not set other things, per bug #643722 - # Keep in sync with ifs above, or refactor to be unified. - cat <<-EOF >> config.mk - TC_CONFIG_ATM := $(usex atm y n) - TC_CONFIG_XT := $(usex iptables y n) - TC_CONFIG_NO_XT := $(usex iptables n y) - # We've locked in recent enough kernel headers, bug #549948 - TC_CONFIG_IPSET := y - HAVE_BERKELEY_DB := $(usex berkdb y n) - HAVE_CAP := $(usex caps y n) - HAVE_MNL := $(usex minimal n y) - HAVE_ELF := $(usex elf y n) - HAVE_RPC := $(usex nfs y n) - HAVE_SELINUX := $(usex selinux y n) - IP_CONFIG_SETNS := ${setns} - # Use correct iptables dir, bug #144265, bug #293709 - IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) - HAVE_LIBBSD := $(usex libbsd y n) - EOF -} - -src_compile() { - emake V=1 NETNS_RUN_DIR=/run/netns -} - -src_install() { - if use minimal ; then - into / - dosbin tc/tc - dobin ip/ip - return 0 - fi - - emake \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}"/$(get_libdir) \ - SBINDIR="${EPREFIX}"/sbin \ - CONFDIR="${EPREFIX}"/etc/iproute2 \ - DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX}"/usr/share/man \ - ARPDDIR="${EPREFIX}"/var/lib/arpd \ - install - - dodir /bin - mv "${ED}"/{s,}bin/ip || die # bug #330115 - - dolib.a lib/libnetlink.a - insinto /usr/include - doins include/libnetlink.h - - if use split-usr ; then - # Can remove compatibility symlink in a year: 2023-05-28. - # bug #547264 - mv "${ED}"/sbin/ss "${ED}"/bin/ss || die - dosym -r /bin/ss /sbin/ss - fi - - if use berkdb ; then - keepdir /var/lib/arpd - # bug #47482, arpd doesn't need to be in /sbin - dodir /usr/bin - mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die - elif [[ -d "${ED}"/var/lib/arpd ]]; then - rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die - fi -} diff --git a/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild new file mode 100644 index 000000000000..a201d0f68938 --- /dev/null +++ b/sys-apps/iproute2/iproute2-5.19.0-r3.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-r3 +else + SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND=" + !net-misc/arpd + !minimal? ( net-libs/libmnl:= ) + atm? ( net-dialup/linux-atm ) + berkdb? ( sys-libs/db:= ) + bpf? ( dev-libs/libbpf:= ) + caps? ( sys-libs/libcap ) + elf? ( virtual/libelf:= ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + libbsd? ( dev-libs/libbsd ) + nfs? ( net-libs/libtirpc:= ) + selinux? ( sys-libs/libselinux ) +" +# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876) +DEPEND=" + ${RDEPEND} + >=sys-kernel/linux-headers-3.16 +" +BDEPEND=" + app-arch/xz-utils + >=sys-devel/bison-2.4 + sys-devel/flex + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907 + "${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722 + #"${FILESDIR}"/${PN}-5.1.0-portability.patch + "${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch + "${FILESDIR}"/${P}-musl.patch + "${FILESDIR}"/${P}-setns-check.patch + "${FILESDIR}"/${PN}-default-color-auto.patch +) + +src_prepare() { + default + + # Fix version if necessary + local versionfile="include/version.h" + if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then + einfo "Fixing version string" + sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \ + -i ${versionfile} || die + fi + + # echo -n is not POSIX compliant + sed 's@echo -n@printf@' -i configure || die + + sed -i \ + -e '/^CC :\?=/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Build against system headers + rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + if use minimal ; then + sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die + fi +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null || die + printf '#include \nint main(){return setns(0, 0);}\n' > test.c || die + if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then + setns=y + else + setns=n + fi + + echo 'int main(){return 0;}' > test.c || die + if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then + sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die + fi + popd >/dev/null || die + + # run "configure" script first which will create "config.mk"... + # Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242) + edo ./configure --libbpf_force $(usex bpf on off) + + # Remove the definitions made by configure and allow them to be overridden + # by USE flags below. + # We have to do the cheesy only-sed-if-disabled because otherwise + # the *_FLAGS etc stuff found by configure will be used but result + # in a broken build. + if ! use berkdb ; then + sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die + fi + + if ! use caps ; then + sed -i -e '/HAVE_CAP/d' config.mk || die + fi + + if use minimal ; then + sed -i -e '/HAVE_MNL/d' config.mk || die + fi + + if ! use elf ; then + sed -i -e '/HAVE_ELF/d' config.mk || die + fi + + if ! use nfs ; then + sed -i -e '/HAVE_RPC/d' config.mk || die + fi + + if ! use selinux ; then + sed -i -e '/HAVE_SELINUX/d' config.mk || die + fi + + if ! use libbsd ; then + sed -i -e '/HAVE_LIBBSD/d' config.mk || die + fi + + # ...Now switch on/off requested features via USE flags + # this is only useful if the test did not set other things, per bug #643722 + # Keep in sync with ifs above, or refactor to be unified. + cat <<-EOF >> config.mk + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + TC_CONFIG_NO_XT := $(usex iptables n y) + # We've locked in recent enough kernel headers, bug #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_CAP := $(usex caps y n) + HAVE_MNL := $(usex minimal n y) + HAVE_ELF := $(usex elf y n) + HAVE_RPC := $(usex nfs y n) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, bug #144265, bug #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + HAVE_LIBBSD := $(usex libbsd y n) + EOF +} + +src_compile() { + emake V=1 NETNS_RUN_DIR=/run/netns +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ + install + + dodir /bin + mv "${ED}"/{s,}bin/ip || die # bug #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + + # Collides with net-analyzer/ifstat + # https://bugs.gentoo.org/868321 + mv "${ED}"/sbin/ifstat{,-iproute2} || die + + if use split-usr ; then + # Can remove compatibility symlink in a year: 2023-05-28. + # bug #547264 + mv "${ED}"/sbin/ss "${ED}"/bin/ss || die + dosym -r /bin/ss /sbin/ss + fi + + if use berkdb ; then + keepdir /var/lib/arpd + # bug #47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + elif [[ -d "${ED}"/var/lib/arpd ]]; then + rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die + fi +} diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild index 8aaa6cc859d8..46297152d6c6 100644 --- a/sys-apps/iproute2/iproute2-9999.ebuild +++ b/sys-apps/iproute2/iproute2-9999.ebuild @@ -193,6 +193,10 @@ src_install() { insinto /usr/include doins include/libnetlink.h + # Collides with net-analyzer/ifstat + # https://bugs.gentoo.org/868321 + mv "${ED}"/sbin/ifstat{,-iproute2} || die + if use split-usr ; then # Can remove compatibility symlink in a year: 2023-05-28. # bug #547264 -- cgit v1.2.3