gentoo resync : 15.05.2018

5 files changed, 96 insertions, 0 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 61334e483e2c..17a1cbf541a4 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/targetcli-fb/Manifest b/sys-block/targetcli-fb/Manifest
index b1c2c4eef527..548686094370 100644
--- a/sys-block/targetcli-fb/Manifest
+++ b/sys-block/targetcli-fb/Manifest
@@ -1,5 +1,8 @@
+AUX targetcli-fb-2.1.48-python3.patch 908 BLAKE2B 9407a1c6b576507479fe06f8f5c942c718b53d15a399f50b074e29df59376bad8ddca2b4394acf052c49df863d049d1518eccc89f611e3dee5612615da02f041 SHA512 742e1ccf3ab911b06d9881f19f552e003729616f69d9ca70e56d74df6dd58267667fa30fa5fa69bec4f3e9ccc21684254a691ab67aca10b58945ceb3a0bc0e6a
 DIST targetcli-fb-2.1.45.tar.gz 32919 BLAKE2B 55b902e438cf379784aa503f72eaee51c17e90f1743fcbc69ec53f06ac4694621a40853f11c16ec11bbf0efe276198592023c908e86d4f529f20560579c3a6b6 SHA512 b9e9e2018b14df5d8fc50a9623d5c5e195088d1062c87629dbc1ab1ca9d53300c76d50a55377bed0d79c1b8dd63224b9423537eb89f63da770661cc5f9294e07
 DIST targetcli-fb-2.1.48.tar.gz 33777 BLAKE2B f24661777509a1e125cccaa12ca03eff9564e08bc3b5b3b1798b69a07bd7587b0089bcccbfa6c0166db51ec9f55fa663833e412ecab1614be43bcddf0521b1af SHA512 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420
 EBUILD targetcli-fb-2.1.45.ebuild 891 BLAKE2B ad9ebba431aa4ff24c03de06fe49acd8d46b5db68a57857b60f710bc158d3c2acb6ca33982faa11d4122b84c740decfa47b05decd9b111269963e906d090539a SHA512 66d6888ff69a365cbb46c3302e34177b13b1b5eb7a4976aff1e7ac90582b52494cc8b40c8d5ac083af4c08a88ae364b2395027543a6e1805e4162f9d9fe8034c
+EBUILD targetcli-fb-2.1.48-r1.ebuild 891 BLAKE2B 1718057cc0d0eae3e857e35ee4064bebfde7ed1e208fe33ed0f5e3bd26805be621a30c8d4dd461aa2705078c646e703b4e35f43d8643f2db2da3a7e2db080641 SHA512 a15caf5fbdad2da3ce3fc7700de1c85ca369db1ff96d578bff7602406c4d84647cf3515e186e674d4e1a062c37bac2bad6cb3a8249441b121157c747af2a6246
+EBUILD targetcli-fb-2.1.48-r2.ebuild 937 BLAKE2B ed91e71d9e59dcc449273b14c13752a921d3c43ad56fb554102b5ff6471234dacd84993fc8e65ce01a3310f18833cb8cd87ea7bd7c6dd60b20dae24a9e230361 SHA512 b3bebc1aba7d4d087a82fcaf25466387d868d202420c5581e9a89ca50a9bba8853b5ff5c95cb007429d77dee283b1817579c19c39069fb9232ad97a078a58986
 EBUILD targetcli-fb-2.1.48.ebuild 889 BLAKE2B 45f45e3f299595164c68e86c5e62cf03c56fc4434704f07cd3a00a49ad3b81b33962c0989b628d623ad8c1d6dd386a4169128d6634d2ad4819f31eb6a502ea34 SHA512 6b47037d5035ae47460411bc74f92581a523f0d8cd2459f1710f02a85b4b44e2ee2e97a14a5055baaf601d973ffc0585db9b623eadb2f140f666355aeada7dfa
 MISC metadata.xml 753 BLAKE2B 95e698cf4414c33f040327e427f8fb554d5f2a6aa48b47629d32cfc4a0228d636ea9c90f12b0d540d1be7a8de9b5c91be5b8188aced8b7bc30faa61ee5f70d9d SHA512 0bbe917fcc75a97f8f1956a734c34ef5abb709c50f1968e9beb83f54d95e3652526a0e651080b9c46cf60806505068b84c7139a91df4db4a7d85797e6b03b6d1
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
new file mode 100644
index 000000000000..ec771c4a1305
--- /dev/null
+++ b/sys-block/targetcli-fb/files/targetcli-fb-2.1.48-python3.patch
@@ -0,0 +1,23 @@
+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/targetcli-fb-2.1.48-r1.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r1.ebuild
new file mode 100644
index 000000000000..c1dfd9ed51b1
--- /dev/null
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+
+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"
+
+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/six[${PYTHON_USEDEP}]
+	!sys-block/targetcli"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /etc/target /etc/target/backup
+	doman targetcli.8
+}
diff --git a/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
new file mode 100644
index 000000000000..b5191e416491
--- /dev/null
+++ b/sys-block/targetcli-fb/targetcli-fb-2.1.48-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 versionator
+
+MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+
+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"
+
+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/six[${PYTHON_USEDEP}]
+	!sys-block/targetcli"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=( "${FILESDIR}/${P}-python3.patch" )
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /etc/target /etc/target/backup
+	doman targetcli.8
+}