1 |
On 06/21/2012 10:37 AM, Ben de Groot (yngwin) wrote: |
2 |
> yngwin 12/06/21 07:37:15 |
3 |
> |
4 |
> Modified: lightdm-1.2.2-r2.ebuild ChangeLog |
5 |
> Log: |
6 |
> Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal version (there is nothing lower in tree). Restore useful comments. |
7 |
|
8 |
There is no glib3 and all the commands are self-explanatory. And users |
9 |
might still have older gobject-introspection installed, with nothing |
10 |
forcing the upgrade now. |
11 |
I consider this a regression (in every regard) and will just do the same |
12 |
changes again with the next fixes |
13 |
|
14 |
> |
15 |
> (Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
16 |
> |
17 |
> Revision Changes Path |
18 |
> 1.2 x11-misc/lightdm/lightdm-1.2.2-r2.ebuild |
19 |
> |
20 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&view=markup |
21 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&content-type=text/plain |
22 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?r1=1.1&r2=1.2 |
23 |
> |
24 |
> Index: lightdm-1.2.2-r2.ebuild |
25 |
> =================================================================== |
26 |
> RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v |
27 |
> retrieving revision 1.1 |
28 |
> retrieving revision 1.2 |
29 |
> diff -u -r1.1 -r1.2 |
30 |
> --- lightdm-1.2.2-r2.ebuild 20 Jun 2012 04:58:41 -0000 1.1 |
31 |
> +++ lightdm-1.2.2-r2.ebuild 21 Jun 2012 07:37:15 -0000 1.2 |
32 |
> @@ -1,6 +1,6 @@ |
33 |
> # Copyright 1999-2012 Gentoo Foundation |
34 |
> # Distributed under the terms of the GNU General Public License v2 |
35 |
> -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.1 2012/06/20 04:58:41 ssuominen Exp $ |
36 |
> +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.2 2012/06/21 07:37:15 yngwin Exp $ |
37 |
> |
38 |
> EAPI=4 |
39 |
> inherit autotools eutils pam |
40 |
> @@ -15,18 +15,16 @@ |
41 |
> KEYWORDS="~amd64 ~x86" |
42 |
> IUSE="+introspection qt4" |
43 |
> |
44 |
> -COMMON_DEPEND=">=dev-libs/glib-2 |
45 |
> +COMMON_DEPEND="dev-libs/glib:2 |
46 |
> dev-libs/libxml2 |
47 |
> sys-apps/accountsservice |
48 |
> virtual/pam |
49 |
> x11-libs/libX11 |
50 |
> >=x11-libs/libxklavier-5 |
51 |
> - introspection? ( >=dev-libs/gobject-introspection-1 ) |
52 |
> - qt4? ( |
53 |
> - x11-libs/qt-core:4 |
54 |
> + introspection? ( dev-libs/gobject-introspection ) |
55 |
> + qt4? ( x11-libs/qt-core:4 |
56 |
> x11-libs/qt-dbus:4 |
57 |
> - x11-libs/qt-gui:4 |
58 |
> - )" |
59 |
> + x11-libs/qt-gui:4 )" |
60 |
> RDEPEND="${COMMON_DEPEND} |
61 |
> >=sys-auth/pambase-20101024-r2" |
62 |
> DEPEND="${COMMON_DEPEND} |
63 |
> @@ -36,7 +34,7 @@ |
64 |
> sys-devel/gettext |
65 |
> virtual/pkgconfig" |
66 |
> |
67 |
> -DOCS="NEWS" |
68 |
> +DOCS=( NEWS ) |
69 |
> |
70 |
> src_prepare() { |
71 |
> sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 |
72 |
> @@ -54,18 +52,18 @@ |
73 |
> } |
74 |
> |
75 |
> src_configure() { |
76 |
> + # Set default values if global vars unset |
77 |
> local _greeter _session _user |
78 |
> _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} |
79 |
> _session=${LIGHTDM_SESSION:=gnome} |
80 |
> _user=${LIGHTDM_USER:=root} |
81 |
> - |
82 |
> + # Let user know how lightdm is configured |
83 |
> einfo "Gentoo configuration" |
84 |
> einfo "Default greeter: ${_greeter}" |
85 |
> einfo "Default session: ${_session}" |
86 |
> einfo "Greeter user: ${_user}" |
87 |
> |
88 |
> - econf \ |
89 |
> - --localstatedir=/var \ |
90 |
> + econf --localstatedir=/var \ |
91 |
> --disable-static \ |
92 |
> $(use_enable introspection) \ |
93 |
> $(use_enable qt4 liblightdm-qt) \ |
94 |
> @@ -78,15 +76,17 @@ |
95 |
> src_install() { |
96 |
> default |
97 |
> |
98 |
> + # Install missing files |
99 |
> insinto /etc/${PN} |
100 |
> doins data/{${PN},users,keys}.conf |
101 |
> - |
102 |
> doins "${FILESDIR}"/Xsession |
103 |
> fperms +x /etc/${PN}/Xsession |
104 |
> |
105 |
> + # Remove unnecessary files |
106 |
> prune_libtool_files --all |
107 |
> rm -rf "${ED}"/etc/init |
108 |
> |
109 |
> + # Install proper pam files |
110 |
> pamd_mimic system-local-login ${PN} auth account session |
111 |
> pamd_mimic system-local-login ${PN}-autologin auth account session |
112 |
> } |
113 |
> |
114 |
> |
115 |
> |
116 |
> 1.43 x11-misc/lightdm/ChangeLog |
117 |
> |
118 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&view=markup |
119 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&content-type=text/plain |
120 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?r1=1.42&r2=1.43 |
121 |
> |
122 |
> Index: ChangeLog |
123 |
> =================================================================== |
124 |
> RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v |
125 |
> retrieving revision 1.42 |
126 |
> retrieving revision 1.43 |
127 |
> diff -u -r1.42 -r1.43 |
128 |
> --- ChangeLog 20 Jun 2012 04:58:41 -0000 1.42 |
129 |
> +++ ChangeLog 21 Jun 2012 07:37:15 -0000 1.43 |
130 |
> @@ -1,6 +1,10 @@ |
131 |
> # ChangeLog for x11-misc/lightdm |
132 |
> # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
133 |
> -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.42 2012/06/20 04:58:41 ssuominen Exp $ |
134 |
> +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.43 2012/06/21 07:37:15 yngwin Exp $ |
135 |
> + |
136 |
> + 21 Jun 2012; Ben de Groot <yngwin@g.o> lightdm-1.2.2-r2.ebuild: |
137 |
> + Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection minimal |
138 |
> + version (there is nothing lower in tree). Restore useful comments. |
139 |
> |
140 |
> *lightdm-1.2.2-r2 (20 Jun 2012) |
141 |
> |
142 |
> |
143 |
> |
144 |
> |
145 |
> |