1 |
commit: 3bded4743d8aef17d6f260cd9d156c315f27666c |
2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 28 12:58:01 2016 +0000 |
4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 28 12:58:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bded474 |
7 |
|
8 |
x11-misc/sddm: Version bump to 0.14.0 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
x11-misc/sddm/Manifest | 1 + |
13 |
x11-misc/sddm/files/sddm-0.14.0-consolekit.patch | 9 +++ |
14 |
x11-misc/sddm/sddm-0.14.0.ebuild | 82 ++++++++++++++++++++++++ |
15 |
3 files changed, 92 insertions(+) |
16 |
|
17 |
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest |
18 |
index 6c3d570..812706d 100644 |
19 |
--- a/x11-misc/sddm/Manifest |
20 |
+++ b/x11-misc/sddm/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST sddm-0.13.0.tar.xz 3869452 SHA256 dd868caaccf7783ead799f3b79e442d5adcb46251b78c8dbf3e9da0016dd347d SHA512 292a584945e74ea987088f975d5973b45a5b4fc07fa90b487fb9ece2de7ecca352344354474dfa8d103c8242367c19ad926e62a553e5b567d8d88a3f2c73c171 WHIRLPOOL e3961ecd5e22e8d565c16d86b6043ba7f3d6c1c296047d196577ab25af4e50216d67d53e9690b4df262c5ae4486bf36f88d345110a54bada9d75c4ff0dfc5ff3 |
23 |
+DIST sddm-0.14.0.tar.xz 3298360 SHA256 7e348258618b20f777767a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366 WHIRLPOOL d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb |
24 |
|
25 |
diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch |
26 |
new file mode 100644 |
27 |
index 00000000..64ea064 |
28 |
--- /dev/null |
29 |
+++ b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch |
30 |
@@ -0,0 +1,9 @@ |
31 |
+--- a/data/scripts/Xsession 2016-08-28 14:52:04.910181422 +0200 |
32 |
++++ b/data/scripts/Xsession 2016-08-28 14:53:07.157184480 +0200 |
33 |
+@@ -91,5 +91,5 @@ |
34 |
+ if [ -z "$@" ]; then |
35 |
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." |
36 |
+ else |
37 |
+- exec $@ |
38 |
++ exec ck-launch-session $@ |
39 |
+ fi |
40 |
|
41 |
diff --git a/x11-misc/sddm/sddm-0.14.0.ebuild b/x11-misc/sddm/sddm-0.14.0.ebuild |
42 |
new file mode 100644 |
43 |
index 00000000..eb423b0 |
44 |
--- /dev/null |
45 |
+++ b/x11-misc/sddm/sddm-0.14.0.ebuild |
46 |
@@ -0,0 +1,82 @@ |
47 |
+# Copyright 1999-2016 Gentoo Foundation |
48 |
+# Distributed under the terms of the GNU General Public License v2 |
49 |
+# $Id$ |
50 |
+ |
51 |
+EAPI=6 |
52 |
+inherit cmake-utils user |
53 |
+ |
54 |
+DESCRIPTION="Simple Desktop Display Manager" |
55 |
+HOMEPAGE="https://github.com/sddm/sddm" |
56 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
57 |
+KEYWORDS="~amd64 ~arm ~x86" |
58 |
+ |
59 |
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
60 |
+SLOT="0" |
61 |
+IUSE="consolekit +pam systemd" |
62 |
+ |
63 |
+QT_MINIMAL="5.6" |
64 |
+ |
65 |
+RDEPEND="dev-qt/qtcore:5 |
66 |
+ dev-qt/qtdbus:5 |
67 |
+ dev-qt/qtgui:5 |
68 |
+ dev-qt/qtdeclarative:5 |
69 |
+ dev-qt/qtnetwork:5 |
70 |
+ >=x11-base/xorg-server-1.15.1 |
71 |
+ x11-libs/libxcb[xkb(-)] |
72 |
+ consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
73 |
+ pam? ( sys-libs/pam ) |
74 |
+ systemd? ( sys-apps/systemd:= ) |
75 |
+ !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" |
76 |
+ |
77 |
+DEPEND="${RDEPEND} |
78 |
+ dev-python/docutils |
79 |
+ dev-qt/linguist-tools:5 |
80 |
+ dev-qt/qttest:5 |
81 |
+ virtual/pkgconfig" |
82 |
+ |
83 |
+pkg_pretend() { |
84 |
+ if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then |
85 |
+ if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then |
86 |
+ die 'The active compiler needs to be gcc 4.7 (or newer)' |
87 |
+ fi |
88 |
+ fi |
89 |
+} |
90 |
+ |
91 |
+src_prepare() { |
92 |
+ eapply "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" |
93 |
+ # fix for flags handling and bug 563108 |
94 |
+ eapply "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" |
95 |
+ use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" |
96 |
+ |
97 |
+ cmake-utils_src_prepare |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ local mycmakeargs=( |
102 |
+ -DENABLE_PAM=$(usex pam) |
103 |
+ -DNO_SYSTEMD=$(usex '!systemd') |
104 |
+ -DBUILD_MAN_PAGES=ON |
105 |
+ -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
106 |
+ ) |
107 |
+ |
108 |
+ cmake-utils_src_configure |
109 |
+} |
110 |
+ |
111 |
+pkg_postinst() { |
112 |
+ enewgroup ${PN} |
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 |
+} |