1 |
zlin 08/03/10 17:39:31 |
2 |
|
3 |
Modified: xorg-server-1.4.0.90-r3.ebuild ChangeLog |
4 |
xorg-server-1.4.0.90-r2.ebuild |
5 |
Log: |
6 |
Remove print_installed(). Bug #211588. |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: xorg-server-1.4.0.90-r3.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- xorg-server-1.4.0.90-r3.ebuild 1 Feb 2008 21:47:19 -0000 1.1 |
23 |
+++ xorg-server-1.4.0.90-r3.ebuild 10 Mar 2008 17:39:30 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.1 2008/02/01 21:47:19 dberkholz Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r3.ebuild,v 1.2 2008/03/10 17:39:30 zlin Exp $ |
29 |
|
30 |
# Must be before x-modular eclass is inherited |
31 |
#SNAPSHOT="yes" |
32 |
@@ -429,11 +429,9 @@ |
33 |
ewarn "or earlier, because the ABI changed. If you cannot start X because" |
34 |
ewarn "of module version mismatch errors, this is your problem." |
35 |
|
36 |
- ewarn "Here's a list of installed X drivers to emerge:" |
37 |
- print_installed x11-drivers/ |
38 |
- |
39 |
echo |
40 |
- ewarn "You can generate a similar list at any point using this command:" |
41 |
+ ewarn "You can generate a list of all installed packages in the x11-drivers" |
42 |
+ ewarn "category using this command:" |
43 |
ewarn "emerge portage-utils; qlist -I -C x11-drivers/" |
44 |
|
45 |
ebeep 5 |
46 |
@@ -552,27 +550,6 @@ |
47 |
eselect opengl set ${OLD_IMPLEM} |
48 |
} |
49 |
|
50 |
-print_installed() { |
51 |
- local command line token=$1 |
52 |
- |
53 |
- if $(type -P qlist >/dev/null 2>&1); then |
54 |
- command="qlist -I -C ${token}" |
55 |
- elif $(type -P equery >/dev/null 2>&1); then |
56 |
- command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'" |
57 |
- elif $(type -P epm >/dev/null 2>&1); then |
58 |
- command="epm -qaG | grep ${token}" |
59 |
- else |
60 |
- local dir |
61 |
- command="true" |
62 |
- for dir in "${PORTDIR}"/${token}*; do |
63 |
- command="${command} ; best_version ${dir#${PORTDIR}/}" |
64 |
- done |
65 |
- fi |
66 |
- while read line; do |
67 |
- ewarn "${line}" |
68 |
- done < <(eval ${command}) |
69 |
-} |
70 |
- |
71 |
xprint_src_install() { |
72 |
# RH-style init script, we provide a wrapper |
73 |
exeinto /usr/$(get_libdir)/misc |
74 |
|
75 |
|
76 |
|
77 |
1.319 x11-base/xorg-server/ChangeLog |
78 |
|
79 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.319&view=markup |
80 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.319&content-type=text/plain |
81 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.318&r2=1.319 |
82 |
|
83 |
Index: ChangeLog |
84 |
=================================================================== |
85 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
86 |
retrieving revision 1.318 |
87 |
retrieving revision 1.319 |
88 |
diff -u -r1.318 -r1.319 |
89 |
--- ChangeLog 11 Feb 2008 06:04:07 -0000 1.318 |
90 |
+++ ChangeLog 10 Mar 2008 17:39:30 -0000 1.319 |
91 |
@@ -1,6 +1,10 @@ |
92 |
# ChangeLog for x11-base/xorg-server |
93 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
94 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.318 2008/02/11 06:04:07 philantrop Exp $ |
95 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.319 2008/03/10 17:39:30 zlin Exp $ |
96 |
+ |
97 |
+ 10 Mar 2008; Bo Ørsted Andresen <zlin@g.o> |
98 |
+ xorg-server-1.4.0.90-r2.ebuild, xorg-server-1.4.0.90-r3.ebuild: |
99 |
+ Remove print_installed(). Bug #211588. |
100 |
|
101 |
11 Feb 2008; Wulf C. Krueger <philantrop@g.o> |
102 |
xorg-server-1.3.0.0-r5.ebuild: |
103 |
|
104 |
|
105 |
|
106 |
1.2 x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild |
107 |
|
108 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild?rev=1.2&view=markup |
109 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild?rev=1.2&content-type=text/plain |
110 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild?r1=1.1&r2=1.2 |
111 |
|
112 |
Index: xorg-server-1.4.0.90-r2.ebuild |
113 |
=================================================================== |
114 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild,v |
115 |
retrieving revision 1.1 |
116 |
retrieving revision 1.2 |
117 |
diff -u -r1.1 -r1.2 |
118 |
--- xorg-server-1.4.0.90-r2.ebuild 18 Jan 2008 21:31:33 -0000 1.1 |
119 |
+++ xorg-server-1.4.0.90-r2.ebuild 10 Mar 2008 17:39:30 -0000 1.2 |
120 |
@@ -1,6 +1,6 @@ |
121 |
# Copyright 1999-2008 Gentoo Foundation |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild,v 1.1 2008/01/18 21:31:33 dberkholz Exp $ |
124 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4.0.90-r2.ebuild,v 1.2 2008/03/10 17:39:30 zlin Exp $ |
125 |
|
126 |
# Must be before x-modular eclass is inherited |
127 |
#SNAPSHOT="yes" |
128 |
@@ -427,11 +427,9 @@ |
129 |
ewarn "or earlier, because the ABI changed. If you cannot start X because" |
130 |
ewarn "of module version mismatch errors, this is your problem." |
131 |
|
132 |
- ewarn "Here's a list of installed X drivers to emerge:" |
133 |
- print_installed x11-drivers/ |
134 |
- |
135 |
echo |
136 |
- ewarn "You can generate a similar list at any point using this command:" |
137 |
+ ewarn "You can generate a list of all installed packages in the x11-drivers" |
138 |
+ ewarn "category using this command:" |
139 |
ewarn "emerge portage-utils; qlist -I -C x11-drivers/" |
140 |
|
141 |
ebeep 5 |
142 |
@@ -550,27 +548,6 @@ |
143 |
eselect opengl set ${OLD_IMPLEM} |
144 |
} |
145 |
|
146 |
-print_installed() { |
147 |
- local command line token=$1 |
148 |
- |
149 |
- if $(type -P qlist >/dev/null 2>&1); then |
150 |
- command="qlist -I -C ${token}" |
151 |
- elif $(type -P equery >/dev/null 2>&1); then |
152 |
- command="equery -q -C list ${token} | grep -o '${token}[[:alnum:].-]*'" |
153 |
- elif $(type -P epm >/dev/null 2>&1); then |
154 |
- command="epm -qaG | grep ${token}" |
155 |
- else |
156 |
- local dir |
157 |
- command="true" |
158 |
- for dir in "${PORTDIR}"/${token}*; do |
159 |
- command="${command} ; best_version ${dir#${PORTDIR}/}" |
160 |
- done |
161 |
- fi |
162 |
- while read line; do |
163 |
- ewarn "${line}" |
164 |
- done < <(eval ${command}) |
165 |
-} |
166 |
- |
167 |
xprint_src_install() { |
168 |
# RH-style init script, we provide a wrapper |
169 |
exeinto /usr/$(get_libdir)/misc |
170 |
|
171 |
|
172 |
|
173 |
-- |
174 |
gentoo-commits@l.g.o mailing list |