gentoo resync : 28.04.2021

5 files changed, 15 insertions, 119 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 87b345b7f0cc..de9690886db0 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,10 +1,8 @@
 AUX strace-5.11-static.patch 5306 BLAKE2B 24150fcdf0ff75c4698542914bcd0fd39df9794f39ce0d16dac6dc3b689365e124d8d77a75a8fe81caff9432679563d84ffd31add74edb4c8f83aec28ff2f078 SHA512 bbeecbfd73109d21732acdaa28d5b4c82b23b7165f09e78e62cad68f9ac63dfb4c7a1c2eb8bdc642dda9f07d62e286ab46a2be236b5f03e1e6f9920f3093ede8
 AUX strace-5.5-static.patch 5187 BLAKE2B 9015d649d644dd4e5fe6b89d7fd4b1d759b7021627384f575e6668fa24841438c49e3acd8d09f0302374fc457001df89a9f384193ddde1da105a5b95167f944a SHA512 a1adbbcc7bc87f37b1071b888f1b2c830113cfd40c341316d7e96e72e142781f41d1b8823277ea0c61079e557460e9a43d1795e7c8cc97cbca9c6aec8d08f682
-DIST strace-5.10.tar.xz 1859688 BLAKE2B 45c40854c9af95395cb274fbfddc3d0084e77cc403ffe104f72ce7592800452776f5c19d03649cdd6705bccc7a0859364e470bdd5344f64af54b798fab50475e SHA512 1baa41b6d52f2e40e42a22850beee1ae278fafe712796694631898f06a7540d8f2c3fa70807e0062734f0976ebbd0824457c733ccda248f017c218387366ed48
 DIST strace-5.11.tar.xz 1926632 BLAKE2B df47612c0928466f8b5788c4a7dc74208fe76c6967d3219b0eb753131fba315e715626c2cd1ed56d3e8ba0eb9a338589a8cbd6205fe876123ac26fdf0fab8d31 SHA512 688bec8d620c7ca701561ed7479e42687cc30737f944b82201731d827775cd2864787ecca7c93ba149b06d5d654d9f6bd109a977f8138bab34339cd5930828f0
-DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad06bc297b68561ec7073297c2e5aaf2c3d9a102382f5833bedacb2a54540068a9f9438094c9180f45b5dc4715 SHA512 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
-EBUILD strace-5.10.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
-EBUILD strace-5.11.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
-EBUILD strace-5.8.ebuild 2346 BLAKE2B 92f60380f83865c45f25a76347a47baee0fa23e240dd7d7879ac31a47a8a6e8614b37d9c8ef4068463527c1c0f31e5f05091febd9082515191faa30ffa1cff45 SHA512 9793e5ef0ad81c97b7bf7e29d3233a1504adce9dd1ace85cbb5b7b04e6b1e9f38b88d8b28c9d36dbeee6dd644615a6068ef45021355b9b587b0b00503b60b929
-EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
+DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
+EBUILD strace-5.11.ebuild 2348 BLAKE2B 59a4676d944dc05b012d9f8b47da68b3d23f95d996dd25ccdb9aab5cda3c3cb950c1ab000aa9536df55b4ee9e59bb4f42bf865f42b295c15cd75655ffcdfc918 SHA512 00c1828d50d7b02ca56f586eb2c3187f9ccddfe38b71a230304a9e111d6d7fe7119da38ff9a4998a4cc6393971874ea6ce699dfc8ae5291f038aca762533084c
+EBUILD strace-5.12.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
+EBUILD strace-9999.ebuild 2356 BLAKE2B b065af02da7b5432fec1b1fe5c7389325cbb9526318aef6045c42011a002480b569b122311dc52ae9c76ffa27a732a6de1986e525e840e86535ba5392b3c1598 SHA512 52e62ee4c32480c762a49e85aa81b200b2eb0104794ab8535b9202824f126769f42dc013e805cc58fa03f318682c2c9c2f83b5388d425d0c8ece0e79f2de1f03
 MISC metadata.xml 760 BLAKE2B 05d51ee681a1103d9619582b1f7788c1c0f2ff180b55fd26cbed2f5aea52cae0e9333ae31fc93a90f8c33798f5caeaf6bc1039cac9a023f114c79c71abfb8480 SHA512 3a7445fe5210eaf6c98ed5193f3e79567e6e815e295671669c2894f3f53a2decd5f2b4db5c87e85cf8b71cc4743fc94cc4a800fb33493c5f99f40ec83b6e57b3
diff --git a/dev-util/strace/strace-5.11.ebuild b/dev-util/strace/strace-5.11.ebuild
index 73df00d83ec8..d71516e9a04d 100644
--- a/dev-util/strace/strace-5.11.ebuild
+++ b/dev-util/strace/strace-5.11.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-5.10.ebuild b/dev-util/strace/strace-5.12.ebuild
index c08dbf18c0a5..73df00d83ec8 100644
--- a/dev-util/strace/strace-5.10.ebuild
+++ b/dev-util/strace/strace-5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.5-static.patch"
+	"${FILESDIR}/${PN}-5.11-static.patch"
 )
 
 src_prepare() {
@@ -97,8 +97,9 @@ src_test() {
 
 src_install() {
 	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
 	fi
 	dodoc CREDITS
 }
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.8.ebuild
deleted file mode 100644
index ccb5d555782b..000000000000
--- a/dev-util/strace/strace-5.8.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strace/strace.git"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://strace.io/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind elfutils"
-
-REQUIRED_USE="?? ( unwind elfutils )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-LIB_DEPEND="
-	unwind? ( sys-libs/libunwind[static-libs(+)] )
-	elfutils? ( dev-libs/elfutils[static-libs(+)] )
-"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-PATCHES=(
-	"${FILESDIR}/strace-5.5-static.patch"
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	# Don't require mpers support on non-multilib systems. #649560
-	local myeconfargs=(
-		--disable-gcc-Werror
-		--enable-mpers=check
-		$(use_enable static)
-		$(use_with unwind libunwind)
-		$(use_with elfutils libdw)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
-		return 0
-	fi
-
-	default
-}
-
-src_install() {
-	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
-	fi
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index c08dbf18c0a5..73df00d83ec8 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.5-static.patch"
+	"${FILESDIR}/${PN}-5.11-static.patch"
 )
 
 src_prepare() {
@@ -97,8 +97,9 @@ src_test() {
 
 src_install() {
 	default
-	if ! use perl ; then
-		rm "${ED}"/usr/bin/strace-graph || die
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
 	fi
 	dodoc CREDITS
 }