config additions for elog

svn path=/main/trunk/; revision=2312

13 files changed, 520 insertions, 0 deletions

diff --git a/cnf/make.conf b/cnf/make.conf
index 000cfdc83..211aa85a5 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -317,3 +317,43 @@ CHOST="i686-pc-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index d90a75fd3..b4d7a780a 100644
--- a/cnf/make.conf.alpha
+++ b/cnf/make.conf.alpha
@@ -303,3 +303,43 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64
index cd73d793a..2b8cc7284 100644
--- a/cnf/make.conf.amd64
+++ b/cnf/make.conf.amd64
@@ -314,3 +314,43 @@ CHOST="x86_64-pc-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index 528e8e6cb..ef4b0da1f 100644
--- a/cnf/make.conf.arm
+++ b/cnf/make.conf.arm
@@ -311,3 +311,43 @@ CHOST="armv4l-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index f935d13d2..53807126a 100644
--- a/cnf/make.conf.hppa
+++ b/cnf/make.conf.hppa
@@ -320,3 +320,43 @@ CHOST="hppa-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64
index 20a81f7c5..b3ef70ff2 100644
--- a/cnf/make.conf.ia64
+++ b/cnf/make.conf.ia64
@@ -282,3 +282,43 @@ CHOST="ia64-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index e06cbd9ec..e67d419c5 100644
--- a/cnf/make.conf.mips
+++ b/cnf/make.conf.mips
@@ -300,3 +300,43 @@ CHOST="mips-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index 3cf2c7369..f173ed2c6 100644
--- a/cnf/make.conf.ppc
+++ b/cnf/make.conf.ppc
@@ -340,3 +340,43 @@ CHOST="powerpc-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.ppc64 b/cnf/make.conf.ppc64
index 54ac76cae..18d172bd8 100644
--- a/cnf/make.conf.ppc64
+++ b/cnf/make.conf.ppc64
@@ -318,3 +318,43 @@ CHOST="powerpc64-unknown-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390
index 6f5297d1d..c5bf313e0 100644
--- a/cnf/make.conf.s390
+++ b/cnf/make.conf.s390
@@ -282,3 +282,43 @@ CHOST="s390-ibm-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index 48c5ddb43..eed13cae4 100644
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -318,3 +318,43 @@
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86
index cd2da93db..32b5de719 100644
--- a/cnf/make.conf.x86
+++ b/cnf/make.conf.x86
@@ -317,3 +317,43 @@ CHOST="i686-pc-linux-gnu"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)
diff --git a/cnf/make.conf.x86-fbsd b/cnf/make.conf.x86-fbsd
index 98650bfaa..340bd2b61 100644
--- a/cnf/make.conf.x86-fbsd
+++ b/cnf/make.conf.x86-fbsd
@@ -308,3 +308,43 @@ CHOST="i686-unknown-freebsd5.3"
 #     The file format is one pattern per line, blanks and ';' or '#' lines are
 #     comments. See 'man rsync' for more details on the exclude-from format.
 #RSYNC_EXCLUDEFROM=/etc/portage/rsync_excludes
+
+# logging related variables:
+# PORTAGE_ELOG_CLASSES: selects messages to be logged, possible values are:
+#                          info, warn, error, log
+#                       Warning: commenting this will disable elog
+PORTAGE_ELOG_CLASSES="warn error log"
+
+# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
+#                      included in portage are (empty means logging is disabled):
+#                          save (saves one log per package in $PORTAGE_TMPDIR/elogs)
+#                          custom (passes all messages to $PORTAGE_LOG_COMMAND)
+#                          syslog (sends all messages to syslog)
+#                          mail (send all messages to the mailserver defined 
+#                                in $PORTAGE_LOG_MAILURI)
+#                      To use elog you should enable at least one module
+#PORTAGE_ELOG_SYSTEM="save mail"
+
+# PORTAGE_ELOG_COMMAND: only used with the "custom" logging module. Specifies a command
+#                      to process log messages. Two variables are expanded:
+#                          ${PACKAGE} - expands to the cpv entry of the processed 
+#                                       package (see $PVR in ebuild(5))
+#                          ${LOGFILE} - absolute path to the logfile
+#PORTAGE_ELOG_COMMAND="/path/to/logprocessor -p ${PACKAGE} -f ${LOGFILE}"
+
+# PORTAGE_ELOG_MAILURI: this variable holds all important settings for the mail
+#                       module. In most cases listing the recipient adress and
+#                       the receiving mailserver should be sufficient, but you can
+#                       also use advanced settings like authentication or TLS. The
+#                       full syntax is:
+#                           adress [[user:passwd@]mailserver[:port]]
+#                       where
+#                           adress:     recipient adress
+#                           user:       username for smtp auth (defaults to none)
+#                           passwd:     password for smtp auth (defaults to none)
+#                           mailserver: smtp server that should be used to deliver the mail (defaults to localhost)
+#                           port:       port to use on the given smtp server (defaults to 25, values > 100000 indicate that starttls should be used on (port-100000))
+#                       Examples:
+#PORTAGE_ELOG_MAILURI="root@localhost localhost" (this is also the default setting)
+#PORTAGE_ELOG_MAILURI="user@some.domain mail.some.domain" (sends mails to user@some.domain using the mailserver mail.some.domain)
+#PORTAGE_ELOG_MAILURI="user@some.domain user:secret@mail.some.domain:100465" (this is left uncommented as a reader excercise ;)