From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 73207138359 for ; Tue, 24 Nov 2020 13:15:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1C3CE083B; Tue, 24 Nov 2020 13:15:45 +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-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 892D4E083B for ; Tue, 24 Nov 2020 13:15:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6502A340E47 for ; Tue, 24 Nov 2020 13:15:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A583A42F for ; Tue, 24 Nov 2020 13:15:42 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1606223730.c40300c9a8a6f40cb7bc16103e1a013e09e6551a.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/ekeyd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild X-VCS-Directories: app-crypt/ekeyd/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c40300c9a8a6f40cb7bc16103e1a013e09e6551a X-VCS-Branch: master Date: Tue, 24 Nov 2020 13:15:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 104fac84-9e8a-47f8-b0a4-79d66e6fbcfa X-Archives-Hash: 481584b0fbd77b39935f14c8e382e66f commit: c40300c9a8a6f40cb7bc16103e1a013e09e6551a Author: Marek Szuba gentoo org> AuthorDate: Tue Nov 24 12:32:08 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Nov 24 13:15:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40300c9 app-crypt/ekeyd: migrate to EAPI-7 In preparation for slotted-Lua support. Very nearly trivial. Signed-off-by: Marek Szuba gentoo.org> app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild index 4cdadc14084..7816044711f 100644 --- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild +++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils multilib linux-info toolchain-funcs udev systemd +inherit multilib linux-info toolchain-funcs udev systemd DESCRIPTION="Entropy Key userspace daemon" HOMEPAGE="http://www.entropykey.co.uk/" @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="kernel_linux munin minimal usb" REQUIRED_USE="minimal? ( !munin )" -EKEYD_RDEPEND="dev-lang/lua" +EKEYD_RDEPEND="dev-lang/lua:0" EKEYD_DEPEND="${EKEYD_RDEPEND}" EKEYD_RDEPEND="${EKEYD_RDEPEND} dev-lua/luasocket @@ -23,7 +23,6 @@ EKEYD_RDEPEND="${EKEYD_RDEPEND} munin? ( net-analyzer/munin )" RDEPEND="!minimal? ( ${EKEYD_RDEPEND} ) - !app-crypt/ekey-egd-linux virtual/service-manager" DEPEND="!minimal? ( ${EKEYD_DEPEND} )" @@ -35,14 +34,14 @@ pkg_setup() { fi } -src_prepare() { - epatch "${FILESDIR}/${P}-const_char_usage.patch"; - epatch "${FILESDIR}/${P}-enoent.patch"; - epatch "${FILESDIR}/${P}-path-fixes.patch"; - epatch "${FILESDIR}/${P}-udev-rule.patch"; - epatch "${FILESDIR}/${P}-remove-werror.patch"; - epatch "${FILESDIR}/${P}-misc.patch"; -} +PATCHES=( + "${FILESDIR}"/${P}-const_char_usage.patch + "${FILESDIR}"/${P}-enoent.patch + "${FILESDIR}"/${P}-path-fixes.patch + "${FILESDIR}"/${P}-udev-rule.patch + "${FILESDIR}"/${P}-remove-werror.patch + "${FILESDIR}"/${P}-misc.patch +) src_compile() { local osname