Add support for EMERGE_DEFAULT_OPTS configuration variable for setting

options that emerge always considers to be specified.

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

diff --git a/bin/emerge b/bin/emerge
index 82915725d412bec887ba56c766c65b08065bfae2..a41b372a999506008ccdddcfb84aa84b9a9a1afb 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -222,7 +222,7 @@ edebug=0
 
 # process short actions
 tmpcmdline=sys.argv[1:]
-#tmpcmdline.extend(portage.settings["EMERGE_OPTS"].split())
+tmpcmdline.extend(portage.settings["EMERGE_DEFAULT_OPTS"].split())
 cmdline=[]
 for x in tmpcmdline:
        if x[0:1]=="-" and x[1:2]!="-":
@@ -3025,7 +3025,7 @@ elif "info"==myaction:
                myvars = ['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
                          'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR',
                          'PORTDIR_OVERLAY', 'USE', 'CHOST', 'CFLAGS', 'CXXFLAGS',
-                         'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES']
+                         'ACCEPT_KEYWORDS', 'SYNC', 'FEATURES', 'EMERGE_DEFAULT_OPTS']
 
                myvars.extend(portage_util.grabfile(portage.settings["PORTDIR"]+"/profiles/info_vars"))
 

diff --git a/cnf/make.conf b/cnf/make.conf
index fb2cad1e8768cb834a802a1b027a13b7d4978a5f..9c23f09d0d7ee43a7c4fb7912d3d1f762b85fdbe 100644 (file)
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -222,6 +222,12 @@ CHOST="i686-pc-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.alpha b/cnf/make.conf.alpha
index 32cba977cb0228a094a9967f2ba0a9b315a2de52..b08342ba22e5ad616b1483657afaec28f4168e73 100644 (file)
--- a/cnf/make.conf.alpha
+++ b/cnf/make.conf.alpha
@@ -208,6 +208,12 @@ CFLAGS="-mcpu=ev5 -O3 -pipe "
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.amd64 b/cnf/make.conf.amd64
index f2de1cef3bc0f247baf0a422b111ac98e40578eb..caff3c59e104a0680e397a5588e72008a46b5724 100644 (file)
--- a/cnf/make.conf.amd64
+++ b/cnf/make.conf.amd64
@@ -219,6 +219,12 @@ CHOST="x86_64-pc-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.arm b/cnf/make.conf.arm
index 3f07565c231ce7adfec87ceee8a84bda72d2e299..34ca3990a211f3856a4e69e7406cd2ea8485d107 100644 (file)
--- a/cnf/make.conf.arm
+++ b/cnf/make.conf.arm
@@ -216,6 +216,12 @@ CHOST="armv4l-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.hppa b/cnf/make.conf.hppa
index 6f948642a060ba1866f3eba6fefda8bda357f889..9241bcc3b2acc0db41c64e552f841503f8a96fce 100644 (file)
--- a/cnf/make.conf.hppa
+++ b/cnf/make.conf.hppa
@@ -225,6 +225,12 @@ CHOST="hppa-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.ia64 b/cnf/make.conf.ia64
index 81f6a29a84864fdf4ec2939b80cd495540337547..7de834833ea0fb3b0da585c4081a08f0e35ce2a5 100644 (file)
--- a/cnf/make.conf.ia64
+++ b/cnf/make.conf.ia64
@@ -187,6 +187,12 @@ CHOST="ia64-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.mips b/cnf/make.conf.mips
index d63369da633d80d56b1eedc1345163c3b5b8b48c..c0834b0198f7a5545b6adf51fffeeeea14ad2220 100644 (file)
--- a/cnf/make.conf.mips
+++ b/cnf/make.conf.mips
@@ -205,6 +205,12 @@ CHOST="mips-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.ppc b/cnf/make.conf.ppc
index d15bc999eb50d23b5ca9a9b94af0788dc7921765..922536f6df8bf8100526dbf498191bacc47f3896 100644 (file)
--- a/cnf/make.conf.ppc
+++ b/cnf/make.conf.ppc
@@ -245,6 +245,12 @@ CHOST="powerpc-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.ppc64 b/cnf/make.conf.ppc64
index 35becf4ec893352b71e276eec38db1c9e2577c9a..2da0e6049ab2fd1aa248f303a90af40b4498dc43 100644 (file)
--- a/cnf/make.conf.ppc64
+++ b/cnf/make.conf.ppc64
@@ -229,6 +229,12 @@ CHOST="powerpc64-unknown-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.s390 b/cnf/make.conf.s390
index fca5c058f89b663290b55aac99fb4e893238cf9e..ad8097d2e93474bc8289fd6100a9411d575ece3d 100644 (file)
--- a/cnf/make.conf.s390
+++ b/cnf/make.conf.s390
@@ -187,6 +187,12 @@ CHOST="s390-ibm-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.sparc b/cnf/make.conf.sparc
index b91446bf66e46ade2ad9f3bf7dd235679aab87b0..e1ab499d6773f3a192e24cf1eaa065bb3e62cad2 100644 (file)
--- a/cnf/make.conf.sparc
+++ b/cnf/make.conf.sparc
@@ -223,6 +223,12 @@
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.x86 b/cnf/make.conf.x86
index 4c769dbf70f3d1a25b5cdc90a19b4536c95f77a9..d98231edaf610fa1729c6a1e9947fb2a40956a08 100644 (file)
--- a/cnf/make.conf.x86
+++ b/cnf/make.conf.x86
@@ -222,6 +222,12 @@ CHOST="i686-pc-linux-gnu"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/cnf/make.conf.x86-fbsd b/cnf/make.conf.x86-fbsd
index 115aca5545db61a28a42ac0b5f0e19d7fedf71ca..1149e41619fde1a4cf391aec19e8366119a31d47 100644 (file)
--- a/cnf/make.conf.x86-fbsd
+++ b/cnf/make.conf.x86-fbsd
@@ -222,6 +222,12 @@ CHOST="i686-unknown-freebsd5.3"
 # Advanced Features
 # =================
 #
+# EMERGE_DEFAULT_OPTS allows emerge to act as if certain options are
+#     specified on every run. Useful options include --ask, --verbose,
+#     --usepkg and many others. Options that are not useful, such as --help,
+#     are not filtered.
+#EMERGE_DEFAULT_OPTS=""
+#
 # MAKEOPTS provides extra options that may be passed to 'make' when a
 #     program is compiled. Presently the only use is for specifying
 #     the number of parallel makes (-j) to perform. The suggested number

diff --git a/man/make.conf.5 b/man/make.conf.5
index 2ae9278b2cf202c9293d5d7eab0130eddc9ccfb7..82f79d9df6ddb4e43c70a5aab38e02b170dce6da 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -98,6 +98,9 @@ Defaults to ${PORTDIR}/distfiles.
 Defines whether or not to ignore audible beeps when displaying important
 informational messages.  This variable is unset by default.
 .TP
+.B EMERGE_DEFAULT_OPTS
+Options to append to the end of the emerge command line on every invocation.
+.TP
 .B EPAUSE_IGNORE
 Defines whether or not to ignore short pauses that occur when displaying
 important informational messages.  This variable is unset by default.