Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/
Date: Sat, 12 Jan 2019 20:07:30
Message-Id: 1547323624.b8e40ee08349cc69eceb19025210a2006572b029.asturm@gentoo
1 commit: b8e40ee08349cc69eceb19025210a2006572b029
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 31 20:35:07 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 12 20:07:04 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8e40ee0
7
8 x11-misc/slim: EAPI-6 bump
9
10 Drop duplicate KEYWORDS line
11 Drop unused eutils
12
13 Package-Manager: Portage-2.3.52, Repoman-2.3.12
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 x11-misc/slim/slim-9999.ebuild | 13 ++++++-------
17 1 file changed, 6 insertions(+), 7 deletions(-)
18
19 diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
20 index 263d58016ab..42f6d06b502 100644
21 --- a/x11-misc/slim/slim-9999.ebuild
22 +++ b/x11-misc/slim/slim-9999.ebuild
23 @@ -1,14 +1,13 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 -EAPI=5
29 +EAPI=6
30
31 -inherit cmake-utils pam eutils systemd versionator
32 +inherit cmake-utils pam systemd versionator
33
34 if [[ ${PV} = 9999* ]]; then
35 EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git"
36 inherit git-r3
37 - KEYWORDS=""
38 else
39 SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
40 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
41 @@ -31,7 +30,7 @@ RDEPEND="x11-libs/libXmu
42 x11-apps/sessreg
43 consolekit? ( sys-auth/consolekit
44 sys-apps/dbus )
45 - pam? ( virtual/pam
46 + pam? ( virtual/pam
47 !x11-misc/slimlock )"
48 DEPEND="${RDEPEND}
49 virtual/pkgconfig
50 @@ -59,8 +58,8 @@ src_prepare() {
51
52 src_configure() {
53 local mycmakeargs=(
54 - $(cmake-utils_use pam USE_PAM)
55 - $(cmake-utils_use consolekit USE_CONSOLEKIT)
56 + -DUSE_PAM=$(usex pam)
57 + -DUSE_CONSOLEKIT=$(usex consolekit)
58 )
59
60 cmake-utils_src_configure