[gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/

[Matt Thode]

commit:     58e097ea1b52aec579753740303ad9d88878a4a1
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 22:46:04 2017 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 22:46:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e097ea

sys-block/open-iscsi: cleanup the ebuild slightly for eapi6

Package-Manager: portage-2.3.0

 sys-block/open-iscsi/open-iscsi-2.0.874.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild 
b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
index 5aea512..fcebbca 100644
--- a/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
@@ -23,6 +23,12 @@ RDEPEND="${DEPEND}
        sys-apps/util-linux"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 
+PATCHES=(
+       "${FILESDIR}/${P}-Makefiles.patch"
+       "${FILESDIR}/${P}-musl-fixes.patch"
+       "${FILESDIR}/${P}-musl-ethtool-compat.patch"
+)
+
 pkg_setup() {
        linux-info_pkg_setup
 
@@ -59,12 +65,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-       eapply "${FILESDIR}"/${P}-Makefiles.patch
-       eapply "${FILESDIR}"/${P}-musl-fixes.patch
-       eapply "${FILESDIR}"/${P}-musl-ethtool-compat.patch
-       eapply_user
-
        sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' 
etc/iscsid.conf || die
+       default
 }
 
 src_configure() {