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 E3AF4138334 for ; Sat, 12 Jan 2019 20:07:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AABB2E0CA1; Sat, 12 Jan 2019 20:07:29 +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 86B7CE0CA1 for ; Sat, 12 Jan 2019 20:07:29 +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 CBCF6335D08 for ; Sat, 12 Jan 2019 20:07:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30EA7510 for ; Sat, 12 Jan 2019 20:07:26 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1547323624.b8e40ee08349cc69eceb19025210a2006572b029.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/slim/slim-9999.ebuild X-VCS-Directories: x11-misc/slim/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b8e40ee08349cc69eceb19025210a2006572b029 X-VCS-Branch: master Date: Sat, 12 Jan 2019 20:07:26 +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: e8f38a9c-6944-4aef-aa15-ab3c8ae1f48b X-Archives-Hash: 991df204b29dc9dde499f37d18544a2b commit: b8e40ee08349cc69eceb19025210a2006572b029 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 31 20:35:07 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 12 20:07:04 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e40ee0 x11-misc/slim: EAPI-6 bump Drop duplicate KEYWORDS line Drop unused eutils Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/slim/slim-9999.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild index 263d58016ab..42f6d06b502 100644 --- a/x11-misc/slim/slim-9999.ebuild +++ b/x11-misc/slim/slim-9999.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit cmake-utils pam eutils systemd versionator +inherit cmake-utils pam systemd versionator if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git" inherit git-r3 - KEYWORDS="" else SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -31,7 +30,7 @@ RDEPEND="x11-libs/libXmu x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) - pam? ( virtual/pam + pam? ( virtual/pam !x11-misc/slimlock )" DEPEND="${RDEPEND} virtual/pkgconfig @@ -59,8 +58,8 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake-utils_use pam USE_PAM) - $(cmake-utils_use consolekit USE_CONSOLEKIT) + -DUSE_PAM=$(usex pam) + -DUSE_CONSOLEKIT=$(usex consolekit) ) cmake-utils_src_configure