[gentoo-commits] repo/gentoo:master commit in: dev-libs/concurrencykit/files/, dev-libs/concurrencykit/

[Joonas Niilola]

commit:     a0111536f393cd3776de329f52d1f3b2ce5dfec4
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Jan 31 07:17:24 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Feb  3 06:37:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0111536

dev-libs/concurrencykit: bump to 0.7.0

Closes: https://bugs.gentoo.org/696418
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/concurrencykit/Manifest                   |  1 +
 .../concurrencykit/concurrencykit-0.7.0.ebuild     | 28 ++++++++++++++++
 .../concurrencykit/files/concurrencykit-doc.patch  | 24 ++++++++++++++
 .../files/concurrencykit-glibc-2.30.patch          | 37 ++++++++++++++++++++++
 4 files changed, 90 insertions(+)

diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index d73660a2410..32e70eae573 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,2 +1,3 @@
 DIST concurrencykit-0.5.2.tar.gz 212783 BLAKE2B d2e3f28a21236c83835dda06fb4c6182b4ae1fe9e14c66d01ab9ccd2c94c4487d06fa668039f9d7d980a100e88bae570edf193a6955ece88cc306cc1c05670fd SHA512 69b4f8618a52e53f2b7c2e47a9d52773370ae74c89ca1de70c6dc7567b5a46b3f57dafa82d61a89525807672697e1cd75b83c3be56cd5a80c10b819e9d9d07b0
 DIST concurrencykit-0.6.0.tar.gz 217198 BLAKE2B 5ba85bd111c06e7be7af5679227350efe187836e5cb2afc19bff4a8f0fbcd97e9631fad64397b0426e8020a6a0f103a0fbe3bf8f83810eaa8a3a1b429a3e8383 SHA512 4c75f1194a6ad9d3e51a4bad4802cc522df70870135e6e2db1e303d0df89d57e5dc7a73e924de49fe9641b3dcdc81b1a74a26aa7297cd06b7acb5cbf46c402f0
+DIST concurrencykit-0.7.0.tar.gz 245574 BLAKE2B 14c386eb35c76297933d2935cdfc1cb0d21071d4fe1784eeb27595c2e75a8edc5add349df6795d03372b30711cda4deeb7957bdcfd7e62ba89b254fb41ba6a55 SHA512 509fe5bc1575a6fd646d30fbcd74204ba4683092f154dc1fb55ed6fc17e734e17759bacfc3f42344db4c243ca6b239f7d207cf2ebc609e2a37d7ddfd1bdcc3a1

diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
new file mode 100644
index 00000000000..1d7428703ed
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="https://github.com/concurrencykit/ck/archive/${PV}.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"
+
+# https://github.com/concurrencykit/ck/issues/147
+# https://github.com/concurrencykit/ck/issues/150
+PATCHES=(
+	"${FILESDIR}/${PN}-glibc-2.30.patch"
+	"${FILESDIR}/${PN}-doc.patch"
+)
+
+S="${WORKDIR}/${MY_P}"

diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
new file mode 100644
index 00000000000..40aa466bb4e
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
@@ -0,0 +1,24 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index cbad704..f476925 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -1,7 +1,7 @@
+ .PHONY: clean install uninstall
+ 
+ MANDIR=@MANDIR@
+-GZIP=@GZIP@
++GZIP=/bin/echo
+ GZIP_SUFFIX=.3@GZIP_SUFFIX@
+ BUILD_DIR=@BUILD_DIR@
+ SRC_DIR=@SRC_DIR@
+@@ -206,7 +206,9 @@ refcheck:
+ 
+ install:
+ 	mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit
+-	cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit
++	for target in $(OBJECTS); do	\
++		cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \
++	done
+ 
+ uninstall:
+ 	for target in $(OBJECTS); do 			  \

diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
new file mode 100644
index 00000000000..452421c6312
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
@@ -0,0 +1,37 @@
+diff --git a/regressions/common.h b/regressions/common.h
+index 6e53483d..9cdc690a 100644
+--- a/regressions/common.h
++++ b/regressions/common.h
+@@ -267,13 +267,11 @@ struct affinity {
+ #define AFFINITY_INITIALIZER {0, 0}
+ 
+ #ifdef __linux__
+-#ifndef gettid
+ static pid_t
+-gettid(void)
++common_gettid(void)
+ {
+ 	return syscall(__NR_gettid);
+ }
+-#endif /* gettid */
+ 
+ CK_CC_UNUSED static int
+ aff_iterate(struct affinity *acb)
+@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb)
+ 	CPU_ZERO(&s);
+ 	CPU_SET(c % CORES, &s);
+ 
+-	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
++	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
+ 		perror("WARNING: Could not affine thread");
+ 	
+         return 0;
+@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core)
+ 	CPU_ZERO(&s);
+ 	CPU_SET((*core) % CORES, &s);
+ 
+-	if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
++	if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
+ 		perror("WARNING: Could not affine thread");
+ 	
+         return 0;