gentoo auto-resync : 10:01:2023 - 06:19:57

3 files changed, 9 insertions, 78 deletions

diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 5805c21382d0..91bac540ced0 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,6 +1,5 @@
 AUX rr-5.6.0-linux-headers-6.0.patch 2303 BLAKE2B 3f804757bc221617939bcfd128546f2bb66d0bd5ec8efb42a6cd05b0aac6e83513d8df89e7838673bc53228801d83ca57a888701539007b73ab9a734d6e2674f SHA512 21216496235e7d7507d319a0b8489a96f44f711dc0727b6bd1828ac80e1ac174a9bf2c9ced7ccadd0cd6d6af64a7a2b1a3f71a25816bef8b6d6e2f884ecd85eb
 AUX rr-5.6.0-tests-clang16.patch 576 BLAKE2B 2e2141a0dd0c5366497654ed499910f79c8e3cf12b3a4ec102817b03b73c25da8e86b43aee75cf2ac04049f0106086bef2ef37e1c7a1787608db3cf3bcf987cf SHA512 52f40c9b73caa02d39b82703d98201733570865e9ca016b2feaecd0fe34cb69d38a294226311ec686ef921f3a195fb09d7c286e9f375668ec50bd156f4ab1b94
 DIST mozilla-rr-5.6.0.tar.gz 1579320 BLAKE2B 14ea99c4486c72db844b5cad3f0c300d7bf5d49449e7080ed0484f89022be6d9b7f81b3808b65f59028a5256a6b3f6508729d5b7e8f3f45d8353ceb7ae2a577a SHA512 4b5ef65b6c6a4b62fc72949b4541aaf608f6133ea0b6c2e529a8eed725e6a0b5186f20ed60b210821e6929410e1f21723840eacfdc85bf12c87703e7ebf5f9a7
-EBUILD rr-5.6.0-r1.ebuild 1527 BLAKE2B 431daa0d158ce6df7f6a10dd7913e4dd37fa8e6b2b8e3237bb3db96e77d8c50ca41d8df9f4c10ebd2be3500ccccb22c4b857991da07cbe7b1e52b73544fef1cf SHA512 f5b2345b44afe38298bd2ab985c5776a2810d0eb9e74e3c7d08bb14d99581cdefbe581b0ddf63e777919df5752c88775261c57ceec29d7c29888b0026966fce8
-EBUILD rr-5.6.0.ebuild 1426 BLAKE2B 3a342707b60f863d85b32eef3b7692225df1c9ca795aae0e2d3ae454e945f02d915e4452f0edd932d50091aed7dbd7c982c55dd28fdd65aa12dcce9fa7e1825e SHA512 828f8e4e466c8790f8217f59c2b3023a02de5bc0e5065911d438cc95d91c7c0b822189d12c479e0a78db3ed771ca64e4cce5489d00b1b69924e914461443ef92
+EBUILD rr-5.6.0-r2.ebuild 1622 BLAKE2B 6597d3655711c06df9e8daa8856d95abdc74ebbc7faac2e5366964be3b67a6575b5f186b9c60d34b55711b807d5384851c91780b2924e2ff75bda1da37d43814 SHA512 950609a623c6c90f550f95b8145587630fba818d05150fb0619ff4d5c8b0ec6ce8b96e5e1a5d0f16c6a6377587d54862859604e0fceb61241b504d6d0e55c7dd
 MISC metadata.xml 448 BLAKE2B 2ca27171b81983b513710708955b70a7a73174ca72fb8bac4c8363a5f0fb464431d9d84d3be7818e4132ff7ca9b2f6b3325c526e6424bbeac8ee6dad1728c8cb SHA512 01fa6e40deff5fc58f51b90f75f93cf38f10ad58e994153045954ebc9d00dc41e7d8ea625b2b882a376cb0db1dbcc9e1a025c85f9fb584ef7a46b6db812b649b
diff --git a/dev-util/rr/rr-5.6.0-r1.ebuild b/dev-util/rr/rr-5.6.0-r2.ebuild
index 3092495a06e7..5b243d13e78c 100644
--- a/dev-util/rr/rr-5.6.0-r1.ebuild
+++ b/dev-util/rr/rr-5.6.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 CMAKE_BUILD_TYPE=Release
 
 inherit cmake linux-info python-single-r1
@@ -79,3 +79,8 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/bin/rr-collect-symbols.py
+}
diff --git a/dev-util/rr/rr-5.6.0.ebuild b/dev-util/rr/rr-5.6.0.ebuild
deleted file mode 100644
index 411c859c27a3..000000000000
--- a/dev-util/rr/rr-5.6.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-CMAKE_BUILD_TYPE=Release
-
-inherit cmake linux-info python-single-r1
-
-DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="https://rr-project.org/"
-SRC_URI="https://github.com/rr-debugger/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
-
-LICENSE="MIT BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="multilib 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? (
-		$(python_gen_cond_dep '
-			dev-python/pexpect[${PYTHON_USEDEP}]
-		')
-		sys-devel/gdb[xml]
-	)"
-
-QA_FLAGS_IGNORED="
-	usr/lib.*/rr/librrpage.so
-	usr/lib.*/rr/librrpage_32.so
-"
-
-RESTRICT="test" # toolchain and kernel version dependent
-
-pkg_setup() {
-	if use kernel_linux; then
-		CONFIG_CHECK="SECCOMP"
-		linux-info_pkg_setup
-	fi
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_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_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS=$(usex test)
-		-Ddisable32bit=$(usex !multilib) #636786
-	)
-
-	cmake_src_configure
-}