Bug #245779 - Document the new category subdirectory behavior for PKGDIR.

(trunk r11997)

svn path=/main/branches/2.1.6/; revision=11998

diff --git a/man/ebuild.1 b/man/ebuild.1
index 4baff262094b55b8a49bcd010a6cd2ac7d35c42f..b4d4fd127735a45820006c95d36969573b6edabd 100644 (file)
--- a/man/ebuild.1
+++ b/man/ebuild.1
@@ -161,9 +161,7 @@ or other similar setups that the user may wish to run.
 .BR package
 This command is a lot like the \fImerge\fR command, except that after
 fetching, unpacking, compiling and installing, a .tbz2 binary package
-tarball is created and stored in  ${PKGDIR}/All (${PKGDIR} defaults to
-/usr/portage/packages).  A symbolic link is created in
-${PKGDIR}/${CATEGORY} that points to the package in ${PKGDIR}/All.
+tarball is created and stored in \fBPKGDIR\fR (see \fBmake.conf\fR(5)).
 .TP
 .BR rpm
 Builds a RedHat RPM package from the files in the temporary

diff --git a/man/emerge.1 b/man/emerge.1
index 6209832e7d9ad1fbee16a93f08efa0d9b6ffd179..738f160f90b9285ccb3ee7de6f18a6dd9a87f03f 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -246,8 +246,8 @@ Tells emerge to build binary packages for all ebuilds processed in
 addition to actually merging the packages.  Useful for maintainers
 or if you administrate multiple Gentoo Linux systems (build once,
 emerge tbz2s everywhere) as well as disaster recovery. The package
-will be created in the
-\fI${PKGDIR}/All\fR directory.  An alternative for already\-merged
+will be created in the \fBPKGDIR\fR directory (see \fBmake.conf\fR(5)).
+An alternative for already\-merged
 packages is to use \fBquickpkg\fR(1) which creates a tbz2 from the
 live filesystem.
 .TP

diff --git a/man/make.conf.5 b/man/make.conf.5
index a36fc4ff30aab1c43411cfb02f23a353afcb8343..4913747e4d4f16602793584ec86084a39c8b6256 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -401,7 +401,13 @@ Defines if color should be disabled by default.
 Defaults to false.
 .TP
 \fBPKGDIR\fR = \fI[path]\fR
-Defines the location where created .tbz2 binary packages will be stored.  Note
+Defines the location where created .tbz2 binary packages will be
+stored when the \fBemerge\fR(1) \fB\-\-buildpkg\fR option is enabled.
+By default, a given package is stored in a subdirectory corresponding
+to it's category. However, for backward compatibility with the layout
+used by older versions of portage, if the \fI${PKGDIR}/All\fR directory
+exists then all packages will be stored inside of it and symlinks to
+the packages will be created in the category subdirectories. Note
 that locations under /usr/portage are not necessarily safe for data storage.
 See the \fBPORTDIR\fR documentation for more information.
 .br