gentoo resync : 07.01.2022

4 files changed, 74 insertions, 8 deletions

diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 4c40afb5f215..f7985e9fcf72 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,3 +1,6 @@
+AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82
 DIST userspace-rcu-0.13.0.tar.bz2 608434 BLAKE2B 11b5d13f4e1a577cc33ad430eb387b26cc2db2ba9ff32c7a09f9cb6c8a418548cd87c198ab4b63be3df884d8e3878046ba817106ff2f07cbab86dd60c9bb1d34 SHA512 7288b5a4a2dca6a75ecaa8553b942b9e7be9cae25776d2448fb0b0c950af9919c369791839607c6c1e6cbd32bbd1e1cafc18ee753f0e3bdc2ed7b65488612580
+DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
 EBUILD userspace-rcu-0.13.0.ebuild 791 BLAKE2B b711826c1f1d7de9feb6cf1fdf679bc068d08f635b52e3130c7bf7fb3132ee60ac4f05b445ad6abf41908f3e4c71db53ca211076c4c2409110fba1c4544f6cfc SHA512 78d733e2bb48079bec52015c27bf5184e333a64d49713dae4c2688209d9506c1689d72e66af2909e365597c43febbbcb290472362bb2f9fce99eb82d92494afd
-MISC metadata.xml 347 BLAKE2B a2a6a24ee4974111cf0e6559b25b17da2f899a965983e1c518355c0808a2168747d23aa0b2edc000bae1a57003bab68041b526e028da9ecd7051e86f340be51d SHA512 2fdd5bd8bf7e9ed31cacfc8c59d0bc46637b1d51ee37bc2157b6b635223dc0c13085d5b65f47f75ec40d4c28c2b2449c62f65f9f7cc84ecb9f037bf1fec99443
+EBUILD userspace-rcu-0.13.1.ebuild 904 BLAKE2B 81564f23e58646f5c9c5d31678250f53ce358aeb04e873b11434ea0aca770ce4cfd81eeaa666ad1754fe0613f1017db5ea3834daa560c69c89db41ae4a20efd5 SHA512 70781b79afe67324c23563c250785e64ab5698ed168c5194a3655b2e5b9b27041409d4a2fd323ec811fed05cfbb3ed0eab893ebdd60c13c9692882ff03a691e4
+MISC metadata.xml 357 BLAKE2B 11e5edf30ea2771ab569b3353e6bd726f3d925347cd4c1f601b4c57b03ff9ae4c68a5a338b4cdf101060af34f4f13e3fe1a7cc8ac5a7b7218bd16ceab2ca048a SHA512 640a8b8fe2188028e7c0da0aba2069167d8799faa37b66c0bed3636c386e9e250865453b3f370a0123f713f72ef35e0a1ee54e7df66a56985e8e42f6816025a0
diff --git a/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-tests-no-benchmark.patch b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-tests-no-benchmark.patch
new file mode 100644
index 000000000000..ecbe3e01e0a8
--- /dev/null
+++ b/dev-libs/userspace-rcu/files/userspace-rcu-0.13.1-tests-no-benchmark.patch
@@ -0,0 +1,13 @@
+Fedora: https://src.fedoraproject.org/rpms/userspace-rcu/raw/rawhide/f/regtest-without-bench.patch
+
+"Remove the benchmarks from the regtest target, they timeout on the buildds."
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -8,7 +8,6 @@
+ 	cd benchmark && $(MAKE) $(AM_MAKEFLAGS) long_bench
+ regtest:
+ 	cd regression && $(MAKE) $(AM_MAKEFLAGS) regtest
+-	cd benchmark && $(MAKE) $(AM_MAKEFLAGS) regtest
+ 
+ check-loop:
+ 	while [ 0 ]; do \
diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index 4123f2f05874..dce48a4a9489 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>base-system@gentoo.org</email>
-<name>Gentoo Base System</name>
-</maintainer>
-<use>
-<flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
-</use>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
new file mode 100644
index 000000000000..434c0ba25a9e
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Userspace RCU (read-copy-update) library"
+HOMEPAGE="https://liburcu.org/"
+SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/8" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( sys-process/time )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for tests patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+
+	emake -C tests/regression regtest
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}