gentoo resync : 16.01.2021

3 files changed, 125 insertions, 14 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 7a1cd604d26d..399380b95160 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,8 +3,10 @@ AUX strace-5.12-detect-ipx-presence.patch 3902 BLAKE2B bc61d359e670462daafa88951
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
+DIST strace-5.16.tar.xz 2265944 BLAKE2B 0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21 SHA512 db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
 EBUILD strace-5.12-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.14-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.15.ebuild 2441 BLAKE2B ad57aeb288b3a5e2ba836c3eadc267084a3be7bc4fd73cab6edab02b0ee13adc7383342095f0df5dac494f53e1ebb881f752a367ddb1a57bd18ebf16ece20098 SHA512 036814f5d4917313557e6672e580abdcadb6f15b326f37268bc8a215bd3c1ea569d32e74562a37c6e439877ee303d3cbb77199999a7575815869b947b529d993
-EBUILD strace-9999.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
+EBUILD strace-5.16.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
+EBUILD strace-9999.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
 MISC metadata.xml 761 BLAKE2B 261db0087db2a12c260efcd80bae1dcabd1b518c7b7d65a7ce4cbd5a2fcf878af3787985d629b43dac0944fe97f7f78df964082c5dbc52da06360ec112a0e7f0 SHA512 dfe6bb1b1149f51947c964d55396c10df38ad68dd987ae3df66b1850b812717d282d41e59a38f35863d22eb7391b7be636b5272e361641c26622618c2cbff19e
diff --git a/dev-util/strace/strace-5.16.ebuild b/dev-util/strace/strace-5.16.ebuild
new file mode 100644
index 000000000000..a0531b88dede
--- /dev/null
+++ b/dev-util/strace/strace-5.16.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 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
+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 selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[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}/${PN}-5.11-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
+
+	# Stub out the -k test since it's known to be flaky. bug #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
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 035be39c8354..a0531b88dede 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,12 +19,9 @@ HOMEPAGE="https://strace.io/"
 LICENSE="BSD"
 SLOT="0"
 IUSE="aio perl selinux static unwind elfutils"
-
 REQUIRED_USE="?? ( unwind elfutils )"
 
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -58,12 +55,7 @@ src_prepare() {
 		[[ ! -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
+	# Stub out the -k test since it's known to be flaky. bug #545812
 	sed -i '1iexit 77' tests*/strace-k.test || die
 }
 
@@ -76,10 +68,17 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	# Don't require mpers support on non-multilib systems. #649560
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
 	local myeconfargs=(
 		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
@@ -90,7 +89,8 @@ src_configure() {
 
 src_test() {
 	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
 		return 0
 	fi
 
@@ -99,6 +99,7 @@ src_test() {
 
 src_install() {
 	default
+
 	if use perl ; then
 		exeinto /usr/bin
 		doexe src/strace-graph