[gentoo-commits] portage r11998 - main/branches/2.1.6/man

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-11-19 03:15:33 +0000 (Wed, 19 Nov 2008)
New Revision: 11998

Modified:
   main/branches/2.1.6/man/ebuild.1
   main/branches/2.1.6/man/emerge.1
   main/branches/2.1.6/man/make.conf.5
Log:
Bug #245779 - Document the new category subdirectory behavior for PKGDIR.
(trunk r11997)


Modified: main/branches/2.1.6/man/ebuild.1
===================================================================
--- main/branches/2.1.6/man/ebuild.1	2008-11-19 03:14:48 UTC (rev 11997)
+++ main/branches/2.1.6/man/ebuild.1	2008-11-19 03:15:33 UTC (rev 11998)
@@ -161,9 +161,7 @@
 .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

Modified: main/branches/2.1.6/man/emerge.1
===================================================================
--- main/branches/2.1.6/man/emerge.1	2008-11-19 03:14:48 UTC (rev 11997)
+++ main/branches/2.1.6/man/emerge.1	2008-11-19 03:15:33 UTC (rev 11998)
@@ -246,8 +246,8 @@
 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

Modified: main/branches/2.1.6/man/make.conf.5
===================================================================
--- main/branches/2.1.6/man/make.conf.5	2008-11-19 03:14:48 UTC (rev 11997)
+++ main/branches/2.1.6/man/make.conf.5	2008-11-19 03:15:33 UTC (rev 11998)
@@ -401,7 +401,13 @@
 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