swift 12/07/24 12:12:52
Modified: hb-install-ia64-disk.xml hb-install-stage.xml
hb-install-system.xml hb-install-x86+amd64-disk.xml
hb-portage-advanced.xml hb-portage-branches.xml
hb-portage-configuration.xml
hb-portage-diverttree.xml hb-portage-files.xml
hb-working-features.xml hb-working-portage.xml
hb-working-rcscripts.xml hb-working-use.xml
Log:
Fix bug #427860 - Use /etc/portage for make.conf and make.profile. Old
location (/etc) is still supported, this is a heads up (new default)
Revision Changes Path
1.13 xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml?rev=1.13&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml?rev=1.13&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml?r1=1.12&r2=1.13
Index: hb-install-ia64-disk.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hb-install-ia64-disk.xml 17 Oct 2011 19:51:45 -0000 1.12
+++ hb-install-ia64-disk.xml 24 Jul 2012 12:12:52 -0000 1.13
@@ -4,12 +4,12 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml,v 1.12
2011/10/17 19:51:45 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-ia64-disk.xml,v 1.13
2012/07/24 12:12:52 swift Exp $ -->
<sections>
-<version>7</version>
-<date>2011-10-17</date>
+<version>8</version>
+<date>2012-07-24</date>
<section>
<title>Introduction to Block Devices</title>
@@ -182,8 +182,8 @@
seem excessive, remember that Portage uses this partition by default for
compiling packages. If you want to keep <path>/var</path> at a more reasonable
size, such as 1GB, you will need to alter your <c>PORTAGE_TMPDIR</c> variable
-in <path>/etc/make.conf</path> to point to the partition with enough free space
-for compiling extremely large packages such as OpenOffice.
+in <path>/etc/portage/make.conf</path> to point to the partition with enough
+free space for compiling extremely large packages such as OpenOffice.
</p>
</body>
1.124 xml/htdocs/doc/en/handbook/hb-install-stage.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.124&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?rev=1.124&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml?r1=1.123&r2=1.124
Index: hb-install-stage.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- hb-install-stage.xml 3 Aug 2011 08:26:43 -0000 1.123
+++ hb-install-stage.xml 24 Jul 2012 12:12:52 -0000 1.124
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v 1.123
2011/08/03 08:26:43 jkt Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-stage.xml,v 1.124
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
describe how you extract the stage3 archive and configure Portage.
</abstract>
-<version>11</version>
-<date>2011-08-03</date>
+<version>12</version>
+<date>2012-07-24</date>
<section>
<title>Installing a Stage Tarball</title>
@@ -327,8 +327,8 @@
To optimize Gentoo, you can set a couple of variables which impact Portage
behaviour. All those variables can be set as environment variables (using
<c>export</c>) but that isn't permanent. To keep your settings, Portage
provides
-you with <path>/etc/make.conf</path>, a configuration file for Portage. It is
-this file we will edit now.
+you with <path>/etc/portage/make.conf</path>, a configuration file for Portage.
+It is this file we will edit now.
</p>
<note>
@@ -343,8 +343,8 @@
the optimization variables we will discuss hereafter.
</p>
-<pre caption="Opening /etc/make.conf">
-# <i>nano -w /mnt/gentoo/etc/make.conf</i>
+<pre caption="Opening /etc/portage/make.conf">
+# <i>nano -w /mnt/gentoo/etc/portage/make.conf</i>
</pre>
<p>
@@ -473,8 +473,8 @@
<body>
<p>
-Update your <path>/mnt/gentoo/etc/make.conf</path> to your own preference and
-save (<c>nano</c> users would hit <c>Ctrl-X</c>). You are now ready to continue
+Update your <path>/mnt/gentoo/etc/portage/make.conf</path> to your own
preference
+and save (<c>nano</c> users would hit <c>Ctrl-X</c>). You are now ready to
continue
with <uri link="?part=1&chap=6">Installing the Gentoo Base System</uri>.
</p>
1.125 xml/htdocs/doc/en/handbook/hb-install-system.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?rev=1.125&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?rev=1.125&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml?r1=1.124&r2=1.125
Index: hb-install-system.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- hb-install-system.xml 29 Jun 2012 16:12:20 -0000 1.124
+++ hb-install-system.xml 24 Jul 2012 12:12:52 -0000 1.125
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v 1.124
2012/06/29 16:12:20 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-system.xml,v 1.125
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -14,8 +14,8 @@
to progress to that state.
</abstract>
-<version>16</version>
-<date>2012-06-29</date>
+<version>17</version>
+<date>2012-07-24</date>
<section>
<title>Chrooting</title>
@@ -36,7 +36,7 @@
</p>
<pre caption="Using mirrorselect for the GENTOO_MIRRORS variable">
-# <i>mirrorselect -i -o >> /mnt/gentoo/etc/make.conf</i>
+# <i>mirrorselect -i -o >> /mnt/gentoo/etc/portage/make.conf</i>
</pre>
<p>
@@ -48,12 +48,12 @@
</p>
<pre caption="Selecting an rsync mirror using mirrorselect">
-# <i>mirrorselect -i -r -o >> /mnt/gentoo/etc/make.conf</i>
+# <i>mirrorselect -i -r -o >> /mnt/gentoo/etc/portage/make.conf</i>
</pre>
<p>
After running <c>mirrorselect</c> it is adviseable to double-check the settings
-in <path>/mnt/gentoo/etc/make.conf</path> !
+in <path>/mnt/gentoo/etc/portage/make.conf</path> !
</p>
<note>
@@ -313,15 +313,16 @@
<p>
The default <c>USE</c> settings are placed in the <path>make.defaults</path>
files of your profile. You will find <path>make.defaults</path> files in the
-directory which <path>/etc/make.profile</path> points to and all parent
+directory which <path>/etc/portage/make.profile</path> points to and all
parent
directories as well. The default <c>USE</c> setting is the sum of all
<c>USE</c>
settings in all <path>make.defaults</path> files. What you place in
-<path>/etc/make.conf</path> is calculated against these defaults settings. If
-you add something to the <c>USE</c> setting, it is added to the default list.
If
-you remove something from the <c>USE</c> setting (by placing a minus sign in
-front of it) it is removed from the default list (if it was in the default list
-at all). <e>Never</e> alter anything inside the <path>/etc/make.profile</path>
-directory; it gets overwritten when you update Portage!
+<path>/etc/portage/make.conf</path> is calculated against these defaults
+settings. If you add something to the <c>USE</c> setting, it is added to the
+default list. If you remove something from the <c>USE</c> setting (by placing
+a minus sign in front of it) it is removed from the default list (if it was
+in the default list at all). <e>Never</e> alter anything inside the
+<path>/etc/portage/make.profile</path> directory; it gets overwritten when
+you update Portage!
</p>
<p>
@@ -341,8 +342,8 @@
and CD Recording support:
</p>
-<pre caption="Opening /etc/make.conf">
-# <i>nano -w /etc/make.conf</i>
+<pre caption="Opening /etc/portage/make.conf">
+# <i>nano -w /etc/portage/make.conf</i>
</pre>
<pre caption="USE setting">
1.19 xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml?r1=1.18&r2=1.19
Index: hb-install-x86+amd64-disk.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hb-install-x86+amd64-disk.xml 17 Oct 2011 19:51:45 -0000 1.18
+++ hb-install-x86+amd64-disk.xml 24 Jul 2012 12:12:52 -0000 1.19
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v
1.18 2011/10/17 19:51:45 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-install-x86+amd64-disk.xml,v
1.19 2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
This chapter describes how to partition a disk for future usage.
</abstract>
-<version>11</version>
-<date>2011-10-17</date>
+<version>12</version>
+<date>2012-07-24</date>
<section>
<title>Introduction to Block Devices</title>
@@ -207,8 +207,8 @@
seem excessive, remember that Portage uses this partition by default for
compiling packages. If you want to keep <path>/var</path> at a more reasonable
size, such as 1GB, you will need to alter your <c>PORTAGE_TMPDIR</c> variable
-in <path>/etc/make.conf</path> to point to the partition with enough free space
-for compiling extremely large packages such as OpenOffice.
+in <path>/etc/portage/make.conf</path> to point to the partition with enough
+free space for compiling extremely large packages such as OpenOffice.
</p>
</body>
1.3 xml/htdocs/doc/en/handbook/hb-portage-advanced.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml?r1=1.2&r2=1.3
Index: hb-portage-advanced.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hb-portage-advanced.xml 7 Feb 2012 19:17:58 -0000 1.2
+++ hb-portage-advanced.xml 24 Jul 2012 12:12:52 -0000 1.3
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml,v 1.2
2012/02/07 19:17:58 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-advanced.xml,v 1.3
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -15,8 +15,8 @@
features.
</abstract>
-<version>2</version>
-<date>2012-02-07</date>
+<version>3</version>
+<date>2012-07-24</date>
<section>
<title>Introduction</title>
@@ -64,10 +64,10 @@
<p>
By default, package builds will use the environment variables defined in
-<path>/etc/make.conf</path>, such as <c>CFLAGS</c>, <c>MAKEOPTS</c> and more.
In
-some cases though, you might want to provide different variables for specific
-packages. To do so, Portage supports the use of <path>/etc/portage/env</path>
-and <path>/etc/portage/package.env</path>.
+<path>/etc/portage/make.conf</path>, such as <c>CFLAGS</c>, <c>MAKEOPTS</c>
+and more. In some cases though, you might want to provide different variables
+for specific packages. To do so, Portage supports the use of
+<path>/etc/portage/env</path> and <path>/etc/portage/package.env</path>.
</p>
<p>
@@ -224,9 +224,9 @@
<p>
By default, Gentoo uses the settings contained in the profile pointed to by
-<path>/etc/make.profile</path> (a symbolic link to the right profile
directory).
-These profiles define both specific settings as well as inherit settings from
-other profiles (through their <path>parent</path> file).
+<path>/etc/portage/make.profile</path> (a symbolic link to the right profile
+directory). These profiles define both specific settings as well as inherit
+settings from other profiles (through their <path>parent</path> file).
</p>
<p>
1.19 xml/htdocs/doc/en/handbook/hb-portage-branches.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?rev=1.19&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?rev=1.19&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml?r1=1.18&r2=1.19
Index: hb-portage-branches.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- hb-portage-branches.xml 2 Mar 2011 09:46:22 -0000 1.18
+++ hb-portage-branches.xml 24 Jul 2012 12:12:52 -0000 1.19
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v 1.18
2011/03/02 09:46:22 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-branches.xml,v 1.19
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -15,8 +15,8 @@
individually.
</abstract>
-<version>3</version>
-<date>2011-03-02</date>
+<version>4</version>
+<date>2012-07-24</date>
<section>
<title>Using One Branch</title>
@@ -67,7 +67,7 @@
<p>
For example, to select the testing branch for the x86 architecture, edit
-<path>/etc/make.conf</path> and set:
+<path>/etc/portage/make.conf</path> and set:
</p>
<pre caption="Setting the ACCEPT_KEYWORDS variable">
1.18 xml/htdocs/doc/en/handbook/hb-portage-configuration.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?rev=1.18&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?rev=1.18&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml?r1=1.17&r2=1.18
Index: hb-portage-configuration.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- hb-portage-configuration.xml 28 Feb 2008 08:25:26 -0000 1.17
+++ hb-portage-configuration.xml 24 Jul 2012 12:12:52 -0000 1.18
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v
1.17 2008/02/28 08:25:26 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-configuration.xml,v
1.18 2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
configuration file or as environment variable.
</abstract>
-<version>1.9</version>
-<date>2008-02-28</date>
+<version>2</version>
+<date>2012-07-24</date>
<section>
<title>Portage Configuration</title>
@@ -23,8 +23,8 @@
<p>
As noted previously, Portage is configurable through many variables which
-you should define in <path>/etc/make.conf</path>. Please refer to the
-<path>make.conf</path> man page for more and complete information:
+you should define in <path>/etc/portage/make.conf</path>. Please refer to
+the <path>make.conf</path> man page for more and complete information:
</p>
<pre caption="Reading the make.conf man page">
1.16 xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml?rev=1.16&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml?rev=1.16&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml?r1=1.15&r2=1.16
Index: hb-portage-diverttree.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- hb-portage-diverttree.xml 13 Jul 2010 22:00:23 -0000 1.15
+++ hb-portage-diverttree.xml 24 Jul 2012 12:12:52 -0000 1.16
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml,v 1.15
2010/07/13 22:00:23 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-diverttree.xml,v 1.16
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -14,8 +14,8 @@
packages and more.
</abstract>
-<version>1.7</version>
-<date>2010-07-13</date>
+<version>2</version>
+<date>2012-07-24</date>
<section>
<title>Using a Portage Tree Subset</title>
@@ -31,10 +31,10 @@
<p>
You need to define the name of the file that contains the exclude patterns in
-the <c>--exclude-from</c> variable in your <path>/etc/make.conf</path>.
+the <c>--exclude-from</c> variable in your <path>/etc/portage/make.conf</path>.
</p>
-<pre caption="Defining the exclude file in /etc/make.conf">
+<pre caption="Defining the exclude file in /etc/portage/make.conf">
PORTAGE_RSYNC_EXTRA_OPTS="--exclude-from=/etc/portage/rsync_excludes"
</pre>
@@ -64,10 +64,10 @@
</p>
<p>
-Then define PORTDIR_OVERLAY in <path>/etc/make.conf</path> and have it point to
-the previously defined directory. When you use Portage now, it will take those
-ebuilds into account as well without removing/overwriting those ebuilds the
next
-time you run <c>emerge --sync</c>.
+Then define PORTDIR_OVERLAY in <path>/etc/portage/make.conf</path> and have it
+point to the previously defined directory. When you use Portage now, it will
+take those ebuilds into account as well without removing/overwriting those
+ebuilds the next time you run <c>emerge --sync</c>.
</p>
</body>
1.22 xml/htdocs/doc/en/handbook/hb-portage-files.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?rev=1.22&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?rev=1.22&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml?r1=1.21&r2=1.22
Index: hb-portage-files.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hb-portage-files.xml 2 Mar 2011 09:25:49 -0000 1.21
+++ hb-portage-files.xml 24 Jul 2012 12:12:52 -0000 1.22
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v 1.21
2011/03/02 09:25:49 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-portage-files.xml,v 1.22
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
files and data.
</abstract>
-<version>2</version>
-<date>2011-03-02</date>
+<version>3</version>
+<date>2012-07-24</date>
<section>
<title>Portage Files</title>
@@ -32,19 +32,19 @@
<p>
Since many configuration directives differ between architectures, Portage also
has default configuration files which are part of your profile. Your profile is
-pointed to by the <path>/etc/make.profile</path> symlink; Portage'
+pointed to by the <path>/etc/portage/make.profile</path> symlink; Portage'
configurations are set in the <path>make.defaults</path> files of your profile
and all parent profiles. We'll explain more about profiles
-and the <path>/etc/make.profile</path> directory later on.
+and the <path>/etc/portage/make.profile</path> directory later on.
</p>
<p>
If you're planning on changing a configuration variable, <e>don't</e> alter
<path>/etc/make.globals</path> or <path>make.defaults</path>. Instead use
-<path>/etc/make.conf</path> which has precedence over the previous files.
You'll
-also find a <path>/usr/share/portage/config/make.conf.example</path>. As the
-name implies, this is merely an example file - Portage does not read in this
-file.
+<path>/etc/portage/make.conf</path> which has precedence over the previous
+files. You'll also find a
<path>/usr/share/portage/config/make.conf.example</path>.
+As the name implies, this is merely an example file - Portage does not read
+in this file.
</p>
<p>
@@ -59,11 +59,11 @@
<body>
<p>
-We've already encountered the <path>/etc/make.profile</path> directory. Well,
-this isn't exactly a directory but a symbolic link to a profile, by default one
-inside <path>/usr/portage/profiles</path> although you can create your own
-profiles elsewhere and point to them. The profile this symlink points to is the
-profile to which your system adheres.
+We've already encountered the <path>/etc/portage/make.profile</path> directory.
+Well, this isn't exactly a directory but a symbolic link to a profile, by
+default one inside <path>/usr/portage/profiles</path> although you can create
+your own profiles elsewhere and point to them. The profile this symlink points
+to is the profile to which your system adheres.
</p>
<p>
@@ -137,9 +137,9 @@
<p>
All these purposes have well-known default locations but can be altered to your
-own taste through <path>/etc/make.conf</path>. The rest of this chapter
explains
-what special-purpose locations Portage uses and how to alter their placement on
-your filesystem.
+own taste through <path>/etc/portage/make.conf</path>. The rest of this chapter
+explains what special-purpose locations Portage uses and how to alter their
+placement on your filesystem.
</p>
<p>
@@ -164,7 +164,7 @@
<p>
The Portage tree default location is <path>/usr/portage</path>. This is defined
by the PORTDIR variable. When you store the Portage tree elsewhere (by altering
-this variable), don't forget to change the <path>/etc/make.profile</path>
+this variable), don't forget to change the
<path>/etc/portage/make.profile</path>
symbolic link accordingly.
</p>
1.43 xml/htdocs/doc/en/handbook/hb-working-features.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?rev=1.43&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?rev=1.43&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml?r1=1.42&r2=1.43
Index: hb-working-features.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- hb-working-features.xml 29 Jun 2012 15:57:32 -0000 1.42
+++ hb-working-features.xml 24 Jul 2012 12:12:52 -0000 1.43
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v 1.42
2012/06/29 15:57:32 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-features.xml,v 1.43
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
ccache and more.
</abstract>
-<version>6</version>
-<date>2012-06-29</date>
+<version>7</version>
+<date>2012-07-24</date>
<section>
<title>Portage Features</title>
@@ -28,8 +28,8 @@
<p>
To enable or disable certain Portage features you need to edit
-<path>/etc/make.conf</path>'s <c>FEATURES</c> variable which contains the
-various feature keywords, separated by white space. In several cases you
+<path>/etc/portage/make.conf</path>'s <c>FEATURES</c> variable which contains
+the various feature keywords, separated by white space. In several cases you
will also need to install the additional tool on which the feature relies.
</p>
@@ -97,7 +97,7 @@
<body>
<p>
-Add <c>distcc</c> to the FEATURES variable inside <path>/etc/make.conf</path>.
+Add <c>distcc</c> to the FEATURES variable inside
<path>/etc/portage/make.conf</path>.
Next, edit the MAKEOPTS variable to your liking. A known guideline is to fill
in
"-jX" with X the number of CPUs that run <c>distccd</c> (including the current
host) plus one, but you might have better results with other numbers.
@@ -150,7 +150,7 @@
will retain stale code objects or corrupted files, which can lead to packages
that cannot be emerged. If this happens (if you receive errors like "File not
recognized: File truncated"), try recompiling the application with ccache
-disabled (<c>FEATURES="-ccache"</c> in <path>/etc/make.conf</path>)
+disabled (<c>FEATURES="-ccache"</c> in <path>/etc/portage/make.conf</path>)
<e>before</e> reporting a bug. Unless you are doing development work, <e>do not
enable ccache</e>.
</warn>
@@ -176,11 +176,11 @@
<body>
<p>
-Open <path>/etc/make.conf</path> and add <c>ccache</c> to the FEATURES
variable.
-Next, add a new variable called CCACHE_SIZE and set it to "2G":
+Open <path>/etc/portage/make.conf</path> and add <c>ccache</c> to the FEATURES
+variable. Next, add a new variable called CCACHE_SIZE and set it to "2G":
</p>
-<pre caption="Editing CCACHE_SIZE in /etc/make.conf">
+<pre caption="Editing CCACHE_SIZE in /etc/portage/make.conf">
CCACHE_SIZE="2G"
</pre>
@@ -197,7 +197,7 @@
<p>
The <path>/var/tmp/ccache</path> location is Portage' default ccache home
directory; if you want to alter this setting you can set the <c>CCACHE_DIR</c>
-variable in <path>/etc/make.conf</path>.
+variable in <path>/etc/portage/make.conf</path>.
</p>
<p>
@@ -270,7 +270,7 @@
it. For instance, if the prebuilt packages are on ftp://buildhost/gentoo:
</p>
-<pre caption="Setting PORTAGE_BINHOST in /etc/make.conf">
+<pre caption="Setting PORTAGE_BINHOST in /etc/portage/make.conf">
PORTAGE_BINHOST="ftp://buildhost/gentoo";
</pre>
@@ -365,8 +365,8 @@
</pre>
<p>
-Next, edit <path>/etc/make.conf</path> and enable support for validating the
-signed Portage tree snapshots (using <c>FEATURES="webrsync-gpg"</c>) and
+Next, edit <path>/etc/portage/make.conf</path> and enable support for
validating
+the signed Portage tree snapshots (using <c>FEATURES="webrsync-gpg"</c>) and
disabling updating the Portage tree using the regular <c>emerge --sync</c>
method.
</p>
1.80 xml/htdocs/doc/en/handbook/hb-working-portage.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.80&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.80&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?r1=1.79&r2=1.80
Index: hb-working-portage.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- hb-working-portage.xml 22 May 2012 18:40:06 -0000 1.79
+++ hb-working-portage.xml 24 Jul 2012 12:12:52 -0000 1.80
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.79
2012/05/22 18:40:06 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.80
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
maintain the software on his system.
</abstract>
-<version>5</version>
-<date>2012-05-22</date>
+<version>6</version>
+<date>2012-07-24</date>
<section>
<title>Welcome to Portage</title>
@@ -410,10 +410,10 @@
<p>
The variable that controls permitted licenses is <c>ACCEPT_LICENSE</c>, which
-can be set in <path>/etc/make.conf</path>:
+can be set in <path>/etc/portage/make.conf</path>:
</p>
-<pre caption="Default ACCEPT_LICENSE in /etc/make.conf">
+<pre caption="Default ACCEPT_LICENSE in /etc/portage/make.conf">
ACCEPT_LICENSE="* -@EULA"
</pre>
@@ -424,8 +424,8 @@
</p>
<p>
-You can set <c>ACCEPT_LICENSE</c> globally in <path>/etc/make.conf</path>, or
-you can specify it on a per-package basis in
+You can set <c>ACCEPT_LICENSE</c> globally in
<path>/etc/portage/make.conf</path>
+, or you can specify it on a per-package basis in
<path>/etc/portage/package.license</path>.
</p>
@@ -458,7 +458,7 @@
license group, as well as a few other groups and individual licenses:
</p>
-<pre caption="ACCEPT_LICENSE in /etc/make.conf">
+<pre caption="ACCEPT_LICENSE in /etc/portage/make.conf">
ACCEPT_LICENSE="@GPL-COMPATIBLE @OSI-APPROVED @EULA atheros-hal BitstreamVera"
</pre>
@@ -641,7 +641,7 @@
<li>
<b>license</b> means that the package's license is not compatible with your
<c>ACCEPT_LICENSE</c> setting. You must explicitly permit its license or
- license group by setting it in <path>/etc/make.conf</path> or in
+ license group by setting it in <path>/etc/portage/make.conf</path> or in
<path>/etc/portage/package.license</path>. Refer to <uri
link="#license">Licenses</uri> to learn how licenses work.
</li>
@@ -682,7 +682,7 @@
<p>
To resolve this, either add the requested USE flag to your global USE flags in
-<path>/etc/make.conf</path>, or set it for the specific package in
+<path>/etc/portage/make.conf</path>, or set it for the specific package in
<path>/etc/portage/package.use</path>.
</p>
1.37 xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml?rev=1.37&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml?rev=1.37&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml?r1=1.36&r2=1.37
Index: hb-working-rcscripts.xml
===================================================================
RCS file:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- hb-working-rcscripts.xml 17 Sep 2011 12:45:11 -0000 1.36
+++ hb-working-rcscripts.xml 24 Jul 2012 12:12:52 -0000 1.37
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml,v 1.36
2011/09/17 12:45:11 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-rcscripts.xml,v 1.37
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -14,8 +14,8 @@
these aspects and explains how to deal with these scripts.
</abstract>
-<version>5</version>
-<date>2011-09-17</date>
+<version>6</version>
+<date>2012-07-24</date>
<section>
<title>Runlevels</title>
@@ -390,8 +390,8 @@
<p>
Such a configuration file contains variables and variables alone (just like
-<path>/etc/make.conf</path>), making it very easy to configure services. It
also
-allows us to provide more information about the variables (as comments).
+<path>/etc/portage/make.conf</path>), making it very easy to configure
services.
+It also allows us to provide more information about the variables (as
comments).
</p>
</body>
1.52 xml/htdocs/doc/en/handbook/hb-working-use.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml?rev=1.52&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml?rev=1.52&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml?r1=1.51&r2=1.52
Index: hb-working-use.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- hb-working-use.xml 9 Jul 2012 04:34:16 -0000 1.51
+++ hb-working-use.xml 24 Jul 2012 12:12:52 -0000 1.52
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml,v 1.51
2012/07/09 04:34:16 nightmorph Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-use.xml,v 1.52
2012/07/24 12:12:52 swift Exp $ -->
<sections>
@@ -13,8 +13,8 @@
work with USE flags and understand how USE flags interact with your system.
</abstract>
-<version>2</version>
-<date>2012-07-08</date>
+<version>3</version>
+<date>2012-07-24</date>
<section>
<title>What are USE flags?</title>
@@ -128,9 +128,9 @@
<p>
The profile your system listens to is pointed to by the
-<path>/etc/make.profile</path> symlink. Each profile works on top of another,
-larger profile, the end result is therefore the sum of all profiles. The top
-profile is the <path>base</path> profile
+<path>/etc/portage/make.profile</path> symlink. Each profile works on top of
+another, larger profile, the end result is therefore the sum of all profiles.
+The top profile is the <path>base</path> profile
(<path>/usr/portage/profiles/base</path>).
</p>
@@ -158,17 +158,17 @@
<p>
To change this default setting, you need to add or remove keywords to the
<c>USE</c> variable. This is done globally by defining the <c>USE</c> variable
-in <path>/etc/make.conf</path>. In this variable you add the extra USE flags
you
-require, or remove the USE flags you don't want. This latter is done by
-prefixing the keyword with the minus-sign ("-").
+in <path>/etc/portage/make.conf</path>. In this variable you add the extra USE
+flags you require, or remove the USE flags you don't want. This latter is done
+by prefixing the keyword with the minus-sign ("-").
</p>
<p>
For instance, to remove support for KDE and QT but add support for ldap, the
-following <c>USE</c> can be defined in <path>/etc/make.conf</path>:
+following <c>USE</c> can be defined in <path>/etc/portage/make.conf</path>:
</p>
-<pre caption="An example USE setting in /etc/make.conf">
+<pre caption="An example USE setting in /etc/portage/make.conf">
USE="-kde -qt4 ldap"
</pre>
@@ -213,10 +213,10 @@
<p>
Sometimes you want to set a certain USE setting only once. Instead of editing
-<path>/etc/make.conf</path> twice (to do and undo the USE changes) you can
just
-declare the USE variable as environment variable. Remember that, when you
-re-emerge or update this application (either explicitly or as part of a system
-update) your changes will be lost!
+<path>/etc/portage/make.conf</path> twice (to do and undo the USE changes) you
+can just declare the USE variable as environment variable. Remember that, when
+you re-emerge or update this application (either explicitly or as part of a
+system update) your changes will be lost!
</p>
<p>
@@ -248,7 +248,7 @@
your profile
</li>
<li>
- User-defined USE setting in <path>/etc/make.conf</path>
+ User-defined USE setting in <path>/etc/portage/make.conf</path>
</li>
<li>
User-defined USE setting in <path>/etc/portage/package.use</path>
