From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-921085-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B8A5B139085
for <garchives@archives.gentoo.org>; Tue, 3 Jan 2017 22:46:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A3116E0BFD;
Tue, 3 Jan 2017 22:46:32 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 805E1E0BFD
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Jan 2017 22:46:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ABE8C34119A
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Jan 2017 22:46:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C020F24E8
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Jan 2017 22:46:29 +0000 (UTC)
From: "Matt Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" <prometheanfire@gentoo.org>
Message-ID: <1483483564.58e097ea1b52aec579753740303ad9d88878a4a1.prometheanfire@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-block/open-iscsi/open-iscsi-2.0.874.ebuild
X-VCS-Directories: sys-block/open-iscsi/
X-VCS-Committer: prometheanfire
X-VCS-Committer-Name: Matt Thode
X-VCS-Revision: 58e097ea1b52aec579753740303ad9d88878a4a1
X-VCS-Branch: master
Date: Tue, 3 Jan 2017 22:46:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 40c52c3f-db66-456d-9db2-422078fae5e8
X-Archives-Hash: 2aaddd2b6b4d58846d11e9b1dd757bb8
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() {