gentoo resync : 25.04.2020

5 files changed, 11 insertions, 47 deletions

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