1 |
On 21 June 2012 15:39, Samuli Suominen <ssuominen@g.o> wrote: |
2 |
> On 06/21/2012 10:37 AM, Ben de Groot (yngwin) wrote: |
3 |
>> |
4 |
>> yngwin 12/06/21 07:37:15 |
5 |
>> |
6 |
>> Modified: lightdm-1.2.2-r2.ebuild ChangeLog |
7 |
>> Log: |
8 |
>> Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection |
9 |
>> minimal version (there is nothing lower in tree). Restore useful comments. |
10 |
> |
11 |
> |
12 |
> There is no glib3 |
13 |
|
14 |
Since glib is slotted, we specified the slot. There was no good reason |
15 |
for you to change that. Besides, it is conceivable there will be a glib-3 |
16 |
in the future. Using the slot is more precise and more likely to be |
17 |
future-proof. |
18 |
|
19 |
> and all the commands are self-explanatory. |
20 |
|
21 |
And what's wrong with leaving the comments in place, which the |
22 |
maintainers put there for a reason? In my opinion it is good practice |
23 |
to document why you are doing things, to make sure maintainers |
24 |
after us will understand -- they might not be as experienced. |
25 |
|
26 |
> And users might |
27 |
> still have older gobject-introspection installed, with nothing forcing the |
28 |
> upgrade now. |
29 |
|
30 |
Regular maintenance should take care of that. We are not in the |
31 |
habit of specifying minimal versions for all dependencies. |
32 |
|
33 |
> I consider this a regression (in every regard) and will just do the same |
34 |
> changes again with the next fixes |
35 |
|
36 |
Please don't fix things that aren't broken. |
37 |
|
38 |
If you think they are broken, then make sure it is documented |
39 |
in the proper places (such as devmanual) before barging in |
40 |
and changing the way the maintainers chose to do things. |
41 |
|
42 |
|
43 |
|
44 |
>> |
45 |
>> (Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
46 |
>> |
47 |
>> Revision Changes Path |
48 |
>> 1.2 x11-misc/lightdm/lightdm-1.2.2-r2.ebuild |
49 |
>> |
50 |
>> file : |
51 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&view=markup |
52 |
>> plain: |
53 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?rev=1.2&content-type=text/plain |
54 |
>> diff : |
55 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild?r1=1.1&r2=1.2 |
56 |
>> |
57 |
>> Index: lightdm-1.2.2-r2.ebuild |
58 |
>> =================================================================== |
59 |
>> RCS file: |
60 |
>> /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v |
61 |
>> retrieving revision 1.1 |
62 |
>> retrieving revision 1.2 |
63 |
>> diff -u -r1.1 -r1.2 |
64 |
>> --- lightdm-1.2.2-r2.ebuild 20 Jun 2012 04:58:41 -0000 1.1 |
65 |
>> +++ lightdm-1.2.2-r2.ebuild 21 Jun 2012 07:37:15 -0000 1.2 |
66 |
>> @@ -1,6 +1,6 @@ |
67 |
>> # Copyright 1999-2012 Gentoo Foundation |
68 |
>> # Distributed under the terms of the GNU General Public License v2 |
69 |
>> -# $Header: |
70 |
>> /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.1 |
71 |
>> 2012/06/20 04:58:41 ssuominen Exp $ |
72 |
>> +# $Header: |
73 |
>> /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.2.2-r2.ebuild,v 1.2 |
74 |
>> 2012/06/21 07:37:15 yngwin Exp $ |
75 |
>> |
76 |
>> EAPI=4 |
77 |
>> inherit autotools eutils pam |
78 |
>> @@ -15,18 +15,16 @@ |
79 |
>> KEYWORDS="~amd64 ~x86" |
80 |
>> IUSE="+introspection qt4" |
81 |
>> |
82 |
>> -COMMON_DEPEND=">=dev-libs/glib-2 |
83 |
>> +COMMON_DEPEND="dev-libs/glib:2 |
84 |
>> dev-libs/libxml2 |
85 |
>> sys-apps/accountsservice |
86 |
>> virtual/pam |
87 |
>> x11-libs/libX11 |
88 |
>> >=x11-libs/libxklavier-5 |
89 |
>> - introspection? ( >=dev-libs/gobject-introspection-1 ) |
90 |
>> - qt4? ( |
91 |
>> - x11-libs/qt-core:4 |
92 |
>> + introspection? ( dev-libs/gobject-introspection ) |
93 |
>> + qt4? ( x11-libs/qt-core:4 |
94 |
>> x11-libs/qt-dbus:4 |
95 |
>> - x11-libs/qt-gui:4 |
96 |
>> - )" |
97 |
>> + x11-libs/qt-gui:4 )" |
98 |
>> RDEPEND="${COMMON_DEPEND} |
99 |
>> >=sys-auth/pambase-20101024-r2" |
100 |
>> DEPEND="${COMMON_DEPEND} |
101 |
>> @@ -36,7 +34,7 @@ |
102 |
>> sys-devel/gettext |
103 |
>> virtual/pkgconfig" |
104 |
>> |
105 |
>> -DOCS="NEWS" |
106 |
>> +DOCS=( NEWS ) |
107 |
>> |
108 |
>> src_prepare() { |
109 |
>> sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die |
110 |
>> #412369 |
111 |
>> @@ -54,18 +52,18 @@ |
112 |
>> } |
113 |
>> |
114 |
>> src_configure() { |
115 |
>> + # Set default values if global vars unset |
116 |
>> local _greeter _session _user |
117 |
>> _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} |
118 |
>> _session=${LIGHTDM_SESSION:=gnome} |
119 |
>> _user=${LIGHTDM_USER:=root} |
120 |
>> - |
121 |
>> + # Let user know how lightdm is configured |
122 |
>> einfo "Gentoo configuration" |
123 |
>> einfo "Default greeter: ${_greeter}" |
124 |
>> einfo "Default session: ${_session}" |
125 |
>> einfo "Greeter user: ${_user}" |
126 |
>> |
127 |
>> - econf \ |
128 |
>> - --localstatedir=/var \ |
129 |
>> + econf --localstatedir=/var \ |
130 |
>> --disable-static \ |
131 |
>> $(use_enable introspection) \ |
132 |
>> $(use_enable qt4 liblightdm-qt) \ |
133 |
>> @@ -78,15 +76,17 @@ |
134 |
>> src_install() { |
135 |
>> default |
136 |
>> |
137 |
>> + # Install missing files |
138 |
>> insinto /etc/${PN} |
139 |
>> doins data/{${PN},users,keys}.conf |
140 |
>> - |
141 |
>> doins "${FILESDIR}"/Xsession |
142 |
>> fperms +x /etc/${PN}/Xsession |
143 |
>> |
144 |
>> + # Remove unnecessary files |
145 |
>> prune_libtool_files --all |
146 |
>> rm -rf "${ED}"/etc/init |
147 |
>> |
148 |
>> + # Install proper pam files |
149 |
>> pamd_mimic system-local-login ${PN} auth account session |
150 |
>> pamd_mimic system-local-login ${PN}-autologin auth account session |
151 |
>> } |
152 |
>> |
153 |
>> |
154 |
>> |
155 |
>> 1.43 x11-misc/lightdm/ChangeLog |
156 |
>> |
157 |
>> file : |
158 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&view=markup |
159 |
>> plain: |
160 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?rev=1.43&content-type=text/plain |
161 |
>> diff : |
162 |
>> http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/lightdm/ChangeLog?r1=1.42&r2=1.43 |
163 |
>> |
164 |
>> Index: ChangeLog |
165 |
>> =================================================================== |
166 |
>> RCS file: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v |
167 |
>> retrieving revision 1.42 |
168 |
>> retrieving revision 1.43 |
169 |
>> diff -u -r1.42 -r1.43 |
170 |
>> --- ChangeLog 20 Jun 2012 04:58:41 -0000 1.42 |
171 |
>> +++ ChangeLog 21 Jun 2012 07:37:15 -0000 1.43 |
172 |
>> @@ -1,6 +1,10 @@ |
173 |
>> # ChangeLog for x11-misc/lightdm |
174 |
>> # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
175 |
>> -# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.42 |
176 |
>> 2012/06/20 04:58:41 ssuominen Exp $ |
177 |
>> +# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.43 |
178 |
>> 2012/06/21 07:37:15 yngwin Exp $ |
179 |
>> + |
180 |
>> + 21 Jun 2012; Ben de Groot <yngwin@g.o> lightdm-1.2.2-r2.ebuild: |
181 |
>> + Re-tidy. Restore glib slot. Drop unnecessary gobject-introspection |
182 |
>> minimal |
183 |
>> + version (there is nothing lower in tree). Restore useful comments. |
184 |
>> |
185 |
>> *lightdm-1.2.2-r2 (20 Jun 2012) |
186 |
>> |
187 |
>> |
188 |
>> |
189 |
>> |
190 |
>> |
191 |
> |
192 |
> |
193 |
|
194 |
|
195 |
|
196 |
-- |
197 |
Cheers, |
198 |
|
199 |
Ben | yngwin |
200 |
Gentoo developer |
201 |
Gentoo Qt project lead |