1 |
commit: 2224a25412ba0fc7d3007b0384c912829971f181 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 28 15:26:04 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 28 15:31:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2224a254 |
7 |
|
8 |
x11-misc/sddm: sync with main tree |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
.../sddm/files/sddm-9999-respect-user-flags.patch | 4 +- |
13 |
x11-misc/sddm/sddm-9999.ebuild | 57 ++++++++++++---------- |
14 |
2 files changed, 33 insertions(+), 28 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch b/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch |
17 |
index 67a6621..fc45016 100644 |
18 |
--- a/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch |
19 |
+++ b/x11-misc/sddm/files/sddm-9999-respect-user-flags.patch |
20 |
@@ -1,6 +1,6 @@ |
21 |
diff -u CMakeLists.txt CMakeLists.txt |
22 |
---- CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 |
23 |
-+++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 |
24 |
+--- a/CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 |
25 |
++++ b/CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 |
26 |
@@ -35,22 +35,6 @@ |
27 |
# Definitions |
28 |
add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) |
29 |
|
30 |
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild |
31 |
index 869ae35..44740c2 100644 |
32 |
--- a/x11-misc/sddm/sddm-9999.ebuild |
33 |
+++ b/x11-misc/sddm/sddm-9999.ebuild |
34 |
@@ -2,8 +2,8 @@ |
35 |
# Distributed under the terms of the GNU General Public License v2 |
36 |
# $Id$ |
37 |
|
38 |
-EAPI=5 |
39 |
-inherit cmake-utils git-r3 toolchain-funcs user |
40 |
+EAPI=6 |
41 |
+inherit cmake-utils git-r3 user |
42 |
|
43 |
DESCRIPTION="Simple Desktop Display Manager" |
44 |
HOMEPAGE="https://github.com/sddm/sddm" |
45 |
@@ -14,12 +14,11 @@ LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
46 |
SLOT="0" |
47 |
IUSE="consolekit +pam systemd" |
48 |
|
49 |
-RDEPEND="dev-qt/qtcore:5 |
50 |
- dev-qt/qtdbus:5 |
51 |
- dev-qt/qtgui:5 |
52 |
- dev-qt/qtdeclarative:5 |
53 |
- dev-qt/qtnetwork:5 |
54 |
- dev-qt/qttest:5 |
55 |
+RDEPEND=">=dev-qt/qtcore-5.6:5 |
56 |
+ >=dev-qt/qtdbus-5.6:5 |
57 |
+ >=dev-qt/qtgui-5.6:5 |
58 |
+ >=dev-qt/qtdeclarative-5.6:5 |
59 |
+ >=dev-qt/qtnetwork-5.6:5 |
60 |
>=x11-base/xorg-server-1.15.1 |
61 |
x11-libs/libxcb[xkb(-)] |
62 |
consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
63 |
@@ -29,7 +28,9 @@ RDEPEND="dev-qt/qtcore:5 |
64 |
|
65 |
DEPEND="${RDEPEND} |
66 |
dev-python/docutils |
67 |
- dev-qt/linguist-tools:5 |
68 |
+ >=dev-qt/linguist-tools-5.6:5 |
69 |
+ >=dev-qt/qttest-5.6:5 |
70 |
+ kde-frameworks/extra-cmake-modules |
71 |
virtual/pkgconfig" |
72 |
|
73 |
pkg_pretend() { |
74 |
@@ -41,27 +42,17 @@ pkg_pretend() { |
75 |
} |
76 |
|
77 |
src_prepare() { |
78 |
- cmake-utils_src_prepare |
79 |
- |
80 |
- epatch "${FILESDIR}/${P}-respect-user-flags.patch" |
81 |
- use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" |
82 |
-} |
83 |
- |
84 |
-src_configure() { |
85 |
- local mycmakeargs=( |
86 |
- $(cmake-utils_use_no pam PAM) |
87 |
- $(cmake-utils_use_no systemd SYSTEMD) |
88 |
- -DBUILD_MAN_PAGES=ON |
89 |
- -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
90 |
- ) |
91 |
+ # fix for flags handling and bug 563108 |
92 |
+ eapply "${FILESDIR}/${P}-respect-user-flags.patch" |
93 |
+ use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" |
94 |
|
95 |
- cmake-utils_src_configure |
96 |
+ cmake-utils_src_prepare |
97 |
} |
98 |
|
99 |
src_configure() { |
100 |
local mycmakeargs=( |
101 |
- $(cmake-utils_use_no pam PAM) |
102 |
- $(cmake-utils_use_no systemd SYSTEMD) |
103 |
+ -DENABLE_PAM=$(usex pam) |
104 |
+ -DNO_SYSTEMD=$(usex '!systemd') |
105 |
-DBUILD_MAN_PAGES=ON |
106 |
-DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
107 |
) |
108 |
@@ -71,5 +62,19 @@ src_configure() { |
109 |
|
110 |
pkg_postinst() { |
111 |
enewgroup ${PN} |
112 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} video |
113 |
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video |
114 |
+ |
115 |
+ if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then |
116 |
+ local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) |
117 |
+ if [[ -z ${line} ]]; then |
118 |
+ ewarn |
119 |
+ ewarn "Erroneous /etc/pam.d/system-login settings detected!" |
120 |
+ ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" |
121 |
+ ewarn |
122 |
+ ewarn "session optional pam_ck_connector.so nox11" |
123 |
+ ewarn |
124 |
+ ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." |
125 |
+ ewarn |
126 |
+ fi |
127 |
+ fi |
128 |
} |