aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-26 02:27:05 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-02-26 02:27:05 +0000
commitefe5d80965ecb3738b471428240aa0ad2ef58838 (patch)
treecaca54dc0caa41f54cf149d8c051a833a81be161
parente843055f3eabad2fcb273ffcadd6068bf96c0349 (diff)
downloadpaludis-efe5d80965ecb3738b471428240aa0ad2ef58838.tar.gz
paludis-efe5d80965ecb3738b471428240aa0ad2ef58838.tar.xz
environment -> environments
-rw-r--r--configure.ac8
-rw-r--r--doc/doxygen.conf.in2
-rw-r--r--doc/examples/Makefile.am2
-rw-r--r--doc/examples/pwp_basic_cplusplus_app.cc2
-rw-r--r--paludis/Makefile.am.m44
-rw-r--r--paludis/dep_list/Makefile.am6
-rw-r--r--paludis/dep_list/dep_list_TEST.hh2
-rw-r--r--paludis/dep_list/uninstall_list_TEST.cc2
-rw-r--r--paludis/environments/Makefile.am (renamed from paludis/environment/Makefile.am)15
-rw-r--r--paludis/environments/default/Makefile.am (renamed from paludis/environment/default/Makefile.am)2
-rw-r--r--paludis/environments/default/default_config.cc (renamed from paludis/environment/default/default_config.cc)8
-rw-r--r--paludis/environments/default/default_config.hh (renamed from paludis/environment/default/default_config.hh)4
-rw-r--r--paludis/environments/default/default_environment.cc (renamed from paludis/environment/default/default_environment.cc)4
-rw-r--r--paludis/environments/default/default_environment.hh (renamed from paludis/environment/default/default_environment.hh)0
-rw-r--r--paludis/environments/default/default_environment_TEST.cc (renamed from paludis/environment/default/default_environment_TEST.cc)0
-rwxr-xr-xpaludis/environments/default/default_environment_TEST_cleanup.sh (renamed from paludis/environment/default/default_environment_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/environments/default/default_environment_TEST_setup.sh (renamed from paludis/environment/default/default_environment_TEST_setup.sh)0
-rw-r--r--paludis/environments/default/repository_config_entry.sr (renamed from paludis/environment/default/repository_config_entry.sr)0
-rw-r--r--paludis/environments/default/use_config_entry.sr (renamed from paludis/environment/default/use_config_entry.sr)0
-rw-r--r--paludis/environments/environment_maker.cc (renamed from paludis/environment/environment_maker.cc)0
-rw-r--r--paludis/environments/environment_maker.hh (renamed from paludis/environment/environment_maker.hh)0
-rw-r--r--paludis/environments/no_config/Makefile.am (renamed from paludis/environment/no_config/Makefile.am)2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc (renamed from paludis/environment/no_config/no_config_environment.cc)2
-rw-r--r--paludis/environments/no_config/no_config_environment.hh (renamed from paludis/environment/no_config/no_config_environment.hh)2
-rw-r--r--paludis/environments/no_config/no_config_environment.sr (renamed from paludis/environment/no_config/no_config_environment.sr)0
-rw-r--r--paludis/environments/test/Makefile.am (renamed from paludis/environment/test/Makefile.am)2
-rw-r--r--paludis/environments/test/test_environment.cc (renamed from paludis/environment/test/test_environment.cc)2
-rw-r--r--paludis/environments/test/test_environment.hh (renamed from paludis/environment/test/test_environment.hh)0
-rw-r--r--paludis/merger/Makefile.am2
-rw-r--r--paludis/merger/merger_TEST.cc2
-rw-r--r--paludis/package_database_TEST.cc2
-rw-r--r--paludis/qa/Makefile.am.m44
-rw-r--r--paludis/qa/qa_environment.hh2
-rw-r--r--paludis/repositories/cran/Makefile.am2
-rw-r--r--paludis/repositories/cran/cran_dep_parser_TEST.cc2
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc2
-rw-r--r--paludis/repositories/gems/Makefile.am6
-rw-r--r--paludis/repositories/gems/cache_TEST.cc2
-rw-r--r--paludis/repositories/gems/gems_repository_TEST.cc2
-rw-r--r--paludis/repositories/gentoo/Makefile.am8
-rw-r--r--paludis/repositories/gentoo/portage_repository_TEST.cc2
-rw-r--r--paludis/repositories/gentoo/vdb_repository_TEST.cc2
-rw-r--r--paludis/repository_name_cache_TEST.cc2
-rw-r--r--ruby/Makefile.am12
-rw-r--r--ruby/environment.cc6
-rw-r--r--ruby/paludis_ruby.hh2
-rw-r--r--src/clients/adjutrix/Makefile.am2
-rw-r--r--src/clients/adjutrix/adjutrix.cc2
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.hh2
-rw-r--r--src/clients/adjutrix/display_profiles_use.hh2
-rw-r--r--src/clients/adjutrix/downgrade_check.hh2
-rw-r--r--src/clients/adjutrix/find_reverse_deps.hh2
-rw-r--r--src/clients/adjutrix/what_needs_keywording.hh2
-rw-r--r--src/clients/contrarius/Makefile.am2
-rw-r--r--src/clients/contrarius/install.cc2
-rw-r--r--src/clients/contrarius/stage.cc4
-rw-r--r--src/clients/gtkpaludis/Makefile.am2
-rw-r--r--src/clients/gtkpaludis/categories_list.cc2
-rw-r--r--src/clients/gtkpaludis/gtkpaludis.cc4
-rw-r--r--src/clients/gtkpaludis/install.cc2
-rw-r--r--src/clients/gtkpaludis/package_overview.cc2
-rw-r--r--src/clients/gtkpaludis/packages_list.cc2
-rw-r--r--src/clients/gtkpaludis/queue_list.cc2
-rw-r--r--src/clients/gtkpaludis/repositories_list.cc2
-rw-r--r--src/clients/gtkpaludis/repositories_page.cc2
-rw-r--r--src/clients/gtkpaludis/repository_overview.cc2
-rw-r--r--src/clients/gtkpaludis/set_overview.cc2
-rw-r--r--src/clients/gtkpaludis/sets_list.cc2
-rw-r--r--src/clients/gtkpaludis/sync.cc2
-rw-r--r--src/clients/inquisitio/Makefile.am2
-rw-r--r--src/clients/inquisitio/inquisitio.cc4
-rw-r--r--src/clients/paludis/Makefile.am4
-rw-r--r--src/clients/paludis/applets.cc2
-rw-r--r--src/clients/paludis/do_config.cc2
-rw-r--r--src/clients/paludis/do_contents.cc2
-rw-r--r--src/clients/paludis/install.cc4
-rw-r--r--src/clients/paludis/list.cc2
-rw-r--r--src/clients/paludis/news.cc2
-rw-r--r--src/clients/paludis/owner.cc2
-rw-r--r--src/clients/paludis/paludis.cc4
-rw-r--r--src/clients/paludis/query.cc2
-rw-r--r--src/clients/paludis/report.cc2
-rw-r--r--src/clients/paludis/sync.cc2
-rw-r--r--src/clients/paludis/uninstall.cc2
-rw-r--r--src/clients/qualudis/Makefile.am2
85 files changed, 111 insertions, 112 deletions
diff --git a/configure.ac b/configure.ac
index 246c484..85b1680 100644
--- a/configure.ac
+++ b/configure.ac
@@ -870,10 +870,10 @@ AC_OUTPUT(
paludis/args/Makefile
paludis/dep_list/Makefile
paludis/digests/Makefile
- paludis/environment/Makefile
- paludis/environment/default/Makefile
- paludis/environment/no_config/Makefile
- paludis/environment/test/Makefile
+ paludis/environments/Makefile
+ paludis/environments/default/Makefile
+ paludis/environments/no_config/Makefile
+ paludis/environments/test/Makefile
paludis/fetchers/Makefile
paludis/hashed_containers.hh
paludis/merger/Makefile
diff --git a/doc/doxygen.conf.in b/doc/doxygen.conf.in
index 39e4e1f..103ddb3 100644
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
@@ -461,7 +461,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = ../paludis ../paludis/digests ../paludis/tasks ../paludis/environment ../paludis/environment/no_config ../paludis/environment/test ../paludis/environment/default ../paludis/qa ../paludis/selinux ../paludis/util ../paludis/merger ../paludis/repositories ../paludis/repositories/cran ../paludis/repositories/virtuals ../paludis/repositories/gentoo ../paludis/repositories/fake ../paludis/args ../paludis/dep_list ../doc ../test
+INPUT = ../paludis ../paludis/digests ../paludis/tasks ../paludis/environment ../paludis/environments/no_config ../paludis/environments/test ../paludis/environments/default ../paludis/qa ../paludis/selinux ../paludis/util ../paludis/merger ../paludis/repositories ../paludis/repositories/cran ../paludis/repositories/virtuals ../paludis/repositories/gentoo ../paludis/repositories/fake ../paludis/args ../paludis/dep_list ../doc ../test
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index df48183..1188452 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -24,7 +24,7 @@ EXTRA_DIST = $(noinst_SCRIPTS)
pwp_basic_cplusplus_app_SOURCES = pwp_basic_cplusplus_app.cc
pwp_basic_cplusplus_app_LDFLAGS = \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/doc/examples/pwp_basic_cplusplus_app.cc b/doc/examples/pwp_basic_cplusplus_app.cc
index adf693b..05931e9 100644
--- a/doc/examples/pwp_basic_cplusplus_app.cc
+++ b/doc/examples/pwp_basic_cplusplus_app.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <iostream>
#include <tr1/memory>
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index fa5d5a0..aef7f7f 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -16,7 +16,7 @@ $1_TEST_LDADD = \
ihateautomake.o \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
libpaludis.la \
@@ -65,7 +65,7 @@ DEFS= \
EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
hashed_containers.hh.in testscriptlist srlist srcleanlist \
repository_blacklist.txt
-SUBDIRS = digests fetchers syncers util selinux . dep_list merger repositories environment args qa tasks
+SUBDIRS = digests fetchers syncers util selinux . dep_list merger repositories environments args qa tasks
BUILT_SOURCES = srcleanlist
libpaludis_la_SOURCES = filelist
diff --git a/paludis/dep_list/Makefile.am b/paludis/dep_list/Makefile.am
index c20a8e2..ce57f17 100644
--- a/paludis/dep_list/Makefile.am
+++ b/paludis/dep_list/Makefile.am
@@ -78,7 +78,7 @@ check_PROGRAMS = $(TESTS)
dep_list_TEST_SOURCES = dep_list_TEST.cc
dep_list_TEST_LDADD = \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -89,7 +89,7 @@ dep_list_TEST_LDADD = \
dep_list_TEST_blockers_SOURCES = dep_list_TEST_blockers.cc
dep_list_TEST_blockers_LDADD = \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -100,7 +100,7 @@ dep_list_TEST_blockers_LDADD = \
uninstall_list_TEST_SOURCES = uninstall_list_TEST.cc
uninstall_list_TEST_LDADD = \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
$(top_builddir)/paludis/util/test_extras.o \
diff --git a/paludis/dep_list/dep_list_TEST.hh b/paludis/dep_list/dep_list_TEST.hh
index 87db355..5a7b8f9 100644
--- a/paludis/dep_list/dep_list_TEST.hh
+++ b/paludis/dep_list/dep_list_TEST.hh
@@ -28,7 +28,7 @@
#include <paludis/repositories/virtuals/virtuals_repository.hh>
#include <paludis/repositories/virtuals/installed_virtuals_repository.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <string>
diff --git a/paludis/dep_list/uninstall_list_TEST.cc b/paludis/dep_list/uninstall_list_TEST.cc
index 2be3364..c2f0d5c 100644
--- a/paludis/dep_list/uninstall_list_TEST.cc
+++ b/paludis/dep_list/uninstall_list_TEST.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/repositories/virtuals/virtuals_repository.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/util/collection_concrete.hh>
#include <test/test_framework.hh>
diff --git a/paludis/environment/Makefile.am b/paludis/environments/Makefile.am
index 8e2891c..e92b39f 100644
--- a/paludis/environment/Makefile.am
+++ b/paludis/environments/Makefile.am
@@ -6,20 +6,20 @@ MAINTAINERCLEANFILES = Makefile.in
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-lib_LTLIBRARIES = libpaludisenvironment.la
+lib_LTLIBRARIES = libpaludisenvironments.la
-paludis_environment_includedir = $(includedir)/paludis/environment/
+paludis_environments_includedir = $(includedir)/paludis/environments/
-paludis_environment_include_HEADERS = \
+paludis_environments_include_HEADERS = \
environment_maker.hh
-libpaludisenvironment_la_SOURCES = \
+libpaludisenvironments_la_SOURCES = \
environment_maker.cc \
- $(paludis_environment_include_HEADERS)
+ $(paludis_environments_include_HEADERS)
-libpaludisenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisenvironments_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-libpaludisenvironment_la_LIBADD = \
+libpaludisenvironments_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
@DYNAMIC_LD_LIBS@
@@ -31,4 +31,3 @@ DEFS= \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)\"
-
diff --git a/paludis/environment/default/Makefile.am b/paludis/environments/default/Makefile.am
index 4638808..521e50d 100644
--- a/paludis/environment/default/Makefile.am
+++ b/paludis/environments/default/Makefile.am
@@ -36,7 +36,7 @@ lib_LTLIBRARIES = libpaludisdefaultenvironment.la
endif
-paludis_environment_default_includedir = $(includedir)/paludis/environment/default
+paludis_environment_default_includedir = $(includedir)/paludis/environments/default
paludis_environment_default_include_HEADERS = \
default_config.hh \
default_environment.hh \
diff --git a/paludis/environment/default/default_config.cc b/paludis/environments/default/default_config.cc
index cdba2cc..8c5b1b2 100644
--- a/paludis/environment/default/default_config.cc
+++ b/paludis/environments/default/default_config.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/environment/default/default_config.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/config_file.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/compare.hh>
@@ -51,8 +51,8 @@
using namespace paludis;
-#include <paludis/environment/default/use_config_entry-sr.cc>
-#include <paludis/environment/default/repository_config_entry-sr.cc>
+#include <paludis/environments/default/use_config_entry-sr.cc>
+#include <paludis/environments/default/repository_config_entry-sr.cc>
namespace paludis
{
diff --git a/paludis/environment/default/default_config.hh b/paludis/environments/default/default_config.hh
index 3503e0b..2f86613 100644
--- a/paludis/environment/default/default_config.hh
+++ b/paludis/environments/default/default_config.hh
@@ -64,8 +64,8 @@ namespace paludis
DefaultConfigError(const std::string & msg) throw ();
};
-#include <paludis/environment/default/use_config_entry-sr.hh>
-#include <paludis/environment/default/repository_config_entry-sr.hh>
+#include <paludis/environments/default/use_config_entry-sr.hh>
+#include <paludis/environments/default/repository_config_entry-sr.hh>
/**
* DefaultConfig is used by DefaultEnvironment to access the user's
diff --git a/paludis/environment/default/default_environment.cc b/paludis/environments/default/default_environment.cc
index 379ee48..0f3faa4 100644
--- a/paludis/environment/default/default_environment.cc
+++ b/paludis/environments/default/default_environment.cc
@@ -20,8 +20,8 @@
#include <list>
#include <paludis/config_file.hh>
#include <paludis/hashed_containers.hh>
-#include <paludis/environment/default/default_config.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/match_package.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
diff --git a/paludis/environment/default/default_environment.hh b/paludis/environments/default/default_environment.hh
index f8650db..f8650db 100644
--- a/paludis/environment/default/default_environment.hh
+++ b/paludis/environments/default/default_environment.hh
diff --git a/paludis/environment/default/default_environment_TEST.cc b/paludis/environments/default/default_environment_TEST.cc
index fcad357..fcad357 100644
--- a/paludis/environment/default/default_environment_TEST.cc
+++ b/paludis/environments/default/default_environment_TEST.cc
diff --git a/paludis/environment/default/default_environment_TEST_cleanup.sh b/paludis/environments/default/default_environment_TEST_cleanup.sh
index 3cd5c8d..3cd5c8d 100755
--- a/paludis/environment/default/default_environment_TEST_cleanup.sh
+++ b/paludis/environments/default/default_environment_TEST_cleanup.sh
diff --git a/paludis/environment/default/default_environment_TEST_setup.sh b/paludis/environments/default/default_environment_TEST_setup.sh
index 9b40b8e..9b40b8e 100755
--- a/paludis/environment/default/default_environment_TEST_setup.sh
+++ b/paludis/environments/default/default_environment_TEST_setup.sh
diff --git a/paludis/environment/default/repository_config_entry.sr b/paludis/environments/default/repository_config_entry.sr
index c2c3a34..c2c3a34 100644
--- a/paludis/environment/default/repository_config_entry.sr
+++ b/paludis/environments/default/repository_config_entry.sr
diff --git a/paludis/environment/default/use_config_entry.sr b/paludis/environments/default/use_config_entry.sr
index d2f3262..d2f3262 100644
--- a/paludis/environment/default/use_config_entry.sr
+++ b/paludis/environments/default/use_config_entry.sr
diff --git a/paludis/environment/environment_maker.cc b/paludis/environments/environment_maker.cc
index a984d35..a984d35 100644
--- a/paludis/environment/environment_maker.cc
+++ b/paludis/environments/environment_maker.cc
diff --git a/paludis/environment/environment_maker.hh b/paludis/environments/environment_maker.hh
index 0be0688..0be0688 100644
--- a/paludis/environment/environment_maker.hh
+++ b/paludis/environments/environment_maker.hh
diff --git a/paludis/environment/no_config/Makefile.am b/paludis/environments/no_config/Makefile.am
index 24ed4bc..13235ef 100644
--- a/paludis/environment/no_config/Makefile.am
+++ b/paludis/environments/no_config/Makefile.am
@@ -33,7 +33,7 @@ lib_LTLIBRARIES = libpaludisnoconfigenvironment.la
endif
-paludis_environment_no_config_includedir = $(includedir)/paludis/environment/no_config
+paludis_environment_no_config_includedir = $(includedir)/paludis/environments/no_config
paludis_environment_no_config_include_HEADERS = \
no_config_environment.hh \
no_config_environment-sr.hh
diff --git a/paludis/environment/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 187c4a9..ae31ca6 100644
--- a/paludis/environment/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -29,7 +29,7 @@
using namespace paludis;
-#include <paludis/environment/no_config/no_config_environment-sr.cc>
+#include <paludis/environments/no_config/no_config_environment-sr.cc>
namespace paludis
{
diff --git a/paludis/environment/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 87a29da..129348d 100644
--- a/paludis/environment/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -42,7 +42,7 @@ namespace paludis
ncer_auto
};
-#include <paludis/environment/no_config/no_config_environment-sr.hh>
+#include <paludis/environments/no_config/no_config_environment-sr.hh>
/**
* An environment that uses a single repository, with no user configuration.
diff --git a/paludis/environment/no_config/no_config_environment.sr b/paludis/environments/no_config/no_config_environment.sr
index 290d5e3..290d5e3 100644
--- a/paludis/environment/no_config/no_config_environment.sr
+++ b/paludis/environments/no_config/no_config_environment.sr
diff --git a/paludis/environment/test/Makefile.am b/paludis/environments/test/Makefile.am
index 3979637..391b07f 100644
--- a/paludis/environment/test/Makefile.am
+++ b/paludis/environments/test/Makefile.am
@@ -30,7 +30,7 @@ lib_LTLIBRARIES = libpaludistestenvironment.la
endif
-paludis_environment_test_includedir = $(includedir)/paludis/environment/test
+paludis_environment_test_includedir = $(includedir)/paludis/environments/test
paludis_environment_test_include_HEADERS = test_environment.hh
built-sources : $(BUILT_SOURCES)
diff --git a/paludis/environment/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 07735db..495d335 100644
--- a/paludis/environment/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/collection_concrete.hh>
#include <map>
#include <string>
diff --git a/paludis/environment/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index 560fd3c..560fd3c 100644
--- a/paludis/environment/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
diff --git a/paludis/merger/Makefile.am b/paludis/merger/Makefile.am
index 8746e10..62743a3 100644
--- a/paludis/merger/Makefile.am
+++ b/paludis/merger/Makefile.am
@@ -56,7 +56,7 @@ check_SCRIPTS = merger_TEST_setup.sh merger_TEST_cleanup.sh
merger_TEST_SOURCES = merger_TEST.cc
merger_TEST_LDADD = \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludismerger.la \
diff --git a/paludis/merger/merger_TEST.cc b/paludis/merger/merger_TEST.cc
index 65992c7..7c6b90b 100644
--- a/paludis/merger/merger_TEST.cc
+++ b/paludis/merger/merger_TEST.cc
@@ -18,7 +18,7 @@
*/
#include "merger.hh"
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <fstream>
diff --git a/paludis/package_database_TEST.cc b/paludis/package_database_TEST.cc
index 3a8668f..ea446bc 100644
--- a/paludis/package_database_TEST.cc
+++ b/paludis/package_database_TEST.cc
@@ -18,7 +18,7 @@
*/
#include <paludis/paludis.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 7aca87f..37f0e44 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -17,7 +17,7 @@ $1_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
libpaludisqa.la \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
@@ -66,7 +66,7 @@ if ! MONOLITHIC
libpaludisqa_la_LIBADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
@LIBXML2DEPS_LIBS@ \
diff --git a/paludis/qa/qa_environment.hh b/paludis/qa/qa_environment.hh
index 1d8cb55..bf63745 100644
--- a/paludis/qa/qa_environment.hh
+++ b/paludis/qa/qa_environment.hh
@@ -22,7 +22,7 @@
#define PALUDIS_GUARD_PALUDIS_QA_ENVIRONMENT_HH 1
#include <paludis/environment.hh>
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/package_database.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry.hh>
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 309513a..cb6720a 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -68,7 +68,7 @@ cran_repository_TEST_LDADD = \
libpaludiscranrepository.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(DYNAMIC_LD_LIBS)
cran_repository_TEST_CXXFLAGS = -I$(top_srcdir)
diff --git a/paludis/repositories/cran/cran_dep_parser_TEST.cc b/paludis/repositories/cran/cran_dep_parser_TEST.cc
index ff08370..7abeb9e 100644
--- a/paludis/repositories/cran/cran_dep_parser_TEST.cc
+++ b/paludis/repositories/cran/cran_dep_parser_TEST.cc
@@ -21,7 +21,7 @@
#include <paludis/dep_spec_flattener.hh>
#include <paludis/dep_spec_pretty_printer.hh>
#include <paludis/repositories/cran/cran_dep_parser.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/system.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index 5af58f9..109269e 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/cran/cran_dep_parser.hh>
#include <paludis/repositories/cran/cran_description.hh>
#include <paludis/repositories/cran/cran_repository.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/system.hh>
#include <test/test_framework.hh>
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 2760062..41e19d5 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -65,7 +65,7 @@ gems_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a
gems_repository_TEST_CXXFLAGS = -I$(top_srcdir)
@@ -77,7 +77,7 @@ yaml_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a
yaml_TEST_CXXFLAGS = -I$(top_srcdir)
@@ -89,7 +89,7 @@ cache_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a
cache_TEST_CXXFLAGS = -I$(top_srcdir)
diff --git a/paludis/repositories/gems/cache_TEST.cc b/paludis/repositories/gems/cache_TEST.cc
index c842d94..c40afa6 100644
--- a/paludis/repositories/gems/cache_TEST.cc
+++ b/paludis/repositories/gems/cache_TEST.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/gems/yaml.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/gems/gems_repository_TEST.cc b/paludis/repositories/gems/gems_repository_TEST.cc
index ca850c7..c407b1c 100644
--- a/paludis/repositories/gems/gems_repository_TEST.cc
+++ b/paludis/repositories/gems/gems_repository_TEST.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/gems/gems_repository.hh>
#include <paludis/repositories/gems/make_gems_repository.hh>
#include <paludis/util/collection_concrete.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/system.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/gentoo/Makefile.am b/paludis/repositories/gentoo/Makefile.am
index 20a5778..96bf946 100644
--- a/paludis/repositories/gentoo/Makefile.am
+++ b/paludis/repositories/gentoo/Makefile.am
@@ -141,7 +141,7 @@ portage_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -152,7 +152,7 @@ portage_repository_TEST_LDADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
@@ -328,7 +328,7 @@ xml_things_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
libpaludisgentoorepository.la \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a \
libpaludisgentoorepositoryxmlthings.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
@@ -342,7 +342,7 @@ xml_things_TEST_LDADD = \
libpaludisgentoorepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
+ $(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
diff --git a/paludis/repositories/gentoo/portage_repository_TEST.cc b/paludis/repositories/gentoo/portage_repository_TEST.cc
index 3f8c7a3..563c2c1 100644
--- a/paludis/repositories/gentoo/portage_repository_TEST.cc
+++ b/paludis/repositories/gentoo/portage_repository_TEST.cc
@@ -20,7 +20,7 @@
#include <paludis/repositories/gentoo/portage_repository.hh>
#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
#include <paludis/util/collection_concrete.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/system.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/repositories/gentoo/vdb_repository_TEST.cc b/paludis/repositories/gentoo/vdb_repository_TEST.cc
index c684ee0..15b4b07 100644
--- a/paludis/repositories/gentoo/vdb_repository_TEST.cc
+++ b/paludis/repositories/gentoo/vdb_repository_TEST.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/vdb/vdb_repository.hh>
#include <paludis/util/collection_concrete.hh>
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
#include <fstream>
diff --git a/paludis/repository_name_cache_TEST.cc b/paludis/repository_name_cache_TEST.cc
index a3a49b6..5d82774 100644
--- a/paludis/repository_name_cache_TEST.cc
+++ b/paludis/repository_name_cache_TEST.cc
@@ -18,7 +18,7 @@
*/
#include "repository_name_cache.hh"
-#include <paludis/environment/test/test_environment.hh>
+#include <paludis/environments/test/test_environment.hh>
#include <paludis/repositories/fake/fake_repository.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/join.hh>
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 362cc21..f054364 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -86,8 +86,8 @@ TESTS_ENVIRONMENT = env \
SYSCONFDIR="$(sysconfdir)" \
LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/default/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs\`: \
@@ -116,8 +116,8 @@ libpaludisruby_la_LIBADD = \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/qa/libpaludisqa.la
TESTS = $(IF_RUBY_QA_TESTS) $(IF_RUBY_TESTS)
@@ -131,8 +131,8 @@ libpaludisruby_la_LIBADD = \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la
TESTS = $(IF_RUBY_TESTS)
diff --git a/ruby/environment.cc b/ruby/environment.cc
index cae0730..71fe1ec 100644
--- a/ruby/environment.cc
+++ b/ruby/environment.cc
@@ -18,9 +18,9 @@
*/
#include <paludis_ruby.hh>
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/ruby/paludis_ruby.hh b/ruby/paludis_ruby.hh
index 2ec58a8..d4ff159 100644
--- a/ruby/paludis_ruby.hh
+++ b/ruby/paludis_ruby.hh
@@ -32,7 +32,7 @@
#include <paludis/mask_reasons.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/environment.hh>
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
#include <paludis/repositories/gentoo/portage_repository.hh>
#include <paludis/query.hh>
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index fa32ca3..389721b 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -47,7 +47,7 @@ adjutrix_SOURCES = \
adjutrix.cc
adjutrix_LDADD = \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
$(top_builddir)/paludis/tasks/libpaludistasks.a \
diff --git a/src/clients/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc
index 6306345..21ddb8e 100644
--- a/src/clients/adjutrix/adjutrix.cc
+++ b/src/clients/adjutrix/adjutrix.cc
@@ -34,7 +34,7 @@
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
#include <iostream>
using namespace paludis;
diff --git a/src/clients/adjutrix/display_default_system_resolution.hh b/src/clients/adjutrix/display_default_system_resolution.hh
index 6d6c340..9934860 100644
--- a/src/clients/adjutrix/display_default_system_resolution.hh
+++ b/src/clients/adjutrix/display_default_system_resolution.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_ADJUTRIX_DISPLAY_DEFAULT_SYSTEM_RESOLUTION_HH
#define PALUDIS_GUARD_SRC_ADJUTRIX_DISPLAY_DEFAULT_SYSTEM_RESOLUTION_HH 1
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
int do_display_default_system_resolution(paludis::NoConfigEnvironment & env);
diff --git a/src/clients/adjutrix/display_profiles_use.hh b/src/clients/adjutrix/display_profiles_use.hh
index 8a5b4e0..9d58880 100644
--- a/src/clients/adjutrix/display_profiles_use.hh
+++ b/src/clients/adjutrix/display_profiles_use.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_ADJUTRIX_DISPLAY_PROFILES_USE_HH
#define PALUDIS_GUARD_SRC_ADJUTRIX_DISPLAY_PROFILES_USE_HH 1
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
void do_display_profiles_use(paludis::NoConfigEnvironment & env);
diff --git a/src/clients/adjutrix/downgrade_check.hh b/src/clients/adjutrix/downgrade_check.hh
index 0ed5d46..086c1fa 100644
--- a/src/clients/adjutrix/downgrade_check.hh
+++ b/src/clients/adjutrix/downgrade_check.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_CLIENTS_ADJUTRIX_DOWNGRADE_CHECK_HH
#define PALUDIS_GUARD_SRC_CLIENTS_ADJUTRIX_DOWNGRADE_CHECK_HH 1
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
int do_build_downgrade_check_list(paludis::NoConfigEnvironment & env);
int do_downgrade_check(paludis::NoConfigEnvironment & env);
diff --git a/src/clients/adjutrix/find_reverse_deps.hh b/src/clients/adjutrix/find_reverse_deps.hh
index 048b1f5..674829e 100644
--- a/src/clients/adjutrix/find_reverse_deps.hh
+++ b/src/clients/adjutrix/find_reverse_deps.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_ARCHTOOL_FIND_REVERSE_DEPS_HH
#define PALUDIS_GUARD_SRC_ARCHTOOL_FIND_REVERSE_DEPS_HH 1
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
int do_find_reverse_deps(paludis::NoConfigEnvironment & env);
diff --git a/src/clients/adjutrix/what_needs_keywording.hh b/src/clients/adjutrix/what_needs_keywording.hh
index 77f8e8a..dcd42c8 100644
--- a/src/clients/adjutrix/what_needs_keywording.hh
+++ b/src/clients/adjutrix/what_needs_keywording.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_SRC_CLIENTS_ADJUTRIX_WHAT_NEEDS_KEYWORDING_HH
#define PALUDIS_GUARD_SRC_CLIENTS_ADJUTRIX_WHAT_NEEDS_KEYWORDING_HH 1
-#include <paludis/environment/no_config/no_config_environment.hh>
+#include <paludis/environments/no_config/no_config_environment.hh>
int do_what_needs_keywording(paludis::NoConfigEnvironment & env);
diff --git a/src/clients/contrarius/Makefile.am b/src/clients/contrarius/Makefile.am
index beb5953..e63c045 100644
--- a/src/clients/contrarius/Makefile.am
+++ b/src/clients/contrarius/Makefile.am
@@ -26,7 +26,7 @@ contrarius_SOURCES = \
contrarius_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/tasks/libpaludistasks.a \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
diff --git a/src/clients/contrarius/install.cc b/src/clients/contrarius/install.cc
index a910a7d..34ad5df 100644
--- a/src/clients/contrarius/install.cc
+++ b/src/clients/contrarius/install.cc
@@ -34,7 +34,7 @@
#include <paludis/util/fd_output_stream.hh>
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/dep_list/exceptions.hh>
#include <paludis/query.hh>
diff --git a/src/clients/contrarius/stage.cc b/src/clients/contrarius/stage.cc
index 8bd4c41..2ed1df1 100644
--- a/src/clients/contrarius/stage.cc
+++ b/src/clients/contrarius/stage.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
#include <paludis/util/log.hh>
#include <paludis/query.hh>
#include <string>
diff --git a/src/clients/gtkpaludis/Makefile.am b/src/clients/gtkpaludis/Makefile.am
index 442c604..aeaa4e8 100644
--- a/src/clients/gtkpaludis/Makefile.am
+++ b/src/clients/gtkpaludis/Makefile.am
@@ -64,7 +64,7 @@ gtkpaludis_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(GTKDEPS_LIBS) \
$(GTKTESTDEPS_LIBS) \
diff --git a/src/clients/gtkpaludis/categories_list.cc b/src/clients/gtkpaludis/categories_list.cc
index 16a292e..fa69564 100644
--- a/src/clients/gtkpaludis/categories_list.cc
+++ b/src/clients/gtkpaludis/categories_list.cc
@@ -20,7 +20,7 @@
#include "categories_list.hh"
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/liststore.h>
diff --git a/src/clients/gtkpaludis/gtkpaludis.cc b/src/clients/gtkpaludis/gtkpaludis.cc
index b797345..ed914ce 100644
--- a/src/clients/gtkpaludis/gtkpaludis.cc
+++ b/src/clients/gtkpaludis/gtkpaludis.cc
@@ -18,8 +18,8 @@
*/
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
#include <paludis/util/log.hh>
#include <libebt/libebt_version.hh>
diff --git a/src/clients/gtkpaludis/install.cc b/src/clients/gtkpaludis/install.cc
index 8fe0e4f..4840b2f 100644
--- a/src/clients/gtkpaludis/install.cc
+++ b/src/clients/gtkpaludis/install.cc
@@ -18,7 +18,7 @@
*/
#include "install.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/util/save.hh>
using namespace paludis;
diff --git a/src/clients/gtkpaludis/package_overview.cc b/src/clients/gtkpaludis/package_overview.cc
index 205ab6c..a162270 100644
--- a/src/clients/gtkpaludis/package_overview.cc
+++ b/src/clients/gtkpaludis/package_overview.cc
@@ -21,7 +21,7 @@
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
diff --git a/src/clients/gtkpaludis/packages_list.cc b/src/clients/gtkpaludis/packages_list.cc
index 0fabfec..f985008 100644
--- a/src/clients/gtkpaludis/packages_list.cc
+++ b/src/clients/gtkpaludis/packages_list.cc
@@ -20,7 +20,7 @@
#include "packages_list.hh"
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/util/sr.hh>
#include <paludis/util/compare.hh>
diff --git a/src/clients/gtkpaludis/queue_list.cc b/src/clients/gtkpaludis/queue_list.cc
index d00744f..5412dca 100644
--- a/src/clients/gtkpaludis/queue_list.cc
+++ b/src/clients/gtkpaludis/queue_list.cc
@@ -31,7 +31,7 @@
#include <paludis/util/tokeniser.hh>
#include <paludis/util/log.hh>
#include <paludis/tasks/exceptions.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <list>
#include <set>
diff --git a/src/clients/gtkpaludis/repositories_list.cc b/src/clients/gtkpaludis/repositories_list.cc
index af3df5e..2abc1cb 100644
--- a/src/clients/gtkpaludis/repositories_list.cc
+++ b/src/clients/gtkpaludis/repositories_list.cc
@@ -20,7 +20,7 @@
#include "repositories_list.hh"
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/liststore.h>
diff --git a/src/clients/gtkpaludis/repositories_page.cc b/src/clients/gtkpaludis/repositories_page.cc
index 17245d4..1977045 100644
--- a/src/clients/gtkpaludis/repositories_page.cc
+++ b/src/clients/gtkpaludis/repositories_page.cc
@@ -24,7 +24,7 @@
#include "main_window.hh"
#include "sync.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/button.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/box.h>
diff --git a/src/clients/gtkpaludis/repository_overview.cc b/src/clients/gtkpaludis/repository_overview.cc
index 0c611f0..e6a732d 100644
--- a/src/clients/gtkpaludis/repository_overview.cc
+++ b/src/clients/gtkpaludis/repository_overview.cc
@@ -21,7 +21,7 @@
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
diff --git a/src/clients/gtkpaludis/set_overview.cc b/src/clients/gtkpaludis/set_overview.cc
index 7fee62a..73b3cd2 100644
--- a/src/clients/gtkpaludis/set_overview.cc
+++ b/src/clients/gtkpaludis/set_overview.cc
@@ -21,7 +21,7 @@
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/util/save.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
diff --git a/src/clients/gtkpaludis/sets_list.cc b/src/clients/gtkpaludis/sets_list.cc
index 1826f21..f7b654b 100644
--- a/src/clients/gtkpaludis/sets_list.cc
+++ b/src/clients/gtkpaludis/sets_list.cc
@@ -20,7 +20,7 @@
#include "sets_list.hh"
#include "paludis_thread.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <gtkmm/treeview.h>
#include <gtkmm/liststore.h>
diff --git a/src/clients/gtkpaludis/sync.cc b/src/clients/gtkpaludis/sync.cc
index 385b587..539c911 100644
--- a/src/clients/gtkpaludis/sync.cc
+++ b/src/clients/gtkpaludis/sync.cc
@@ -19,7 +19,7 @@
#include "sync.hh"
#include "main_window.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
using namespace paludis;
using namespace gtkpaludis;
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index 47a42f3..de18d06 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -47,7 +47,7 @@ inquisitio_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/src/output/liboutput.a \
$(top_builddir)/src/common_args/libcommonargs.a \
$(DYNAMIC_LD_LIBS) \
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 6aa903b..ba1cfbd 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -26,8 +26,8 @@
#include <paludis/about.hh>
#include <paludis/util/join.hh>
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
#include <src/output/colour.hh>
#include <src/common_args/do_help.hh>
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index a9581d7..09ff90d 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -53,7 +53,7 @@ paludis_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/src/output/liboutput.a \
@@ -67,7 +67,7 @@ paludis_LDADD = \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
+ $(top_builddir)/paludis/environments/default/libpaludisdefaultenvironment.la \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/src/output/liboutput.a \
$(top_builddir)/src/common_args/libcommonargs.a \
diff --git a/src/clients/paludis/applets.cc b/src/clients/paludis/applets.cc
index 64aa7b6..c5ddfa3 100644
--- a/src/clients/paludis/applets.cc
+++ b/src/clients/paludis/applets.cc
@@ -28,7 +28,7 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/system.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/repositories/repository_maker.hh>
#include <string>
#include <set>
diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc
index e973376..efb3695 100644
--- a/src/clients/paludis/do_config.cc
+++ b/src/clients/paludis/do_config.cc
@@ -21,7 +21,7 @@
#include "command_line.hh"
#include <src/output/colour.hh>
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <iostream>
using namespace paludis;
diff --git a/src/clients/paludis/do_contents.cc b/src/clients/paludis/do_contents.cc
index 62d34ec..c1fdfbb 100644
--- a/src/clients/paludis/do_contents.cc
+++ b/src/clients/paludis/do_contents.cc
@@ -21,7 +21,7 @@
#include <src/output/colour.hh>
#include "command_line.hh"
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <iostream>
#include <algorithm>
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 7f711dc..9e774c4 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -43,8 +43,8 @@
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/system.hh>
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
#include <paludis/dep_list/exceptions.hh>
/** \file
diff --git a/src/clients/paludis/list.cc b/src/clients/paludis/list.cc
index 1ada7c2..f4a0161 100644
--- a/src/clients/paludis/list.cc
+++ b/src/clients/paludis/list.cc
@@ -25,7 +25,7 @@
#include <list>
#include <map>
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/util/log.hh>
#include <paludis/util/visitor.hh>
diff --git a/src/clients/paludis/news.cc b/src/clients/paludis/news.cc
index 654f0a7..e8651c6 100644
--- a/src/clients/paludis/news.cc
+++ b/src/clients/paludis/news.cc
@@ -23,7 +23,7 @@
#include <iomanip>
#include <iostream>
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <string>
/** \file
diff --git a/src/clients/paludis/owner.cc b/src/clients/paludis/owner.cc
index 5970ae2..cbace86 100644
--- a/src/clients/paludis/owner.cc
+++ b/src/clients/paludis/owner.cc
@@ -21,7 +21,7 @@
#include <src/output/colour.hh>
#include "command_line.hh"
#include <paludis/paludis.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <iostream>
using namespace paludis;
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index fe28f7e..262d417 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -38,8 +38,8 @@
#include <paludis/hashed_containers.hh>
#include <paludis/util/util.hh>
#include <paludis/util/log.hh>
-#include <paludis/environment/default/default_environment.hh>
-#include <paludis/environment/default/default_config.hh>
+#include <paludis/environments/default/default_environment.hh>
+#include <paludis/environments/default/default_config.hh>
#include <libebt/libebt.hh>
#include <libwrapiter/libwrapiter.hh>
diff --git a/src/clients/paludis/query.cc b/src/clients/paludis/query.cc
index 3d6e797..7e8c7c3 100644
--- a/src/clients/paludis/query.cc
+++ b/src/clients/paludis/query.cc
@@ -27,7 +27,7 @@
#include <iostream>
#include <paludis/paludis.hh>
#include <paludis/util/collection_concrete.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <string>
/** \file
diff --git a/src/clients/paludis/report.cc b/src/clients/paludis/report.cc
index b531ea2..a9fe90e 100644
--- a/src/clients/paludis/report.cc
+++ b/src/clients/paludis/report.cc
@@ -20,7 +20,7 @@
#include "report.hh"
#include <src/output/colour.hh>
#include <paludis/tasks/report_task.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <iostream>
/** \file
diff --git a/src/clients/paludis/sync.cc b/src/clients/paludis/sync.cc
index 2270b92..055ab7c 100644
--- a/src/clients/paludis/sync.cc
+++ b/src/clients/paludis/sync.cc
@@ -20,7 +20,7 @@
#include <src/output/colour.hh>
#include "sync.hh"
#include <paludis/tasks/sync_task.hh>
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/syncer.hh>
#include <iomanip>
#include <iostream>
diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index 97f6636..b4902bc 100644
--- a/src/clients/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -20,7 +20,7 @@
#include <src/output/colour.hh>
#include "uninstall.hh"
-#include <paludis/environment/default/default_environment.hh>
+#include <paludis/environments/default/default_environment.hh>
#include <paludis/tasks/uninstall_task.hh>
#include <paludis/tasks/exceptions.hh>
#include <paludis/dep_list/uninstall_list.hh>
diff --git a/src/clients/qualudis/Makefile.am b/src/clients/qualudis/Makefile.am
index 3b26dd6..c66ddc6 100644
--- a/src/clients/qualudis/Makefile.am
+++ b/src/clients/qualudis/Makefile.am
@@ -22,7 +22,7 @@ if MONOLITHIC
qualudis_LDADD = \
$(top_builddir)/paludis/qa/libpaludisqa.la \
- $(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
+ $(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/src/output/liboutput.a \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \