gentoo resync : 25.04.2020

12 files changed, 27 insertions, 56 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index dd010cd69ba6..a121df765ed9 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 5fa88cfd1692..edf9688957b5 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -15,7 +15,7 @@ EBUILD fio-3.16-r1.ebuild 3597 BLAKE2B bf428d5695302fc3014dc0708b17c1457ec5f2bc5
 EBUILD fio-3.16.ebuild 3546 BLAKE2B 95eb92a3c0e390bd9a1b4c7e02a0025031d1d3f203df1a03813e40db7f4a9550847ca36bd6b11c9aaa82b9e29afd3368ec039d1d96f1017611f965abb3462d3a SHA512 090fa98cad51a50de4120a9c61bba262fe26564dae5075d010b18d1a72f722db0a3c7630c212a2c54f5d07c8d2bb21d380268796b98e1054ca1721c2c7a5b9a7
 EBUILD fio-3.17-r1.ebuild 3954 BLAKE2B 07679b26b26d69613f78e30f26675cbfc55a96afb4091df1805828d3622cc5635332d7eb47c71ee0d8aa2d43197f333c0bb4d58a85eaf55061f7512e91bd42ec SHA512 2ab44da6d7c1fea4360ee4688302a5e3f823e0f1341168fbd35ba1942b7d225e1bfc745e09bfe8a0bd9ecd34dc340e23a2cf3fe7233872ea1c4d940af5aefba0
 EBUILD fio-3.17.ebuild 3558 BLAKE2B f99a7063106935000160b8402bdd6eb5ce06235364b68ffb05aa344fcfc73f695fdb4e5d305babb0899e1416f74703f3eb5f5efc8d75553305be0d2f0547429a SHA512 2219b427895295e6c4c5914c3eaf6c2fe71f2f1330196fc0debeef598d4d88006011172227d24a8798544ec41561ef8919663431746f05f782d115ebfbb9132b
-EBUILD fio-3.19.ebuild 3903 BLAKE2B cee1dd4ea89f2f00d7fb627a5fabcb748deb70a15f998784ee3633977ee1e2aa614ce77d3665ba9813e229591af3eaa06bd1220dbd2f4c3992b0cde7910ceebd SHA512 4000258622da411512e41598e769768f54e59093e0dc8d5db1e894be90c10ddb2ed94f9ad2f569bef432ccee546d0a6a40e6c309cb0bf144c082e3346220ddc0
+EBUILD fio-3.19.ebuild 3909 BLAKE2B e348a3e6275d6218cebe7b40d47d5e0e7f8e3f472d51e14333ee01bd4ede968e62fcf69552d30076756b2aee64d23ce92b8b30d70941ce7ff849cf386cb518be SHA512 a9b1b0c4a3e07b9abbe0aa147c22fd5144e04664a545bc2615428ef5ddf7933bcc27133e5fc3b44da9522f44a0349350e91b3867e3b94ca4e20c7b1ab52cbf4f
 EBUILD fio-3.2.ebuild 2855 BLAKE2B 9496bc95ff5ad4511285897285904b352e8e5e1ba547f8eed4932bece1b98f229c7677405c3f6af7e6948ab710e13d79612b94d9442f8371f63cd2a15003b9c6 SHA512 72db1a54e4e876142a7e4c1b16fa467fc0024a1d67eda20a77c97a9685833a03d5a0acaa54b07e0e62e3e12ebd128d2e49ccd58e36758f70c62ca9df25d09bd1
 EBUILD fio-3.7.ebuild 3006 BLAKE2B 0803b0f384761f77702d0e844767152c2f23f76291a3685bc2364d2a7dd2b781ea2170ec0da781ed4017c4821953b6d7a5ff7abfd1beac65687de2487a240724 SHA512 bc261cda042724608ec4e89e5b16bd96799d3ca72e87e19d32f3d95e30f6ca36f7d5e1ece54a125aaea7ddad49a59ae96b7ef52e5177fd158b5f934a15590b91
 MISC metadata.xml 1000 BLAKE2B b31d96139431d807a30a3d310a259aee985e0bcbc8bd8a0ca55951aa9fd7d11441e837a2fce8f92c8f53601bcdebc64b432d93bab2ff976e6a1d19726e91a853 SHA512 d2c849aae5d4c80bce349d6f34de456602cbb04a0c670e60a126a7ff2e77b0e48b66d08aecfe0ad9f75b10a580a8f2e9214a0864310abff066d6d06077ba6613
diff --git a/sys-block/fio/fio-3.19.ebuild b/sys-block/fio/fio-3.19.ebuild
index bc57b7b265c8..fc1834df0b55 100644
--- a/sys-block/fio/fio-3.19.ebuild
+++ b/sys-block/fio/fio-3.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit python-r1 toolchain-funcs
 
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index cdc530f1b3b5..dcd439809a7d 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -1,5 +1,5 @@
 DIST gparted-1.0.0.tar.gz 3980258 BLAKE2B 4c0e7c36e2cd4dde68ee27b67e11a529c27fd22f0d93f6a8d1c6932b3728eead9c8aa282ff7e26c7e9922f0f7991ab3c5d72a7bd968708aac2c6b1e7f59bb5a5 SHA512 88eef4e4fbd51d9a9a3bdfb0a9738f6957ec5cbc21c2f93febf0d4cfe927e0ae3cb8cb1a9b2ca956a55dc62b9228ec76107e3e4701623be6474c99678c9197be
 DIST gparted-1.1.0.tar.gz 4032829 BLAKE2B d47d45e77a3d9dc29e9fa0428aaa7c12bb863cb70ac11f4055cbcc0a0fde8019fbb20266b7f810d6a47c5239248486049c8e9813ead8e88081dd16f445da036a SHA512 afaad690fccbec7385b078a299b78bf4f0f83999e2661f89cb97f9e8f2b30ee41f0535450075e3a7174967e77c75024df78863d0d90d5e8dc726a487b4ae0bae
 EBUILD gparted-1.0.0.ebuild 2121 BLAKE2B 372a5500afb8252587dc60586b4cd9c4b42e1f29fc02905f994f1123498a7e76336a0e00037f5cd9b84cc1d9e77ca86b79adb1c5f7233b4d768c291797b020d0 SHA512 3e23f1a9f9ae949003150289d85d140ed6743d9d2894678a1d5346cd9200ddb9426c94e6645c000b82de71c87e8130bbd637833d49417315d30d33b38783cf3b
-EBUILD gparted-1.1.0.ebuild 2169 BLAKE2B 85ceb59f7af5047b0e3e96ab7ee812ece15673067936c360adbd5ff8e638b73f9254e2c2b84d9817a4266e6b2298a1b4c6b19d51907f044062df06c0e2041831 SHA512 df10e1dcc85941d9b8d8b8bd2602940b1073043585e98b409ba6426bba7684988d10d27fd02577cee961366a8e07593eb70e33d77508cfaa35774a409197f88c
+EBUILD gparted-1.1.0.ebuild 2165 BLAKE2B 27462145c570c272e776d505eabfa082fe2b345fa964c43000d82e30a5ceb59477fb5f6f7cc3ec12390d817e58fba2a106c4cd1eae9df57ddb3fce240d9a0349 SHA512 abd09f8d33e728da1b433226697501fb21dff98550db0bed7aa9750491539f127feb44b7a06128c5e370a160af7405994464373ddcfa2005974286ec547bd8ef
 MISC metadata.xml 2003 BLAKE2B c1568f7b030ae6d3f0ddc3724424bac3701fd470a535c5cedb8c5fb01f2c7f4f20476075be0033dacaf59bc9797f155c7fecc7ea4ef19ac4545454c275b82010 SHA512 03814c5741c01c342ebaa7b4923253f8efeb7beeb5026866dbc8a28ce1b3c3562c06eff108a15f2365070d389a84fe6d498bde39ed0632a63cf1eef412b3b97b
diff --git a/sys-block/gparted/gparted-1.1.0.ebuild b/sys-block/gparted/gparted-1.1.0.ebuild
index e7d5c990cc61..a1e937d24c61 100644
--- a/sys-block/gparted/gparted-1.1.0.ebuild
+++ b/sys-block/gparted/gparted-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="btrfs cryptsetup dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 udf wayland xfs"
 
 COMMON_DEPEND="
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 03aad013b901..9313a08b22e0 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,3 +1,3 @@
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
-EBUILD seekwatcher-0.13.ebuild 646 BLAKE2B 26582b1672b3c3063dda68aa6a8571540ecd053391a1b18315058046e9cb749115cd01206333d252cf8dfe545bd5f580db501cfde6e21529be68d67de5d03347 SHA512 db078692250fdad2496514b7a957217ba914e7fc9af6b830f854b6d015a3b23b18a5128486aa2a4713f13db8cf5dca8833a3df41f6241bbaeef18d0ce80d5611
+EBUILD seekwatcher-0.13.ebuild 774 BLAKE2B b85d2a94ae73422d669fe7bf02ed06e060f1622fcb211d8e9a7fa88c9b7f8ddd99f007cf857c45c6b7fd05976c540cc85ed77ad8ee36aa279d9e1e593e63aff2 SHA512 3656339acb1ee917a297de8cb8c6df40dfb8842ee29cf4c271e83a1c2a6d4c60606c0163e9438302e378a0d62d551ad0de8e16f4495364d2d96d5fd3cb4e8cc4
 MISC metadata.xml 326 BLAKE2B 21768c11bcab92a1bb978e7ed1be16b1b76525a957955894a1ca18ae5e5fd0103dc312c8dc09b586ed4b3d46f471ccf039a4180ba000b0f4e410b05d34f7f335 SHA512 0a77e934710066157e808d2848283a9d25d9db5c1ccd03292ddb35b812b996918c8ae731b75eb1d60518cf1d6ece5ee9db51ae4e8a964357cb66e77fcd1c3b06
diff --git a/sys-block/seekwatcher/seekwatcher-0.13.ebuild b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
index d079d0df137f..703af1b5aadd 100644
--- a/sys-block/seekwatcher/seekwatcher-0.13.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.13.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -17,10 +18,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-python/cython"
+BDEPEND="$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
 RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-block/blktrace
 "
 
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index 42cea969c1db..04356c51b6ec 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,6 +1,5 @@
-AUX targetcli-fb-2.1.48-python3.patch 908 BLAKE2B 9407a1c6b576507479fe06f8f5c942c718b53d15a399f50b074e29df59376bad8ddca2b4394acf052c49df863d049d1518eccc89f611e3dee5612615da02f041 SHA512 742e1ccf3ab911b06d9881f19f552e003729616f69d9ca70e56d74df6dd58267667fa30fa5fa69bec4f3e9ccc21684254a691ab67aca10b58945ceb3a0bc0e6a
-DIST targetcli-fb-2.1.48.tar.gz 33777 BLAKE2B f24661777509a1e125cccaa12ca03eff9564e08bc3b5b3b1798b69a07bd7587b0089bcccbfa6c0166db51ec9f55fa663833e412ecab1614be43bcddf0521b1af SHA512 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420
 DIST targetcli-fb-2.1.49.tar.gz 34147 BLAKE2B 49ed4a610282af30308373cdf806832a3441dcab9a52cddb3f59bacdecb79f7308f316cc65f526d6ea1f9bb875d05e049e6cd7d99eb243f25546395ba6aaa38c SHA512 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a
-EBUILD targetcli-fb-2.1.48-r2.ebuild 918 BLAKE2B dec79afa54141475cd5ad813de3c48eaa264c17a2cda5a47d3e76ae078ff8d99215851c06a17700e38c907a777ab964d5192f0646f89fca6b903ea39ac8d7d4c SHA512 c8c32e509033910985628efb8df9b78d7914e7d54a0b2cb0308e5012697a93b1bb9beabeabc8a4674a2433ec796d65b2326e983fc2c3a2b0cc1ad0c521fb15b5
-EBUILD targetcli-fb-2.1.49.ebuild 816 BLAKE2B 6e7f4e1a67965fdd312ae9faa74e199f0352e583c7c42eefc060dfeb98cdb55ae57ea8996285c5622c22c7ed6ecd3a1384050e7257ea1945726a4dec7082b99c SHA512 e5120e747b7bc30aeb695085e3be746a6e29b430de0e1d17ee9311e37ecabff1cd83916b47757d7a467b7af5ff972ec6ffa42114e9a700ce83bcd3e8a0d97840
-MISC metadata.xml 852 BLAKE2B 375f8bd771785bd8d928dc5975b5e7157355693b743fca1e28bca06a75bf6425f49a1df304962aeabb0ae9fd85fa84cd7db3ed23309dcb93e946da8417afe173 SHA512 af99e8996b35debdc6780b95d36201e701e93c2be464dc737d5eb018a1c2e907ee94a53a9901173d8a76d0d0f2948556e7be8e2b8d3cf8c3c8cdcf7de69d1749
+DIST targetcli-fb-2.1.51.tar.gz 38577 BLAKE2B 0cc1cc920ec7bcefb987fac0397aa7c5a994cf47966971238a6c469e87b2dffc00dc09a55279b5ba0fda776a32a129ad3170b861e6309ea30f271ddc32f690f6 SHA512 a94f251889913888c430cfe2b2fa1b27e4cd01f05627f1c3f0d4c72145b23081be189b7ca5d381bffa0da74ba6a53146e7ca964ff864cb532f132e24bc205b9a
+EBUILD targetcli-fb-2.1.49.ebuild 815 BLAKE2B d40abe7dabb6eef54e2bc65696e4656acd7277b9da245e52e9c318c92c2e61cab49a38ee5dc8721744a28c952a58df371efb0e23ee67c2c27d5e70e93021206f SHA512 521a6fa706fb91f7101afe8bc2ae4b183613eec635584a39aab2ec8296671c77bf8734d2bebbf8c8938d73a254cf7a4db38126aa3340e8a137ee2b4ef9d71d32
+EBUILD targetcli-fb-2.1.51.ebuild 714 BLAKE2B 382ad6f05bd4a4e1896c856a9aef2f028744e42384c5ecc69d3dee59c8833380aca80193ed1747d49c61355fbda21f856ee353642af4d46e9ab6c7d6d0e31a80 SHA512 fce72a63825c1dc45d61cacdeb0e9f4a0740ad603a624e56281c7ff5d9c5394091e4d3e869dee06bbd9c3b49cd1ddf5bda4ac93754b858124820060b46be8569
+MISC metadata.xml 712 BLAKE2B 7b038add297ff7f92e9c83df1d3bd493e169b9dbc42258c16b30884377f6538bb46151981779b2facbc3ced0a523c51cfbf9f3594a79152fc713b0c4d1816b57 SHA512 6c9af32d85c643e798be9215e7240cc2767abf09163a713d75ad29a0c5c30f6c7504ece5403c0acd1c131e97953d3c937d5488d0e70daf3717b9e275aeca844a
diff --git a/sys-block/targetcli-fb/files/targetcli-fb-2.1.48-python3.patch b/sys-block/targetcli-fb/files/targetcli-fb-2.1.48-python3.patch
deleted file mode 100644
index ec771c4a1305..000000000000
--- a/sys-block/targetcli-fb/files/targetcli-fb-2.1.48-python3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ed5ff9b9505e50b545e86dfbdd32077f0ddda0cb Mon Sep 17 00:00:00 2001
-From: Taylor Jakobson <tjakobs@us.ibm.com>
-Date: Thu, 1 Feb 2018 14:44:32 -0600
-Subject: [PATCH] Use signed char instead of char
-
-Python3 does not have the "character" type, use signed char instead.
----
- targetcli/ui_backstore.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
-index 3a2db10..5af448f 100644
---- a/targetcli/ui_backstore.py
-+++ b/targetcli/ui_backstore.py
-@@ -536,7 +536,7 @@ def _ui_block_ro_check(self, dev):
-         except (OSError, IOError):
-             raise ExecutionError("Could not open %s" % dev)
-         # ioctl returns an int. Provision a buffer for it
--        buf = array.array('c', [chr(0)] * 4)
-+        buf = array.array('b', [0] * 4)
-         try:
-             fcntl.ioctl(f, BLKROGET, buf)
-         except (OSError, IOError):
diff --git a/sys-block/targetcli-fb/metadata.xml b/sys-block/targetcli-fb/metadata.xml
index d73e87ae50fd..abc38c494084 100644
--- a/sys-block/targetcli-fb/metadata.xml
+++ b/sys-block/targetcli-fb/metadata.xml
@@ -9,10 +9,6 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
-<longdescription lang="en">
-	targetcli-fb is a command-line interface for configuring
-	the Linux-IO generic SCSI target.
-</longdescription>
 <upstream>
 	<maintainer status="active">
 		<email>mlombard@redhat.com</email>
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
index 3160fb70e92c..20062c179103 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.49.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild
index 9f7e58e94305..fe0c14a548f7 100644
--- a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.51.ebuild
@@ -1,32 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
 
 DESCRIPTION="Command shell for managing Linux LIO kernel target"
 HOMEPAGE="https://github.com/open-iscsi/targetcli-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/configshell-fb[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.62[${PYTHON_USEDEP}]
+	dev-python/rtslib-fb[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	!sys-block/targetcli"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=( "${FILESDIR}/${P}-python3.patch" )
+	sys-apps/dbus"
 
 src_install() {
 	distutils-r1_src_install