gentoo resync : 10.02.2020

11 files changed, 13 insertions, 40 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index db3880b0a197..23144c227556 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cfv/Manifest b/app-arch/cfv/Manifest
index a49520c261cd..84c5ac1245f0 100644
--- a/app-arch/cfv/Manifest
+++ b/app-arch/cfv/Manifest
@@ -1,3 +1,3 @@
 DIST cfv-1.18.3.tar.gz 68030 BLAKE2B 72372ebf7fa2d72a68b20cc0bf82823e973de5e8acacdcded85f50ad0e2f3e867c6924828b0a4ee42663e623d0d6d2e55b3f4b94addd83a703e4502edb1dda35 SHA512 dbca82df850703ab68a20db9314475025ac2e7012f34a12abbb358677e81cbb29a465adf4a1b002f6cf1c1dd84f1588fc1072791d6bbaad0c02cc563e5fe7d71
-EBUILD cfv-1.18.3-r1.ebuild 745 BLAKE2B e781ee1173842bc29fd4a8e9a7af77637dddd25dd2faefb85bf3d4250f05f2d8787d6e5cde39708e9db3deaf18af9a371e5fbe8df0df47d0a8bf051e4300b3d1 SHA512 4b84222ca5b887626f958709c8ca665451d7de46be75d14cd7c9dcac63f52db4a3b75275b2e969e675c4700a001eeba3217cca4a9ed176b02777ed16531c479d
+EBUILD cfv-1.18.3-r1.ebuild 785 BLAKE2B e94a77aabd9f6caaabc0d8bd8239c4fcf459b8a824af501368d19add43c4dc00a89cfa9abdd8e0074597c8ce7ce11e360a1e5a88cafa28d6943ae448fafeae8b SHA512 591f2700700c9bd4d08f7e075dbe2d8e18b8e4029df4ef07122bfb96d45bb7a6961b2b283af3856e015f8ba0df7dc36274b88b036b1f18b4cd12116335f627c3
 MISC metadata.xml 581 BLAKE2B bc30bbb35470c1ab89641e3da14813f964ff2e4d2aeb6f37abd4bba0e4b5e5288b21637927fb0a8c04066653a09a66d00d3fcbd67a65d4b18e59cd1c31eefa1d SHA512 ac57bc554978a1f62b0ecef157853b66a00aa7098be0f5e42e01e5cf9546a8aec259dca9037d6698defea3e2e265ef7827e9e9cc73db98d6584896a3755b9d56
diff --git a/app-arch/cfv/cfv-1.18.3-r1.ebuild b/app-arch/cfv/cfv-1.18.3-r1.ebuild
index 05ba386240c5..3fdafa44a202 100644
--- a/app-arch/cfv/cfv-1.18.3-r1.ebuild
+++ b/app-arch/cfv/cfv-1.18.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,8 +18,10 @@ KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
-	dev-python/python-fchksum[${PYTHON_USEDEP}]
-	bittorrent? ( net-p2p/bittornado[${PYTHON_USEDEP}] )"
+	$(python_gen_cond_dep '
+		dev-python/python-fchksum[${PYTHON_MULTI_USEDEP}]
+		bittorrent? ( net-p2p/bittornado[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 44e2fe9080db..9322be2550be 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,5 +1,4 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
-EBUILD deb2targz-1-r2.ebuild 647 BLAKE2B 1a921c18c5cbb13b01cb70394b81ba5e69a148f0020e7e2cfe98820ee3c5ce0923b0e0e17d9753c9bf53630b2de348ed3a641d4aaed2b72dffbd9d3c4521c0ee SHA512 834e4b97d44c9dd3a8052e81f49178c91c3e12574d746ed8142613da44922605542df26873e3818fba3c10a9a24707d93912d11e4470e70ec1323826d6444735
 EBUILD deb2targz-1-r3.ebuild 620 BLAKE2B 1c133e08f12e80914d91deac2faf9e6944b50b992aef3bdcc781e9066d4f58b5add1a9e6607e4c41ca0058bdc399d8919ad779007124016397b123382e2de2a2 SHA512 d9e5da4e10599eca4159cd8c8804777b82bd95d4a343245281c203252431cd239ee716a58097046e049ffb1257e899f8b88a6d38b73a78a64996e0077986ce64
 MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/app-arch/deb2targz/deb2targz-1-r2.ebuild b/app-arch/deb2targz/deb2targz-1-r2.ebuild
deleted file mode 100644
index f2c8a15145e1..000000000000
--- a/app-arch/deb2targz/deb2targz-1-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit base
-
-DESCRIPTION="Convert a .deb file to a .tar.gz archive"
-HOMEPAGE="http://www.miketaylor.org.uk/tech/deb/"
-SRC_URI="http://www.miketaylor.org.uk/tech/deb/${PN}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-S=${WORKDIR}
-PATCHES=( "${FILESDIR}/${PN}-any-data.patch" )
-
-src_unpack() {
-	cp "${DISTDIR}/${PN}" "${S}"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-arch/lzma/Manifest b/app-arch/lzma/Manifest
index 60834b34090b..46d556b4e404 100644
--- a/app-arch/lzma/Manifest
+++ b/app-arch/lzma/Manifest
@@ -1,3 +1,3 @@
 DIST lzma-9.20.tar.bz2 534077 BLAKE2B c1be526d6fb9f68da10b654940a92420b6c708c7aefe213394cf1c7650b3d65c4f54d3ca0663e52be13aa9f996ff9cc87262fac8b76dd0654e839cefc073c374 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35
-EBUILD lzma-9.20-r1.ebuild 884 BLAKE2B e74b87a6c1227401469972335506b128131aee6155da6893127616e43124f42b5ea58330dd15798d457542d7f69bfd16450b8875928968d431b9862f45b16494 SHA512 71bd5054fe67ad9678b59e4591ca29700a9a8fa83ca90e7e07d159dc396a97e5899a1b2fe52f753d301ad2343b4799cfa3e64ec5a6f7dfb9a5fe2ebec7c54085
+EBUILD lzma-9.20-r1.ebuild 889 BLAKE2B 5251a783ff4fe58c0087d9c969b37c91fda0e3e3ebf8743a74d0bb314d098ddaeaad66911d524a9d8415767a5a35123e58bcebdebab350768fce7b20356b5584 SHA512 4318d54b4e1dbac9b817e26d23606d56458e98d85ce3679db896fec1a915dc001ea934022d50ed2f571feef0b17e3ffa6f429d079dea78cf47cc5648c790a7fe
 MISC metadata.xml 250 BLAKE2B e05a373f0ea02a1a107bb27632d2f6b87bb754d82a7a7c6f56b7bb6041a92a0bea6ef1a6353cd535f5f9d992b10cb68e402c4efa3189d7f65d2c9fc904a4610a SHA512 7bd753e69082bd70f8afe68f12584dd5ee18b9972c27c523570075d4d0168f3e3d8eb638da7ca08ab3969904e39ec2c76f4891fd649a26553abd4115a41b70bb
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 7f1a8de904eb..3a61ba9f510f 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 S=${WORKDIR}
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 9119a27678bc..d83bb494ba74 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -2,5 +2,5 @@ AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9
 DIST tar-1.32.90.tar.xz 2145976 BLAKE2B 95f1442da87bcbd58e0a6aad303b8c9da9179cc32a6e835d3fbe2e090ad4316e96265a54f573906b262034b92d8d3e56f3ff2609145249bd16dd4ea2a79bb601 SHA512 a42703b73ec3c1f462849469f00dd190a0164972fd2e97f128c3b559a6e9c79e87d5bbf47fca17ca9f8b6810221fbc727b6c15e38693256d9e43a2c2a2d7b593
 DIST tar-1.32.tar.bz2 2947264 BLAKE2B 4e380a9a2f84a2af5130464e1b298ae6acf02ee459cbca20dd0991c2859785e5aac789d57b87b32e8b45d89985b6414af9dd37161385da9568d6030c5aa42c0e SHA512 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe3c785c1be622f520f00fcfbdf44ad1d3247866d0ecfe347a85bbfec38eb38fa1014baef566f6
 EBUILD tar-1.32.90.ebuild 2241 BLAKE2B 7278283c24c652daf44dc8b4c9f3874f16d9dd1c951ccb3e3282f0152d2e8d15b8473838fec99214186d0b2f697c001139a1dcea7d2d07f8850e7a0cc43f5e0a SHA512 7ddff2e4d12bbff96553a3b546868fd724b120372c7f3c96393aeb82d26f65699080969896fe2347e0c6e502e11484cc0a216da318e837272dc4327f20ffb327
-EBUILD tar-1.32.ebuild 2185 BLAKE2B b5a2eb360f79c4a8dd43cbc7a93a174cb7723a50b440cfa6c026f7b166918b218536d46ae583df014bcb96737a758a4ec02df8a7d6dd89c5dbc054b1d097139a SHA512 e905cc2052399f180e6b6a57a398343db300ba343131f3b4a819dffc05a8c1cebdfbe357da97f30da38667d4141de856f0512bc3dad7d40487126afe032ecf99
+EBUILD tar-1.32.ebuild 2181 BLAKE2B a44af952b2ae85b122f38e20c74ba3e1bc550b2420fa1fd9897c7850d71034e9788fc3e52b77bb6e522c8ed98664be49900cec31afefc0299c1e47dc8f5b252f SHA512 df70570bbc0b6f85263b153a20ad1b51e3ce23aba232c746083c748fb3c1b4841cc78ff28b706f4b2e3517642431eddb2cdba00e5f93ca5e171b98e5b4fdc0de
 MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild
index 5cd710f63505..eedf274e20ed 100644
--- a/app-arch/tar/tar-1.32.ebuild
+++ b/app-arch/tar/tar-1.32.ebuild
@@ -38,9 +38,9 @@ src_prepare() {
 src_configure() {
 	use static && append-ldflags -static
 	local myeconfargs=(
-		--bindir="${EPREFIX%/}"/bin
+		--bindir="${EPREFIX}"/bin
 		--enable-backup-scripts
-		--libexecdir="${EPREFIX%/}"/usr/sbin
+		--libexecdir="${EPREFIX}"/usr/sbin
 		$(usex userland_GNU "" "--program-prefix=g")
 		$(use_with acl posix-acls)
 		$(use_enable nls)
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index ec6bee6fd9ee..ff344c93f6ef 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -5,5 +5,5 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a04
 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21
 EBUILD unzip-6.0_p21-r2.ebuild 2572 BLAKE2B 73d5d122d7235addf9d00b9ffb8f756ff624994d20fc49cddbc7cdf817a56878d0963aba9bfb551c5e0433821f9529c58ee0328f73bb02a6a21713b72d94fc28 SHA512 0655022342398ce2cf53308eb874929e1ba2aed0fc63a954ebd95a4f58f30babf3b15386e920f4c35998c6b869114cf1bf8201d40fc73c168a352a9129cc549b
-EBUILD unzip-6.0_p25.ebuild 2576 BLAKE2B 161eff2576eb01839462c07a7ae577908295f4cd98cfe789400edb4057acc2b9af93e0b5f16ca41b1a233fd7523f7536d4392019eb11fec710d25face033daa8 SHA512 71b86550aec62d2ac257d62283e280ae2521f06ab850f67610b55e1f81466086b2fd36781fc85a2b6f51aeefd9f5f5ac5b1e683ac67211624f8898e2e9b20fea
+EBUILD unzip-6.0_p25.ebuild 2575 BLAKE2B 2b3efa2f332208b07273e2806c3c00ce4e565ad6188a13a1420b86f40665ec6bea57f485da284aa42bbca423425df3313628cdf8eca8de2276143be929f9db5f SHA512 162e64fe61ba6343592733923183e741c0d77b0dbb832cdcc93a2a917cbf70ac48d25639ad0cf0040843df17d0e28b613446ee0b207d0964c65c8c4069d39276
 MISC metadata.xml 534 BLAKE2B a6baad9ace7880a38dea2a34ea8cebb730e8a0742bd4447ebc9147a713eff82aed50e97dfeaed5589a7025c2ba7d9a244d101508f21f69a3dfd79c0ed61c214e SHA512 b4735d77d58b041bb5259d362f493247cdd9217423d79eab06567a5d7f1ebdfae0f80085ab3c3a842e68c6f5a6122913cb13c210d6e7fbfe398ff5ade29b97d5
diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild
index 3268759cabd2..b0f5ed79c0d8 100644
--- a/app-arch/unzip/unzip-6.0_p25.ebuild
+++ b/app-arch/unzip/unzip-6.0_p25.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz
 
 LICENSE="Info-ZIP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux"
 IUSE="bzip2 natspec unicode"
 
 DEPEND="bzip2? ( app-arch/bzip2 )