Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in xml/htdocs/proj/en/desktop/kde: kde4-guide.xml
Date: Wed, 27 Jul 2011 13:47:27
Message-Id: 20110727134717.965452004B@flycatcher.gentoo.org
1 tampakrap 11/07/27 13:47:17
2
3 Modified: kde4-guide.xml
4 Log:
5 Bump, update guide for tonight's KDE SC 4.7.0 release
6
7 Revision Changes Path
8 1.77 xml/htdocs/proj/en/desktop/kde/kde4-guide.xml
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml?rev=1.77&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml?rev=1.77&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml?r1=1.76&r2=1.77
13
14 Index: kde4-guide.xml
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml,v
17 retrieving revision 1.76
18 retrieving revision 1.77
19 diff -u -r1.76 -r1.77
20 --- kde4-guide.xml 22 Apr 2011 21:04:44 -0000 1.76
21 +++ kde4-guide.xml 27 Jul 2011 13:47:17 -0000 1.77
22 @@ -1,6 +1,6 @@
23 <?xml version="1.0" encoding="UTF-8"?>
24 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
25 -<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml,v 1.76 2011/04/22 21:04:44 dilfridge Exp $ -->
26 +<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/desktop/kde/kde4-guide.xml,v 1.77 2011/07/27 13:47:17 tampakrap Exp $ -->
27
28 <guide>
29 <title>Gentoo KDE Guide</title>
30 @@ -36,8 +36,8 @@
31 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
32 <license/>
33
34 -<version>2.8</version>
35 -<date>2011-03-08</date>
36 +<version>3.0</version>
37 +<date>2011-07-27</date>
38
39 <chapter>
40 <title>KDE 3</title>
41 @@ -68,22 +68,18 @@
42 </body>
43 </section>
44 </chapter>
45 -
46 <chapter>
47 <title>KDE SC 4</title>
48 <section>
49 <title>Quick info: Stable upgrade from KDE SC 4.4 to 4.6</title>
50 <body>
51 <p>
52 -KDE SC 4.6 will be stabilized in the near future. If you encounter problems during the
53 -resulting upgrade, please have a look at the separate
54 +KDE SC 4.6.3 is currently stable. If you encounter problems during the
55 + upgrade from KDE SC 4.4, please have a look at the separate
56 <uri link="kde44-46-upgrade.xml">Gentoo KDE 4.4 - 4.6 Upgrade Guide</uri> first!
57 </p>
58 </body>
59 </section>
60 -
61 -
62 -
63 <section>
64 <title>Introduction</title>
65 <body>
66 @@ -92,7 +88,7 @@
67 KDE SC 4 is the current KDE version supported by upstream. In Portage there is a
68 stable version, and there might be one (or more) non-stable versions. Under
69 normal conditions new versions get in stabilized after a month. The KDE SC 4
70 -version available through Portage is 4.4.5 (stable by both upstream and
71 +version available through Portage is 4.6.3 (stable by both upstream and
72 Gentoo).
73 In addition, KDE upstream provides weekly <uri
74 link="ftp://ftp.kde.org/pub/kde/unstable">snapshots</uri>, and a <uri
75 @@ -111,19 +107,19 @@
76 <th>Repository</th>
77 </tr>
78 <tr>
79 - <ti><uri link="#kde4_4">KDE SC 4.4.5</uri></ti>
80 + <ti><uri link="#kde4_6">KDE SC 4.6.3</uri></ti>
81 <ti>Portage</ti>
82 </tr>
83 <tr>
84 - <ti><uri link="#kde4_6">KDE SC 4.6.2</uri></ti>
85 + <ti><uri link="#kde4_7">KDE SC 4.7.0</uri></ti>
86 <ti>Portage</ti>
87 </tr>
88 <!--tr>
89 - <ti><uri link="#snapshots">KDE SC 4.5.xx snapshots</uri></ti>
90 + <ti><uri link="#snapshots">KDE SC 4.x.xx snapshots</uri></ti>
91 <ti>KDE Overlay</ti>
92 </tr-->
93 <tr>
94 - <ti><uri link="#live">Live Ebuilds (4.6 Branch, Trunk)</uri></ti>
95 + <ti><uri link="#live">Live Ebuilds (4.7 Branch, Trunk)</uri></ti>
96 <ti>KDE Overlay</ti>
97 </tr>
98 </table>
99 @@ -133,88 +129,42 @@
100 </chapter>
101 <chapter id="kde_portage">
102 <title>Installing KDE SC from Portage</title>
103 -<section id="kde4_4">
104 -<title>KDE SC 4.4.5</title>
105 +<section id="kde4_6">
106 +<title>KDE SC 4.6.3</title>
107 <body>
108
109 <p>
110 -KDE SC 4.4.5 is the currect stable release.
111 +KDE SC 4.6.3 is the currect stable release.
112 </p>
113
114 -<pre caption="Installation of KDE SC 4.4.5 using meta packages">
115 +<pre caption="Installation of KDE SC 4.6.3 using meta packages">
116 # <i>emerge -av kde-meta</i> <comment>(contains all of KDE modules)</comment>
117 # <i>emerge -av kdebase-meta kdegames-meta</i> <comment>(installation of chosen modules only)</comment>
118 </pre>
119
120 </body>
121 </section>
122 -<section id="kde4_6">
123 -<title>KDE SC 4.6.2</title>
124 +<section id="kde4_7">
125 +<title>KDE SC 4.7.0</title>
126 <body>
127
128 <p>
129 -KDE SC 4.6.2 is in portage, currently as ~testing, but stabilization is planned for the near future.
130 +KDE SC 4.7.0 is in portage, currently as ~testing, but stabilization is planned for the near future.
131 </p>
132
133 <p>
134 Users with stable systems need to put <uri
135 -link="http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=blob_plain;f=Documentation/package.keywords/kde-4.6.keywords">
136 +link="http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=blob_plain;f=Documentation/package.keywords/kde-4.7.keywords">
137 this keywords file</uri> in <path>/etc/portage/package.keywords</path>.
138 </p>
139
140 -<pre caption="Installation of KDE SC 4.6.2 using meta packages">
141 +<pre caption="Installation of KDE SC 4.7.0 using meta packages">
142 # <i>emerge -av kde-meta</i> <comment>(contains all of KDE modules)</comment>
143 # <i>emerge -av kdebase-meta kdegames-meta</i> <comment>(installation of chosen modules only)</comment>
144 </pre>
145
146 </body>
147 </section>
148 -<section id="kdepim">
149 -<title>KDE SC 4.6 and KDEPIM</title>
150 -<body>
151 -
152 -<p>
153 -KDEPIM was once again delayed for 4.6.2, and there is no official
154 -answer for the future versions. KDE 4.6 works with either KDEPIM 4.4.10
155 -or with KDEPIM 4.6 beta, which is currently in the kde overlay.
156 -</p>
157 -
158 -<p>
159 -<b>KDEPIM 4.4.[9.10]:</b><br />
160 -KDEPIM 4.4.9 is stable in portage, and 4.4.10 is ~testing. You are
161 -adviced to use the latter, for which stable users will need to put <uri
162 -link="http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=blob;f=sets/kdepim-4.6">
163 -this keywords file</uri> in <path>/etc/portage/package.keywords</path>.
164 -</p>
165 -
166 -<pre caption="Installation of KDEPIM 4.4.10">
167 -# <i>emerge -av kdepim-meta</i>
168 -</pre>
169 -
170 -<p>
171 -<b>KDEPIM 4.6 Beta</b><br />
172 -The upstream KDEPIM developers released a number of beta tarballs,
173 -since the decision that KDEPIM is not ready for inclusion to 4.6.0.
174 -These tarballs are currently in the kde overlay:
175 -</p>
176 -
177 -<pre caption="Installing kde overlay">
178 -# <i>layman -f -a kde</i>
179 -<comment>For more information regarding overlays, please read the <uri
180 -link="http://www.gentoo.org/proj/en/overlays/userguide.xml">Overlay Guide</uri></comment>
181 -</pre>
182 -
183 -<pre caption="Creating symlink of the keywords/unmask files">
184 -# <i>ln -s /path/to/overlay/kde/Documentation/package.keywords/.kde-4.6/kdepim-4.6 /etc/portage/package.keywords/</i><comment>(For users with stable systems only)</comment>
185 -# <i>ln -s /path/to/overlay/kde/Documentation/package.unmask/kdepim-4.6 /etc/portage/package.unmask/</i>
186 -</pre>
187 -
188 -<pre caption="Installation of KDEPIM 4.6 beta">
189 -# <i>emerge -av kdepim-meta</i>
190 -</pre>
191 -
192 -</body>
193 -</section>
194 <section id="snapshots">
195 <title>Installing KDE snapshots (from kde overlay)</title>
196 <body>
197 @@ -307,8 +257,8 @@
198 <th>KDE SC Version</th>
199 </tr>
200 <tr>
201 - <ti>4.6.9999</ti>
202 - <ti>KDE 4.6 Branch</ti>
203 + <ti>4.7.9999</ti>
204 + <ti>KDE 4.7 Branch</ti>
205 </tr>
206 <tr>
207 <ti>9999</ti>
208 @@ -335,7 +285,7 @@
209
210 <pre caption="Creating symlink of the keywords file">
211 # <i>cd /etc/portage/package.keywords</i>
212 -# <i>ln -s /path/to/overlay/kde/Documentation/package.keywords/kde-4.6.9999.keywords .</i><comment>(for 4.6 Branch)</comment>
213 +# <i>ln -s /path/to/overlay/kde/Documentation/package.keywords/kde-4.7.9999.keywords .</i><comment>(for 4.7 Branch)</comment>
214 # <i>ln -s /path/to/overlay/kde/Documentation/package.keywords/kde-live.keywords .</i><comment>(for KDE Trunk)</comment>
215 </pre>
216
217 @@ -350,9 +300,9 @@
218 </pre>
219
220 <pre caption="Installation using sets">
221 -<comment>(For KDE SC 4.6 Branch)</comment>
222 -# <i>emerge -av @kde-4.6</i> <comment>(contains all of KDE modules)</comment>
223 -# <i>emerge -av @kdebase-4.6 @kdegames-4.6</i> <comment>(installation of chosen modules only)</comment>
224 +<comment>(For KDE SC 4.7 Branch)</comment>
225 +# <i>emerge -av @kde-4.7</i> <comment>(contains all of KDE modules)</comment>
226 +# <i>emerge -av @kdebase-4.7 @kdegames-4.7</i> <comment>(installation of chosen modules only)</comment>
227 <comment>(For KDE SC Trunk)</comment>
228 # <i>emerge -av @kde-live</i> <comment>(contains all of KDE modules)</comment>
229 # <i>emerge -av @kdebase-live @kdegames-live</i> <comment>(installation of chosen modules only)</comment>