Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/
Date: Wed, 15 Feb 2017 17:02:57
Message-Id: 1487178170.446f198a4d8ad8f09109fa343e800abf22fc3bd8.polynomial-c@gentoo
1 commit: 446f198a4d8ad8f09109fa343e800abf22fc3bd8
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 17:02:33 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 15 17:02:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=446f198a
7
8 x11-misc/lightdm: Removed old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 x11-misc/lightdm/Manifest | 2 -
13 x11-misc/lightdm/lightdm-1.16.7.ebuild | 129 -------------------------------
14 x11-misc/lightdm/lightdm-1.20.0.ebuild | 137 ---------------------------------
15 3 files changed, 268 deletions(-)
16
17 diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
18 index 19eb52513e..258f64b90d 100644
19 --- a/x11-misc/lightdm/Manifest
20 +++ b/x11-misc/lightdm/Manifest
21 @@ -1,6 +1,4 @@
22 DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
23 -DIST lightdm-1.16.7.tar.xz 486692 SHA256 67b72a5dadf823ebc7df1bb523da59342271fcf67fcac9a2a2c30007ccb9ab32 SHA512 8ab35293e90653814ce877697d6cba335906f04129ba63d87e3dcb05efdca64c815023f75920a836064134d7c28dcf3949e993db67c85e93dc954ef48fe4984f WHIRLPOOL 9b3867e37cac072b2883b8621f7604cfda5e769157220aaf76d72c641b14c9c149bd989818d8880b845f569d1a55b80fe690435b4799ea487bbb504ac4f8887f
24 DIST lightdm-1.18.3.tar.xz 503968 SHA256 d99215aeca38db2da84eede2ac3b9e875a746b3bc81bb3a30e0b8d89b87e1494 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234 WHIRLPOOL 5b06581c56188ada75a196d0663b041b7507f0923a8a8ceec2531926a034675ac592df356c7840568492f5af9ca0d6058ad477904147ece66568f59517cde8cb
25 -DIST lightdm-1.20.0.tar.xz 506488 SHA256 f03b7804a4902d189849a060292e4987d1e4f8272a1edb3e681e6f3cdfaa5ba4 SHA512 7d1d8379bc59f0326f486fe4a618c4939aadd6795ff92f9cd983997ad41e5fed5690eb6cbd81de30f4384ede6f5f88b2fff1781e13b51b5fe8f389379e8d2335 WHIRLPOOL e6345a1b66afb05aefe52664d33274df316b43d17808404cd7337dff284cb41106e191ffaf24e9805a02ac2b650d784fe988592a460a81302022386b2aadb674
26 DIST lightdm-1.21.3.tar.xz 517332 SHA256 f66d95d61672701ae8dca0b2d9fe52429e8c068bfbc598639a03a97ee4d0cc0b SHA512 bb91a1eae1d3637c1556b968b062cf9fc0c0f619320458ea77ea3c4f3dbf2aff5eeed136c703744851ec21fca8e0410dcfb02d2a44ca55c1f2db290a0bf3fde1 WHIRLPOOL 26e1ff294598b5648a0a6073ee68585698de41d38b2d77ca9deb2cbffc5beb685563e204ce5077b7ae945b253d68b08fb8580ac4e6220db92079af01c7419a2e
27 DIST lightdm-1.21.4.tar.xz 517372 SHA256 4befc82400a3409dd3e82054f1884536ebc85ee6ccc455f38617d8d920806de8 SHA512 aaee4e1de058950dbb96eb24ae4ed490b7a0112866161af5f7936b7448ac69085d80993f04e044bd6ffd8176c605c0a7076db5ddd10514a17912d1deefcc7afb WHIRLPOOL 1153be388f99d444216a20055f995e45c62bc94ab47d800f7f8ab5de8794a666ba899edf6c3a80a98c76cc4fe69f8b4a93dd3c6745ee5be24c06352fd2bd892e
28
29 diff --git a/x11-misc/lightdm/lightdm-1.16.7.ebuild b/x11-misc/lightdm/lightdm-1.16.7.ebuild
30 deleted file mode 100644
31 index a3fba9ad7a..0000000000
32 --- a/x11-misc/lightdm/lightdm-1.16.7.ebuild
33 +++ /dev/null
34 @@ -1,129 +0,0 @@
35 -# Copyright 1999-2016 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -# $Id$
38 -
39 -EAPI=5
40 -inherit autotools eutils pam readme.gentoo systemd versionator
41 -
42 -TRUNK_VERSION="$(get_version_component_range 1-2)"
43 -DESCRIPTION="A lightweight display manager"
44 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
45 -SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
46 - mirror://gentoo/introspection-20110205.m4.tar.bz2"
47 -
48 -LICENSE="GPL-3 LGPL-3"
49 -SLOT="0"
50 -KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
51 -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
52 -REQUIRED_USE="|| ( gtk kde )"
53 -
54 -COMMON_DEPEND="audit? ( sys-process/audit )
55 - >=dev-libs/glib-2.32.3:2
56 - dev-libs/libxml2
57 - gnome? ( sys-apps/accountsservice )
58 - virtual/pam
59 - x11-libs/libX11
60 - >=x11-libs/libxklavier-5
61 - introspection? ( >=dev-libs/gobject-introspection-1 )
62 - qt4? (
63 - dev-qt/qtcore:4
64 - dev-qt/qtdbus:4
65 - dev-qt/qtgui:4
66 - )
67 - qt5? (
68 - dev-qt/qtcore:5
69 - dev-qt/qtdbus:5
70 - dev-qt/qtgui:5
71 - )"
72 -RDEPEND="${COMMON_DEPEND}
73 - >=sys-auth/pambase-20101024-r2"
74 -DEPEND="${COMMON_DEPEND}
75 - dev-util/gtk-doc-am
76 - dev-util/intltool
77 - gnome? ( gnome-base/gnome-common )
78 - sys-devel/gettext
79 - virtual/pkgconfig"
80 -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
81 - kde? ( x11-misc/lightdm-kde )"
82 -
83 -DOCS=( NEWS )
84 -RESTRICT="test"
85 -
86 -src_prepare() {
87 - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
88 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
89 -
90 - einfo "Fixing the session-wrapper variable in lightdm.conf"
91 - sed -i -e \
92 - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
93 - data/lightdm.conf || die "Failed to fix lightdm.conf"
94 -
95 - epatch_user
96 -
97 - # Remove bogus Makefile statement. This needs to go upstream
98 - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
99 - if has_version dev-libs/gobject-introspection; then
100 - eautoreconf
101 - else
102 - AT_M4DIR=${WORKDIR} eautoreconf
103 - fi
104 -}
105 -
106 -src_configure() {
107 - # Set default values if global vars unset
108 - local _greeter _session _user
109 - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
110 - _session=${LIGHTDM_SESSION:=gnome}
111 - _user=${LIGHTDM_USER:=root}
112 - # Let user know how lightdm is configured
113 - einfo "Gentoo configuration"
114 - einfo "Default greeter: ${_greeter}"
115 - einfo "Default session: ${_session}"
116 - einfo "Greeter user: ${_user}"
117 -
118 - # also disable tests because libsystem.c does not build. Tests are
119 - # restricted so it does not matter anyway.
120 - econf \
121 - --localstatedir=/var \
122 - --disable-static \
123 - --disable-tests \
124 - $(use_enable audit libaudit) \
125 - $(use_enable introspection) \
126 - $(use_enable qt4 liblightdm-qt) \
127 - $(use_enable qt5 liblightdm-qt5) \
128 - --with-user-session=${_session} \
129 - --with-greeter-session=${_greeter} \
130 - --with-greeter-user=${_user} \
131 - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
132 -}
133 -
134 -src_install() {
135 - default
136 -
137 - # Delete apparmor profiles because they only work with Ubuntu's
138 - # apparmor package. Bug #494426
139 - if [[ -d ${D}/etc/apparmor.d ]]; then
140 - rm -r "${D}/etc/apparmor.d" || die \
141 - "Failed to remove apparmor profiles"
142 - fi
143 -
144 - insinto /etc/${PN}
145 - doins data/{${PN},keys}.conf
146 - doins "${FILESDIR}"/Xsession
147 - fperms +x /etc/${PN}/Xsession
148 - # /var/lib/lightdm-data could be useful. Bug #522228
149 - dodir /var/lib/lightdm-data
150 -
151 - prune_libtool_files --all
152 - rm -rf "${ED}"/etc/init
153 -
154 - # Remove existing pam file. We will build a new one. Bug #524792
155 - rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
156 - pamd_mimic system-local-login ${PN} auth account password session #372229
157 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
158 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
159 -
160 - readme.gentoo_create_doc
161 -
162 - systemd_dounit "${FILESDIR}/${PN}.service"
163 -}
164
165 diff --git a/x11-misc/lightdm/lightdm-1.20.0.ebuild b/x11-misc/lightdm/lightdm-1.20.0.ebuild
166 deleted file mode 100644
167 index 22ff7e282a..0000000000
168 --- a/x11-misc/lightdm/lightdm-1.20.0.ebuild
169 +++ /dev/null
170 @@ -1,137 +0,0 @@
171 -# Copyright 1999-2016 Gentoo Foundation
172 -# Distributed under the terms of the GNU General Public License v2
173 -# $Id$
174 -
175 -EAPI=6
176 -inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
177 -
178 -TRUNK_VERSION="$(get_version_component_range 1-2)"
179 -DESCRIPTION="A lightweight display manager"
180 -HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
181 -SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
182 - mirror://gentoo/introspection-20110205.m4.tar.bz2"
183 -
184 -LICENSE="GPL-3 LGPL-3"
185 -SLOT="0"
186 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
187 -IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
188 -REQUIRED_USE="|| ( gtk kde )"
189 -
190 -COMMON_DEPEND="audit? ( sys-process/audit )
191 - >=dev-libs/glib-2.32.3:2
192 - dev-libs/libxml2
193 - gnome? ( sys-apps/accountsservice )
194 - virtual/pam
195 - x11-libs/libX11
196 - >=x11-libs/libxklavier-5
197 - introspection? ( >=dev-libs/gobject-introspection-1 )
198 - qt4? (
199 - dev-qt/qtcore:4
200 - dev-qt/qtdbus:4
201 - dev-qt/qtgui:4
202 - )
203 - qt5? (
204 - dev-qt/qtcore:5
205 - dev-qt/qtdbus:5
206 - dev-qt/qtgui:5
207 - )"
208 -RDEPEND="${COMMON_DEPEND}
209 - >=sys-auth/pambase-20101024-r2"
210 -DEPEND="${COMMON_DEPEND}
211 - dev-util/gtk-doc-am
212 - dev-util/intltool
213 - gnome? ( gnome-base/gnome-common )
214 - sys-devel/gettext
215 - virtual/pkgconfig"
216 -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
217 - kde? ( x11-misc/lightdm-kde )"
218 -
219 -DOCS=( NEWS )
220 -RESTRICT="test"
221 -
222 -src_prepare() {
223 - xdg_environment_reset
224 -
225 - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
226 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
227 -
228 - einfo "Fixing the session-wrapper variable in lightdm.conf"
229 - sed -i -e \
230 - "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
231 - data/lightdm.conf || die "Failed to fix lightdm.conf"
232 -
233 - # use correct version of qmake. bug #566950
234 - sed -i -e "/AC_CHECK_TOOLS(MOC4/a AC_SUBST(MOC4,$(qt4_get_bindir)/moc)" configure.ac || die
235 - sed -i -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" configure.ac || die
236 -
237 - default
238 -
239 - # Remove bogus Makefile statement. This needs to go upstream
240 - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
241 - if has_version dev-libs/gobject-introspection; then
242 - eautoreconf
243 - else
244 - AT_M4DIR=${WORKDIR} eautoreconf
245 - fi
246 -}
247 -
248 -src_configure() {
249 - # Set default values if global vars unset
250 - local _greeter _session _user
251 - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
252 - _session=${LIGHTDM_SESSION:=gnome}
253 - _user=${LIGHTDM_USER:=root}
254 - # Let user know how lightdm is configured
255 - einfo "Gentoo configuration"
256 - einfo "Default greeter: ${_greeter}"
257 - einfo "Default session: ${_session}"
258 - einfo "Greeter user: ${_user}"
259 -
260 - use qt5 && append-cxxflags -std=c++11
261 -
262 - # also disable tests because libsystem.c does not build. Tests are
263 - # restricted so it does not matter anyway.
264 - econf \
265 - --localstatedir=/var \
266 - --disable-static \
267 - --disable-tests \
268 - $(use_enable audit libaudit) \
269 - $(use_enable introspection) \
270 - $(use_enable qt4 liblightdm-qt) \
271 - $(use_enable qt5 liblightdm-qt5) \
272 - --with-user-session=${_session} \
273 - --with-greeter-session=${_greeter} \
274 - --with-greeter-user=${_user} \
275 - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
276 -}
277 -
278 -src_install() {
279 - default
280 -
281 - # Delete apparmor profiles because they only work with Ubuntu's
282 - # apparmor package. Bug #494426
283 - if [[ -d ${D}/etc/apparmor.d ]]; then
284 - rm -r "${D}/etc/apparmor.d" || die \
285 - "Failed to remove apparmor profiles"
286 - fi
287 -
288 - insinto /etc/${PN}
289 - doins data/{${PN},keys}.conf
290 - doins "${FILESDIR}"/Xsession
291 - fperms +x /etc/${PN}/Xsession
292 - # /var/lib/lightdm-data could be useful. Bug #522228
293 - dodir /var/lib/lightdm-data
294 -
295 - prune_libtool_files --all
296 - rm -rf "${ED}"/etc/init
297 -
298 - # Remove existing pam file. We will build a new one. Bug #524792
299 - rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
300 - pamd_mimic system-local-login ${PN} auth account password session #372229
301 - pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
302 - dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
303 -
304 - readme.gentoo_create_doc
305 -
306 - systemd_dounit "${FILESDIR}/${PN}.service"
307 -}