Merged from trunk 6806:6812

   +------------------------------------------------------------------------+
   | 6807    | Move news about ** token in package.keywords to the 2.1.3    |
   | zmedico | section.                                                     |
   |---------+--------------------------------------------------------------|
   | 6808    | Update the PORT_LOGDIR docs for bug #82378. Thanks to        |
   | zmedico | Arfrever FTA for reporting.                                  |
   |---------+--------------------------------------------------------------|
   | 6809    | Update the PORT_LOGDIR docs for bug #82378. Thanks to        |
   | zmedico | Arfrever FTA for reporting.                                  |
   |---------+--------------------------------------------------------------|
   | 6810    | Remove stray newline.                                        |
   | zmedico |                                                              |
   |---------+--------------------------------------------------------------|
   | 6812    | Add a note about preservation of timestamps on merged files. |
   | zmedico |                                                              |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6939

diff --git a/NEWS b/NEWS
index 3dce9553727640e708ae150248ff703c84702acc..d7c316d83895a2d5585caae8ec21ee045d817bc0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,6 @@ portage-2.2
 -------------
 
 * Allow per-module setting of PORTAGE_ELOG_CLASSES
-* Add ** as new token for package.keywords to bypass the keyword visibility layer
 * Namespace sanitizing: move all portage related code into portage.* namespace,
   rename portage_foo modules to portage.foo (but keep symlinks for compability)
 * Add license visibility filtering (GLEP 23)
@@ -20,9 +19,13 @@ portage-2.2
 portage-2.1.3
 -------------
 
+* Add ** as new token for package.keywords to bypass the keyword visibility layer
 * USE_EXPAND variables such as LINGUAS support a * wildcard that will enable
   all of the corresponding flags that are listed in IUSE for a given package.
   USE_EXPAND wildcards such as linguas_* are supported in USE and package.use.
+* The merge process preserves the modification timestamp of files that it
+  installs. The unmerge process will not uninstall files that are claimed by
+  another package in the same slot.
 
 portage-2.1.2
 -------------

diff --git a/cnf/make.conf b/cnf/make.conf
index 4ed71dd63f43c958622e110224c13b6080de48ad..47ed6c819b39290d9aae818b129698182dee2c6d 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -97,12 +97,11 @@
 #PKGDIR=/usr/portage/packages
 #
 # PORT_LOGDIR is the location where portage will store all the logs it
-#     creates from each individual merge. They are stored as NNNN-$PF.log
-#     in the directory specified. This is disabled until you enable it by
-#     providing a directory. Permissions will be modified as needed IF the
-#     directory exists, otherwise logging will be disabled. NNNN is the
-#     increment at the time the log is created. Logs are thus sequential.
-#     The common setting is to use the /var/log/portage path.
+#     creates from each individual merge. They are stored as
+#     ${CATEGORY}:${PF}:YYYYMMDD-HHMMSS.log in the directory specified.
+#     If the direcory does not exist, it will be created automatically and
+#     group permissions will be applied to it.  If the directory already
+#     exists, portage will not modify it's permissions.
 #PORT_LOGDIR=""
 #
 # PORTDIR_OVERLAY is a directory where local ebuilds may be stored without

diff --git a/man/make.conf.5 b/man/make.conf.5
index 64bd7bece6134ce7a950841c53f70b70a8158c5e..db94770a1b3a27816d708c8b9b0c416c06874dd0 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -324,7 +324,11 @@ Defaults to /usr/portage/packages.
 .TP
 .B PORT_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.
-Logs are created only when this is set and writable.
+Logs are created only when this is set. They are stored as
+${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
+direcory does not exist, it will be created automatically and group permissions
+will be applied to it.  If the directory already exists, portage will not
+modify it's permissions.
 .TP
 \fBPORTAGE_BINHOST\fR = \fI"ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon\-xp/"\fR
 This is the host from which portage will grab prebuilt\-binary packages.