gentoo resync : 14.12.2020

4 files changed, 36 insertions, 24 deletions

diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index 339046652f7c..e1a2f54c17c7 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -2,8 +2,7 @@ AUX concurrencykit-0.7.0-ar.patch 3293 BLAKE2B a5e67853a4d6c08f8f0d93d528bd93688
 AUX concurrencykit-0.7.0-glibc-2.30.patch 1609 BLAKE2B 1aa8eb4d29ed2ecb52b1fa942eead2e88a97979c331f2227d05b578505df35d9f9549798ebc401632bc29572f0c12351e2b4485471767b70dd3eadcb2ff010ea SHA512 fe6e25a67025c5f4ef9affbd32cb4fe0c29879af866c2b621be004fbbd3ff8b203f7655aca8943bb8303a318aecd387352256b121eab68487fac0a135ad82903
 AUX concurrencykit-0.7.0-gzip.patch 1553 BLAKE2B 8a164f19cdeab56fd9a1099c312bc04209e24e2bc1798da5e56c6c4414b327801f73e6c222e665bf8299c8620a12ebcf73bbf6839075274cdcb759261b79fe35 SHA512 bef714a6d22ee6ae5a8e70befcfc92a254fbd724646832043dce03ce1b4f922fc8c6bf91d9b37433b8849afc5e276ea5d7510fcff6fdd0e20aa650414766ce02
 AUX concurrencykit-0.7.0-static-libs.patch 3170 BLAKE2B 8884eb8cfffdc5bdf864ec29495e8a209befdd8c7318e49bbee15821c42c7a18b0ed8d52ee07b72974318f57785a7867bd47461a44e535102bfc03c650e85af1 SHA512 52ac965f0876cca54a60ea05e1bcee9a72534368646594b55ced604f425e505bdf39b836c3a19fc5fca49a6838866e0fef4c192ff073bdb864f113e41ba87cc4
-DIST concurrencykit-0.6.0.tar.gz 217198 BLAKE2B 5ba85bd111c06e7be7af5679227350efe187836e5cb2afc19bff4a8f0fbcd97e9631fad64397b0426e8020a6a0f103a0fbe3bf8f83810eaa8a3a1b429a3e8383 SHA512 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0
+AUX concurrencykit-0.7.0-tests.patch 1104 BLAKE2B f85dc6544d31e39ba9cbcbdfc8bd810763dbed231c23683700743fca4e4d80f88f0129c835bf93aabe71d9f2b63a33923a8516d51fc582638e09e6093b9c94d4 SHA512 1dee5e646e02c84c5ec823c600a2e18270288bc066f67b63b7da38126d43fc8cb92c8d466bf8a160e4689513d021c587d9d607e9828dcb6446c5f7df01602663
 DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1
-EBUILD concurrencykit-0.6.0.ebuild 533 BLAKE2B 2d864df0f25e31574f18ba9f1f766c5bc9cbcb68e8733901c7edf09b0b5f989593407e2be44fc6b2a46459a8432ad618890d0e70625718cbeb6a3ed2ba09d97d SHA512 d44cd4c7f56403ce6e142f8b054b2593335527691bbdab1466feccffc8e0aa317ae2f4cd62d3d975a781b557f7289956f4da350299407dadf33e880bc38c520d
-EBUILD concurrencykit-0.7.0-r1.ebuild 866 BLAKE2B 58555f7d90f850792dbcef3933cb822b003ba2af724bff6cc0496d2391ccb1fb3127a13f814007f4fea1537875c75776f09355d570d017d7ac55b08f1430e692 SHA512 371c423b9bda8a0aeb793c160f5e4041d4591131dbe2f710f89d64bbc43b5ff089353c84209cd4229278a97f1a0d9e51f809c52036ce97096da8cc7424824d95
+EBUILD concurrencykit-0.7.0-r1.ebuild 898 BLAKE2B 6f441e3dbb4d980e26d7aeef3b01411af1e08cd22cc0dedea756ce1ef400aadd580e1d3c2584a7d0fd4535c5aaae115ffc54452819baa84977fa7534e1b2dbfb SHA512 e68e545f173474ee985ee611861c7415775bc3abd391fc75c6befdaa747075cc5edeaf58fb60de98a07eaae2cba51423b9576e69b9ce7b634a88d2cff33262db
 MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
deleted file mode 100644
index 75b0b9bf0c78..000000000000
--- a/dev-libs/concurrencykit/concurrencykit-0.6.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="ck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A library with concurrency related algorithms and data structures in C"
-HOMEPAGE="http://concurrencykit.org"
-SRC_URI="http://concurrencykit.org/releases/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# libck.so name collision #616762
-# these packages have nothing in common
-RDEPEND="!sys-cluster/charm"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
index 52fdc2f36338..e3b8d4182451 100644
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-glibc-2.30.patch"
 	"${FILESDIR}/${P}-gzip.patch"
 	"${FILESDIR}/${P}-static-libs.patch"
+	"${FILESDIR}/${P}-tests.patch"
 )
 
 src_configure() {
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
new file mode 100644
index 000000000000..4d29c6bcf7eb
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-tests.patch
@@ -0,0 +1,33 @@
+From 07835a3d08d96db30393c235f95649e792883d50 Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Mon, 30 Nov 2020 18:33:51 -0500
+Subject: [PATCH] regressions/ck_hp_fifo: fixes false-positive from #165.
+
+Add busy-wait barrier before next stage of test. Otherwise,
+some threads may enter it and a non-empty queue state is observed.
+---
+ regressions/ck_hp/validate/ck_hp_fifo.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/regressions/ck_hp/validate/ck_hp_fifo.c b/regressions/ck_hp/validate/ck_hp_fifo.c
+index 4454283c..5820f1aa 100644
+--- a/regressions/ck_hp/validate/ck_hp_fifo.c
++++ b/regressions/ck_hp/validate/ck_hp_fifo.c
+@@ -55,6 +55,7 @@ static struct affinity a;
+ static int size;
+ static unsigned int barrier;
+ static unsigned int e_barrier;
++static unsigned int s_barrier;
+ 
+ static void *
+ test(void *c)
+@@ -98,6 +99,9 @@ test(void *c)
+ 		}
+ 	}
+ 
++	ck_pr_inc_uint(&s_barrier);
++	while (ck_pr_load_uint(&s_barrier) < (unsigned int)nthr);
++
+ 	for (i = 0; i < ITERATIONS; i++) {
+ 		for (j = 0; j < size; j++) {
+ 			fifo_entry = malloc(sizeof(ck_hp_fifo_entry_t));