aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--doc/configuration/Makefile.am16
-rw-r--r--doc/configuration/general.html.part.in (renamed from doc/configuration/environment.html.part.in)7
-rw-r--r--doc/configuration/index.html.part2
-rw-r--r--doc/configuration/toplinks.html.part.in2
-rw-r--r--doc/index.html.part.in2
-rw-r--r--doc/overview/gettingstarted.html.part6
-rw-r--r--paludis/environments/paludis/paludis_config.cc85
-rwxr-xr-xpython/dep_list_TEST_setup.sh2
-rwxr-xr-xpython/environment_TEST_setup.sh2
-rwxr-xr-xpython/mask_TEST_setup.sh2
-rwxr-xr-xpython/package_database_TEST_setup.sh2
-rwxr-xr-xpython/repository_TEST_setup.sh2
-rwxr-xr-xruby/action_TEST_setup.sh2
-rwxr-xr-xruby/dep_list_TEST_setup.sh2
-rwxr-xr-xruby/dep_spec_TEST_setup.sh2
-rwxr-xr-xruby/dep_tag_TEST_setup.sh2
-rwxr-xr-xruby/environment_TEST_setup.sh2
-rwxr-xr-xruby/generator_TEST_setup.sh2
-rwxr-xr-xruby/package_database_TEST_setup.sh2
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh2
-rwxr-xr-xruby/repository_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/continue_on_failure_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/pretend_TEST_setup.sh2
-rw-r--r--vim/ftdetect/paludis.vim4
-rw-r--r--vim/syntax/Makefile.am2
-rw-r--r--vim/syntax/paludis-environment-conf.vim53
-rw-r--r--vim/syntax/paludis-general-conf.vim53
29 files changed, 154 insertions, 116 deletions
diff --git a/.gitignore b/.gitignore
index 8911e38ae..2cb118751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,8 +93,8 @@ paludis-*.*.*.tar.bz2
/doc/configuration/bashrc.html
/doc/configuration/bashrc.html.part
/doc/configuration/configfiles.html
-/doc/configuration/environment.html
-/doc/configuration/environment.html.part
+/doc/configuration/general.html
+/doc/configuration/general.html.part
/doc/configuration/envvars.html
/doc/configuration/erepository.html
/doc/configuration/erepository.html.part
diff --git a/doc/configuration/Makefile.am b/doc/configuration/Makefile.am
index d3efbdae5..e518e2ca7 100644
--- a/doc/configuration/Makefile.am
+++ b/doc/configuration/Makefile.am
@@ -17,8 +17,8 @@ CLEANFILES += \
fetchlist \
specpath.html \
specpath.html.part \
- environment.html \
- environment.html.part \
+ general.html \
+ general.html.part \
keywords.html \
keywords.html.part \
packagemask.html \
@@ -44,7 +44,7 @@ EXTRA_DIST = \
fetchers.html.part.in \
envvars.html.part \
specpath.html.part.in \
- environment.html.part.in \
+ general.html.part.in \
keywords.html.part.in \
packagemask.html.part.in \
licenses.html.part.in \
@@ -65,7 +65,7 @@ paludisconfigurationhtml_DATA = \
fetchers.html \
envvars.html \
specpath.html \
- environment.html \
+ general.html \
keywords.html \
packagemask.html \
mirrors.html \
@@ -149,11 +149,11 @@ specpath.html.part : $(srcdir)/specpath.html.part.in $(srcdir)/paludisenvironmen
-e 's,###PALUDISENVIRONMENTONLY###,,g' \
< $(srcdir)/specpath.html.part.in > specpath.html.part
-environment.html.part : $(srcdir)/environment.html.part.in $(srcdir)/paludisenvironmentonly.html.part
+general.html.part : $(srcdir)/general.html.part.in $(srcdir)/paludisenvironmentonly.html.part
sed \
-e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-e 's,###PALUDISENVIRONMENTONLY###,,g' \
- < $(srcdir)/environment.html.part.in > environment.html.part
+ < $(srcdir)/general.html.part.in > general.html.part
keywords.html.part : $(srcdir)/keywords.html.part.in $(srcdir)/paludisenvironmentonly.html.part
sed \
@@ -203,8 +203,8 @@ fetchers.html.part : $(srcdir)/fetchers.html.part.in fetchlist
-e 's,###FETCHERS###,,g' \
< $(srcdir)/fetchers.html.part.in > fetchers.html.part
-environment.html : header.html.part environment.html.part footer.html.part
- cat header.html.part environment.html.part footer.html.part > $@
+general.html : header.html.part general.html.part footer.html.part
+ cat header.html.part general.html.part footer.html.part > $@
keywords.html : header.html.part keywords.html.part footer.html.part
cat header.html.part keywords.html.part footer.html.part > $@
diff --git a/doc/configuration/environment.html.part.in b/doc/configuration/general.html.part.in
index 574ad4543..8fb5a957b 100644
--- a/doc/configuration/environment.html.part.in
+++ b/doc/configuration/general.html.part.in
@@ -1,12 +1,11 @@
<!-- vim: set tw=120 ft=html sw=4 sts=4 et : -->
-<h1>environment.conf</h1>
+<h1>general.conf</h1>
###PALUDISENVIRONMENTONLY###
-<p>The <code>environment.conf</code> file can be used to control general environment settings. It is a standard
-key=value configuration file, and may optionally be in bash format. This file overwrites the key=value sets from the
-commandline given in --environment(-E). Recognised keys are as follows:</p>
+<p>The <code>general.conf</code> file can be used to control general settings. It is a standard key=value configuration
+file, and may optionally be in bash format.</p>
<dl>
<dt><code>world</code></dt>
diff --git a/doc/configuration/index.html.part b/doc/configuration/index.html.part
index 2431b5315..5aaf19b76 100644
--- a/doc/configuration/index.html.part
+++ b/doc/configuration/index.html.part
@@ -25,7 +25,7 @@
and <code>.bash</code> dynamic configuration files.</li>
<li><a href="specs.html">Dependency specifications</a> in general.</li>
<li><a href="specpath.html">specpath.conf</a>, and where Paludis looks for configuration files.</li>
- <li><a href="environment.html">environment.conf</a>: for environment options.</li>
+ <li><a href="general.html">general.conf</a>: for general options.</li>
<li><a href="keywords.html">keywords.conf or platforms.conf</a>: for keywords or platforms.</li>
<li><a href="use.html">use.conf or options.conf</a>: for USE flags or options.</li>
<li><a href="licenses.html">licenses.conf or licences.conf</a>: for licence filtering.</li>
diff --git a/doc/configuration/toplinks.html.part.in b/doc/configuration/toplinks.html.part.in
index 694025a13..de46f807d 100644
--- a/doc/configuration/toplinks.html.part.in
+++ b/doc/configuration/toplinks.html.part.in
@@ -18,7 +18,7 @@
</td>
<td class="currentpage">
- <a href="###TOPURI###configuration/environment.html">environment.conf</a>
+ <a href="###TOPURI###configuration/general.html">general.conf</a>
</td>
<td class="currentpage">
diff --git a/doc/index.html.part.in b/doc/index.html.part.in
index 50fb5b2dc..5bda6579c 100644
--- a/doc/index.html.part.in
+++ b/doc/index.html.part.in
@@ -59,7 +59,7 @@ the exheres repository format.</p>
and <code>.bash</code> dynamic configuration files.</li>
<li><a href="configuration/specs.html">Dependency specifications</a> in general.</li>
<li><a href="configuration/specpath.html">specpath.conf</a>, and where Paludis looks for configuration files.</li>
- <li><a href="configuration/environment.html">environment.conf</a>: for environment options.</li>
+ <li><a href="configuration/general.html">general.conf</a>: for general options.</li>
<li><a href="configuration/keywords.html">keywords.conf or platforms.conf</a>: for keywords or platforms.</li>
<li><a href="configuration/use.html">use.conf or options.conf</a>: for USE flags or options.</li>
<li><a href="configuration/licenses.html">licenses.conf or licences.conf</a>: for licence filtering.</li>
diff --git a/doc/overview/gettingstarted.html.part b/doc/overview/gettingstarted.html.part
index 98d6882d1..cc3ee531c 100644
--- a/doc/overview/gettingstarted.html.part
+++ b/doc/overview/gettingstarted.html.part
@@ -45,7 +45,7 @@ another filesystem root).</p>
<p>By default, will be unable to use packages that use EAPIs that Portage does not support. The packages in the Paludis
overlay fall into this category. You may override this by setting the <code>PALUDIS_IGNORE_BREAKS_PORTAGE</code>
in <code>make.conf</code>; the allowed values are the same as for the <code>accept_breaks_portage</code>
-key in Paludis's <a href="../configuration/environment.html"><code>environment.conf</code></a>,
+key in Paludis's <a href="../configuration/general.html"><code>general.conf</code></a>,
except that the default is an empty string.</p>
<p>Next, proceed to <a href="#testing">Testing a configuration</a>.</p>
@@ -88,9 +88,9 @@ should usually be <code>/etc</code>:</p>
mkdir -p /etc/paludis/repositories
</pre>
-<h3>environment.conf</h3>
+<h3>general.conf</h3>
-<p>The file <code>/etc/paludis/environment.conf</code> must, at minimum, specify the location of the world file
+<p>The file <code>/etc/paludis/general.conf</code> must, at minimum, specify the location of the world file
(other options are described elsewhere in the documentation). The usual location for Paludis on Gentoo and
Gentoo-derived systems is:</p>
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 8e4106a0c..75f8e71bc 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -190,8 +190,8 @@ namespace paludis
mutable std::tr1::shared_ptr<uid_t> reduced_uid;
mutable std::tr1::shared_ptr<gid_t> reduced_gid;
- mutable Mutex environment_conf_mutex;
- mutable bool has_environment_conf;
+ mutable Mutex general_conf_mutex;
+ mutable bool has_general_conf;
mutable bool accept_all_breaks_portage;
mutable Set<std::string> accept_breaks_portage;
mutable std::string reduced_username;
@@ -200,7 +200,7 @@ namespace paludis
Implementation(PaludisEnvironment * const);
- void need_environment_conf() const;
+ void need_general_conf() const;
};
Implementation<PaludisConfig>::Implementation(PaludisEnvironment * e) :
@@ -215,7 +215,7 @@ namespace paludis
package_unmask_conf(new PackageMaskConf(e)),
mirrors_conf(new MirrorsConf(e)),
output_conf(new OutputConf(e)),
- has_environment_conf(false),
+ has_general_conf(false),
accept_all_breaks_portage(false),
reduced_username(getenv_with_default("PALUDIS_REDUCED_USERNAME", "paludisbuild")),
commandline_environment(new Map<std::string, std::string>)
@@ -223,14 +223,14 @@ namespace paludis
}
void
- Implementation<PaludisConfig>::need_environment_conf() const
+ Implementation<PaludisConfig>::need_general_conf() const
{
- Lock lock(environment_conf_mutex);
+ Lock lock(general_conf_mutex);
- if (has_environment_conf)
+ if (has_general_conf)
return;
- Context context("When loading environment.conf:");
+ Context context("When loading general.conf:");
std::tr1::shared_ptr<KeyValueConfigFile> kv;
std::tr1::shared_ptr<FSEntry> world_file;
@@ -246,21 +246,60 @@ namespace paludis
std::tr1::placeholders::_1,
std::tr1::placeholders::_2);
- if ((FSEntry(config_dir) / "environment.conf").exists())
+ if ((FSEntry(config_dir) / "general.conf").exists())
{
kv.reset(new KeyValueConfigFile(
+ FSEntry(config_dir) / "general.conf",
+ KeyValueConfigFileOptions(),
+ def_predefined,
+ &KeyValueConfigFile::no_transformation));
+ }
+ else if ((FSEntry(config_dir) / "general.bash").exists())
+ {
+ std::stringstream s;
+ Command cmd(Command("bash '" + stringify(FSEntry(config_dir) / "general.bash") + "'")
+ .with_setenv("PALUDIS_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
+ .with_setenv("PALUDIS_EBUILD_DIR", getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis"))
+ .with_stderr_prefix("general.bash> ")
+ .with_captured_stdout_stream(&s));
+ int exit_status(run_command(cmd));
+ kv.reset(new KeyValueConfigFile(
+ s,
+ KeyValueConfigFileOptions(),
+ def_predefined,
+ &KeyValueConfigFile::no_transformation));
+
+ if (exit_status != 0)
+ {
+ Log::get_instance()->message("paludis_environment.general.bash.failure", ll_warning, lc_context)
+ << "Script '" << (FSEntry(config_dir) / "general.bash") <<
+ "' returned non-zero exit status '" << exit_status << "'";
+ kv.reset();
+ }
+ }
+ else if ((FSEntry(config_dir) / "environment.conf").exists())
+ {
+ Log::get_instance()->message("paludis_environment.general.rename", ll_warning, lc_context)
+ << "The file '" << (FSEntry(config_dir) / "environment.conf") << "' should be renamed to '"
+ << (FSEntry(config_dir) / "general.conf") << "'.";
+
+ kv.reset(new KeyValueConfigFile(
FSEntry(config_dir) / "environment.conf",
KeyValueConfigFileOptions(),
def_predefined,
&KeyValueConfigFile::no_transformation));
}
- else if ((FSEntry(config_dir) / "environment.bash").exists())
+ else if ((FSEntry(config_dir) / "general.bash").exists())
{
+ Log::get_instance()->message("paludis_environment.general.rename", ll_warning, lc_context)
+ << "The file '" << (FSEntry(config_dir) / "environment.bash") << "' should be renamed to '"
+ << (FSEntry(config_dir) / "general.bash") << "'.";
+
std::stringstream s;
- Command cmd(Command("bash '" + stringify(FSEntry(config_dir) / "environment.bash") + "'")
+ Command cmd(Command("bash '" + stringify(FSEntry(config_dir) / "general.bash") + "'")
.with_setenv("PALUDIS_LOG_LEVEL", stringify(Log::get_instance()->log_level()))
.with_setenv("PALUDIS_EBUILD_DIR", getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis"))
- .with_stderr_prefix("environment.bash> ")
+ .with_stderr_prefix("general.bash> ")
.with_captured_stdout_stream(&s));
int exit_status(run_command(cmd));
kv.reset(new KeyValueConfigFile(
@@ -271,16 +310,16 @@ namespace paludis
if (exit_status != 0)
{
- Log::get_instance()->message("paludis_environment.environment_bash.failure", ll_warning, lc_context)
- << "Script '" << (FSEntry(config_dir) / "environment.bash") <<
+ Log::get_instance()->message("paludis_environment.general.bash.failure", ll_warning, lc_context)
+ << "Script '" << (FSEntry(config_dir) / "general.bash") <<
"' returned non-zero exit status '" << exit_status << "'";
kv.reset();
}
}
else
{
- Log::get_instance()->message("paludis_environment.no_environment_conf", ll_debug, lc_context)
- << "No environment.conf or environment.bash in '" << config_dir << "'";
+ Log::get_instance()->message("paludis_environment.no_general_conf", ll_debug, lc_context)
+ << "No general.conf or general.bash in '" << config_dir << "'";
std::stringstream str;
kv.reset(new KeyValueConfigFile(
str,
@@ -320,11 +359,11 @@ namespace paludis
if (! world_file)
Log::get_instance()->message("paludis_environment.world.no_world", ll_warning, lc_context)
<< "No world file specified. You should specify 'world = /path/to/world/file' in "
- << (FSEntry(config_dir) / "environment.conf")
+ << (FSEntry(config_dir) / "general.conf")
<< ". Any attempted updates to world will not be saved.";
world.reset(new World(env, world_file));
- has_environment_conf = true;
+ has_general_conf = true;
}
template <>
@@ -938,7 +977,7 @@ std::string
PaludisConfig::reduced_username() const
{
Context context("When determining reduced username:");
- _imp->need_environment_conf();
+ _imp->need_general_conf();
Log::get_instance()->message("paludis_environment.reduced_username", ll_debug, lc_context)
<< "Reduced username is '" << _imp->reduced_username << "'";
@@ -949,7 +988,7 @@ PaludisConfig::reduced_username() const
bool
PaludisConfig::accept_all_breaks_portage() const
{
- _imp->need_environment_conf();
+ _imp->need_general_conf();
return _imp->accept_all_breaks_portage;
}
@@ -957,7 +996,7 @@ PaludisConfig::accept_all_breaks_portage() const
const Set<std::string> &
PaludisConfig::accept_breaks_portage() const
{
- _imp->need_environment_conf();
+ _imp->need_general_conf();
return _imp->accept_breaks_portage;
}
@@ -1007,7 +1046,7 @@ PaludisConfig::mirrors_conf() const
std::tr1::shared_ptr<const World>
PaludisConfig::world() const
{
- _imp->need_environment_conf();
+ _imp->need_general_conf();
return _imp->world;
}
@@ -1019,7 +1058,7 @@ PaludisConfig::distribution() const
if (! _imp->distribution.empty())
return _imp->distribution;
- _imp->need_environment_conf();
+ _imp->need_general_conf();
if (_imp->distribution.empty())
_imp->distribution = getenv_with_default("PALUDIS_DISTRIBUTION", DEFAULT_DISTRIBUTION);
diff --git a/python/dep_list_TEST_setup.sh b/python/dep_list_TEST_setup.sh
index a9652ced1..a37c90c39 100755
--- a/python/dep_list_TEST_setup.sh
+++ b/python/dep_list_TEST_setup.sh
@@ -41,7 +41,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/python/environment_TEST_setup.sh b/python/environment_TEST_setup.sh
index 8ca20f825..ea96075df 100755
--- a/python/environment_TEST_setup.sh
+++ b/python/environment_TEST_setup.sh
@@ -37,7 +37,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/python/mask_TEST_setup.sh b/python/mask_TEST_setup.sh
index c4240b130..4492d2e2a 100755
--- a/python/mask_TEST_setup.sh
+++ b/python/mask_TEST_setup.sh
@@ -83,7 +83,7 @@ cat <<END > home/.paludis/keywords.conf
*/* test
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/python/package_database_TEST_setup.sh b/python/package_database_TEST_setup.sh
index d482b044c..2ba115d39 100755
--- a/python/package_database_TEST_setup.sh
+++ b/python/package_database_TEST_setup.sh
@@ -29,7 +29,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/python/repository_TEST_setup.sh b/python/repository_TEST_setup.sh
index 5e9d5c113..55428ccb2 100755
--- a/python/repository_TEST_setup.sh
+++ b/python/repository_TEST_setup.sh
@@ -37,7 +37,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/action_TEST_setup.sh b/ruby/action_TEST_setup.sh
index 2a49bf758..3d2ea4956 100755
--- a/ruby/action_TEST_setup.sh
+++ b/ruby/action_TEST_setup.sh
@@ -37,7 +37,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/dep_list_TEST_setup.sh b/ruby/dep_list_TEST_setup.sh
index c9e8b1c60..b3d5337bc 100755
--- a/ruby/dep_list_TEST_setup.sh
+++ b/ruby/dep_list_TEST_setup.sh
@@ -41,7 +41,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/dep_spec_TEST_setup.sh b/ruby/dep_spec_TEST_setup.sh
index a05ab5f40..a3f33f3ff 100755
--- a/ruby/dep_spec_TEST_setup.sh
+++ b/ruby/dep_spec_TEST_setup.sh
@@ -15,7 +15,7 @@ profiles = \${location}/profiles/testprofile
builddir = `pwd`
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/dep_tag_TEST_setup.sh b/ruby/dep_tag_TEST_setup.sh
index 691d7a798..fd6fdc043 100755
--- a/ruby/dep_tag_TEST_setup.sh
+++ b/ruby/dep_tag_TEST_setup.sh
@@ -15,7 +15,7 @@ profiles = \${location}/profiles/testprofile
builddir = `pwd`
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/environment_TEST_setup.sh b/ruby/environment_TEST_setup.sh
index d40bb34f7..6bc1b5b05 100755
--- a/ruby/environment_TEST_setup.sh
+++ b/ruby/environment_TEST_setup.sh
@@ -43,7 +43,7 @@ cat <<END > home/.paludis/mirrors.conf
testmirror http://c
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/generator_TEST_setup.sh b/ruby/generator_TEST_setup.sh
index b7393421d..acf2fe07f 100755
--- a/ruby/generator_TEST_setup.sh
+++ b/ruby/generator_TEST_setup.sh
@@ -15,7 +15,7 @@ profiles = \${location}/profiles/testprofile
builddir = `pwd`
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/package_database_TEST_setup.sh b/ruby/package_database_TEST_setup.sh
index a18060e74..26f177494 100755
--- a/ruby/package_database_TEST_setup.sh
+++ b/ruby/package_database_TEST_setup.sh
@@ -29,7 +29,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index 7aba80ad8..09d6e38a2 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -37,7 +37,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = `pwd`/world
END
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index 5262bf13d..2eb9bbb33 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -37,7 +37,7 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
-cat <<END > home/.paludis/environment.conf
+cat <<END > home/.paludis/general.conf
world = /dev/null
END
diff --git a/src/clients/paludis/continue_on_failure_TEST_setup.sh b/src/clients/paludis/continue_on_failure_TEST_setup.sh
index b1003de6a..1d2d72ac7 100755
--- a/src/clients/paludis/continue_on_failure_TEST_setup.sh
+++ b/src/clients/paludis/continue_on_failure_TEST_setup.sh
@@ -24,7 +24,7 @@ cat <<END > root/${SYSCONFDIR}/paludis/keywords.conf
*/* test
END
-cat <<END > root/${SYSCONFDIR}/paludis/environment.conf
+cat <<END > root/${SYSCONFDIR}/paludis/general.conf
world = `pwd`/root/world
END
diff --git a/src/clients/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index 342fc3c46..b202c7c49 100755
--- a/src/clients/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
@@ -41,7 +41,7 @@ END
for d in always none ; do
- cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/environment.conf
+ cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/general.conf
world = `pwd`/root/world-${c}
END
diff --git a/src/clients/paludis/pretend_TEST_setup.sh b/src/clients/paludis/pretend_TEST_setup.sh
index 3213f07b2..41cf70533 100755
--- a/src/clients/paludis/pretend_TEST_setup.sh
+++ b/src/clients/paludis/pretend_TEST_setup.sh
@@ -15,7 +15,7 @@ cat <<END > root/${SYSCONFDIR}/paludis/use.conf
*/* foo
END
-cat <<END > root/${SYSCONFDIR}/paludis/environment.conf
+cat <<END > root/${SYSCONFDIR}/paludis/general.conf
world = `pwd`/root/world
END
diff --git a/vim/ftdetect/paludis.vim b/vim/ftdetect/paludis.vim
index 9c430ff79..3db4bdd32 100644
--- a/vim/ftdetect/paludis.vim
+++ b/vim/ftdetect/paludis.vim
@@ -11,8 +11,8 @@ if &compatible || v:version < 700
finish
endif
-au BufNewFile,BufRead environment.conf
- \ set filetype=paludis-environment-conf
+au BufNewFile,BufRead general.conf
+ \ set filetype=paludis-general-conf
au BufNewFile,BufRead keywords.conf
\ set filetype=paludis-keywords-conf
diff --git a/vim/syntax/Makefile.am b/vim/syntax/Makefile.am
index ee7314bc2..22e2d9498 100644
--- a/vim/syntax/Makefile.am
+++ b/vim/syntax/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =
AUTOMAKE_OPTIONS = 1.11 parallel-tests
vimscripts = \
- paludis-environment-conf.vim \
+ paludis-general-conf.vim \
paludis-keywords-conf.vim \
paludis-licenses-conf.vim \
paludis-mirrors-conf.vim \
diff --git a/vim/syntax/paludis-environment-conf.vim b/vim/syntax/paludis-environment-conf.vim
deleted file mode 100644
index 6318746a4..000000000
--- a/vim/syntax/paludis-environment-conf.vim
+++ /dev/null
@@ -1,53 +0,0 @@
-" Vim syntax file
-" Language: Paludis environment.conf files
-" Author: Ciaran McCreesh
-" Copyright: Copyright (c) 2007, 2008 Ciaran McCreesh
-" Licence: You may redistribute this under the same terms as Vim itself
-"
-" Syntax highlighting for Paludis environment.conf files.
-"
-
-if &compatible || v:version < 700
- finish
-endif
-
-if exists("b:current_syntax")
- finish
-endif
-
-syn region PaludisEnvironmentConfComment start=/^\s*#/ end=/$/
-
-syn region PaludisEnvironmentConfKey start=/^\(\s*[^#]\)\@=/ end=/=\@=/
- \ contains=PaludisEnvironmentConfKnownKey
-
-syn match PaludisEnvironmentConfEquals /=/ skipwhite
- \ nextgroup=PaludisEnvironmentConfValue
-
-syn region PaludisEnvironmentConfValue contained start=// end=/$/
- \ contains=PaludisEnvironmentConfString,PaludisEnvironmentConfUnquoted,
- \ PaludisEnvironmentConfContinuation,PaludisEnvironmentConfVariable
- \ skipwhite
-
-syn match PaludisEnvironmentConfContinuation contained /\\$/
- \ skipnl
-
-syn match PaludisEnvironmentConfUnquoted contained /[^ \t$"'\\]\+/ skipwhite
-
-syn region PaludisEnvironmentConfString contained start=/"/ end=/"/
- \ contains=PaludisEnvironmentConfVariable
- \ skipwhite
-
-syn keyword PaludisEnvironmentConfKnownKey contained
- \ reduced_username portage_compatible distribution world
-
-syn match PaludisEnvironmentConfVariable contained /\$\({[^}]\+}\|[a-zA-Z0-9_]\+\)/ skipwhite
-
-hi def link PaludisEnvironmentConfKnownKey Keyword
-hi def link PaludisEnvironmentConfString String
-hi def link PaludisEnvironmentConfUnquoted Constant
-hi def link PaludisEnvironmentConfVariable Identifier
-hi def link PaludisEnvironmentConfContinuation Preproc
-hi def link PaludisEnvironmentConfComment Comment
-
-let b:current_syntax = "paludis-environment-conf"
-
diff --git a/vim/syntax/paludis-general-conf.vim b/vim/syntax/paludis-general-conf.vim
new file mode 100644
index 000000000..537f682de
--- /dev/null
+++ b/vim/syntax/paludis-general-conf.vim
@@ -0,0 +1,53 @@
+" Vim syntax file
+" Language: Paludis general.conf files
+" Author: Ciaran McCreesh
+" Copyright: Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
+" Licence: You may redistribute this under the same terms as Vim itself
+"
+" Syntax highlighting for Paludis general.conf files.
+"
+
+if &compatible || v:version < 700
+ finish
+endif
+
+if exists("b:current_syntax")
+ finish
+endif
+
+syn region PaludisGeneralConfComment start=/^\s*#/ end=/$/
+
+syn region PaludisGeneralConfKey start=/^\(\s*[^#]\)\@=/ end=/=\@=/
+ \ contains=PaludisGeneralConfKnownKey
+
+syn match PaludisGeneralConfEquals /=/ skipwhite
+ \ nextgroup=PaludisGeneralConfValue
+
+syn region PaludisGeneralConfValue contained start=// end=/$/
+ \ contains=PaludisGeneralConfString,PaludisGeneralConfUnquoted,
+ \ PaludisGeneralConfContinuation,PaludisGeneralConfVariable
+ \ skipwhite
+
+syn match PaludisGeneralConfContinuation contained /\\$/
+ \ skipnl
+
+syn match PaludisGeneralConfUnquoted contained /[^ \t$"'\\]\+/ skipwhite
+
+syn region PaludisGeneralConfString contained start=/"/ end=/"/
+ \ contains=PaludisGeneralConfVariable
+ \ skipwhite
+
+syn keyword PaludisGeneralConfKnownKey contained
+ \ reduced_username portage_compatible distribution world
+
+syn match PaludisGeneralConfVariable contained /\$\({[^}]\+}\|[a-zA-Z0-9_]\+\)/ skipwhite
+
+hi def link PaludisGeneralConfKnownKey Keyword
+hi def link PaludisGeneralConfString String
+hi def link PaludisGeneralConfUnquoted Constant
+hi def link PaludisGeneralConfVariable Identifier
+hi def link PaludisGeneralConfContinuation Preproc
+hi def link PaludisGeneralConfComment Comment
+
+let b:current_syntax = "paludis-general-conf"
+