gentoo resync : 18.11.2019

8 files changed, 49 insertions, 269 deletions

diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 46ab02e0e635..8a497b46862d 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,13 +1,6 @@
-AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b5192e3e1baca36b8b6aa8e35254191ffa783aa8a2b3ee504f85baebf50fdd5e8534a443a6363d73a82108f9e5 SHA512 57c802d02ba6d8e9295300fcc0156670a3fc9b35dbd05d594eff95481eaa746d7715d9b493190c94833cb331e45cda71f5574b0fa5aed06991b1d80fd4f9bae6
 AUX rr-5.2.0-c++14.patch 791 BLAKE2B 6e13ead39239a2ec2cfd0a7c9537b7780ede7fdacdca5d34302b269ae67e73abca6dda22c6dff4c918040d46ec6745ba7eb45602a6464bd5a454a0cfa3633786 SHA512 9aec12ef80b8c83de56e8186e43db3bda1c10028255eccf8aac4db5f3cc817092a8d59b578145bdb87eb01fc761d5d3c1734daec337b7342a892b3017a51035d
+AUX rr-5.2.0-tgkill-glibc-2.30.patch 1076 BLAKE2B 52fbe716a4830197800d63eac91188abc45fb55936c1580d965ec0864b06a230bd9e2f13036387cc17ec583bd87c580ae29ea53f9250ac0eb5439c8af629ee30 SHA512 f6d21968118499d4fc1f2d6437904d225a767f36738e859218606c13fe641b74a6eb778170e1a99fa89d5cbb915bcef4294d2c4f71f4d1a8a3b76bf261d079a2
 AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
-DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
-DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
-DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
 DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a0eb7cd3443e7110d3562ac4ef30c310e6448a588f4e31f2943a6d4ff0af006cbbafc50722543436fcae3bdc8e453f SHA512 4465985f67e9812b62b91ac7942105a9f976faf0c0d7c352a99a638fe6bdfde024f939b3daa922d431c7fc87118ae4d9d039b00345760fb547c349e8737dc168
-EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084
-EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
-EBUILD rr-5.2.0-r1.ebuild 1176 BLAKE2B af849daac6f1eb7b6567356b58319b1e48d6e3d3ab54bac95553835a1024f2f853e44c3053d044a213d9a64994dc46d19c9a88890119c5952140ade732b2560a SHA512 0cbe93c6d10d125eb46da72042baf61b92b4d472124327a68238e59dbf7ac0e92a5ab9c258392103a5b6617e55ded5029e602cd08a4c4c93206f2b32eaaa897f
-EBUILD rr-5.2.0.ebuild 1122 BLAKE2B 5eddd67054f0cb35ccdc6b18fd53b9b023eaed84c716e751bd7d22e1f0800fb193b28153bed852c4eba02b48b0ddd264df23483296161ef7ef330a657e030fe6 SHA512 0b092bb0d699a3c6fc516d01a1e71b3c1b3190ee62ebe284f02d31d9dce5e0500b67e817a83c1b6d744c27eac33995a12333538a6e5085c82a0dc0e213e86ea0
+EBUILD rr-5.2.0-r1.ebuild 1450 BLAKE2B 640c129935a43188cee50dd412ccf639081f2cbda491c93a6391bf0da58474af6abf899e909a100ca8c485394a62f6b494e476f36ce58f3b3f70c4f76881623b SHA512 b1228db164e3e7c56b3092c76b8d018741d1489889a5df5fa4a02b485f7e45d05f3336bc96b8b0cd997b14d82c96895e88b1d445d5cc95e549f24bd9404c271c
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/files/rr-4.5.0-sysmacros.patch b/dev-util/rr/files/rr-4.5.0-sysmacros.patch
deleted file mode 100644
index 573d5956598b..000000000000
--- a/dev-util/rr/files/rr-4.5.0-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/mozilla/rr/pull/1981
-
-From fefdb3b89e98192601dfdc98c8927c9a91f07f9f Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 13 Feb 2017 16:01:52 -0500
-Subject: [PATCH] tests: include sys/sysmacros.h for minor/major funcs
-
-Newer versions of glibc are deprecating the implicit sys/sysmacros.h
-include via sys/types.h, so include it explicitly.
----
- src/test/rrutil.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/test/rrutil.h b/src/test/rrutil.h
-index 60de6e47a57b..bb5b527c4c9a 100644
---- a/src/test/rrutil.h
-+++ b/src/test/rrutil.h
-@@ -76,6 +76,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/sysinfo.h>
-+#include <sys/sysmacros.h>
- #include <sys/time.h>
- #include <sys/timerfd.h>
- #include <sys/times.h>
--- 
-2.11.0
-
diff --git a/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
new file mode 100644
index 000000000000..2a6e9daef2fb
--- /dev/null
+++ b/dev-util/rr/files/rr-5.2.0-tgkill-glibc-2.30.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/699886
+
+From 7044c5c6a8e64c737ba3cdb97187ff5c406e5162 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
+Date: Thu, 23 May 2019 23:18:26 +0200
+Subject: [PATCH] Fix build in newer glibc.
+
+Seems tgkill was added recently to glibc.
+
+build/32/tgkill.c:7:12: error: static declaration of 'tgkill' follows non-static declaration
+static int tgkill(int tgid, int tid, int sig) {
+           ^
+/usr/include/bits/signal_ext.h:29:12: note: previous declaration is here
+extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal);
+---
+ src/test/tgkill.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/src/test/tgkill.c
++++ b/src/test/tgkill.c
+@@ -4,9 +4,8 @@
+ 
+ static int num_signals_caught;
+ 
+-static int tgkill(int tgid, int tid, int sig) {
+-  return syscall(SYS_tgkill, tgid, tid, sig);
+-}
++#define tgkill(tgid, tid, sig) \
++  syscall(SYS_tgkill, (int)(tgid), (int)(tid), (int)(sig))
+ 
+ static void sighandler(int sig) {
+   atomic_printf("Task %d got signal %d\n", sys_gettid(), sig);
+-- 
+2.24.0
+
diff --git a/dev-util/rr/rr-4.5.0.ebuild b/dev-util/rr/rr-4.5.0.ebuild
deleted file mode 100644
index 32d5d5d6983e..000000000000
--- a/dev-util/rr/rr-4.5.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rr/rr-5.0.0.ebuild b/dev-util/rr/rr-5.0.0.ebuild
deleted file mode 100644
index 330b1821df13..000000000000
--- a/dev-util/rr/rr-5.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rr/rr-5.1.0.ebuild b/dev-util/rr/rr-5.1.0.ebuild
deleted file mode 100644
index 330b1821df13..000000000000
--- a/dev-util/rr/rr-5.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-sysmacros.patch
-#)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/rr/rr-5.2.0-r1.ebuild b/dev-util/rr/rr-5.2.0-r1.ebuild
index b272d4c8faab..b98223d5136d 100644
--- a/dev-util/rr/rr-5.2.0-r1.ebuild
+++ b/dev-util/rr/rr-5.2.0-r1.ebuild
@@ -31,9 +31,12 @@ DEPEND+="
 		sys-devel/gdb[xml]
 	)"
 
+RESTRICT="test" # toolchain and kernel version dependent
+
 PATCHES=(
 	"${FILESDIR}"/${P}-ucontext_t.patch
 	"${FILESDIR}"/${P}-c++14.patch
+	"${FILESDIR}"/${P}-tgkill-glibc-2.30.patch
 )
 
 pkg_setup() {
@@ -50,6 +53,15 @@ src_prepare() {
 	sed -i 's:-Werror::' CMakeLists.txt || die #609192
 }
 
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
+		return 0
+	fi
+
+	cmake-utils_src_test
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
diff --git a/dev-util/rr/rr-5.2.0.ebuild b/dev-util/rr/rr-5.2.0.ebuild
deleted file mode 100644
index 8c74d5929434..000000000000
--- a/dev-util/rr/rr-5.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake-utils linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	sys-libs/zlib
-	dev-libs/capnproto
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	sys-devel/gdb[xml]"
-# Add all the deps needed only at build/test time.
-DEPEND+="
-	test? (
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		sys-devel/gdb[xml]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ucontext_t.patch
-	"${FILESDIR}"/${P}-c++14.patch
-)
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i 's:-Werror::' CMakeLists.txt || die #609192
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}