Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/concurrencykit/, dev-libs/concurrencykit/files/
Date: Sun, 22 Nov 2020 01:50:52
Message-Id: 1606009836.e0f1d58281363a0f2be384ecfa395e065119bd50.conikost@gentoo
1 commit: e0f1d58281363a0f2be384ecfa395e065119bd50
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 22 01:50:14 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 22 01:50:36 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f1d582
7
8 dev-libs/concurrencykit: drop old version
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 .../concurrencykit/concurrencykit-0.7.0.ebuild | 28 ----------------
14 .../concurrencykit/files/concurrencykit-doc.patch | 24 --------------
15 .../files/concurrencykit-glibc-2.30.patch | 37 ----------------------
16 3 files changed, 89 deletions(-)
17
18 diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
19 deleted file mode 100644
20 index 24f79b72508..00000000000
21 --- a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
22 +++ /dev/null
23 @@ -1,28 +0,0 @@
24 -# Copyright 1999-2020 Gentoo Authors
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI=7
28 -
29 -MY_PN="ck"
30 -MY_P="${MY_PN}-${PV}"
31 -
32 -DESCRIPTION="A library with concurrency related algorithms and data structures in C"
33 -HOMEPAGE="http://concurrencykit.org"
34 -SRC_URI="https://github.com/concurrencykit/ck/archive/${PV}.tar.gz -> ${P}.tar.gz"
35 -
36 -LICENSE="Apache-2.0 BSD-2"
37 -SLOT="0"
38 -KEYWORDS="amd64 ~x86"
39 -
40 -# libck.so name collision #616762
41 -# these packages have nothing in common
42 -RDEPEND="!sys-cluster/charm"
43 -
44 -# https://github.com/concurrencykit/ck/issues/147
45 -# https://github.com/concurrencykit/ck/issues/150
46 -PATCHES=(
47 - "${FILESDIR}/${PN}-glibc-2.30.patch"
48 - "${FILESDIR}/${PN}-doc.patch"
49 -)
50 -
51 -S="${WORKDIR}/${MY_P}"
52
53 diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
54 deleted file mode 100644
55 index 40aa466bb4e..00000000000
56 --- a/dev-libs/concurrencykit/files/concurrencykit-doc.patch
57 +++ /dev/null
58 @@ -1,24 +0,0 @@
59 -diff --git a/doc/Makefile.in b/doc/Makefile.in
60 -index cbad704..f476925 100644
61 ---- a/doc/Makefile.in
62 -+++ b/doc/Makefile.in
63 -@@ -1,7 +1,7 @@
64 - .PHONY: clean install uninstall
65 -
66 - MANDIR=@MANDIR@
67 --GZIP=@GZIP@
68 -+GZIP=/bin/echo
69 - GZIP_SUFFIX=.3@GZIP_SUFFIX@
70 - BUILD_DIR=@BUILD_DIR@
71 - SRC_DIR=@SRC_DIR@
72 -@@ -206,7 +206,9 @@ refcheck:
73 -
74 - install:
75 - mkdir -p $(DESTDIR)/$(MANDIR)/man3 || exit
76 -- cp *$(GZIP_SUFFIX) $(DESTDIR)/$(MANDIR)/man3 || exit
77 -+ for target in $(OBJECTS); do \
78 -+ cp -v $$target $(DESTDIR)/$(MANDIR)/man3/$$target.3 || exit; \
79 -+ done
80 -
81 - uninstall:
82 - for target in $(OBJECTS); do \
83
84 diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
85 deleted file mode 100644
86 index 452421c6312..00000000000
87 --- a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
88 +++ /dev/null
89 @@ -1,37 +0,0 @@
90 -diff --git a/regressions/common.h b/regressions/common.h
91 -index 6e53483d..9cdc690a 100644
92 ---- a/regressions/common.h
93 -+++ b/regressions/common.h
94 -@@ -267,13 +267,11 @@ struct affinity {
95 - #define AFFINITY_INITIALIZER {0, 0}
96 -
97 - #ifdef __linux__
98 --#ifndef gettid
99 - static pid_t
100 --gettid(void)
101 -+common_gettid(void)
102 - {
103 - return syscall(__NR_gettid);
104 - }
105 --#endif /* gettid */
106 -
107 - CK_CC_UNUSED static int
108 - aff_iterate(struct affinity *acb)
109 -@@ -285,7 +283,7 @@ aff_iterate(struct affinity *acb)
110 - CPU_ZERO(&s);
111 - CPU_SET(c % CORES, &s);
112 -
113 -- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
114 -+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
115 - perror("WARNING: Could not affine thread");
116 -
117 - return 0;
118 -@@ -300,7 +298,7 @@ aff_iterate_core(struct affinity *acb, unsigned int *core)
119 - CPU_ZERO(&s);
120 - CPU_SET((*core) % CORES, &s);
121 -
122 -- if (sched_setaffinity(gettid(), sizeof(s), &s) != 0)
123 -+ if (sched_setaffinity(common_gettid(), sizeof(s), &s) != 0)
124 - perror("WARNING: Could not affine thread");
125 -
126 - return 0;