gentoo resync : 12.05.2022

5 files changed, 15 insertions, 101 deletions

diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 767161650c12..884615cf5a46 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,14 +1,11 @@
-AUX lttng-ust-2.11.0-fno-common.patch 1620 BLAKE2B 8603834fa34cc8fdda200d9d6808d5c7983d46cce944d22c4ea3e4caf667cba9b2a735cf9d5bb363df88ce5b443aac5eb66a25eae81cad386128be81ac4d538c SHA512 dc46d9571afbe17707495ab34cdcb32224ec5380e982157d01c7aac57da3b5449ff594583d13e21659a56dc8e1161a360e07c73804bd20801962890d539fc754
-DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
-DIST lttng-ust-2.11.3.tar.bz2 846839 BLAKE2B 4ef6918588d139e1ca15f477194796d974f8442a44c7e18768582199ba1e0f467c796d2b10ea9936554e589c91b49e1a07c29b619d74b77b884b081868484ea3 SHA512 2483bb7c57f0e99b9e0d6431114c74f6e5af295a73643307716f5abb6fc20e7dec8bfe7fe3e074ca96bad72ca5f6042b6340d1a67928e885753fecfa8a136eb4
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.12.1.tar.bz2 859667 BLAKE2B 474d03ac0d3c1102ef085230659545f3e12bc0847cebab598f2998741741cb98ac139812a296992614dd90ed9478040ee0567822eb20e960e0a6489836274394 SHA512 6d5116a88be601f96513535ef7dfda409780cbacaab0831dc76b86070da60d5eac719d7020f70a6821e1c6dbbfae05ddf5a431662ef5a714fc200c2216eeb80e
 DIST lttng-ust-2.12.2.tar.bz2 861351 BLAKE2B 0c580285721b3d7932630c8d9f4a3606ee294596eef75fcf8b3c892ebdfaa1daae4cbfad1b6ef0ef93877b1f7dd143d97fa947758ab476e4a54e746d0f1e1e7e SHA512 e8734deb27b1a4c5efb81ebaa5c100079c1b3eac6b741b4f85487d1cb921d78d9ddf76040be56081404701b3053c6acc83a5d82667e3f49fcc4fa33392462eb8
-DIST lttng-ust-2.13.0.tar.bz2 1408266 BLAKE2B 28f584f168544e28539511d3904d7ace19ce61e8490f8c021913f4e8c6b91e4f44e1816265ef54336dd724826a01425f77d3751468bf8a9b40e7f60b918eec45 SHA512 f132cbd98c6574e460c99a2ffd5ea181ac592a5f820171f45cf83bf7314ec9bad1397bf8505bad326b9bc8220bb87a42fdbbda5f1c9b89a39d5be8a3c0cb2cea
-EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
-EBUILD lttng-ust-2.11.3.ebuild 732 BLAKE2B 0fe4bbd05e5c18daf01e825f82bfcb9e4be762f845dcac1da730a0a88237c75ffa6cfbc6351af3b62be7a86cdddd998825c78f59a515e61a5e8d825fd638c81f SHA512 9301586063911e0b975e8ed003295d1f5acac7071b2ca75122bd9f8577a035fc41776f4c87bee92cb1292e2ad8161199670eb7f1689137858453a6444ce5145e
+DIST lttng-ust-2.12.4.tar.bz2 772723 BLAKE2B cf9782d7b0ab39b1eeebd3f21a31d7a249c9f4f4b1c28746d27ad4dfc0196a4d71dd3d837bfa211ab98c1b555b79b4fa6b39b341312d8b5cc6c47708fa0e8963 SHA512 c2935c9aa63446ceeff1d6fe76367883a3b188c113fcc25c83848b4ee89497a614dfc0b32f920a0c5054c6208bc37899482d40938a1fc37ad890b7c5172fc20b
+DIST lttng-ust-2.13.2.tar.bz2 1327075 BLAKE2B 39296ba62fcf5518b16d67f196ab4788c78b41eeadb5f8037c2445ac13a95754e7723399f58f6b21734d8931ae0d68d1dea28b74759fd531fac6a9308817bc09 SHA512 2392b0aeabbaea6daf62a9c752a04ea3043e1cc2d93064b073fd4438beac0d30832aea9b2f158cc8b90b3d98f427bca2999cce4e873fa3f82e04693e13ed9fb3
 EBUILD lttng-ust-2.12.0.ebuild 786 BLAKE2B 64652ad07761ab57fb396473ff814fa72b54d55db53ad0fc3c1c50a70c4e13915e8d5fa02e275ef99a8942bd9a1602b87642b411ed6abceb66be2cb8d0ffe344 SHA512 db5de27798866d4f880930bc55eee11499f9e518fc04f07058b4cc2922fefc00630ff5d0e9dabeca42844d4a97079ecba6a3fc9c700e3c1f3832ab5674e0e010
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
 EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
-EBUILD lttng-ust-2.13.0.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
+EBUILD lttng-ust-2.12.4.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
+EBUILD lttng-ust-2.13.2.ebuild 807 BLAKE2B de1a5a71db40f0b49d75205dd05f4ea404a8a983c90e25aa488da31bc71f7d296d97469e8f5b5d1fc832591c586c98a6990d7a7847389d0d98d13ff2666f2bf0 SHA512 bf58535651ac42457f7efbefff8d9d5a70d461604742a0b78fa4df5dccc9b78f193be3be4197f2a4115df0144a407d9213b968b399f870b296aa9297d08db05e
 MISC metadata.xml 701 BLAKE2B 2bd57c9e2b0d8e24eba3ae0767e22d911ff7d4e9c86035fd2c2a10f3e011e7e98fe4d17fbbf99419477652f4a56425cc242a8947fca314486d858145ca992db4 SHA512 87721cee084407a7565d2f0da06d588b5de039349769901102b6833571a53bbfd95d3986a0d7e74a3fd4d285c68c3942f776e813793f0a30d2d83f0a9243628b
diff --git a/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch b/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch
deleted file mode 100644
index 48b5bfbbe39c..000000000000
--- a/dev-util/lttng-ust/files/lttng-ust-2.11.0-fno-common.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 21a934df4c683e73e0a66a9afca33573fcf9d789 Mon Sep 17 00:00:00 2001
-From: Michael Jeanson <mjeanson@efficios.com>
-Date: Thu, 16 Jan 2020 10:59:14 -0500
-Subject: [PATCH] Fix: build with -fno-common
-
-GCC 10 will default to building with -fno-common, this inhibits the
-linker from merging multiple tentative definitions of a symbol in an
-archive. Keep only the declaration in the libustsnprintf.la convenience
-library.
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-Change-Id: I8fb7c72811ce7e62f10342f55fcabeeabfdd4c67
----
- liblttng-ust-ctl/ustctl.c      | 2 --
- liblttng-ust-fd/lttng-ust-fd.c | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
-index 949ece17..c2b761a1 100644
---- a/liblttng-ust-ctl/ustctl.c
-+++ b/liblttng-ust-ctl/ustctl.c
-@@ -77,8 +77,6 @@ extern void lttng_ring_buffer_client_discard_exit(void);
- extern void lttng_ring_buffer_client_discard_rt_exit(void);
- extern void lttng_ring_buffer_metadata_client_exit(void);
- 
--volatile enum ust_loglevel ust_loglevel;
--
- int ustctl_release_handle(int sock, int handle)
- {
- 	struct ustcomm_ust_msg lum;
-diff --git a/liblttng-ust-fd/lttng-ust-fd.c b/liblttng-ust-fd/lttng-ust-fd.c
-index 863f0618..4818e02e 100644
---- a/liblttng-ust-fd/lttng-ust-fd.c
-+++ b/liblttng-ust-fd/lttng-ust-fd.c
-@@ -28,8 +28,6 @@
- #include <helper.h>
- #include "usterr-signal-safe.h"
- 
--volatile enum ust_loglevel ust_loglevel;
--
- static int (*__lttng_ust_fd_plibc_close)(int fd);
- static int (*__lttng_ust_fd_plibc_fclose)(FILE *stream);
- 
--- 
-2.25.0
-
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.3.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.3.ebuild
deleted file mode 100644
index 36218ac04534..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.11.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples numa"
-
-DEPEND="
-	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )
-	"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	default
-	if ! use examples; then
-		sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable numa)
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.4.ebuild
index efe9ff12201c..28e8ec940860 100644
--- a/dev-util/lttng-ust/lttng-ust-2.13.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.13.2.ebuild
index bbe2663203dd..28e8ec940860 100644
--- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.13.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -14,17 +14,14 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
 	dev-libs/userspace-rcu:=
-	numa? ( sys-process/numactl )
-	"
+	numa? ( sys-process/numactl )"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}"/${P}-fno-common.patch)
-
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
@@ -38,3 +35,8 @@ src_prepare() {
 src_configure() {
 	econf $(use_enable numa)
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}