Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/systemd: systemd-204.ebuild ChangeLog systemd-206-r3.ebuild
Date: Wed, 28 Aug 2013 11:01:51
Message-Id: 20130828110145.61C062004C@flycatcher.gentoo.org
1 pacho 13/08/28 11:01:45
2
3 Modified: systemd-204.ebuild ChangeLog systemd-206-r3.ebuild
4 Log:
5 Update message about /etc/mtab link (#482786), show message about systemd-ui only when package is not installed (#480606)
6
7 (Portage version: 2.1.13.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)
8
9 Revision Changes Path
10 1.11 sys-apps/systemd/systemd-204.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-204.ebuild?rev=1.11&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-204.ebuild?rev=1.11&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-204.ebuild?r1=1.10&r2=1.11
15
16 Index: systemd-204.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-204.ebuild,v
19 retrieving revision 1.10
20 retrieving revision 1.11
21 diff -u -r1.10 -r1.11
22 --- systemd-204.ebuild 7 Aug 2013 13:20:41 -0000 1.10
23 +++ systemd-204.ebuild 28 Aug 2013 11:01:45 -0000 1.11
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-204.ebuild,v 1.10 2013/08/07 13:20:41 ago Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-204.ebuild,v 1.11 2013/08/28 11:01:45 pacho Exp $
29
30 EAPI=5
31
32 @@ -235,20 +235,6 @@
33 done
34 }
35
36 -optfeature() {
37 - local i desc=${1} text
38 - shift
39 -
40 - text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
41 - shift
42 -
43 - for i; do
44 - elog "${text}"
45 - text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
46 - done
47 - elog "${text} (${desc})"
48 -}
49 -
50 pkg_postinst() {
51 # for udev rules
52 enewgroup dialout
53 @@ -267,17 +253,18 @@
54 fi
55
56 if [[ ! -L "${ROOT}"/etc/mtab ]]; then
57 - ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
58 - ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
59 - ewarn "require that specific feature, please call:"
60 - ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
61 + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
62 + ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
63 + ewarn "and 'mount' to not work properly. Please run:"
64 + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
65 ewarn
66 fi
67
68 - elog "To get additional features, a number of optional runtime dependencies may"
69 - elog "be installed:"
70 - optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
71 - 'sys-apps/systemd-ui'
72 + if ! has_version sys-apps/systemd-ui; then
73 + elog "To get additional features, a number of optional runtime dependencies may"
74 + elog "be installed:"
75 + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
76 + fi
77 }
78
79 pkg_prerm() {
80
81
82
83 1.168 sys-apps/systemd/ChangeLog
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.168&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?rev=1.168&content-type=text/plain
87 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/ChangeLog?r1=1.167&r2=1.168
88
89 Index: ChangeLog
90 ===================================================================
91 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v
92 retrieving revision 1.167
93 retrieving revision 1.168
94 diff -u -r1.167 -r1.168
95 --- ChangeLog 11 Aug 2013 21:34:00 -0000 1.167
96 +++ ChangeLog 28 Aug 2013 11:01:45 -0000 1.168
97 @@ -1,6 +1,11 @@
98 # ChangeLog for sys-apps/systemd
99 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
100 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.167 2013/08/11 21:34:00 floppym Exp $
101 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.168 2013/08/28 11:01:45 pacho Exp $
102 +
103 + 28 Aug 2013; Pacho Ramos <pacho@g.o> systemd-204.ebuild,
104 + systemd-206-r3.ebuild:
105 + Update message about /etc/mtab link (#482786), show message about systemd-ui
106 + only when package is not installed (#480606)
107
108 11 Aug 2013; Mike Gilbert <floppym@g.o> systemd-206-r3.ebuild,
109 systemd-9999-r1.ebuild:
110
111
112
113 1.6 sys-apps/systemd/systemd-206-r3.ebuild
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild?rev=1.6&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild?rev=1.6&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild?r1=1.5&r2=1.6
118
119 Index: systemd-206-r3.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v
122 retrieving revision 1.5
123 retrieving revision 1.6
124 diff -u -r1.5 -r1.6
125 --- systemd-206-r3.ebuild 11 Aug 2013 21:34:00 -0000 1.5
126 +++ systemd-206-r3.ebuild 28 Aug 2013 11:01:45 -0000 1.6
127 @@ -1,6 +1,6 @@
128 # Copyright 1999-2013 Gentoo Foundation
129 # Distributed under the terms of the GNU General Public License v2
130 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v 1.5 2013/08/11 21:34:00 floppym Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-206-r3.ebuild,v 1.6 2013/08/28 11:01:45 pacho Exp $
132
133 EAPI=5
134
135 @@ -330,20 +330,6 @@
136 done
137 }
138
139 -optfeature() {
140 - local i desc=${1} text
141 - shift
142 -
143 - text=" [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
144 - shift
145 -
146 - for i; do
147 - elog "${text}"
148 - text="& [\e[1m$(has_version ${1} && echo I || echo ' ')\e[0m] ${1}"
149 - done
150 - elog "${text} (${desc})"
151 -}
152 -
153 pkg_postinst() {
154 # for udev rules
155 enewgroup dialout
156 @@ -369,17 +355,18 @@
157 fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt
158
159 if [[ ! -L "${ROOT}"/etc/mtab ]]; then
160 - ewarn "Upstream suggests that the /etc/mtab file should be a symlink to /proc/mounts."
161 - ewarn "It is known to cause users being unable to unmount user mounts. If you don't"
162 - ewarn "require that specific feature, please call:"
163 - ewarn " $ ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
164 + ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts."
165 + ewarn "Not having it is not supported by upstream and will cause tools like 'df'"
166 + ewarn "and 'mount' to not work properly. Please run:"
167 + ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'"
168 ewarn
169 fi
170
171 - elog "To get additional features, a number of optional runtime dependencies may"
172 - elog "be installed:"
173 - optfeature 'for GTK+ systemadm UI and gnome-ask-password-agent' \
174 - 'sys-apps/systemd-ui'
175 + if ! has_version sys-apps/systemd-ui; then
176 + elog "To get additional features, a number of optional runtime dependencies may"
177 + elog "be installed:"
178 + elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent"
179 + fi
180 }
181
182 pkg_prerm() {
Report Message
Find on MARC Find on Google Groups