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 0A739138334 for ; Thu, 16 May 2019 08:32:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06FD9E083B; Thu, 16 May 2019 08:32:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DEA1BE083B for ; Thu, 16 May 2019 08:32:40 +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 39B68344693 for ; Thu, 16 May 2019 08:32:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A53B557E for ; Thu, 16 May 2019 08:32:37 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1557995549.82a86ba7b8a7e4395cb979869b11c85dcfdcc01c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/ykpers/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-auth/ykpers/ykpers-1.19.3.ebuild X-VCS-Directories: sys-auth/ykpers/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 82a86ba7b8a7e4395cb979869b11c85dcfdcc01c X-VCS-Branch: master Date: Thu, 16 May 2019 08:32:37 +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: 2ca0cef7-5f42-4598-aeaa-ff78bf95b4b4 X-Archives-Hash: fbeca080a46c04fc8f0b07be64891048 commit: 82a86ba7b8a7e4395cb979869b11c85dcfdcc01c Author: Lars Wendler gentoo org> AuthorDate: Thu May 16 08:31:15 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu May 16 08:32:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a86ba7 sys-auth/ykpers: Added elogind USE flag. Bumped ebuild to EAPI-7 Closes: https://bugs.gentoo.org/686014 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-auth/ykpers/ykpers-1.19.3.ebuild | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/sys-auth/ykpers/ykpers-1.19.3.ebuild b/sys-auth/ykpers/ykpers-1.19.3.ebuild index 1996fb57cb4..a014641d7eb 100644 --- a/sys-auth/ykpers/ykpers-1.19.3.ebuild +++ b/sys-auth/ykpers/ykpers-1.19.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools udev @@ -12,17 +12,21 @@ HOMEPAGE="https://github.com/Yubico/yubikey-personalization" KEYWORDS="~amd64 ~x86" SLOT="0" LICENSE="BSD-2" -IUSE="static-libs consolekit" +IUSE="consolekit elogind static-libs" -RDEPEND=" +DEPEND=" dev-libs/json-c:= >=sys-auth/libyubikey-1.6 virtual/libusb:1" -DEPEND="${RDEPEND} +BDEPEND=" app-text/asciidoc virtual/pkgconfig" -RDEPEND="${RDEPEND} - consolekit? ( sys-auth/consolekit[acl] )" +RDEPEND="${DEPEND} + consolekit? ( sys-auth/consolekit[acl] ) + elogind? ( sys-auth/elogind[acl] ) +" + +REQUIRED_USE="^^ ( consolekit elogind )" S="${WORKDIR}/yubikey-personalization-${PV}" @@ -31,18 +35,26 @@ DOCS=( doc/. AUTHORS NEWS README ) src_prepare() { default eautoreconf + + if use elogind ; then + sed '/TEST==/d' -i 70-yubikey.rules || die + fi } src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - --localstatedir=/var \ + local myeconfargs=( + --libdir=/usr/$(get_libdir) + --localstatedir=/var $(use_enable static-libs static) + ) + econf "${myeconfargs[@]}" } src_install() { default - use consolekit && udev_dorules *.rules + if use consolekit || use elogind ; then + udev_dorules *.rules + fi find "${D}" -name '*.la' -delete || die }