1 |
axs 12/11/04 01:02:57 |
2 |
|
3 |
Modified: ChangeLog slim-1.3.2-r7.ebuild slim-1.3.4-r1.ebuild |
4 |
Log: |
5 |
made pkg_postinst messages relevant based on emerge context to reduce elog spam |
6 |
|
7 |
(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
8 |
|
9 |
Revision Changes Path |
10 |
1.91 x11-misc/slim/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.91&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.91&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.90&r2=1.91 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v |
19 |
retrieving revision 1.90 |
20 |
retrieving revision 1.91 |
21 |
diff -u -r1.90 -r1.91 |
22 |
--- ChangeLog 5 Oct 2012 19:22:14 -0000 1.90 |
23 |
+++ ChangeLog 4 Nov 2012 01:02:57 -0000 1.91 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-misc/slim |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.90 2012/10/05 19:22:14 axs Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.91 2012/11/04 01:02:57 axs Exp $ |
29 |
+ |
30 |
+ 04 Nov 2012; Ian Stakenvicius <axs@g.o> slim-1.3.2-r7.ebuild, |
31 |
+ slim-1.3.4-r1.ebuild: |
32 |
+ made pkg_postinst messages relevant based on emerge context to reduce elog |
33 |
+ spam |
34 |
|
35 |
05 Oct 2012; Ian Stakenvicius <axs@g.o> slim-1.3.4-r1.ebuild, |
36 |
+files/slim-1.3.4-arm.patch: |
37 |
|
38 |
|
39 |
|
40 |
1.7 x11-misc/slim/slim-1.3.2-r7.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild?rev=1.7&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild?rev=1.7&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild?r1=1.6&r2=1.7 |
45 |
|
46 |
Index: slim-1.3.2-r7.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild,v |
49 |
retrieving revision 1.6 |
50 |
retrieving revision 1.7 |
51 |
diff -u -r1.6 -r1.7 |
52 |
--- slim-1.3.2-r7.ebuild 5 May 2012 04:53:46 -0000 1.6 |
53 |
+++ slim-1.3.2-r7.ebuild 4 Nov 2012 01:02:57 -0000 1.7 |
54 |
@@ -1,10 +1,10 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild,v 1.6 2012/05/05 04:53:46 jdhore Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.2-r7.ebuild,v 1.7 2012/11/04 01:02:57 axs Exp $ |
59 |
|
60 |
EAPI=4 |
61 |
|
62 |
-inherit toolchain-funcs pam eutils |
63 |
+inherit toolchain-funcs pam eutils versionator |
64 |
|
65 |
DESCRIPTION="Simple Login Manager" |
66 |
HOMEPAGE="http://slim.berlios.de" |
67 |
@@ -106,32 +106,37 @@ |
68 |
} |
69 |
|
70 |
pkg_postinst() { |
71 |
- elog |
72 |
- elog "The configuration file is located at /etc/slim.conf." |
73 |
- elog |
74 |
- elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
75 |
- elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
76 |
- elog |
77 |
- elog "By default, ${PN} now does proper X session selection, including ~/.xsession" |
78 |
- elog "support, as well as selection between sessions available in" |
79 |
- elog "/etc/X11/Sessions/ at login by pressing [F1]." |
80 |
- elog |
81 |
- elog "The XSESSION environment variable is still supported as a default" |
82 |
- elog "if no session has been specified by the user." |
83 |
- elog |
84 |
- elog "If you want to use .xinitrc in the user's home directory for session" |
85 |
- elog "management instead, see README and xinitrc.sample in" |
86 |
- elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
87 |
- elog "accordingly." |
88 |
- elog |
89 |
- ewarn "Please note that the slim session start script now supports consolekit" |
90 |
- ewarn "directly. Please remove any existing work-arounds to avoid multiple calls " |
91 |
- ewarn "to ck-launch-session, and enable USE=\"consolekit\"" |
92 |
- elog |
93 |
+ # note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim |
94 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
95 |
+ elog |
96 |
+ elog "The configuration file is located at /etc/slim.conf." |
97 |
+ elog |
98 |
+ elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
99 |
+ elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
100 |
+ fi |
101 |
+ if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then |
102 |
+ elog |
103 |
+ elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession" |
104 |
+ elog "support, as well as selection between sessions available in" |
105 |
+ elog "/etc/X11/Sessions/ at login by pressing [F1]." |
106 |
+ elog |
107 |
+ elog "The XSESSION environment variable is still supported as a default" |
108 |
+ elog "if no session has been specified by the user." |
109 |
+ elog |
110 |
+ elog "If you want to use .xinitrc in the user's home directory for session" |
111 |
+ elog "management instead, see README and xinitrc.sample in" |
112 |
+ elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
113 |
+ elog "accordingly." |
114 |
+ elog |
115 |
+ ewarn "Please note that slim supports consolekit directly. Please do not use any " |
116 |
+ ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" |
117 |
+ ewarn "and enable USE=\"consolekit\" instead." |
118 |
+ ewarn |
119 |
+ fi |
120 |
if ! use pam; then |
121 |
- elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" |
122 |
- elog "the console when restarting your window manager. If this is not" |
123 |
- elog "desired, then please remerge ${PN} with USE=pam" |
124 |
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" |
125 |
+ elog "the console when restarting your window manager. If this is not desired, then" |
126 |
+ elog "please remerge ${PN} with USE=\"pam\"" |
127 |
elog |
128 |
fi |
129 |
} |
130 |
|
131 |
|
132 |
|
133 |
1.3 x11-misc/slim/slim-1.3.4-r1.ebuild |
134 |
|
135 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild?rev=1.3&view=markup |
136 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild?rev=1.3&content-type=text/plain |
137 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild?r1=1.2&r2=1.3 |
138 |
|
139 |
Index: slim-1.3.4-r1.ebuild |
140 |
=================================================================== |
141 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild,v |
142 |
retrieving revision 1.2 |
143 |
retrieving revision 1.3 |
144 |
diff -u -r1.2 -r1.3 |
145 |
--- slim-1.3.4-r1.ebuild 5 Oct 2012 19:22:14 -0000 1.2 |
146 |
+++ slim-1.3.4-r1.ebuild 4 Nov 2012 01:02:57 -0000 1.3 |
147 |
@@ -1,11 +1,11 @@ |
148 |
# Copyright 1999-2012 Gentoo Foundation |
149 |
# Distributed under the terms of the GNU General Public License v2 |
150 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild,v 1.2 2012/10/05 19:22:14 axs Exp $ |
151 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4-r1.ebuild,v 1.3 2012/11/04 01:02:57 axs Exp $ |
152 |
|
153 |
EAPI=4 |
154 |
|
155 |
CMAKE_MIN_VERSION="2.8.8" |
156 |
-inherit cmake-utils pam eutils |
157 |
+inherit cmake-utils pam eutils versionator |
158 |
|
159 |
DESCRIPTION="Simple Login Manager" |
160 |
HOMEPAGE="http://slim.berlios.de" |
161 |
@@ -75,32 +75,37 @@ |
162 |
} |
163 |
|
164 |
pkg_postinst() { |
165 |
- elog |
166 |
- elog "The configuration file is located at /etc/slim.conf." |
167 |
- elog |
168 |
- elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
169 |
- elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
170 |
- elog |
171 |
- elog "By default, ${PN} now does proper X session selection, including ~/.xsession" |
172 |
- elog "support, as well as selection between sessions available in" |
173 |
- elog "/etc/X11/Sessions/ at login by pressing [F1]." |
174 |
- elog |
175 |
- elog "The XSESSION environment variable is still supported as a default" |
176 |
- elog "if no session has been specified by the user." |
177 |
- elog |
178 |
- elog "If you want to use .xinitrc in the user's home directory for session" |
179 |
- elog "management instead, see README and xinitrc.sample in" |
180 |
- elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
181 |
- elog "accordingly." |
182 |
- elog |
183 |
- ewarn "Please note that slim now supports consolekit directly. Please remove any " |
184 |
- ewarn "existing work-arounds (including all calls to 'ck-launch-session' in " |
185 |
- ewarn "xinitrc scripts) and enable USE=\"consolekit\"" |
186 |
- elog |
187 |
+ # note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim |
188 |
+ if [[ -z ${REPLACING_VERSIONS} ]]; then |
189 |
+ elog |
190 |
+ elog "The configuration file is located at /etc/slim.conf." |
191 |
+ elog |
192 |
+ elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" " |
193 |
+ elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"." |
194 |
+ fi |
195 |
+ if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then |
196 |
+ elog |
197 |
+ elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession" |
198 |
+ elog "support, as well as selection between sessions available in" |
199 |
+ elog "/etc/X11/Sessions/ at login by pressing [F1]." |
200 |
+ elog |
201 |
+ elog "The XSESSION environment variable is still supported as a default" |
202 |
+ elog "if no session has been specified by the user." |
203 |
+ elog |
204 |
+ elog "If you want to use .xinitrc in the user's home directory for session" |
205 |
+ elog "management instead, see README and xinitrc.sample in" |
206 |
+ elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf" |
207 |
+ elog "accordingly." |
208 |
+ elog |
209 |
+ ewarn "Please note that slim supports consolekit directly. Please do not use any " |
210 |
+ ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)" |
211 |
+ ewarn "and enable USE=\"consolekit\" instead." |
212 |
+ ewarn |
213 |
+ fi |
214 |
if ! use pam; then |
215 |
- elog "You have merged ${PN} without USE=pam, this will cause ${PN} to fall back to" |
216 |
- elog "the console when restarting your window manager. If this is not" |
217 |
- elog "desired, then please remerge ${PN} with USE=pam" |
218 |
+ elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" |
219 |
+ elog "the console when restarting your window manager. If this is not desired, then" |
220 |
+ elog "please remerge ${PN} with USE=\"pam\"" |
221 |
elog |
222 |
fi |
223 |
} |