gentoo resync : 25.11.2020

9 files changed, 310 insertions, 62 deletions

diff --git a/dev-libs/concurrencykit/Manifest b/dev-libs/concurrencykit/Manifest
index f126e5124bf4..339046652f7c 100644
--- a/dev-libs/concurrencykit/Manifest
+++ b/dev-libs/concurrencykit/Manifest
@@ -1,7 +1,9 @@
-AUX concurrencykit-doc.patch 589 BLAKE2B e8812a5d72ba8ee3de915f0c52cf44e55d3e2ae52adeac9b80f4788db80b8c8dbbfdfc11c6199ce19edaa2ecaefe1825d2b9ff656aab1525180f349e5a14994d SHA512 5f07ba35e8b0d6bd70aa234592499648839c53c532ce7755ed7ab463b0e415451a7dbacdccc64dbf57b0efe0f37ae4a49468f7af43801b1daa7074714fe18e3d
-AUX concurrencykit-glibc-2.30.patch 1024 BLAKE2B 1e973dfd3b55dde0a187c7b7dc76ee5e374e2ce8bf24028b5b0758c8c62933e566e7c4ac6a9e98a53e7ae7df74856a335e1b7302e3a9bf6f87bc9909f533f1cb SHA512 6702c3c156589c167e36bf81fbd22f7031b95d539c66c700e915018425ce49bffd7aaded210269e4326cd561682e07ae253d13c952bad5eff8832befcc98f82d
+AUX concurrencykit-0.7.0-ar.patch 3293 BLAKE2B a5e67853a4d6c08f8f0d93d528bd93688e3edfc434bca235ef272cbd95e87430e64596301d6bf7ce366b0faa0892ecaf479aa0b8e877c4c0bb2d04901bb58168 SHA512 6394717aec1c10766aae8aff8f7cc0b0aea1bcad8e71f017c6c2765f2e5fe43f29a1733480fa280dc2da36a50d74f2095a2e51a42b79b27b776e99b4f971f03f
+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
 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.ebuild 721 BLAKE2B eed6fdd8a7f1e263fa2d1456eb91057bece5535d2e742270d060e06ca7c73e2018df0eae1396dee3599012a27e377b1efd94001cffa6dc3e6bebca007c03158d SHA512 2040a1cc83f656d8f0f3c2bf97984904a21cd70c5cbf01c535844bfc4d7831a95e07fa2fb1febd1aa94add5bc84c22c150b6cd4f0586ce938c32e53fe26342bd
-MISC metadata.xml 449 BLAKE2B 1567c91f6f505bfe5f1b9b737f6dfb02e8ba4ff8dd7ee1c629e314cc6c646c21b9c870d5bd6fae28551bfbeae8901922821f3c2eb1f1351b8733616c613a7fea SHA512 402d971b138335d751d645cd8face4addcda8f351e95bf8a0826b7fdd946c9cf6a22bb0ae274e51f39ee4d56389887856f84a83451040adc12e29d9740982d33
+EBUILD concurrencykit-0.7.0-r1.ebuild 866 BLAKE2B 58555f7d90f850792dbcef3933cb822b003ba2af724bff6cc0496d2391ccb1fb3127a13f814007f4fea1537875c75776f09355d570d017d7ac55b08f1430e692 SHA512 371c423b9bda8a0aeb793c160f5e4041d4591131dbe2f710f89d64bbc43b5ff089353c84209cd4229278a97f1a0d9e51f809c52036ce97096da8cc7424824d95
+MISC metadata.xml 332 BLAKE2B 49342ad7a1d20ae0e15f6c3860f7902155b40d5a840a696d3fbd19257c956052775ad3d21da63aee00e2f4d80ebb30653623726a55107df3bb0b90a84a3f5bfb SHA512 894530344acb0eacd5604efe8eb521d83c1eb98274f878832ea38bf39afcfcea1b72e44c37d05e7dadb8a2a38f972e24cbad43d3d23711090bd57f4617c02712
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..52fdc2f36338
--- /dev/null
+++ b/dev-libs/concurrencykit/concurrencykit-0.7.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+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/${PN}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# The 'libck.so' has a name collision.
+# See #616762 for more information.
+RDEPEND="!sys-cluster/charm"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ar.patch"
+	"${FILESDIR}/${P}-glibc-2.30.patch"
+	"${FILESDIR}/${P}-gzip.patch"
+	"${FILESDIR}/${P}-static-libs.patch"
+)
+
+src_configure() {
+	tc-export AR CC LD
+	$(usex x86 'export PROFILE=x86' '')
+
+	local myeconfargs=(
+		"--disable-static"
+	)
+
+	GZIP="" econf ${myeconfargs[@]}
+}
diff --git a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild b/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
deleted file mode 100644
index 24f79b725083..000000000000
--- a/dev-libs/concurrencykit/concurrencykit-0.7.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-0.7.0-ar.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
new file mode 100644
index 000000000000..70dd46a113f2
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-ar.patch
@@ -0,0 +1,112 @@
+From c6a2f41369bb4549bfaadf1120ccacd884b0b70f Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <ck@bl4ckb0x.de>
+Date: Sun, 22 Nov 2020 00:55:36 +0100
+Subject: [PATCH] Add support for setting AR
+
+By default, the command 'ar' is called. Is should be possible, as with
+'CC', to override that value and set an own AR.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure       | 11 +++++++++++
+ src/Makefile.in |  2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 1b85d113..78535332 100755
+--- a/configure
++++ b/configure
+@@ -146,6 +146,7 @@ generate_stdout()
+ 	echo "           SRC_DIR = $BUILD_DIR"
+ 	echo "            SYSTEM = $SYSTEM"
+ 	echo "           PROFILE = $PROFILE"
++	echo "                AR = $AR"
+ 	echo "                CC = $CC"
+ 	echo "          COMPILER = $COMPILER"
+ 	echo "            CFLAGS = $CFLAGS"
+@@ -215,6 +216,7 @@ for option; do
+ 		echo "  --cores=N                Specify number of cores available on target machine"
+ 		echo
+ 		echo "The following environment variables may be used:"
++		echo "   AR       AR archiver command"
+ 		echo "   CC       C compiler command"
+ 		echo "   CFLAGS   C compiler flags"
+ 		echo "   LDFLAGS  Linker flags"
+@@ -645,6 +647,15 @@ if test ! -x "${CC}"; then
+ fi
+ assert "$CC" "not found"
+ 
++printf "Finding suitable archiver........"
++if test ! -x "${AR}"; then
++	AR=`pathsearch "${AR:-ar}"`
++	if test -z "$AR" -o ! -x "$AR"; then
++		AR=`pathsearch "${AR:-ar}"`
++	fi
++fi
++assert "$AR" "not found"
++
+ cat << EOF > .1.c
+ #include <stdio.h>
+ int main(void) {
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 0b7ae7b6..73788497 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -25,7 +25,7 @@ libck.so: $(OBJECTS)
+ 	$(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS)
+ 
+ libck.a: $(OBJECTS)
+-	ar rcs $(TARGET_DIR)/libck.a $(OBJECTS)
++	$(AR) rcs $(TARGET_DIR)/libck.a $(OBJECTS)
+ 
+ ck_array.o: $(INCLUDE_DIR)/ck_array.h $(SDIR)/ck_array.c
+ 	$(CC) $(CFLAGS) -c -o $(TARGET_DIR)/ck_array.o $(SDIR)/ck_array.c
+From 866c2af332a075cc83af78b184be0d5e6152de13 Mon Sep 17 00:00:00 2001
+From: Olivier Houchard <cognet@ci0.org>
+Date: Sun, 22 Nov 2020 01:16:10 +0100
+Subject: [PATCH] build: Make the lookup for an archiver report success.
+
+Move the code looking for ar outside the compiler checking code, and make
+it report success if found.
+---
+ configure | 20 +++++++++++---------
+ 1 file changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/configure b/configure
+index 78535332..16a8f64f 100755
+--- a/configure
++++ b/configure
+@@ -647,15 +647,6 @@ if test ! -x "${CC}"; then
+ fi
+ assert "$CC" "not found"
+ 
+-printf "Finding suitable archiver........"
+-if test ! -x "${AR}"; then
+-	AR=`pathsearch "${AR:-ar}"`
+-	if test -z "$AR" -o ! -x "$AR"; then
+-		AR=`pathsearch "${AR:-ar}"`
+-	fi
+-fi
+-assert "$AR" "not found"
+-
+ cat << EOF > .1.c
+ #include <stdio.h>
+ int main(void) {
+@@ -736,6 +727,17 @@ else
+ 	assert "" "unknown compiler"
+ fi
+ 
++printf "Finding suitable archiver........"
++if test ! -x "${AR}"; then
++	AR=`pathsearch "${AR:-ar}"`
++	if test -z "$AR" -o ! -x "$AR"; then
++		AR=`pathsearch "${AR:-ar}"`
++	else
++		echo "success [$AR]"
++	fi
++fi
++assert "$AR" "not found"
++
+ printf "Detecting VMA bits..............."
+ VMA="unknown"
+ if test "$VMA_BITS" = "unknown"; then
diff --git a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
index 452421c63125..77e63e3de7ef 100644
--- a/dev-libs/concurrencykit/files/concurrencykit-glibc-2.30.patch
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-glibc-2.30.patch
@@ -1,3 +1,20 @@
+From b520d58d00b7ed6c5cc9bc97c62f07e09f4f49ad Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Tue, 29 Oct 2019 17:30:09 -0400
+Subject: [PATCH] regressions/common: rename gettid wrapper to common_gettid.
+
+glibc-2.30 added a wrapper to gettid (https://lwn.net/Articles/795127/).
+gettid will clash with the glibc-provided symbol. Remove the
+macro and instead move to a dedicated namespace.
+
+We go this route to avoid introducing unnecessary complexity to
+build.
+
+Fixes #147
+---
+ regressions/common.h | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
 diff --git a/regressions/common.h b/regressions/common.h
 index 6e53483d..9cdc690a 100644
 --- a/regressions/common.h
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
new file mode 100644
index 000000000000..62477f9acf6c
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-gzip.patch
@@ -0,0 +1,58 @@
+From cb63256ae2e5fde7a67d7740bb2f4a0eab538a2d Mon Sep 17 00:00:00 2001
+From: Samy Al Bahra <sbahra@backtrace.io>
+Date: Thu, 9 Apr 2020 20:08:40 -0400
+Subject: [PATCH] build: allow GZIP to be set to empty string in configure.
+
+---
+ configure | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index 2cbdbef3..ed188f96 100755
+--- a/configure
++++ b/configure
+@@ -325,7 +325,7 @@ done
+ HEADERS=${HEADERS:-"${PREFIX}/include"}
+ LIBRARY=${LIBRARY:-"${PREFIX}/lib"}
+ MANDIR=${MANDIR:-"${PREFIX}/share/man"}
+-GZIP=${GZIP:-"gzip -c"}
++GZIP=${GZIP-"gzip -c"}
+ POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
+ DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
+ PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
+@@ -583,21 +583,26 @@ else
+ 	echo "success [$BUILD_DIR]"
+ fi
+ 
+-printf "Finding gzip tool................"
+-GZIP=`pathsearch "${GZIP:-gzip}"`
+-if test -z "$GZIP" -o ! -x "$GZIP"; then
++if test -n "$GZIP"; then
++	printf "Finding gzip tool................"
+ 	GZIP=`pathsearch "${GZIP:-gzip}"`
+-	GZIP="$GZIP"
++	if test -z "$GZIP" -o ! -x "$GZIP"; then
++		GZIP=`pathsearch "${GZIP:-gzip}"`
++		GZIP="$GZIP"
++	fi
++
++	if test -z "$GZIP"; then
++		echo "not found"
++	else
++		echo "success [$GZIP]"
++		GZIP="$GZIP -c"
++		GZIP_SUFFIX=".gz"
++	fi
+ fi
+ 
+ if test -z "$GZIP"; then
+-	echo "not found"
+ 	GZIP=cat
+ 	GZIP_SUFFIX=""
+-else
+-	echo "success [$GZIP]"
+-	GZIP="$GZIP -c"
+-	GZIP_SUFFIX=".gz"
+ fi
+ 
+ printf "Finding suitable compiler........"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
new file mode 100644
index 000000000000..3e1d080a5f4d
--- /dev/null
+++ b/dev-libs/concurrencykit/files/concurrencykit-0.7.0-static-libs.patch
@@ -0,0 +1,75 @@
+diff --git a/configure b/configure
+index 7853533..4e1ee9d 100755
+--- a/configure
++++ b/configure
+@@ -119,6 +119,7 @@ generate()
+ 	    -e "s#@GZIP_SUFFIX@#$GZIP_SUFFIX#g"			\
+ 	    -e "s#@POINTER_PACK_ENABLE@#$POINTER_PACK_ENABLE#g"	\
+ 	    -e "s#@DISABLE_DOUBLE@#$DISABLE_DOUBLE#g"		\
++	    -e "s#@DISABLE_STATIC@#$DISABLE_STATIC#g"		\
+ 	    -e "s#@SSE_DISABLE@#$SSE_DISABLE#g"			\
+ 	    -e "s#@PPC32_LWSYNC_ENABLE@#$PPC32_LWSYNC_ENABLE#g"	\
+ 	    -e "s#@RTM_ENABLE@#$RTM_ENABLE#g"			\
+@@ -156,6 +157,7 @@ generate_stdout()
+ 	echo "    LDNAME_VERSION = $LDNAME_VERSION"
+ 	echo "      LDNAME_MAJOR = $LDNAME_MAJOR"
+ 	echo "           LDFLAGS = $LDFLAGS"
++	echo "        STATIC_LIB = $DISABLE_STATIC"
+ 	echo "              GZIP = $GZIP"
+ 	echo "             CORES = $CORES"
+ 	echo "      POINTER_PACK = $POINTER_PACK_ENABLE"
+@@ -205,6 +207,7 @@ for option; do
+ 		echo "  --platform=N             Force the platform type, instead of relying on autodetection"
+ 		echo "  --use-cc-builtins        Use the compiler atomic builtin functions, instead of the CK implementation"
+ 		echo "  --disable-double         Don't generate any of the functions using the \"double\" type"
++		echo "  --disable-static         Don't compile a static version of the ck lib"
+ 		echo
+ 		echo "The following options will affect specific platform-dependent generated code."
+ 		echo "  --disable-sse            Do not use any SSE instructions (x86)"
+@@ -293,6 +296,9 @@ for option; do
+ 	--disable-double)
+ 		DISABLE_DOUBLE="CK_PR_DISABLE_DOUBLE"
+ 		;;
++	--disable-static)
++		DISABLE_STATIC=1
++		;;
+ 	--platform=*)
+ 		PLATFORM=$value
+ 		;;
+@@ -330,6 +336,7 @@ MANDIR=${MANDIR:-"${PREFIX}/share/man"}
+ GZIP=${GZIP-"gzip -c"}
+ POINTER_PACK_ENABLE=${POINTER_PACK_ENABLE:-"CK_MD_POINTER_PACK_DISABLE"}
+ DISABLE_DOUBLE=${DISABLE_DOUBLE:-"CK_PR_ENABLE_DOUBLE"}
++DISABLE_STATIC=${DISABLE_STATIC:-"0"}
+ PPC32_LWSYNC_ENABLE=${PPC32_LWSYNC_ENABLE:-"CK_MD_PPC32_LWSYNC_DISABLE"}
+ RTM_ENABLE=${RTM_ENABLE_SET:-"CK_MD_RTM_DISABLE"}
+ SSE_DISABLE=${SSE_DISABLE:-"CK_MD_SSE_ENABLE"}
+@@ -717,13 +724,24 @@ elif test "$COMPILER" = "gcc" || test "$COMPILER" = "clang" || test "$COMPILER"
+ 	if test "$WANT_PIC" = "yes"; then
+ 		LDFLAGS="$LDFLAGS -shared -fPIC"
+ 		CFLAGS="$CFLAGS -fPIC"
+-		ALL_LIBS="libck.so libck.a"
+-		INSTALL_LIBS="install-so install-lib"
++
++		if [ "$DISABLE_STATIC" -eq 1 ]; then
++			ALL_LIBS="libck.so"
++			INSTALL_LIBS="install-so"
++		else
++			ALL_LIBS="libck.so libck.a"
++			INSTALL_LIBS="install-so install-lib"
++		fi
+ 	else
+ 		LDFLAGS="$LDFLAGS -fno-PIC"
+ 		CFLAGS="$CFLAGS -fno-PIC"
+-		ALL_LIBS="libck.a"
+-		INSTALL_LIBS="install-lib"
++		if [ "$DISABLE_STATIC" -eq 1 ]; then
++			echo "Error: You have choosen to disable PIC, yet you also disabled the static lib." 1>&2
++			exit $EXIT_FAILURE
++		else
++			ALL_LIBS="libck.a"
++			INSTALL_LIBS="install-lib"
++		fi
+ 	fi
+ 
+ 	CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses $CFLAGS"
diff --git a/dev-libs/concurrencykit/files/concurrencykit-doc.patch b/dev-libs/concurrencykit/files/concurrencykit-doc.patch
deleted file mode 100644
index 40aa466bb4e6..000000000000
--- a/dev-libs/concurrencykit/files/concurrencykit-doc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/metadata.xml b/dev-libs/concurrencykit/metadata.xml
index 5acb2fa5df31..8600ab81dac4 100644
--- a/dev-libs/concurrencykit/metadata.xml
+++ b/dev-libs/concurrencykit/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hydrapolic@gmail.com</email>
-		<name>Tomáš Mózes</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">concurrencykit/ck</remote-id>