Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/
Date: Tue, 03 Jan 2017 22:46:34
Message-Id: 1483483564.58e097ea1b52aec579753740303ad9d88878a4a1.prometheanfire@gentoo
1 commit: 58e097ea1b52aec579753740303ad9d88878a4a1
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 3 22:46:04 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 3 22:46:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e097ea
7
8 sys-block/open-iscsi: cleanup the ebuild slightly for eapi6
9
10 Package-Manager: portage-2.3.0
11
12 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild | 12 +++++++-----
13 1 file changed, 7 insertions(+), 5 deletions(-)
14
15 diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
16 index 5aea512..fcebbca 100644
17 --- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
18 +++ b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
19 @@ -23,6 +23,12 @@ RDEPEND="${DEPEND}
20 sys-apps/util-linux"
21 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
22
23 +PATCHES=(
24 + "${FILESDIR}/${P}-Makefiles.patch"
25 + "${FILESDIR}/${P}-musl-fixes.patch"
26 + "${FILESDIR}/${P}-musl-ethtool-compat.patch"
27 +)
28 +
29 pkg_setup() {
30 linux-info_pkg_setup
31
32 @@ -59,12 +65,8 @@ pkg_setup() {
33 }
34
35 src_prepare() {
36 - eapply "${FILESDIR}"/${P}-Makefiles.patch
37 - eapply "${FILESDIR}"/${P}-musl-fixes.patch
38 - eapply "${FILESDIR}"/${P}-musl-ethtool-compat.patch
39 - eapply_user
40 -
41 sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die
42 + default
43 }
44
45 src_configure() {