gentoo resync : 26.11.2017

5 files changed, 14 insertions, 158 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 7a170c69cdc1..5353c9f89637 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,14 +1,8 @@
-DIST strace-4.13.tar.xz 847032 SHA256 d48f732576c91ece36a5843d63f9be054c40ef59f1e4773986042636861625d7 SHA512 166d9b80ec093e049161ee5506a60c408d6f953d8fa04ba5dcb5105b0c9181282a2c28ff0a7acfa44880be44fd1dbde2319e895868a6edecd0121700a49dfdec WHIRLPOOL 0e5dd46610befc20fe9c0d65f665b304e7e512d647b2bd4b3cf73840197c052914d775296e01a738969e5ec84df94e19c491ab943e88040ca04063a4cd22a8ed
 DIST strace-4.16.tar.xz 966668 SHA256 98487cb5178ec1259986cc9f6e2a844f50e5d1208c112cc22431a1e4d9adf0ef SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5 WHIRLPOOL 3406b4fa96d4113c620e5d179ae61def8dc8ca97f4255b8df6b344269f9fd2c0eae76d9dde6fcc10a6aebc192e4ccb0e130a60ee03f83bcef9be56632e400cb3
-DIST strace-4.17.tar.xz 1001808 SHA256 81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419 SHA512 dab376d9c5ac7db98e864f3cfb165eeec714e3ea492f32ee873cebe01fbd3a0793db09983af1da6530480666a59973ccd9855d348e754be1eead9c0a5d524029 WHIRLPOOL 5d1aaa0405288695d73523eb0171e9c56e966db44a58dbd7ae6aed16af66a151be5ad58fb716ce2305ea9435e29dc36bd3be5ade73e09fef69fcbcf32599a036
-DIST strace-4.18.tar.xz 1040676 SHA256 89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08 SHA512 4fcabc11ef8055c09a5a4777e66f006dd9d67d74740dc0d6e31eb16fa8496062b848c1f21adeeeba7895f57af851103a384c19000ac15cd2f5521e78a5e7a8ad WHIRLPOOL 740d8a19ed3cc0822ec3bbdae72dd3cbe892f78a9161ee824735599ac316788a3fa8c54a18ba32b79c6225930e57f9a74f00fd8e11a1b96514bce9b40d124edc
 DIST strace-4.19.tar.xz 1113124 SHA256 7c93ebc6c29280f47c24a0eb86873a99ccb2cac6512c60a60ba4ef99ab807281 SHA512 91d57f58ac0e70ff4dcd69fda3cb835de7f40a9152817427e9c264773f99015badbad7bab047ce7f69001b689b1ce54af9522a9738060823de8873bee1e0c629 WHIRLPOOL 426bca505798a70f623f263de2fe3b02ee603ae513523d3b3fe781780ffc31a0a365214f76c1afdcdb32ec72a37178dd342f594fafe596a3c64d3b99ba38f2fb
-EBUILD strace-4.13.ebuild 1800 SHA256 e8fe3974786f448e785e96e05a4390a2c6d35e1bd51b8d5253b87badd1d3d935 SHA512 2aa3389c2d06aa98a3a2b5702cad42fcba83d7e0a0d7a7cea94d79d8e7e029fbe020425e10e8a03509e7458d84ae0c47036532cf12d133f53cb9692a624feaca WHIRLPOOL ffacf9c81b8e56ea572d09afb394828aa1a9ed454129a8272f1dba4cc45ee020a01886d89351b6f335339d0c3dcd4a1aec120d8581a3d71935bc18e1b16f6e28
-EBUILD strace-4.16.ebuild 1804 SHA256 a329d855bf9f805b1a687acecb0d64dbaf58f646de6fbdf465dcb1f8c942c28f SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf WHIRLPOOL 9f3542c671bc334123382b9f678165403a2cb29899c38dac1c020036c021ff074d87d1fb39335d8fb5dd80c5a9437a32adc45a06ec50d9848f313800533bf1cc
-EBUILD strace-4.17.ebuild 1813 SHA256 3672eda237edd674c0352f4106e49b5369f06e5747f2c2b9a8a9e8133822a91f SHA512 41dee05059e875a00e44acdd89f2851a8d409f84ffe260f0124bd5cec3dfb38f562a043b4804a8840f2d4cd7cc2fb9465078f8f7135c5477e2b51c989f21bfdb WHIRLPOOL 14a285c45f9c9513c89355f888c802369d85d57936141467e30cd6fdaa119ea341cade0f93e3b1dff2b0e10de699e83a6dfb36523492c77dcfb47e9ff85621d3
-EBUILD strace-4.18.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
-EBUILD strace-4.19.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
-EBUILD strace-9999.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
-MISC ChangeLog 6475 SHA256 cb6f88a0781d3ae1ad956eea89528142607b55ffac120fc6ce3cda8ba73f715f SHA512 bb2e8128d7522634f95dcc3af8d3902c904ba2c666ae89106f9673f844880b1dddda45564251e711899f72a81c73dbfaf8b0088d1567d2db9dcbdd29e7cf36f8 WHIRLPOOL ad4ccff60ab2379c2bbb5f29e43f800f03d0d0b060f8f4a4d969a62b48c487b0681f7f04accaba2c766728224e20a5b830d49b1340fbf98c280cf7162ae9a519
-MISC ChangeLog-2015 25514 SHA256 89a5d54c7b85ba428f52c74535710e834504ff846ba4491e2ec8fb9c23523e1b SHA512 fc6c2a4a4c0e9acf27604cdef5383a5789e5e0ee633b301706a7d4e44556a7608fbda5e23c6a59c403d2fad7693f55a90aad4d3b5265a713134e33a514b3970c WHIRLPOOL ef1ffe8a0dedc7a533a32d4c73802ea0f86d88c6076acd0a3b598fa97e4d49b440335d610231b148cd01dac0b2610c70d6741e681685543ae34d1d8e0def26d5
-MISC metadata.xml 593 SHA256 e109b90d149d7f0a92316f83f9695c40f2d702625c274b3a9c48bfab2b38dd53 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4 WHIRLPOOL 1af581a8525b849b93b4e2f1c7106fb4805c61818d374e451b5cdf88d7e0d87a41e5175d08e789daab6daf4832ed4b055e9b7de4ad7516220c9da0c203bdc910
+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
+MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild
deleted file mode 100644
index 5b110f03e767..000000000000
--- a/dev-util/strace/strace-4.13.ebuild
+++ /dev/null
@@ -1,69 +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.17.ebuild b/dev-util/strace/strace-4.17.ebuild
deleted file mode 100644
index e7f4e44ab5b5..000000000000
--- a/dev-util/strace/strace-4.17.ebuild
+++ /dev/null
@@ -1,69 +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.18.ebuild b/dev-util/strace/strace-4.20.ebuild
index 24bc92be859d..458e7d64d80e 100644
--- a/dev-util/strace/strace-4.18.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
 	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
+	inherit git-r3 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"
@@ -34,7 +34,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	epatch_user
+	default
 
 	if [[ ! -e configure ]] ; then
 		# git generation
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 24bc92be859d..458e7d64d80e 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
 	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
+	inherit git-r3 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"
@@ -34,7 +34,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	epatch_user
+	default
 
 	if [[ ! -e configure ]] ; then
 		# git generation