gentoo resync : 02.01.2018

4 files changed, 23 insertions, 79 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 88751694f08f..6e9df23fac4f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,6 @@
 DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
-DIST strace-4.19.tar.xz 1113124 BLAKE2B 7018df9a1efd5e732cbef9eb3907e9cff8eafcee0b69853c54627d244ab55bae1ed295ac06a36314f3e88ce9e623fbe147a59f3519352e8d4d3a0d552d0bc884 SHA512 91d57f58ac0e70ff4dcd69fda3cb835de7f40a9152817427e9c264773f99015badbad7bab047ce7f69001b689b1ce54af9522a9738060823de8873bee1e0c629
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
-EBUILD strace-4.19.ebuild 1817 BLAKE2B eb572e07f4fe3dd676d15c70ba43228d123dd192a358a248de418bc92b3da7297acfeb28ab411939c3360102c68ae2801170877d1a1f742c896c8c85c1cd497b SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e
-EBUILD strace-4.20.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
-EBUILD strace-9999.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
+EBUILD strace-4.20.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
+EBUILD strace-9999.ebuild 1974 BLAKE2B f3315727c093ae27f58cc89a3b349e6c85863b09e8a2595890916b0bb4956aaa90b3f36581904cfe5c5ebb942243a63b504b3c3e085d9625b00e28f20479458f SHA512 bb5f51ff496c447567594ad51fca30114344f961a3efc55f27ab62279fe27ac3b2446582cc95b0572efe3d1a4e63347a9dd70ecb599ea6879a0141049fe57040
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.19.ebuild b/dev-util/strace/strace-4.19.ebuild
deleted file mode 100644
index 24bc92be859d..000000000000
--- a/dev-util/strace/strace-4.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[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 )
-"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
-
-	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
-
-	econf $(use_with unwind libunwind)
-}
-
-src_install() {
-	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 458e7d64d80e..e445febc7869 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,15 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+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
 	use perl || rm "${ED}"/usr/bin/strace-graph
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 458e7d64d80e..cfa22a181d7a 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,16 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+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
 	use perl || rm "${ED}"/usr/bin/strace-graph