Gentoo Archives: gentoo-commits

From: Ben de Groot <yngwin@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
Date: Wed, 30 May 2012 14:25:01
Message-Id: 1338387872.45ada3c0ec6f1799ca066fab9e3d10006db10ab5.yngwin@gentoo
1 commit: 45ada3c0ec6f1799ca066fab9e3d10006db10ab5
2 Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
3 AuthorDate: Wed May 30 14:24:32 2012 +0000
4 Commit: Ben de Groot <yngwin <AT> gmail <DOT> com>
5 CommitDate: Wed May 30 14:24:32 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=45ada3c0
7
8 x11-misc/lightdm: remove, since changes have been committed to gx86
9
10 ---
11 x11-misc/lightdm/Manifest | 2 -
12 x11-misc/lightdm/files/Xsession | 69 -------------
13 x11-misc/lightdm/files/lightdm | 8 --
14 .../files/lightdm-1.2.0-fix-configure.patch | 10 --
15 x11-misc/lightdm/files/lightdm-autologin | 10 --
16 .../lightdm/files/session-wrapper-lightdm.patch | 13 ---
17 x11-misc/lightdm/lightdm-1.2.2.ebuild | 104 --------------------
18 x11-misc/lightdm/metadata.xml | 11 --
19 8 files changed, 0 insertions(+), 227 deletions(-)
20
21 diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
22 deleted file mode 100644
23 index c03747d..0000000
24 --- a/x11-misc/lightdm/Manifest
25 +++ /dev/null
26 @@ -1,2 +0,0 @@
27 -DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
28 -DIST lightdm-1.2.2.tar.gz 642334 SHA256 772cc6a4e7da670352f6a38c05470b8fcfe50a2c1d3d424be1c9309afb0c541b SHA512 b5135e9241be12353da27945abad73c04f888cd0be1991cb23663be84b63b3781da93add7e51e438dee4e36a259458d6c66beb60382937234acf28dcbda520e7 WHIRLPOOL 968addfb9d56339ec20918761e30195cbdd357da59287325af7067ff229994937cb5fb6436e04a9a67987f6657b52a36cb3f3d993ce2330de74e42c8678c3c5c
29
30 diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession
31 deleted file mode 100644
32 index 5da041e..0000000
33 --- a/x11-misc/lightdm/files/Xsession
34 +++ /dev/null
35 @@ -1,69 +0,0 @@
36 -#!/bin/sh
37 -#
38 -# LightDM wrapper to run around X sessions.
39 -
40 -echo "Running X session wrapper"
41 -
42 -# Load profile
43 -for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
44 - if [ -f "$file" ]; then
45 - echo "Loading profile from $file";
46 - . "$file"
47 - fi
48 -done
49 -
50 -# Load resources
51 -for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
52 - if [ -f "$file" ]; then
53 - echo "Loading resource: $file"
54 - xrdb -nocpp -merge "$file"
55 - fi
56 -done
57 -
58 -# Load keymaps
59 -for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
60 - if [ -f "$file" ]; then
61 - echo "Loading keymap: $file"
62 - setxkbmap `cat "$file"`
63 - XKB_IN_USE=yes
64 - fi
65 -done
66 -
67 -# Load xmodmap if not using XKB
68 -if [ -z "$XKB_IN_USE" ]; then
69 - for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
70 - if [ -f "$file" ]; then
71 - echo "Loading modmap: $file"
72 - xmodmap "$file"
73 - fi
74 - done
75 -fi
76 -
77 -unset XKB_IN_USE
78 -
79 -# Run all system xinitrc shell scripts.
80 -xinitdir="/etc/X11/xinit/xinitrc.d"
81 -if [ -d "$xinitdir" ]; then
82 - for script in $xinitdir/*; do
83 - echo "Loading xinit script $script"
84 - if [ -x "$script" -a ! -d "$script" ]; then
85 - . "$script"
86 - fi
87 - done
88 -fi
89 -
90 -# Load Xsession scripts
91 -xsessionddir="/etc/X11/Xsession.d"
92 -if [ -d "$xsessionddir" ]; then
93 - for i in `ls $xsessionddir`; do
94 - script="$xsessionddir/$i"
95 - echo "Loading X session script $script"
96 - if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
97 - . "$script"
98 - fi
99 - done
100 -fi
101 -
102 -echo "X session wrapper complete, running session $@"
103 -
104 -exec $@
105
106 diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm
107 deleted file mode 100644
108 index 6286d6a..0000000
109 --- a/x11-misc/lightdm/files/lightdm
110 +++ /dev/null
111 @@ -1,8 +0,0 @@
112 -#%PAM-1.0
113 -auth optional pam_env.so
114 -auth include system-login
115 -auth required pam_nologin.so
116 -account include system-login
117 -password include system-login
118 -session optional pam_loginuid.so
119 -session include system-auth
120
121 diff --git a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch b/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
122 deleted file mode 100644
123 index c8c795e..0000000
124 --- a/x11-misc/lightdm/files/lightdm-1.2.0-fix-configure.patch
125 +++ /dev/null
126 @@ -1,10 +0,0 @@
127 ---- configure.ac~ 2012-04-23 12:12:44.000000000 +0100
128 -+++ configure.ac 2012-04-23 12:25:51.050999668 +0100
129 -@@ -93,6 +93,7 @@
130 - PKG_CHECK_MODULES(LIBLIGHTDM_QT, [
131 - QtCore
132 - QtDBus
133 -+ QtGui
134 - ])
135 - QT4_BINDIR=`$PKG_CONFIG Qt --variable bindir`
136 - AC_CHECK_TOOLS(MOC, [moc-qt4 moc],, [$QT4_BINDIR:$PATH])
137
138 diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin
139 deleted file mode 100644
140 index 9d165d6..0000000
141 --- a/x11-misc/lightdm/files/lightdm-autologin
142 +++ /dev/null
143 @@ -1,10 +0,0 @@
144 -#%PAM-1.0
145 -auth optional pam_env.so
146 -auth required pam_nologin.so
147 -auth required pam_permit.so
148 -account include system-login
149 -password include system-login
150 -session include system-auth
151 -# For the keyring to unlock with autologin, you need to set an empty
152 -# password on the keyring.
153 -#Keyring=session optional pam_gnome_keyring.so auto_start
154
155 diff --git a/x11-misc/lightdm/files/session-wrapper-lightdm.patch b/x11-misc/lightdm/files/session-wrapper-lightdm.patch
156 deleted file mode 100644
157 index 9f41816..0000000
158 --- a/x11-misc/lightdm/files/session-wrapper-lightdm.patch
159 +++ /dev/null
160 @@ -1,13 +0,0 @@
161 -Index: lightdm-1.0.6/data/lightdm.conf
162 -===================================================================
163 ---- lightdm-1.0.6.orig/data/lightdm.conf
164 -+++ lightdm-1.0.6/data/lightdm.conf
165 -@@ -65,7 +65,7 @@
166 - #user-session=default
167 - #allow-guest=true
168 - #guest-session=UNIMPLEMENTED
169 --#session-wrapper=lightdm-session
170 -+session-wrapper=/etc/lightdm/Xsession
171 - #display-setup-script=
172 - #greeter-setup-script=
173 - #session-setup-script=
174
175 diff --git a/x11-misc/lightdm/lightdm-1.2.2.ebuild b/x11-misc/lightdm/lightdm-1.2.2.ebuild
176 deleted file mode 100644
177 index 884f5a9..0000000
178 --- a/x11-misc/lightdm/lightdm-1.2.2.ebuild
179 +++ /dev/null
180 @@ -1,104 +0,0 @@
181 -# Copyright 1999-2012 Gentoo Foundation
182 -# Distributed under the terms of the GNU General Public License v2
183 -# $Header: $
184 -
185 -EAPI=4
186 -inherit autotools eutils pam
187 -
188 -DESCRIPTION="A lightweight display manager"
189 -HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
190 -SRC_URI="http://launchpad.net/${PN}/1.2/${PV}/+download/${P}.tar.gz
191 - mirror://gentoo/introspection-20110205.m4.tar.bz2"
192 -
193 -LICENSE="GPL-3 LGPL-3"
194 -SLOT="0"
195 -KEYWORDS="~amd64 ~x86"
196 -IUSE="+introspection qt4"
197 -
198 -RDEPEND="dev-libs/glib:2
199 - dev-libs/libxml2
200 - sys-apps/accountsservice
201 - virtual/pam
202 - x11-libs/libxklavier
203 - x11-libs/libX11
204 - introspection? ( dev-libs/gobject-introspection )
205 - qt4? ( x11-libs/qt-core:4
206 - x11-libs/qt-dbus:4
207 - x11-libs/qt-gui:4 )"
208 -DEPEND="${RDEPEND}
209 - dev-util/gtk-doc-am
210 - dev-util/intltool
211 - gnome-base/gnome-common
212 - sys-devel/gettext
213 - virtual/pkgconfig"
214 -
215 -DOCS=( NEWS )
216 -
217 -src_prepare() {
218 - sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
219 - sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
220 -
221 - epatch "${FILESDIR}"/session-wrapper-${PN}.patch
222 - epatch "${FILESDIR}/${PN}"-1.2.0-fix-configure.patch
223 -
224 - if has_version dev-libs/gobject-introspection; then
225 - eautoreconf
226 - else
227 - AT_M4DIR=${WORKDIR} eautoreconf
228 - fi
229 -}
230 -
231 -src_configure() {
232 - # Set default values if global vars unset
233 - local _greeter _session _user
234 - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
235 - _session=${LIGHTDM_SESSION:=gnome}
236 - _user=${LIGHTDM_USER:=root}
237 - # Let user know how lightdm is configured
238 - einfo "Gentoo configuration"
239 - einfo "Default greeter: ${_greeter}"
240 - einfo "Default session: ${_session}"
241 - einfo "Greeter user: ${_user}"
242 -
243 - # do the actual configuration
244 - econf --localstatedir=/var \
245 - --disable-static \
246 - $(use_enable introspection) \
247 - $(use_enable qt4 liblightdm-qt) \
248 - --with-user-session=${_session} \
249 - --with-greeter-session=${_greeter} \
250 - --with-greeter-user=${_user} \
251 - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
252 -}
253 -
254 -src_install() {
255 - default
256 -
257 - # Install missing files
258 - insinto /etc/${PN}/
259 - doins "${S}"/data/{${PN},users,keys}.conf
260 - doins "${FILESDIR}"/Xsession
261 - fperms +x /etc/${PN}/Xsession
262 - # remove .la files
263 - find "${ED}" -name "*.la" -exec rm -rf {} +
264 - rm -Rf "${ED}"/etc/init || die
265 -
266 - dopamd "${FILESDIR}"/${PN}
267 - dopamd "${FILESDIR}"/${PN}-autologin
268 -}
269 -
270 -pkg_postinst() {
271 - elog
272 - elog "You will need to install a greeter as actual GUI for LightDM."
273 - elog
274 - elog "Even though the default /etc/${PN}/${PN}.conf will work for"
275 - elog "most users, make sure you configure it to suit your needs"
276 - elog "before using ${PN} for the first time."
277 - elog "You can test the configuration file using the following"
278 - elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
279 - elog "requires xorg-server to be built with the 'kdrive' useflag."
280 - elog
281 - elog "You can also set your own default values for LIGHTDM_GREETER,"
282 - elog "LIGHTDM_SESSION, LIGHTDM_USER in /etc/make.conf"
283 - elog
284 -}
285
286 diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
287 deleted file mode 100644
288 index 5f6cca2..0000000
289 --- a/x11-misc/lightdm/metadata.xml
290 +++ /dev/null
291 @@ -1,11 +0,0 @@
292 -<?xml version="1.0" encoding="UTF-8"?>
293 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
294 -<pkgmetadata>
295 -<maintainer>
296 -<email>hwoarang@g.o</email>
297 -<name>Markos Chandras</name>
298 -</maintainer>
299 -<use>
300 - <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
301 -</use>
302 -</pkgmetadata>