Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-screensaver/
Date: Sun, 31 Mar 2019 10:48:00
Message-Id: 1554029242.6a58f568520b5fedc9b81b9b5fa02f6c3bf9b4b2.asturm@gentoo
1 commit: 6a58f568520b5fedc9b81b9b5fa02f6c3bf9b4b2
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 24 16:10:55 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 31 10:47:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a58f568
7
8 mate-extra/mate-screensaver: add elogind support
9
10 Bug: https://bugs.gentoo.org/681334
11 Package-Manager: Portage-2.3.52, Repoman-2.3.12
12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 .../mate-screensaver-1.22.0.ebuild | 41 ++++++++++++++--------
16 1 file changed, 27 insertions(+), 14 deletions(-)
17
18 diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
19 index afbb7b7d8e6..cea71578dfc 100644
20 --- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
21 +++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
22 @@ -10,10 +10,11 @@ if [[ ${PV} != 9999 ]]; then
23 fi
24
25 DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
26 +
27 LICENSE="GPL-2"
28 SLOT="0"
29 -
30 -IUSE="X debug consolekit kernel_linux libnotify opengl pam systemd"
31 +IUSE="X debug consolekit elogind kernel_linux libnotify opengl pam systemd"
32 +REQUIRED_USE="?? ( elogind systemd )"
33
34 DOC_CONTENTS="
35 Information for converting screensavers is located in
36 @@ -45,6 +46,7 @@ COMMON_DEPEND="
37 opengl? ( virtual/opengl )
38 pam? ( gnome-base/gnome-keyring virtual/pam )
39 !pam? ( kernel_linux? ( sys-apps/shadow ) )
40 + elogind? ( sys-auth/elogind )
41 systemd? ( sys-apps/systemd:= )
42 !!<gnome-extra/gnome-screensaver-3"
43
44 @@ -58,19 +60,30 @@ DEPEND="${COMMON_DEPEND}
45 virtual/pkgconfig:*"
46
47 src_configure() {
48 - mate_src_configure \
49 - --enable-locking \
50 - --with-kbd-layout-indicator \
51 - --with-xf86gamma-ext \
52 - --with-xscreensaverdir=/usr/share/xscreensaver/config \
53 - --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver \
54 - $(use_with X x) \
55 - $(use_with consolekit console-kit) \
56 - $(use_with libnotify) \
57 - $(use_with opengl libgl) \
58 - $(use_with systemd) \
59 - $(use_enable debug) \
60 + local myconf=(
61 + --enable-locking
62 + --with-kbd-layout-indicator
63 + --with-xf86gamma-ext
64 + --with-xscreensaverdir=/usr/share/xscreensaver/config
65 + --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
66 + $(use_with X x)
67 + $(use_with consolekit console-kit)
68 + $(use_with libnotify)
69 + $(use_with opengl libgl)
70 + $(use_with systemd)
71 + $(use_enable debug)
72 $(use_enable pam)
73 + )
74 +
75 + if use elogind; then
76 + myconf+=(
77 + --with-systemd
78 + SYSTEMD_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
79 + SYSTEMD_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
80 + )
81 + fi
82 +
83 + mate_src_configure "${myconf[@]}"
84 }
85
86 src_install() {