1 |
mabi 11/01/05 12:15:50 |
2 |
|
3 |
Modified: php-guide.xml |
4 |
Log: |
5 |
add a note about unsupported USE combinations, remove bit about uninstalling php first |
6 |
|
7 |
Revision Changes Path |
8 |
1.4 xml/htdocs/proj/en/php/php-guide.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/php/php-guide.xml?rev=1.4&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/php/php-guide.xml?rev=1.4&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/proj/en/php/php-guide.xml?r1=1.3&r2=1.4 |
13 |
|
14 |
Index: php-guide.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/php-guide.xml,v |
17 |
retrieving revision 1.3 |
18 |
retrieving revision 1.4 |
19 |
diff -u -r1.3 -r1.4 |
20 |
--- php-guide.xml 27 Dec 2010 22:06:16 -0000 1.3 |
21 |
+++ php-guide.xml 5 Jan 2011 12:15:50 -0000 1.4 |
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/php/php-guide.xml,v 1.3 2010/12/27 22:06:16 darkside Exp $ --> |
26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/php/php-guide.xml,v 1.4 2011/01/05 12:15:50 mabi Exp $ --> |
27 |
|
28 |
<guide link="php-guide.xml" lang="en"> |
29 |
<title>Upgrading PHP</title> |
30 |
@@ -20,8 +20,8 @@ |
31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
32 |
<license/> |
33 |
|
34 |
-<version>1.5</version> |
35 |
-<date>2010-12-27</date> |
36 |
+<version>1.6</version> |
37 |
+<date>2011-01-05</date> |
38 |
|
39 |
<chapter> |
40 |
<title>PHP package</title> |
41 |
@@ -80,17 +80,14 @@ |
42 |
<title>Switching from major to minor version slotting</title> |
43 |
|
44 |
<section> |
45 |
-<title>Removing the old installation</title> |
46 |
+<title>Preperations</title> |
47 |
|
48 |
-<body><p> You need to deinstall <c>dev-lang/php</c> and |
49 |
-<c>app-admin/php-toolkit</c>, if you have them installed: </p> |
50 |
- |
51 |
-<pre caption="Uninstalling your php setup"> |
52 |
-<i>emerge -C php php-toolkit</i> |
53 |
-</pre> |
54 |
+<body> |
55 |
+<note>Due to popular demand it is now possible to upgrade from major to minor |
56 |
+version slotting without uninstalling php first</note> |
57 |
|
58 |
-<note>If you always want PHP extensions compiled for all installed PHP versions, |
59 |
-you can skip the next step.</note> |
60 |
+<note>If you always want PHP extensions compiled for the last stable PHP version, |
61 |
+you can skip the first step.</note> |
62 |
|
63 |
<p>Decide which versions of PHP you want extensions compiled for and set them |
64 |
in your <path>/etc/make.conf</path>. </p> |
65 |
@@ -122,14 +119,17 @@ |
66 |
<p>Update your extensions. If you have installed PHP extensions such as suhosin |
67 |
or mailparse, you need to reinstall them.<br /> The php team has provided a |
68 |
minor version slotting compatible version of every package in the |
69 |
-<c>dev-php5</c> category. They currently have testing keywords only, so you |
70 |
-might need to add them to your <path>/etc/portage/package.keywords</path> file, |
71 |
-if you are running an otherwise stable system. </p> |
72 |
+<c>dev-php5</c> category. </p> |
73 |
|
74 |
<pre caption="Reinstalling all extensions"> |
75 |
emerge -av $(equery depends dev-lang/php | egrep -v 'dev-php/|/php' | sed -e 's:^:=:') |
76 |
</pre> |
77 |
|
78 |
+<warn>Running both PHP versions with different USE flags is not supported. |
79 |
+You may be able to install packages with differing configurations, but do not file bugs about it breaking.<br /> |
80 |
+The php team is working on a solution that will automate this in the future. |
81 |
+</warn> |
82 |
+ |
83 |
<p> Note that <c>PHP_TARGETS</c> is displayed as a USE-expand variable.<br /> |
84 |
Some extensions are not available for all slots (e.g. have not been updated to |
85 |
work with PHP-5.3). They will indicate this via the <c>USE_PHP</c> variable |