Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/targetcli/
Date: Fri, 02 Sep 2016 17:18:47
Message-Id: 1472836694.ca36978e8cd1543a44300433742e9142aaa7a1c1.monsieurp@gentoo
1 commit: ca36978e8cd1543a44300433742e9142aaa7a1c1
2 Author: Diogo Pereira <sir.suriv <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 6 22:20:52 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 17:18:14 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca36978e
7
8 sys-block/targetcli: update live ebuild
9
10 * Update to EAPI 6
11 * Update git repository URI
12 * Change license to Apache-2.0
13 * Remove DEPEND on sys-block/lio-utils
14 * Add DEPEND on dev-python/prettytable
15 * Add RDEPEND on dev-python/urwid
16
17 Gentoo-Bug: https://bugs.gentoo.org/436814
18 Gentoo-Bug: https://bugs.gentoo.org/491668
19 Closes: https://github.com/gentoo/gentoo/pull/2034
20
21 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
22
23 sys-block/targetcli/targetcli-9999.ebuild | 59 ++++++++++++++++++-------------
24 1 file changed, 35 insertions(+), 24 deletions(-)
25
26 diff --git a/sys-block/targetcli/targetcli-9999.ebuild b/sys-block/targetcli/targetcli-9999.ebuild
27 index e9948c9..5701d51 100644
28 --- a/sys-block/targetcli/targetcli-9999.ebuild
29 +++ b/sys-block/targetcli/targetcli-9999.ebuild
30 @@ -1,35 +1,46 @@
31 -# Copyright 1999-2012 Gentoo Foundation
32 +# Copyright 1999-2016 Gentoo Foundation
33 # Distributed under the terms of the GNU General Public License v2
34 # $Id$
35
36 -EAPI=4
37 +EAPI=6
38
39 -EGIT_REPO_URI="git://linux-iscsi.org/${PN}.git"
40 -PYTHON_DEPEND="2"
41 -RESTRICT_PYTHON_ABIS="3.*"
42 -SUPPORT_PYTHON_ABIS="1"
43 +PYTHON_COMPAT=( python2_7 )
44
45 -inherit eutils distutils git-2 python linux-info
46 +inherit distutils-r1 linux-info
47
48 -DESCRIPTION="The targetcli administration shell"
49 -HOMEPAGE="http://linux-iscsi.org/"
50 -SRC_URI=""
51 +if [[ ${PV} == 9999 ]]; then
52 + inherit git-r3
53 + EGIT_REPO_URI="git://github.com/Datera/${PN}.git
54 + https://github.com/Datera/${PN}.git"
55 + KEYWORDS=""
56 +else
57 + MY_PV=${PV/_/-}
58 + SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
59 + S="${WORKDIR}/${PN}-${MY_PV}"
60 + KEYWORDS="~amd64"
61 +fi
62
63 -LICENSE="AGPL-3"
64 +DESCRIPTION="CLI and shell for the Linux SCSI target"
65 +HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
66 +
67 +LICENSE="Apache-2.0"
68 SLOT="0"
69 -KEYWORDS=""
70 IUSE=""
71
72 -DEPEND="
73 - dev-python/configshell
74 - dev-python/rtslib
75 - sys-block/lio-utils
76 - "
77 -RDEPEND="${DEPEND}"
78 -
79 -CONFIG_CHECK="~TARGET_CORE"
80 -
81 -pkg_setup() {
82 - linux-info_pkg_setup
83 - python_pkg_setup
84 +DEPEND="dev-python/configshell[${PYTHON_USEDEP}]
85 + dev-python/prettytable[${PYTHON_USEDEP}]
86 + dev-python/rtslib[${PYTHON_USEDEP}]"
87 +RDEPEND="${DEPEND}
88 + dev-python/urwid[${PYTHON_USEDEP}]"
89 +
90 +pkg_pretend() {
91 + if use kernel_linux; then
92 + linux-info_get_any_version
93 + if ! linux_config_exists; then
94 + eerror "Unable to check your kernel for SCSI target support"
95 + else
96 + CONFIG_CHECK="~TARGET_CORE"
97 + check_extra_config
98 + fi
99 + fi
100 }