aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-28 21:45:56 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-28 21:45:56 +0000
commit45692e817c0a0c4b4f2ebc91501987efecff23aa (patch)
treeaf997ccbbb94eda5b55271ac1ba763ac49dc5540
parente73fa3ac11891c1db89e1a600b1edeb9395d86c9 (diff)
downloadpaludis-45692e817c0a0c4b4f2ebc91501987efecff23aa.tar.gz
paludis-45692e817c0a0c4b4f2ebc91501987efecff23aa.tar.xz
r3634@snowflake: ciaranm | 2007-06-28 22:45:19 +0100
We'll call it 'E', not 'Gentoo'
-rw-r--r--configure.ac22
-rw-r--r--doc/doxygen.conf.in2
-rw-r--r--paludis/Makefile.am.m44
-rw-r--r--paludis/dep_list/Makefile.am6
-rw-r--r--paludis/merger/Makefile.am4
-rw-r--r--paludis/qa/Makefile.am.m42
-rw-r--r--paludis/repositories/e/Makefile.am (renamed from paludis/repositories/gentoo/Makefile.am)38
-rw-r--r--paludis/repositories/e/e_key.cc (renamed from paludis/repositories/gentoo/e_key.cc)4
-rw-r--r--paludis/repositories/e/e_key.hh (renamed from paludis/repositories/gentoo/e_key.hh)0
-rw-r--r--paludis/repositories/e/eapi_phase.cc (renamed from paludis/repositories/gentoo/eapi_phase.cc)0
-rw-r--r--paludis/repositories/e/eapi_phase.hh (renamed from paludis/repositories/gentoo/eapi_phase.hh)0
-rw-r--r--paludis/repositories/e/ebin.cc (renamed from paludis/repositories/gentoo/ebin.cc)4
-rw-r--r--paludis/repositories/e/ebin.hh (renamed from paludis/repositories/gentoo/ebin.hh)4
-rw-r--r--paludis/repositories/e/ebin.se (renamed from paludis/repositories/gentoo/ebin.se)0
-rw-r--r--paludis/repositories/e/ebin.sr (renamed from paludis/repositories/gentoo/ebin.sr)0
-rw-r--r--paludis/repositories/e/ebin_entries.cc (renamed from paludis/repositories/gentoo/ebin_entries.cc)4
-rw-r--r--paludis/repositories/e/ebin_entries.hh (renamed from paludis/repositories/gentoo/ebin_entries.hh)4
-rw-r--r--paludis/repositories/e/ebuild.cc (renamed from paludis/repositories/gentoo/ebuild.cc)8
-rw-r--r--paludis/repositories/e/ebuild.hh (renamed from paludis/repositories/gentoo/ebuild.hh)2
-rw-r--r--paludis/repositories/e/ebuild.sr (renamed from paludis/repositories/gentoo/ebuild.sr)0
-rw-r--r--paludis/repositories/e/ebuild/Makefile.am (renamed from paludis/repositories/gentoo/ebuild/Makefile.am)6
-rw-r--r--paludis/repositories/e/ebuild/build_functions.bash (renamed from paludis/repositories/gentoo/ebuild/build_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_fetch.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_fetch.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_fetchbin.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_fetchbin.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_init.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_init.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_initbin.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_initbin.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_loadenv.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_loadenv.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_merge.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_merge.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_metadata.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_metadata.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_prepare.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_prepare.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_saveenv.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_saveenv.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_strip.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_strip.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_tidyup.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_tidyup.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_unmerge.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_unmerge.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_unpackbin.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_unpackbin.bash)0
-rw-r--r--paludis/repositories/e/ebuild/builtin_variable.bash (renamed from paludis/repositories/gentoo/ebuild/builtin_variable.bash)0
-rw-r--r--paludis/repositories/e/ebuild/die_functions.bash (renamed from paludis/repositories/gentoo/ebuild/die_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/digests/Makefile.am (renamed from paludis/repositories/gentoo/ebuild/digests/Makefile.am)0
-rw-r--r--paludis/repositories/e/ebuild/digests/domd5.cc (renamed from paludis/repositories/gentoo/ebuild/digests/domd5.cc)0
-rw-r--r--paludis/repositories/e/ebuild/digests/dormd160.cc (renamed from paludis/repositories/gentoo/ebuild/digests/dormd160.cc)0
-rw-r--r--paludis/repositories/e/ebuild/digests/dosha256.cc (renamed from paludis/repositories/gentoo/ebuild/digests/dosha256.cc)0
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash (renamed from paludis/repositories/gentoo/ebuild/ebuild.bash)0
-rw-r--r--paludis/repositories/e/ebuild/echo_functions.bash.in (renamed from paludis/repositories/gentoo/ebuild/echo_functions.bash.in)0
-rw-r--r--paludis/repositories/e/ebuild/echo_functions_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/echo_functions_TEST.bash)0
-rw-r--r--paludis/repositories/e/ebuild/eclass_functions.bash (renamed from paludis/repositories/gentoo/ebuild/eclass_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/exlib_functions.bash (renamed from paludis/repositories/gentoo/ebuild/exlib_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/install_functions.bash (renamed from paludis/repositories/gentoo/ebuild/install_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/kernel_functions.bash (renamed from paludis/repositories/gentoo/ebuild/kernel_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/kernel_functions_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/kernel_functions_TEST.bash)0
-rw-r--r--paludis/repositories/e/ebuild/list_functions.bash (renamed from paludis/repositories/gentoo/ebuild/list_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/list_functions_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/list_functions_TEST.bash)0
-rw-r--r--paludis/repositories/e/ebuild/merge.cc (renamed from paludis/repositories/gentoo/ebuild/merge.cc)0
-rw-r--r--paludis/repositories/e/ebuild/merge_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/merge_TEST.bash)18
-rwxr-xr-xpaludis/repositories/e/ebuild/merge_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/ebuild/merge_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/ebuild/merge_TEST_setup.sh (renamed from paludis/repositories/gentoo/ebuild/merge_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/ebuild/merge_common.cc (renamed from paludis/repositories/gentoo/ebuild/merge_common.cc)0
-rw-r--r--paludis/repositories/e/ebuild/merge_common.hh (renamed from paludis/repositories/gentoo/ebuild/merge_common.hh)0
-rw-r--r--paludis/repositories/e/ebuild/multilib_functions.bash (renamed from paludis/repositories/gentoo/ebuild/multilib_functions.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_config.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_config.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_nofetch.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_nofetch.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_postinst.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_postinst.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_postrm.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_postrm.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_preinst.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_preinst.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_prerm.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_prerm.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_pretend.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_pretend.bash)0
-rw-r--r--paludis/repositories/e/ebuild/pkg_setup.bash (renamed from paludis/repositories/gentoo/ebuild/pkg_setup.bash)0
-rw-r--r--paludis/repositories/e/ebuild/portage_stubs.bash (renamed from paludis/repositories/gentoo/ebuild/portage_stubs.bash)0
-rwxr-xr-xpaludis/repositories/e/ebuild/run_test.bash (renamed from paludis/repositories/gentoo/ebuild/run_test.bash)0
-rw-r--r--paludis/repositories/e/ebuild/sandbox.bash (renamed from paludis/repositories/gentoo/ebuild/sandbox.bash)0
-rw-r--r--paludis/repositories/e/ebuild/src_compile.bash (renamed from paludis/repositories/gentoo/ebuild/src_compile.bash)0
-rw-r--r--paludis/repositories/e/ebuild/src_install.bash (renamed from paludis/repositories/gentoo/ebuild/src_install.bash)0
-rw-r--r--paludis/repositories/e/ebuild/src_test.bash (renamed from paludis/repositories/gentoo/ebuild/src_test.bash)0
-rw-r--r--paludis/repositories/e/ebuild/src_unpack.bash (renamed from paludis/repositories/gentoo/ebuild/src_unpack.bash)0
-rw-r--r--paludis/repositories/e/ebuild/unmerge.cc (renamed from paludis/repositories/gentoo/ebuild/unmerge.cc)0
-rw-r--r--paludis/repositories/e/ebuild/unmerge_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/unmerge_TEST.bash)12
-rwxr-xr-xpaludis/repositories/e/ebuild/unmerge_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/ebuild/unmerge_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/ebuild/unmerge_TEST_setup.sh (renamed from paludis/repositories/gentoo/ebuild/unmerge_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/ebuild/usage_error.bash (renamed from paludis/repositories/gentoo/ebuild/usage_error.bash)0
-rw-r--r--paludis/repositories/e/ebuild/utils/Makefile.am (renamed from paludis/repositories/gentoo/ebuild/utils/Makefile.am)8
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/canonicalise (renamed from paludis/repositories/gentoo/ebuild/utils/canonicalise)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dobin (renamed from paludis/repositories/gentoo/ebuild/utils/dobin)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dobin_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/utils/dobin_TEST.bash)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doconfd (renamed from paludis/repositories/gentoo/ebuild/utils/doconfd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dodir (renamed from paludis/repositories/gentoo/ebuild/utils/dodir)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dodoc (renamed from paludis/repositories/gentoo/ebuild/utils/dodoc)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doenvd (renamed from paludis/repositories/gentoo/ebuild/utils/doenvd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doexe (renamed from paludis/repositories/gentoo/ebuild/utils/doexe)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dohard (renamed from paludis/repositories/gentoo/ebuild/utils/dohard)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dohtml (renamed from paludis/repositories/gentoo/ebuild/utils/dohtml)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doinfo (renamed from paludis/repositories/gentoo/ebuild/utils/doinfo)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doinitd (renamed from paludis/repositories/gentoo/ebuild/utils/doinitd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doins (renamed from paludis/repositories/gentoo/ebuild/utils/doins)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dolib (renamed from paludis/repositories/gentoo/ebuild/utils/dolib)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dolib.a.in (renamed from paludis/repositories/gentoo/ebuild/utils/dolib.a.in)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dolib.so.in (renamed from paludis/repositories/gentoo/ebuild/utils/dolib.so.in)0
-rw-r--r--paludis/repositories/e/ebuild/utils/doman (renamed from paludis/repositories/gentoo/ebuild/utils/doman)0
-rw-r--r--paludis/repositories/e/ebuild/utils/domo (renamed from paludis/repositories/gentoo/ebuild/utils/domo)0
-rw-r--r--paludis/repositories/e/ebuild/utils/donewins (renamed from paludis/repositories/gentoo/ebuild/utils/donewins)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dosbin (renamed from paludis/repositories/gentoo/ebuild/utils/dosbin)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dosed (renamed from paludis/repositories/gentoo/ebuild/utils/dosed)0
-rw-r--r--paludis/repositories/e/ebuild/utils/dosym (renamed from paludis/repositories/gentoo/ebuild/utils/dosym)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dounpack (renamed from paludis/repositories/gentoo/ebuild/utils/dounpack)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/emake (renamed from paludis/repositories/gentoo/ebuild/utils/emake)0
-rw-r--r--paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am (renamed from paludis/repositories/gentoo/ebuild/utils/exheres-0/Makefile.am)8
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0 (renamed from paludis/repositories/gentoo/ebuild/utils/exheres-0/banned_in_eapi_exheres-0)0
-rw-r--r--paludis/repositories/e/ebuild/utils/fowners (renamed from paludis/repositories/gentoo/ebuild/utils/fowners)0
-rw-r--r--paludis/repositories/e/ebuild/utils/fperms (renamed from paludis/repositories/gentoo/ebuild/utils/fperms)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/getfsize (renamed from paludis/repositories/gentoo/ebuild/utils/getfsize)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/getfsize_TEST.bash (renamed from paludis/repositories/gentoo/ebuild/utils/getfsize_TEST.bash)0
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/getmtime (renamed from paludis/repositories/gentoo/ebuild/utils/getmtime)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newbin (renamed from paludis/repositories/gentoo/ebuild/utils/newbin)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newconfd (renamed from paludis/repositories/gentoo/ebuild/utils/newconfd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newdoc (renamed from paludis/repositories/gentoo/ebuild/utils/newdoc)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newenvd (renamed from paludis/repositories/gentoo/ebuild/utils/newenvd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newexe (renamed from paludis/repositories/gentoo/ebuild/utils/newexe)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newinitd (renamed from paludis/repositories/gentoo/ebuild/utils/newinitd)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newins (renamed from paludis/repositories/gentoo/ebuild/utils/newins)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newlib.a.in (renamed from paludis/repositories/gentoo/ebuild/utils/newlib.a.in)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newlib.so.in (renamed from paludis/repositories/gentoo/ebuild/utils/newlib.so.in)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newman (renamed from paludis/repositories/gentoo/ebuild/utils/newman)0
-rw-r--r--paludis/repositories/e/ebuild/utils/newsbin (renamed from paludis/repositories/gentoo/ebuild/utils/newsbin)0
-rw-r--r--paludis/repositories/e/ebuild/utils/prep.in (renamed from paludis/repositories/gentoo/ebuild/utils/prep.in)0
-rw-r--r--paludis/repositories/e/ebuild/utils/run_test.bash (renamed from paludis/repositories/gentoo/ebuild/utils/run_test.bash)0
-rw-r--r--paludis/repositories/e/ebuild/work_around_broken_utilities.bash.in (renamed from paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash.in)0
-rwxr-xr-xpaludis/repositories/e/ebuild/write_vdb_entry.bash (renamed from paludis/repositories/gentoo/ebuild/write_vdb_entry.bash)0
-rw-r--r--paludis/repositories/e/ebuild_entries.cc (renamed from paludis/repositories/gentoo/ebuild_entries.cc)12
-rw-r--r--paludis/repositories/e/ebuild_entries.hh (renamed from paludis/repositories/gentoo/ebuild_entries.hh)4
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc (renamed from paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc)0
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh (renamed from paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh)6
-rw-r--r--paludis/repositories/e/ebuild_id.cc (renamed from paludis/repositories/gentoo/ebuild_id.cc)12
-rw-r--r--paludis/repositories/e/ebuild_id.hh (renamed from paludis/repositories/gentoo/ebuild_id.hh)0
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc (renamed from paludis/repositories/gentoo/eclass_mtimes.cc)0
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh (renamed from paludis/repositories/gentoo/eclass_mtimes.hh)0
-rw-r--r--paludis/repositories/e/exheres_layout.cc (renamed from paludis/repositories/gentoo/exheres_layout.cc)8
-rw-r--r--paludis/repositories/e/exheres_layout.hh (renamed from paludis/repositories/gentoo/exheres_layout.hh)2
-rw-r--r--paludis/repositories/e/glsa.cc (renamed from paludis/repositories/gentoo/glsa.cc)0
-rw-r--r--paludis/repositories/e/glsa.hh (renamed from paludis/repositories/gentoo/glsa.hh)2
-rw-r--r--paludis/repositories/e/glsa.sr (renamed from paludis/repositories/gentoo/glsa.sr)0
-rw-r--r--paludis/repositories/e/layout.cc (renamed from paludis/repositories/gentoo/layout.cc)6
-rw-r--r--paludis/repositories/e/layout.hh (renamed from paludis/repositories/gentoo/layout.hh)0
-rw-r--r--paludis/repositories/e/make_ebin_repository.cc (renamed from paludis/repositories/gentoo/make_ebin_repository.cc)2
-rw-r--r--paludis/repositories/e/make_ebin_repository.hh (renamed from paludis/repositories/gentoo/make_ebin_repository.hh)2
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc (renamed from paludis/repositories/gentoo/make_ebuild_repository.cc)2
-rw-r--r--paludis/repositories/e/make_ebuild_repository.hh (renamed from paludis/repositories/gentoo/make_ebuild_repository.hh)2
-rw-r--r--paludis/repositories/e/portage_repository.cc (renamed from paludis/repositories/gentoo/portage_repository.cc)16
-rw-r--r--paludis/repositories/e/portage_repository.hh (renamed from paludis/repositories/gentoo/portage_repository.hh)6
-rw-r--r--paludis/repositories/e/portage_repository_TEST.cc (renamed from paludis/repositories/gentoo/portage_repository_TEST.cc)4
-rwxr-xr-xpaludis/repositories/e/portage_repository_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/portage_repository_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/portage_repository_TEST_setup.sh (renamed from paludis/repositories/gentoo/portage_repository_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/portage_repository_entries.cc (renamed from paludis/repositories/gentoo/portage_repository_entries.cc)0
-rw-r--r--paludis/repositories/e/portage_repository_entries.hh (renamed from paludis/repositories/gentoo/portage_repository_entries.hh)4
-rw-r--r--paludis/repositories/e/portage_repository_exceptions.cc (renamed from paludis/repositories/gentoo/portage_repository_exceptions.cc)0
-rw-r--r--paludis/repositories/e/portage_repository_exceptions.hh (renamed from paludis/repositories/gentoo/portage_repository_exceptions.hh)0
-rw-r--r--paludis/repositories/e/portage_repository_news.cc (renamed from paludis/repositories/gentoo/portage_repository_news.cc)4
-rw-r--r--paludis/repositories/e/portage_repository_news.hh (renamed from paludis/repositories/gentoo/portage_repository_news.hh)0
-rw-r--r--paludis/repositories/e/portage_repository_params.cc (renamed from paludis/repositories/gentoo/portage_repository_params.cc)2
-rw-r--r--paludis/repositories/e/portage_repository_params.hh (renamed from paludis/repositories/gentoo/portage_repository_params.hh)2
-rw-r--r--paludis/repositories/e/portage_repository_params.sr (renamed from paludis/repositories/gentoo/portage_repository_params.sr)0
-rw-r--r--paludis/repositories/e/portage_repository_profile.cc (renamed from paludis/repositories/gentoo/portage_repository_profile.cc)8
-rw-r--r--paludis/repositories/e/portage_repository_profile.hh (renamed from paludis/repositories/gentoo/portage_repository_profile.hh)0
-rw-r--r--paludis/repositories/e/portage_repository_profile_file.cc (renamed from paludis/repositories/gentoo/portage_repository_profile_file.cc)0
-rw-r--r--paludis/repositories/e/portage_repository_profile_file.hh (renamed from paludis/repositories/gentoo/portage_repository_profile_file.hh)0
-rw-r--r--paludis/repositories/e/portage_repository_sets.cc (renamed from paludis/repositories/gentoo/portage_repository_sets.cc)6
-rw-r--r--paludis/repositories/e/portage_repository_sets.hh (renamed from paludis/repositories/gentoo/portage_repository_sets.hh)0
-rw-r--r--paludis/repositories/e/portage_repository_sets_TEST.cc (renamed from paludis/repositories/gentoo/portage_repository_sets_TEST.cc)4
-rwxr-xr-xpaludis/repositories/e/portage_repository_sets_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/portage_repository_sets_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/portage_repository_sets_TEST_setup.sh (renamed from paludis/repositories/gentoo/portage_repository_sets_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/registration.cc (renamed from paludis/repositories/gentoo/registration.cc)6
-rw-r--r--paludis/repositories/e/traditional_layout.cc (renamed from paludis/repositories/gentoo/traditional_layout.cc)6
-rw-r--r--paludis/repositories/e/traditional_layout.hh (renamed from paludis/repositories/gentoo/traditional_layout.hh)2
-rw-r--r--paludis/repositories/e/use_desc.cc (renamed from paludis/repositories/gentoo/use_desc.cc)0
-rw-r--r--paludis/repositories/e/use_desc.hh (renamed from paludis/repositories/gentoo/use_desc.hh)0
-rw-r--r--paludis/repositories/e/vdb_id.cc (renamed from paludis/repositories/gentoo/vdb_id.cc)4
-rw-r--r--paludis/repositories/e/vdb_id.hh (renamed from paludis/repositories/gentoo/vdb_id.hh)0
-rw-r--r--paludis/repositories/e/vdb_merger.cc (renamed from paludis/repositories/gentoo/vdb_merger.cc)2
-rw-r--r--paludis/repositories/e/vdb_merger.hh (renamed from paludis/repositories/gentoo/vdb_merger.hh)2
-rw-r--r--paludis/repositories/e/vdb_merger.sr (renamed from paludis/repositories/gentoo/vdb_merger.sr)0
-rw-r--r--paludis/repositories/e/vdb_repository.cc (renamed from paludis/repositories/gentoo/vdb_repository.cc)14
-rw-r--r--paludis/repositories/e/vdb_repository.hh (renamed from paludis/repositories/gentoo/vdb_repository.hh)2
-rw-r--r--paludis/repositories/e/vdb_repository.sr (renamed from paludis/repositories/gentoo/vdb_repository.sr)0
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc (renamed from paludis/repositories/gentoo/vdb_repository_TEST.cc)0
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/vdb_repository_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/vdb_repository_TEST_setup.sh (renamed from paludis/repositories/gentoo/vdb_repository_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc (renamed from paludis/repositories/gentoo/vdb_unmerger.cc)2
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh (renamed from paludis/repositories/gentoo/vdb_unmerger.hh)2
-rw-r--r--paludis/repositories/e/vdb_unmerger.sr (renamed from paludis/repositories/gentoo/vdb_unmerger.sr)0
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc (renamed from paludis/repositories/gentoo/vdb_unmerger_TEST.cc)0
-rwxr-xr-xpaludis/repositories/e/vdb_unmerger_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/vdb_unmerger_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/vdb_unmerger_TEST_setup.sh (renamed from paludis/repositories/gentoo/vdb_unmerger_TEST_setup.sh)0
-rw-r--r--paludis/repositories/e/xml_things.cc (renamed from paludis/repositories/gentoo/xml_things.cc)2
-rw-r--r--paludis/repositories/e/xml_things.hh (renamed from paludis/repositories/gentoo/xml_things.hh)0
-rw-r--r--paludis/repositories/e/xml_things_TEST.cc (renamed from paludis/repositories/gentoo/xml_things_TEST.cc)2
-rwxr-xr-xpaludis/repositories/e/xml_things_TEST_cleanup.sh (renamed from paludis/repositories/gentoo/xml_things_TEST_cleanup.sh)0
-rwxr-xr-xpaludis/repositories/e/xml_things_TEST_setup.sh (renamed from paludis/repositories/gentoo/xml_things_TEST_setup.sh)0
-rw-r--r--paludis/repositories/fake/Makefile.am6
-rw-r--r--paludis/repositories/gems/Makefile.am6
-rw-r--r--paludis/repositories/virtuals/Makefile.am6
-rw-r--r--python/Makefile.am36
-rw-r--r--ruby/Makefile.am32
-rw-r--r--src/clients/adjutrix/Makefile.am8
-rw-r--r--src/clients/inquisitio/Makefile.am6
-rw-r--r--src/clients/paludis/Makefile.am10
202 files changed, 216 insertions, 216 deletions
diff --git a/configure.ac b/configure.ac
index 5fff1aa9e..79a71f6cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -847,18 +847,18 @@ AC_SUBST([VIM_INSTALL_DIR])
dnl }}}
dnl {{{ repositories
-ALL_REPOSITORIES="cran fake gems gentoo virtuals"
-DEFAULT_REPOSITORIES="fake gentoo virtuals"
+ALL_REPOSITORIES="cran e fake gems virtuals"
+DEFAULT_REPOSITORIES="e fake virtuals"
AC_MSG_CHECKING([which repositories to build...])
AC_ARG_WITH([repositories],
[ --with-repositories=foo,bar,...
Build the specified repositories:
- default Equivalent to fake,gentoo,virtuals
+ default Equivalent to e,fake,virtuals
cran The Comprehensive R Archive Network (experimental)
+ e Ebuild, Ebin, Exheres, VDB etc
fake A fake repository for test cases and adjutrix
gems Ruby gems (experimental)
- gentoo Gentoo packages (ebuilds, vdb)
virtuals Old style Gentoo virtuals],
[repositories="`echo $with_repositories | tr ',' ' '`"],
[repositories="$DEFAULT_REPOSITORIES"])
@@ -1153,13 +1153,13 @@ AC_OUTPUT(
paludis/repositories/cran/cran/Makefile
paludis/repositories/fake/Makefile
paludis/repositories/gems/Makefile
- paludis/repositories/gentoo/Makefile
- paludis/repositories/gentoo/ebuild/Makefile
- paludis/repositories/gentoo/ebuild/digests/Makefile
- paludis/repositories/gentoo/ebuild/utils/Makefile
- paludis/repositories/gentoo/ebuild/utils/exheres-0/Makefile
- paludis/repositories/gentoo/ebuild/echo_functions.bash
- paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash
+ paludis/repositories/e/Makefile
+ paludis/repositories/e/ebuild/Makefile
+ paludis/repositories/e/ebuild/digests/Makefile
+ paludis/repositories/e/ebuild/utils/Makefile
+ paludis/repositories/e/ebuild/utils/exheres-0/Makefile
+ paludis/repositories/e/ebuild/echo_functions.bash
+ paludis/repositories/e/ebuild/work_around_broken_utilities.bash
paludis/repositories/virtuals/Makefile
paludis/selinux/Makefile
paludis/syncers/Makefile
diff --git a/doc/doxygen.conf.in b/doc/doxygen.conf.in
index fa5f8032f..952939df5 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/args ../paludis/dep_list ../paludis/digests ../paludis/environments ../paludis/environments/no_config ../paludis/environments/adapted ../paludis/environments/portage ../paludis/environments/paludis ../paludis/environments/test ../paludis/fetchers ../paludis/merger ../paludis/qa ../paludis/repositories ../paludis/repositories/cran ../paludis/repositories/fake ../paludis/repositories/gems ../paludis/repositories/gentoo ../paludis/repositories/virtuals ../paludis/selinux ../paludis/syncers ../paludis/tasks ../paludis/util ../doc
+INPUT = ../paludis ../paludis/args ../paludis/dep_list ../paludis/digests ../paludis/environments ../paludis/environments/no_config ../paludis/environments/adapted ../paludis/environments/portage ../paludis/environments/paludis ../paludis/environments/test ../paludis/fetchers ../paludis/merger ../paludis/qa ../paludis/repositories ../paludis/repositories/cran ../paludis/repositories/fake ../paludis/repositories/gems ../paludis/repositories/e ../paludis/repositories/virtuals ../paludis/selinux ../paludis/syncers ../paludis/tasks ../paludis/util ../doc
# 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/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 8aeacb623..c1e472296 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -154,11 +154,11 @@ built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
PALUDIS_SKIP_CONFIG="yes" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/dep_list/Makefile.am b/paludis/dep_list/Makefile.am
index 3049e7c7a..c30c37023 100644
--- a/paludis/dep_list/Makefile.am
+++ b/paludis/dep_list/Makefile.am
@@ -63,15 +63,15 @@ TESTS = \
range_rewriter_TEST
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/`:` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
diff --git a/paludis/merger/Makefile.am b/paludis/merger/Makefile.am
index 1f8087948..78c48bbaf 100644
--- a/paludis/merger/Makefile.am
+++ b/paludis/merger/Makefile.am
@@ -46,13 +46,13 @@ TESTS = \
merger_TEST
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
bash $(top_srcdir)/test/run_test.sh
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 1bd22729e..d339ee731 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -79,7 +79,7 @@ endif
TESTS = testlist
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
diff --git a/paludis/repositories/gentoo/Makefile.am b/paludis/repositories/e/Makefile.am
index 59b07bc81..24d3003f1 100644
--- a/paludis/repositories/gentoo/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -20,18 +20,18 @@ DEFS= \
paludis_repositories_libdir = $(libdir)/paludis/repositories
-paludis_repositories_lib_LTLIBRARIES = libpaludisgentoorepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludiserepository.la
if ENABLE_GLSA
-lib_LTLIBRARIES = libpaludisgentoorepositoryxmlthings.la
+lib_LTLIBRARIES = libpaludiserepositoryxmlthings.la
endif
-paludis_repositories_gentoo_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/gentoo/
-libpaludisgentoorepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_e_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/e/
+libpaludiserepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-paludis_repositories_gentoo_include_HEADERS = \
+paludis_repositories_e_include_HEADERS = \
ebuild.hh \
ebuild-sr.hh \
ebin.hh \
@@ -69,7 +69,7 @@ paludis_repositories_gentoo_include_HEADERS = \
vdb_id.hh \
e_key.hh
-libpaludisgentoorepository_la_SOURCES = \
+libpaludiserepository_la_SOURCES = \
ebuild.cc \
ebin.cc \
glsa.cc \
@@ -99,9 +99,9 @@ libpaludisgentoorepository_la_SOURCES = \
ebuild_id.cc \
vdb_id.cc \
e_key.cc \
- $(paludis_repositories_gentoo_include_HEADERS)
+ $(paludis_repositories_e_include_HEADERS)
-libpaludisgentoorepository_la_LIBADD = \
+libpaludiserepository_la_LIBADD = \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
$(top_builddir)/paludis/merger/libpaludismerger.la \
$(top_builddir)/paludis/digests/libpaludisdigests.la \
@@ -112,7 +112,7 @@ libpaludisgentoorepository_la_LIBADD = \
portage_repository_TEST_SOURCES = portage_repository_TEST.cc
portage_repository_TEST_LDADD = \
- libpaludisgentoorepository.la \
+ libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
@@ -125,7 +125,7 @@ portage_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
vdb_unmerger_TEST_LDADD = \
- libpaludisgentoorepository.la \
+ libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
@@ -138,7 +138,7 @@ vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
portage_repository_sets_TEST_SOURCES = portage_repository_sets_TEST.cc
portage_repository_sets_TEST_LDADD = \
- libpaludisgentoorepository.la \
+ libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/paludis/libpaludis.la \
@@ -215,15 +215,15 @@ check_SCRIPTS = \
portage_repository_sets_TEST_setup.sh portage_repository_sets_TEST_cleanup.sh
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/`:` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
portage_repository_params-sr.hh : portage_repository_params.sr $(top_srcdir)/misc/make_sr.bash
@@ -275,14 +275,14 @@ ebin-se.cc : ebin.se $(top_srcdir)/misc/make_se.bash
if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/ebin.se > $@ ; then rm -f $@ ; exit 1 ; fi
-libpaludisgentoorepositoryxmlthings_la_SOURCES = xml_things.cc xml_things.hh
-libpaludisgentoorepositoryxmlthings_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
+libpaludiserepositoryxmlthings_la_SOURCES = xml_things.cc xml_things.hh
+libpaludiserepositoryxmlthings_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
-libpaludisgentoorepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
+libpaludiserepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la
-libpaludisgentoorepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludiserepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
if ENABLE_GLSA
@@ -292,7 +292,7 @@ xml_things_TEST_SOURCES = xml_things_TEST.cc
xml_things_TEST_LDADD = \
$(top_builddir)/paludis/util/test_extras.o \
$(top_builddir)/test/libtest.a \
- libpaludisgentoorepository.la \
+ libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/environments/test/libpaludistestenvironment.la \
diff --git a/paludis/repositories/gentoo/e_key.cc b/paludis/repositories/e/e_key.cc
index edf96b00f..7989ed142 100644
--- a/paludis/repositories/gentoo/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/e_key.hh>
-#include <paludis/repositories/gentoo/ebuild_id.hh>
+#include <paludis/repositories/e/e_key.hh>
+#include <paludis/repositories/e/ebuild_id.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/stringify.hh>
diff --git a/paludis/repositories/gentoo/e_key.hh b/paludis/repositories/e/e_key.hh
index bdcf17ea7..bdcf17ea7 100644
--- a/paludis/repositories/gentoo/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
diff --git a/paludis/repositories/gentoo/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index 70dafc200..70dafc200 100644
--- a/paludis/repositories/gentoo/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
diff --git a/paludis/repositories/gentoo/eapi_phase.hh b/paludis/repositories/e/eapi_phase.hh
index 10e4a6da1..10e4a6da1 100644
--- a/paludis/repositories/gentoo/eapi_phase.hh
+++ b/paludis/repositories/e/eapi_phase.hh
diff --git a/paludis/repositories/gentoo/ebin.cc b/paludis/repositories/e/ebin.cc
index 4ade151b8..488356645 100644
--- a/paludis/repositories/gentoo/ebin.cc
+++ b/paludis/repositories/e/ebin.cc
@@ -35,8 +35,8 @@
using namespace paludis;
-#include <paludis/repositories/gentoo/ebin-se.cc>
-#include <paludis/repositories/gentoo/ebin-sr.cc>
+#include <paludis/repositories/e/ebin-se.cc>
+#include <paludis/repositories/e/ebin-sr.cc>
EbinCommand::EbinCommand(const EbinCommandParams & p) :
params(p)
diff --git a/paludis/repositories/gentoo/ebin.hh b/paludis/repositories/e/ebin.hh
index 92415fc48..8247d56cc 100644
--- a/paludis/repositories/gentoo/ebin.hh
+++ b/paludis/repositories/e/ebin.hh
@@ -31,8 +31,8 @@ namespace paludis
{
class Command;
-#include <paludis/repositories/gentoo/ebin-se.hh>
-#include <paludis/repositories/gentoo/ebin-sr.hh>
+#include <paludis/repositories/e/ebin-se.hh>
+#include <paludis/repositories/e/ebin-sr.hh>
/**
* A command related to a .ebin file.
diff --git a/paludis/repositories/gentoo/ebin.se b/paludis/repositories/e/ebin.se
index 0bfb0796f..0bfb0796f 100644
--- a/paludis/repositories/gentoo/ebin.se
+++ b/paludis/repositories/e/ebin.se
diff --git a/paludis/repositories/gentoo/ebin.sr b/paludis/repositories/e/ebin.sr
index 20800ef75..20800ef75 100644
--- a/paludis/repositories/gentoo/ebin.sr
+++ b/paludis/repositories/e/ebin.sr
diff --git a/paludis/repositories/gentoo/ebin_entries.cc b/paludis/repositories/e/ebin_entries.cc
index 7a4b83d37..6994b9505 100644
--- a/paludis/repositories/gentoo/ebin_entries.cc
+++ b/paludis/repositories/e/ebin_entries.cc
@@ -18,8 +18,8 @@
*/
#include "ebin_entries.hh"
-#include <paludis/repositories/gentoo/ebin.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/ebin.hh>
+#include <paludis/repositories/e/portage_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/dep_spec_flattener.hh>
diff --git a/paludis/repositories/gentoo/ebin_entries.hh b/paludis/repositories/e/ebin_entries.hh
index a74cd5764..8a7d6d146 100644
--- a/paludis/repositories/gentoo/ebin_entries.hh
+++ b/paludis/repositories/e/ebin_entries.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EBIN_ENTRIES_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EBIN_ENTRIES_HH 1
-#include <paludis/repositories/gentoo/portage_repository_entries.hh>
-#include <paludis/repositories/gentoo/portage_repository_params.hh>
+#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/portage_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
namespace paludis
diff --git a/paludis/repositories/gentoo/ebuild.cc b/paludis/repositories/e/ebuild.cc
index cb21c554a..ea8484e2e 100644
--- a/paludis/repositories/gentoo/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -17,9 +17,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/ebuild.hh>
-#include <paludis/repositories/gentoo/ebuild_id.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/ebuild.hh>
+#include <paludis/repositories/e/ebuild_id.hh>
+#include <paludis/repositories/e/portage_repository.hh>
#include <paludis/util/system.hh>
#include <paludis/util/strip.hh>
@@ -53,7 +53,7 @@
using namespace paludis;
using namespace paludis::erepository;
-#include <paludis/repositories/gentoo/ebuild-sr.cc>
+#include <paludis/repositories/e/ebuild-sr.cc>
EbuildCommand::EbuildCommand(const EbuildCommandParams & p) :
params(p)
diff --git a/paludis/repositories/gentoo/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 4b5b0196c..42f7975b5 100644
--- a/paludis/repositories/gentoo/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -42,7 +42,7 @@ namespace paludis
{
class EbuildID;
-#include <paludis/repositories/gentoo/ebuild-sr.hh>
+#include <paludis/repositories/e/ebuild-sr.hh>
/**
* An EbuildCommand is the base class from which specific ebuild
diff --git a/paludis/repositories/gentoo/ebuild.sr b/paludis/repositories/e/ebuild.sr
index 48cde63da..48cde63da 100644
--- a/paludis/repositories/gentoo/ebuild.sr
+++ b/paludis/repositories/e/ebuild.sr
diff --git a/paludis/repositories/gentoo/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index 0ffbf4ba1..4346427db 100644
--- a/paludis/repositories/gentoo/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -50,13 +50,13 @@ libexecprog_SCRIPTS = \
work_around_broken_utilities.bash
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/e/ebuild/" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/`" \
+ TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/gentoo/ebuild/run_test.bash
+ bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
TESTS = echo_functions_TEST.bash list_functions_TEST.bash kernel_functions_TEST.bash \
merge_TEST.bash unmerge_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/build_functions.bash b/paludis/repositories/e/ebuild/build_functions.bash
index 6e7aa11be..6e7aa11be 100644
--- a/paludis/repositories/gentoo/ebuild/build_functions.bash
+++ b/paludis/repositories/e/ebuild/build_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_fetch.bash b/paludis/repositories/e/ebuild/builtin_fetch.bash
index c3f6402d0..c3f6402d0 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_fetch.bash
+++ b/paludis/repositories/e/ebuild/builtin_fetch.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_fetchbin.bash b/paludis/repositories/e/ebuild/builtin_fetchbin.bash
index 17af258e9..17af258e9 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_fetchbin.bash
+++ b/paludis/repositories/e/ebuild/builtin_fetchbin.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_init.bash b/paludis/repositories/e/ebuild/builtin_init.bash
index 4a3836bf1..4a3836bf1 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/builtin_init.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_initbin.bash b/paludis/repositories/e/ebuild/builtin_initbin.bash
index bdd9650d8..bdd9650d8 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_initbin.bash
+++ b/paludis/repositories/e/ebuild/builtin_initbin.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_loadenv.bash b/paludis/repositories/e/ebuild/builtin_loadenv.bash
index 4b057c0c9..4b057c0c9 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_loadenv.bash
+++ b/paludis/repositories/e/ebuild/builtin_loadenv.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_merge.bash b/paludis/repositories/e/ebuild/builtin_merge.bash
index d922e92a5..d922e92a5 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_merge.bash
+++ b/paludis/repositories/e/ebuild/builtin_merge.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_metadata.bash b/paludis/repositories/e/ebuild/builtin_metadata.bash
index 36d181bd5..36d181bd5 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_metadata.bash
+++ b/paludis/repositories/e/ebuild/builtin_metadata.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_prepare.bash b/paludis/repositories/e/ebuild/builtin_prepare.bash
index 4a1195e5f..4a1195e5f 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_prepare.bash
+++ b/paludis/repositories/e/ebuild/builtin_prepare.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash b/paludis/repositories/e/ebuild/builtin_saveenv.bash
index 097578f64..097578f64 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_saveenv.bash
+++ b/paludis/repositories/e/ebuild/builtin_saveenv.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_strip.bash b/paludis/repositories/e/ebuild/builtin_strip.bash
index 9a4168e7c..9a4168e7c 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_strip.bash
+++ b/paludis/repositories/e/ebuild/builtin_strip.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_tidyup.bash b/paludis/repositories/e/ebuild/builtin_tidyup.bash
index 8927d23b8..8927d23b8 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_tidyup.bash
+++ b/paludis/repositories/e/ebuild/builtin_tidyup.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_unmerge.bash b/paludis/repositories/e/ebuild/builtin_unmerge.bash
index e358d8a3a..e358d8a3a 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_unmerge.bash
+++ b/paludis/repositories/e/ebuild/builtin_unmerge.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_unpackbin.bash b/paludis/repositories/e/ebuild/builtin_unpackbin.bash
index 975af78ba..975af78ba 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_unpackbin.bash
+++ b/paludis/repositories/e/ebuild/builtin_unpackbin.bash
diff --git a/paludis/repositories/gentoo/ebuild/builtin_variable.bash b/paludis/repositories/e/ebuild/builtin_variable.bash
index e140188d7..e140188d7 100644
--- a/paludis/repositories/gentoo/ebuild/builtin_variable.bash
+++ b/paludis/repositories/e/ebuild/builtin_variable.bash
diff --git a/paludis/repositories/gentoo/ebuild/die_functions.bash b/paludis/repositories/e/ebuild/die_functions.bash
index cfff825c4..cfff825c4 100644
--- a/paludis/repositories/gentoo/ebuild/die_functions.bash
+++ b/paludis/repositories/e/ebuild/die_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/digests/Makefile.am b/paludis/repositories/e/ebuild/digests/Makefile.am
index d4ad64597..d4ad64597 100644
--- a/paludis/repositories/gentoo/ebuild/digests/Makefile.am
+++ b/paludis/repositories/e/ebuild/digests/Makefile.am
diff --git a/paludis/repositories/gentoo/ebuild/digests/domd5.cc b/paludis/repositories/e/ebuild/digests/domd5.cc
index d139f472e..d139f472e 100644
--- a/paludis/repositories/gentoo/ebuild/digests/domd5.cc
+++ b/paludis/repositories/e/ebuild/digests/domd5.cc
diff --git a/paludis/repositories/gentoo/ebuild/digests/dormd160.cc b/paludis/repositories/e/ebuild/digests/dormd160.cc
index 47fcd7f00..47fcd7f00 100644
--- a/paludis/repositories/gentoo/ebuild/digests/dormd160.cc
+++ b/paludis/repositories/e/ebuild/digests/dormd160.cc
diff --git a/paludis/repositories/gentoo/ebuild/digests/dosha256.cc b/paludis/repositories/e/ebuild/digests/dosha256.cc
index 056ce5a2a..056ce5a2a 100644
--- a/paludis/repositories/gentoo/ebuild/digests/dosha256.cc
+++ b/paludis/repositories/e/ebuild/digests/dosha256.cc
diff --git a/paludis/repositories/gentoo/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 4c2a59f22..4c2a59f22 100755
--- a/paludis/repositories/gentoo/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
diff --git a/paludis/repositories/gentoo/ebuild/echo_functions.bash.in b/paludis/repositories/e/ebuild/echo_functions.bash.in
index 98e538443..98e538443 100644
--- a/paludis/repositories/gentoo/ebuild/echo_functions.bash.in
+++ b/paludis/repositories/e/ebuild/echo_functions.bash.in
diff --git a/paludis/repositories/gentoo/ebuild/echo_functions_TEST.bash b/paludis/repositories/e/ebuild/echo_functions_TEST.bash
index 6e4ad2786..6e4ad2786 100644
--- a/paludis/repositories/gentoo/ebuild/echo_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/echo_functions_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/eclass_functions.bash b/paludis/repositories/e/ebuild/eclass_functions.bash
index 93e6151b2..93e6151b2 100644
--- a/paludis/repositories/gentoo/ebuild/eclass_functions.bash
+++ b/paludis/repositories/e/ebuild/eclass_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/exlib_functions.bash b/paludis/repositories/e/ebuild/exlib_functions.bash
index 44dcbd84c..44dcbd84c 100644
--- a/paludis/repositories/gentoo/ebuild/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exlib_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/install_functions.bash b/paludis/repositories/e/ebuild/install_functions.bash
index e23628c7b..e23628c7b 100644
--- a/paludis/repositories/gentoo/ebuild/install_functions.bash
+++ b/paludis/repositories/e/ebuild/install_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/kernel_functions.bash b/paludis/repositories/e/ebuild/kernel_functions.bash
index 9126376e6..9126376e6 100644
--- a/paludis/repositories/gentoo/ebuild/kernel_functions.bash
+++ b/paludis/repositories/e/ebuild/kernel_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/kernel_functions_TEST.bash b/paludis/repositories/e/ebuild/kernel_functions_TEST.bash
index 4b3271df3..4b3271df3 100644
--- a/paludis/repositories/gentoo/ebuild/kernel_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/kernel_functions_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/list_functions.bash b/paludis/repositories/e/ebuild/list_functions.bash
index d34ba64eb..d34ba64eb 100644
--- a/paludis/repositories/gentoo/ebuild/list_functions.bash
+++ b/paludis/repositories/e/ebuild/list_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/list_functions_TEST.bash b/paludis/repositories/e/ebuild/list_functions_TEST.bash
index c3ba14fbb..c3ba14fbb 100644
--- a/paludis/repositories/gentoo/ebuild/list_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/list_functions_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/merge.cc b/paludis/repositories/e/ebuild/merge.cc
index 77e78bf03..77e78bf03 100644
--- a/paludis/repositories/gentoo/ebuild/merge.cc
+++ b/paludis/repositories/e/ebuild/merge.cc
diff --git a/paludis/repositories/gentoo/ebuild/merge_TEST.bash b/paludis/repositories/e/ebuild/merge_TEST.bash
index c4f525331..23156255b 100644
--- a/paludis/repositories/gentoo/ebuild/merge_TEST.bash
+++ b/paludis/repositories/e/ebuild/merge_TEST.bash
@@ -18,7 +18,7 @@
merge_empty_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/empty_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/empty_src" \
"merge_TEST_dir/empty_dst" \
"merge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
@@ -26,7 +26,7 @@ merge_empty_TEST()
merge_files_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/files_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/files_src" \
"merge_TEST_dir/files_dst" \
"merge_TEST_dir/files_contents" 1>/dev/null
test_return_code
@@ -40,7 +40,7 @@ merge_files_TEST()
merge_dirs_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/dirs_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/dirs_src" \
"merge_TEST_dir/dirs_dst" \
"merge_TEST_dir/dirs_contents" 1>/dev/null
test_return_code
@@ -61,7 +61,7 @@ merge_dirs_TEST()
merge_dirs_over_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/dirs_over_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/dirs_over_src" \
"merge_TEST_dir/dirs_over_dst" \
"merge_TEST_dir/dirs_over_contents" 1>/dev/null
test_return_code
@@ -82,7 +82,7 @@ merge_dirs_over_TEST()
merge_links_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/links_src" \
"merge_TEST_dir/links_dst" \
"merge_TEST_dir/links_contents" 1>/dev/null
test_return_code
@@ -100,7 +100,7 @@ merge_links_TEST()
merge_links_over_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_over_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/links_over_src" \
"merge_TEST_dir/links_over_dst" \
"merge_TEST_dir/links_over_contents" 1>/dev/null
test_return_code
@@ -122,7 +122,7 @@ merge_links_over_TEST()
merge_links_over_dir_TEST()
{
- ! ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_over_dir_src" \
+ ! ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/links_over_dir_src" \
"merge_TEST_dir/links_over_dir_dst" \
"merge_TEST_dir/links_over_dir_contents" &>/dev/null
test_return_code
@@ -132,7 +132,7 @@ merge_config_protect_TEST()
{
export CONFIG_PROTECT=/dir
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/config_pro_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/config_pro_src" \
"merge_TEST_dir/config_pro_dst" \
"merge_TEST_dir/config_pro_contents" 1>/dev/null
test_return_code
@@ -178,7 +178,7 @@ merge_config_protect_noroot_TEST()
{
export CONFIG_PROTECT=$(${PALUDIS_EBUILD_DIR}/utils/canonicalise `pwd` )/merge_TEST_dir/noroot_dst/dir
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/config_pro_noroot_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "merge_TEST_dir/config_pro_noroot_src" \
"/" \
"merge_TEST_dir/config_pro_slash_root_contents" 1>/dev/null
test_return_code
diff --git a/paludis/repositories/gentoo/ebuild/merge_TEST_cleanup.sh b/paludis/repositories/e/ebuild/merge_TEST_cleanup.sh
index 4b40b8f65..4b40b8f65 100755
--- a/paludis/repositories/gentoo/ebuild/merge_TEST_cleanup.sh
+++ b/paludis/repositories/e/ebuild/merge_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/ebuild/merge_TEST_setup.sh b/paludis/repositories/e/ebuild/merge_TEST_setup.sh
index 4af857d16..4af857d16 100755
--- a/paludis/repositories/gentoo/ebuild/merge_TEST_setup.sh
+++ b/paludis/repositories/e/ebuild/merge_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/ebuild/merge_common.cc b/paludis/repositories/e/ebuild/merge_common.cc
index 27b9e11ef..27b9e11ef 100644
--- a/paludis/repositories/gentoo/ebuild/merge_common.cc
+++ b/paludis/repositories/e/ebuild/merge_common.cc
diff --git a/paludis/repositories/gentoo/ebuild/merge_common.hh b/paludis/repositories/e/ebuild/merge_common.hh
index 3ab1399c9..3ab1399c9 100644
--- a/paludis/repositories/gentoo/ebuild/merge_common.hh
+++ b/paludis/repositories/e/ebuild/merge_common.hh
diff --git a/paludis/repositories/gentoo/ebuild/multilib_functions.bash b/paludis/repositories/e/ebuild/multilib_functions.bash
index f6569334e..f6569334e 100644
--- a/paludis/repositories/gentoo/ebuild/multilib_functions.bash
+++ b/paludis/repositories/e/ebuild/multilib_functions.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_config.bash b/paludis/repositories/e/ebuild/pkg_config.bash
index f0bb49ab4..f0bb49ab4 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_config.bash
+++ b/paludis/repositories/e/ebuild/pkg_config.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_nofetch.bash b/paludis/repositories/e/ebuild/pkg_nofetch.bash
index 09c179125..09c179125 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_nofetch.bash
+++ b/paludis/repositories/e/ebuild/pkg_nofetch.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_postinst.bash b/paludis/repositories/e/ebuild/pkg_postinst.bash
index 9eb7c6c8f..9eb7c6c8f 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_postinst.bash
+++ b/paludis/repositories/e/ebuild/pkg_postinst.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_postrm.bash b/paludis/repositories/e/ebuild/pkg_postrm.bash
index 9fc7855ac..9fc7855ac 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_postrm.bash
+++ b/paludis/repositories/e/ebuild/pkg_postrm.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_preinst.bash b/paludis/repositories/e/ebuild/pkg_preinst.bash
index 70a346154..70a346154 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_preinst.bash
+++ b/paludis/repositories/e/ebuild/pkg_preinst.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_prerm.bash b/paludis/repositories/e/ebuild/pkg_prerm.bash
index ca28d79f1..ca28d79f1 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_prerm.bash
+++ b/paludis/repositories/e/ebuild/pkg_prerm.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_pretend.bash b/paludis/repositories/e/ebuild/pkg_pretend.bash
index ee2f63b0e..ee2f63b0e 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_pretend.bash
+++ b/paludis/repositories/e/ebuild/pkg_pretend.bash
diff --git a/paludis/repositories/gentoo/ebuild/pkg_setup.bash b/paludis/repositories/e/ebuild/pkg_setup.bash
index 51b83a492..51b83a492 100644
--- a/paludis/repositories/gentoo/ebuild/pkg_setup.bash
+++ b/paludis/repositories/e/ebuild/pkg_setup.bash
diff --git a/paludis/repositories/gentoo/ebuild/portage_stubs.bash b/paludis/repositories/e/ebuild/portage_stubs.bash
index 5fc68401a..5fc68401a 100644
--- a/paludis/repositories/gentoo/ebuild/portage_stubs.bash
+++ b/paludis/repositories/e/ebuild/portage_stubs.bash
diff --git a/paludis/repositories/gentoo/ebuild/run_test.bash b/paludis/repositories/e/ebuild/run_test.bash
index b5587b9d1..b5587b9d1 100755
--- a/paludis/repositories/gentoo/ebuild/run_test.bash
+++ b/paludis/repositories/e/ebuild/run_test.bash
diff --git a/paludis/repositories/gentoo/ebuild/sandbox.bash b/paludis/repositories/e/ebuild/sandbox.bash
index cd504ae08..cd504ae08 100644
--- a/paludis/repositories/gentoo/ebuild/sandbox.bash
+++ b/paludis/repositories/e/ebuild/sandbox.bash
diff --git a/paludis/repositories/gentoo/ebuild/src_compile.bash b/paludis/repositories/e/ebuild/src_compile.bash
index 85a48e478..85a48e478 100644
--- a/paludis/repositories/gentoo/ebuild/src_compile.bash
+++ b/paludis/repositories/e/ebuild/src_compile.bash
diff --git a/paludis/repositories/gentoo/ebuild/src_install.bash b/paludis/repositories/e/ebuild/src_install.bash
index f0c2f9d64..f0c2f9d64 100644
--- a/paludis/repositories/gentoo/ebuild/src_install.bash
+++ b/paludis/repositories/e/ebuild/src_install.bash
diff --git a/paludis/repositories/gentoo/ebuild/src_test.bash b/paludis/repositories/e/ebuild/src_test.bash
index 17ad3414c..17ad3414c 100644
--- a/paludis/repositories/gentoo/ebuild/src_test.bash
+++ b/paludis/repositories/e/ebuild/src_test.bash
diff --git a/paludis/repositories/gentoo/ebuild/src_unpack.bash b/paludis/repositories/e/ebuild/src_unpack.bash
index 02ce83eee..02ce83eee 100644
--- a/paludis/repositories/gentoo/ebuild/src_unpack.bash
+++ b/paludis/repositories/e/ebuild/src_unpack.bash
diff --git a/paludis/repositories/gentoo/ebuild/unmerge.cc b/paludis/repositories/e/ebuild/unmerge.cc
index 367b42c65..367b42c65 100644
--- a/paludis/repositories/gentoo/ebuild/unmerge.cc
+++ b/paludis/repositories/e/ebuild/unmerge.cc
diff --git a/paludis/repositories/gentoo/ebuild/unmerge_TEST.bash b/paludis/repositories/e/ebuild/unmerge_TEST.bash
index bd59a914e..fa006824b 100644
--- a/paludis/repositories/gentoo/ebuild/unmerge_TEST.bash
+++ b/paludis/repositories/e/ebuild/unmerge_TEST.bash
@@ -18,12 +18,12 @@
unmerge_empty_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/empty_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "unmerge_TEST_dir/empty_src" \
"unmerge_TEST_dir/empty_dst" \
"unmerge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/empty_dst" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/unmerge "unmerge_TEST_dir/empty_dst" \
"unmerge_TEST_dir/empty_contents" 1>/dev/null
test_return_code
@@ -38,7 +38,7 @@ unmerge_empty_TEST()
unmerge_files_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/files_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "unmerge_TEST_dir/files_src" \
"unmerge_TEST_dir/files_dst" \
"unmerge_TEST_dir/files_contents" 1>/dev/null
test_return_code
@@ -51,7 +51,7 @@ unmerge_files_TEST()
done
test_equality "$ok" "yes"
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/files_dst" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/unmerge "unmerge_TEST_dir/files_dst" \
"unmerge_TEST_dir/files_contents" 1>/dev/null
test_return_code
@@ -66,7 +66,7 @@ unmerge_files_TEST()
unmerge_spaces_TEST()
{
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/spaces_src" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/merge "unmerge_TEST_dir/spaces_src" \
"unmerge_TEST_dir/spaces_dst" \
"unmerge_TEST_dir/spaces_contents"
test_return_code
@@ -79,7 +79,7 @@ unmerge_spaces_TEST()
done
test_equality "$ok" "yes"
- ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/spaces_dst" \
+ ${TOP_BUILD_DIR}/paludis/repositories/e/ebuild/unmerge "unmerge_TEST_dir/spaces_dst" \
"unmerge_TEST_dir/spaces_contents"
test_return_code
diff --git a/paludis/repositories/gentoo/ebuild/unmerge_TEST_cleanup.sh b/paludis/repositories/e/ebuild/unmerge_TEST_cleanup.sh
index e0f01b607..e0f01b607 100755
--- a/paludis/repositories/gentoo/ebuild/unmerge_TEST_cleanup.sh
+++ b/paludis/repositories/e/ebuild/unmerge_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/ebuild/unmerge_TEST_setup.sh b/paludis/repositories/e/ebuild/unmerge_TEST_setup.sh
index 33643aa89..33643aa89 100755
--- a/paludis/repositories/gentoo/ebuild/unmerge_TEST_setup.sh
+++ b/paludis/repositories/e/ebuild/unmerge_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/ebuild/usage_error.bash b/paludis/repositories/e/ebuild/usage_error.bash
index 0af5b2d47..0af5b2d47 100644
--- a/paludis/repositories/gentoo/ebuild/usage_error.bash
+++ b/paludis/repositories/e/ebuild/usage_error.bash
diff --git a/paludis/repositories/gentoo/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index c3fc9066a..681d0c319 100644
--- a/paludis/repositories/gentoo/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -55,12 +55,12 @@ libexecprog_SCRIPTS = \
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
+ $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
PALUDIS_EBUILD_LOG_LEVEL="silent" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/run_test.bash
+ bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
TESTS = dobin_TEST.bash getfsize_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/utils/canonicalise b/paludis/repositories/e/ebuild/utils/canonicalise
index b186eba65..b186eba65 100755
--- a/paludis/repositories/gentoo/ebuild/utils/canonicalise
+++ b/paludis/repositories/e/ebuild/utils/canonicalise
diff --git a/paludis/repositories/gentoo/ebuild/utils/dobin b/paludis/repositories/e/ebuild/utils/dobin
index 506f50f0f..506f50f0f 100755
--- a/paludis/repositories/gentoo/ebuild/utils/dobin
+++ b/paludis/repositories/e/ebuild/utils/dobin
diff --git a/paludis/repositories/gentoo/ebuild/utils/dobin_TEST.bash b/paludis/repositories/e/ebuild/utils/dobin_TEST.bash
index 1af77004f..1af77004f 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dobin_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/dobin_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/utils/doconfd b/paludis/repositories/e/ebuild/utils/doconfd
index 37c453cc9..37c453cc9 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doconfd
+++ b/paludis/repositories/e/ebuild/utils/doconfd
diff --git a/paludis/repositories/gentoo/ebuild/utils/dodir b/paludis/repositories/e/ebuild/utils/dodir
index 52b7c2090..52b7c2090 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dodir
+++ b/paludis/repositories/e/ebuild/utils/dodir
diff --git a/paludis/repositories/gentoo/ebuild/utils/dodoc b/paludis/repositories/e/ebuild/utils/dodoc
index edd6b6525..edd6b6525 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dodoc
+++ b/paludis/repositories/e/ebuild/utils/dodoc
diff --git a/paludis/repositories/gentoo/ebuild/utils/doenvd b/paludis/repositories/e/ebuild/utils/doenvd
index 7299776f9..7299776f9 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doenvd
+++ b/paludis/repositories/e/ebuild/utils/doenvd
diff --git a/paludis/repositories/gentoo/ebuild/utils/doexe b/paludis/repositories/e/ebuild/utils/doexe
index a67166b09..a67166b09 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doexe
+++ b/paludis/repositories/e/ebuild/utils/doexe
diff --git a/paludis/repositories/gentoo/ebuild/utils/dohard b/paludis/repositories/e/ebuild/utils/dohard
index b0758e5ae..b0758e5ae 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dohard
+++ b/paludis/repositories/e/ebuild/utils/dohard
diff --git a/paludis/repositories/gentoo/ebuild/utils/dohtml b/paludis/repositories/e/ebuild/utils/dohtml
index 09743c9ce..09743c9ce 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dohtml
+++ b/paludis/repositories/e/ebuild/utils/dohtml
diff --git a/paludis/repositories/gentoo/ebuild/utils/doinfo b/paludis/repositories/e/ebuild/utils/doinfo
index df3040ea0..df3040ea0 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doinfo
+++ b/paludis/repositories/e/ebuild/utils/doinfo
diff --git a/paludis/repositories/gentoo/ebuild/utils/doinitd b/paludis/repositories/e/ebuild/utils/doinitd
index 8fc7080da..8fc7080da 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doinitd
+++ b/paludis/repositories/e/ebuild/utils/doinitd
diff --git a/paludis/repositories/gentoo/ebuild/utils/doins b/paludis/repositories/e/ebuild/utils/doins
index 2d70f5acf..2d70f5acf 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doins
+++ b/paludis/repositories/e/ebuild/utils/doins
diff --git a/paludis/repositories/gentoo/ebuild/utils/dolib b/paludis/repositories/e/ebuild/utils/dolib
index c35b20245..c35b20245 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dolib
+++ b/paludis/repositories/e/ebuild/utils/dolib
diff --git a/paludis/repositories/gentoo/ebuild/utils/dolib.a.in b/paludis/repositories/e/ebuild/utils/dolib.a.in
index e766554dd..e766554dd 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dolib.a.in
+++ b/paludis/repositories/e/ebuild/utils/dolib.a.in
diff --git a/paludis/repositories/gentoo/ebuild/utils/dolib.so.in b/paludis/repositories/e/ebuild/utils/dolib.so.in
index d4dcb4a46..d4dcb4a46 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dolib.so.in
+++ b/paludis/repositories/e/ebuild/utils/dolib.so.in
diff --git a/paludis/repositories/gentoo/ebuild/utils/doman b/paludis/repositories/e/ebuild/utils/doman
index ff5435627..ff5435627 100644
--- a/paludis/repositories/gentoo/ebuild/utils/doman
+++ b/paludis/repositories/e/ebuild/utils/doman
diff --git a/paludis/repositories/gentoo/ebuild/utils/domo b/paludis/repositories/e/ebuild/utils/domo
index b7a0dd413..b7a0dd413 100644
--- a/paludis/repositories/gentoo/ebuild/utils/domo
+++ b/paludis/repositories/e/ebuild/utils/domo
diff --git a/paludis/repositories/gentoo/ebuild/utils/donewins b/paludis/repositories/e/ebuild/utils/donewins
index 90f037799..90f037799 100644
--- a/paludis/repositories/gentoo/ebuild/utils/donewins
+++ b/paludis/repositories/e/ebuild/utils/donewins
diff --git a/paludis/repositories/gentoo/ebuild/utils/dosbin b/paludis/repositories/e/ebuild/utils/dosbin
index 25c625801..25c625801 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dosbin
+++ b/paludis/repositories/e/ebuild/utils/dosbin
diff --git a/paludis/repositories/gentoo/ebuild/utils/dosed b/paludis/repositories/e/ebuild/utils/dosed
index ca9dc0429..ca9dc0429 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dosed
+++ b/paludis/repositories/e/ebuild/utils/dosed
diff --git a/paludis/repositories/gentoo/ebuild/utils/dosym b/paludis/repositories/e/ebuild/utils/dosym
index 818ef1aaa..818ef1aaa 100644
--- a/paludis/repositories/gentoo/ebuild/utils/dosym
+++ b/paludis/repositories/e/ebuild/utils/dosym
diff --git a/paludis/repositories/gentoo/ebuild/utils/dounpack b/paludis/repositories/e/ebuild/utils/dounpack
index 8de948caf..8de948caf 100755
--- a/paludis/repositories/gentoo/ebuild/utils/dounpack
+++ b/paludis/repositories/e/ebuild/utils/dounpack
diff --git a/paludis/repositories/gentoo/ebuild/utils/emake b/paludis/repositories/e/ebuild/utils/emake
index 57ffa4ca4..57ffa4ca4 100755
--- a/paludis/repositories/gentoo/ebuild/utils/emake
+++ b/paludis/repositories/e/ebuild/utils/emake
diff --git a/paludis/repositories/gentoo/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index 1a3a8dc9c..f0f99f450 100644
--- a/paludis/repositories/gentoo/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -22,12 +22,12 @@ AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
TESTS_ENVIRONMENT = env \
PALUDIS_UTILITY_PATH_SUFFIXES="exheres-0" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise \
+ $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
PALUDIS_EBUILD_LOG_LEVEL="silent" \
TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/run_test.bash
+ bash $(top_srcdir)/paludis/repositories/e/ebuild/utils/run_test.bash
TESTS =
diff --git a/paludis/repositories/gentoo/ebuild/utils/exheres-0/banned_in_eapi_exheres-0 b/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
index 937c70cd9..937c70cd9 100755
--- a/paludis/repositories/gentoo/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
diff --git a/paludis/repositories/gentoo/ebuild/utils/fowners b/paludis/repositories/e/ebuild/utils/fowners
index 4eb208c6e..4eb208c6e 100644
--- a/paludis/repositories/gentoo/ebuild/utils/fowners
+++ b/paludis/repositories/e/ebuild/utils/fowners
diff --git a/paludis/repositories/gentoo/ebuild/utils/fperms b/paludis/repositories/e/ebuild/utils/fperms
index 04c5db7eb..04c5db7eb 100644
--- a/paludis/repositories/gentoo/ebuild/utils/fperms
+++ b/paludis/repositories/e/ebuild/utils/fperms
diff --git a/paludis/repositories/gentoo/ebuild/utils/getfsize b/paludis/repositories/e/ebuild/utils/getfsize
index 38a271b00..38a271b00 100755
--- a/paludis/repositories/gentoo/ebuild/utils/getfsize
+++ b/paludis/repositories/e/ebuild/utils/getfsize
diff --git a/paludis/repositories/gentoo/ebuild/utils/getfsize_TEST.bash b/paludis/repositories/e/ebuild/utils/getfsize_TEST.bash
index 3688bdf4c..3688bdf4c 100755
--- a/paludis/repositories/gentoo/ebuild/utils/getfsize_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/getfsize_TEST.bash
diff --git a/paludis/repositories/gentoo/ebuild/utils/getmtime b/paludis/repositories/e/ebuild/utils/getmtime
index 88a74b21f..88a74b21f 100755
--- a/paludis/repositories/gentoo/ebuild/utils/getmtime
+++ b/paludis/repositories/e/ebuild/utils/getmtime
diff --git a/paludis/repositories/gentoo/ebuild/utils/newbin b/paludis/repositories/e/ebuild/utils/newbin
index 21792c697..21792c697 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newbin
+++ b/paludis/repositories/e/ebuild/utils/newbin
diff --git a/paludis/repositories/gentoo/ebuild/utils/newconfd b/paludis/repositories/e/ebuild/utils/newconfd
index 77838656c..77838656c 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newconfd
+++ b/paludis/repositories/e/ebuild/utils/newconfd
diff --git a/paludis/repositories/gentoo/ebuild/utils/newdoc b/paludis/repositories/e/ebuild/utils/newdoc
index b4cb50700..b4cb50700 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newdoc
+++ b/paludis/repositories/e/ebuild/utils/newdoc
diff --git a/paludis/repositories/gentoo/ebuild/utils/newenvd b/paludis/repositories/e/ebuild/utils/newenvd
index 76f0a7f5e..76f0a7f5e 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newenvd
+++ b/paludis/repositories/e/ebuild/utils/newenvd
diff --git a/paludis/repositories/gentoo/ebuild/utils/newexe b/paludis/repositories/e/ebuild/utils/newexe
index 9a5cb35df..9a5cb35df 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newexe
+++ b/paludis/repositories/e/ebuild/utils/newexe
diff --git a/paludis/repositories/gentoo/ebuild/utils/newinitd b/paludis/repositories/e/ebuild/utils/newinitd
index 01ca12b2d..01ca12b2d 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newinitd
+++ b/paludis/repositories/e/ebuild/utils/newinitd
diff --git a/paludis/repositories/gentoo/ebuild/utils/newins b/paludis/repositories/e/ebuild/utils/newins
index 2b692adb6..2b692adb6 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newins
+++ b/paludis/repositories/e/ebuild/utils/newins
diff --git a/paludis/repositories/gentoo/ebuild/utils/newlib.a.in b/paludis/repositories/e/ebuild/utils/newlib.a.in
index 415a0571c..415a0571c 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newlib.a.in
+++ b/paludis/repositories/e/ebuild/utils/newlib.a.in
diff --git a/paludis/repositories/gentoo/ebuild/utils/newlib.so.in b/paludis/repositories/e/ebuild/utils/newlib.so.in
index 0701351d8..0701351d8 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newlib.so.in
+++ b/paludis/repositories/e/ebuild/utils/newlib.so.in
diff --git a/paludis/repositories/gentoo/ebuild/utils/newman b/paludis/repositories/e/ebuild/utils/newman
index 0dab5fc16..0dab5fc16 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newman
+++ b/paludis/repositories/e/ebuild/utils/newman
diff --git a/paludis/repositories/gentoo/ebuild/utils/newsbin b/paludis/repositories/e/ebuild/utils/newsbin
index da94577f7..da94577f7 100644
--- a/paludis/repositories/gentoo/ebuild/utils/newsbin
+++ b/paludis/repositories/e/ebuild/utils/newsbin
diff --git a/paludis/repositories/gentoo/ebuild/utils/prep.in b/paludis/repositories/e/ebuild/utils/prep.in
index fcb64959d..fcb64959d 100644
--- a/paludis/repositories/gentoo/ebuild/utils/prep.in
+++ b/paludis/repositories/e/ebuild/utils/prep.in
diff --git a/paludis/repositories/gentoo/ebuild/utils/run_test.bash b/paludis/repositories/e/ebuild/utils/run_test.bash
index 1f9db4e38..1f9db4e38 100644
--- a/paludis/repositories/gentoo/ebuild/utils/run_test.bash
+++ b/paludis/repositories/e/ebuild/utils/run_test.bash
diff --git a/paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash.in b/paludis/repositories/e/ebuild/work_around_broken_utilities.bash.in
index cb97656b6..cb97656b6 100644
--- a/paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash.in
+++ b/paludis/repositories/e/ebuild/work_around_broken_utilities.bash.in
diff --git a/paludis/repositories/gentoo/ebuild/write_vdb_entry.bash b/paludis/repositories/e/ebuild/write_vdb_entry.bash
index b7591d05a..b7591d05a 100755
--- a/paludis/repositories/gentoo/ebuild/write_vdb_entry.bash
+++ b/paludis/repositories/e/ebuild/write_vdb_entry.bash
diff --git a/paludis/repositories/gentoo/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 55f2a9b05..48ccff5d8 100644
--- a/paludis/repositories/gentoo/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -17,12 +17,12 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/ebuild_entries.hh>
-#include <paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/ebuild.hh>
-#include <paludis/repositories/gentoo/eapi_phase.hh>
-#include <paludis/repositories/gentoo/ebuild_id.hh>
+#include <paludis/repositories/e/ebuild_entries.hh>
+#include <paludis/repositories/e/ebuild_flat_metadata_cache.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/ebuild.hh>
+#include <paludis/repositories/e/eapi_phase.hh>
+#include <paludis/repositories/e/ebuild_id.hh>
#include <paludis/eapi.hh>
#include <paludis/dep_spec_flattener.hh>
diff --git a/paludis/repositories/gentoo/ebuild_entries.hh b/paludis/repositories/e/ebuild_entries.hh
index 6a2cf0dce..fc4a5f007 100644
--- a/paludis/repositories/gentoo/ebuild_entries.hh
+++ b/paludis/repositories/e/ebuild_entries.hh
@@ -20,8 +20,8 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH 1
-#include <paludis/repositories/gentoo/portage_repository_entries.hh>
-#include <paludis/repositories/gentoo/portage_repository_params.hh>
+#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/portage_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
/** \file
diff --git a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index 37315f1f4..37315f1f4 100644
--- a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
diff --git a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
index 6541bda3e..2d2726548 100644
--- a/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
@@ -20,10 +20,10 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH 1
-#include <paludis/repositories/gentoo/ebuild.hh>
-#include <paludis/repositories/gentoo/ebuild_id.hh>
+#include <paludis/repositories/e/ebuild.hh>
+#include <paludis/repositories/e/ebuild_id.hh>
#include <paludis/util/fs_entry.hh>
-#include <paludis/repositories/gentoo/eclass_mtimes.hh>
+#include <paludis/repositories/e/eclass_mtimes.hh>
namespace paludis
{
diff --git a/paludis/repositories/gentoo/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index ceb0ed8e1..1a82e90cc 100644
--- a/paludis/repositories/gentoo/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -17,12 +17,12 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/ebuild_id.hh>
-#include <paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/portage_repository_params.hh>
-#include <paludis/repositories/gentoo/eapi_phase.hh>
-#include <paludis/repositories/gentoo/e_key.hh>
+#include <paludis/repositories/e/ebuild_id.hh>
+#include <paludis/repositories/e/ebuild_flat_metadata_cache.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/eapi_phase.hh>
+#include <paludis/repositories/e/e_key.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
diff --git a/paludis/repositories/gentoo/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 04440b48a..04440b48a 100644
--- a/paludis/repositories/gentoo/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
diff --git a/paludis/repositories/gentoo/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc
index 041cdfe22..041cdfe22 100644
--- a/paludis/repositories/gentoo/eclass_mtimes.cc
+++ b/paludis/repositories/e/eclass_mtimes.cc
diff --git a/paludis/repositories/gentoo/eclass_mtimes.hh b/paludis/repositories/e/eclass_mtimes.hh
index 4fd49c000..4fd49c000 100644
--- a/paludis/repositories/gentoo/eclass_mtimes.hh
+++ b/paludis/repositories/e/eclass_mtimes.hh
diff --git a/paludis/repositories/gentoo/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index fb1f6cdaa..461d0c1be 100644
--- a/paludis/repositories/gentoo/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/exheres_layout.hh>
-#include <paludis/repositories/gentoo/portage_repository_entries.hh>
-#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/exheres_layout.hh>
+#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/portage_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/hashed_containers.hh>
#include <paludis/package_id.hh>
diff --git a/paludis/repositories/gentoo/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh
index 70e190b90..1517af8c9 100644
--- a/paludis/repositories/gentoo/exheres_layout.hh
+++ b/paludis/repositories/e/exheres_layout.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EXHERES_LAYOUT_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EXHERES_LAYOUT_HH 1
-#include <paludis/repositories/gentoo/layout.hh>
+#include <paludis/repositories/e/layout.hh>
#include <paludis/util/private_implementation_pattern.hh>
namespace paludis
diff --git a/paludis/repositories/gentoo/glsa.cc b/paludis/repositories/e/glsa.cc
index df4f723f6..df4f723f6 100644
--- a/paludis/repositories/gentoo/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
diff --git a/paludis/repositories/gentoo/glsa.hh b/paludis/repositories/e/glsa.hh
index c9ab4561a..47ffae527 100644
--- a/paludis/repositories/gentoo/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -31,7 +31,7 @@
namespace paludis
{
-#include <paludis/repositories/gentoo/glsa-sr.hh>
+#include <paludis/repositories/e/glsa-sr.hh>
/**
* Thrown if a bad GLSA is found.
diff --git a/paludis/repositories/gentoo/glsa.sr b/paludis/repositories/e/glsa.sr
index fdff8e421..fdff8e421 100644
--- a/paludis/repositories/gentoo/glsa.sr
+++ b/paludis/repositories/e/glsa.sr
diff --git a/paludis/repositories/gentoo/layout.cc b/paludis/repositories/e/layout.cc
index decda9b87..88f22d799 100644
--- a/paludis/repositories/gentoo/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -18,9 +18,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/layout.hh>
-#include <paludis/repositories/gentoo/traditional_layout.hh>
-#include <paludis/repositories/gentoo/exheres_layout.hh>
+#include <paludis/repositories/e/layout.hh>
+#include <paludis/repositories/e/traditional_layout.hh>
+#include <paludis/repositories/e/exheres_layout.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/virtual_constructor-impl.hh>
diff --git a/paludis/repositories/gentoo/layout.hh b/paludis/repositories/e/layout.hh
index 7d257bb53..7d257bb53 100644
--- a/paludis/repositories/gentoo/layout.hh
+++ b/paludis/repositories/e/layout.hh
diff --git a/paludis/repositories/gentoo/make_ebin_repository.cc b/paludis/repositories/e/make_ebin_repository.cc
index a402c622f..1244a4f59 100644
--- a/paludis/repositories/gentoo/make_ebin_repository.cc
+++ b/paludis/repositories/e/make_ebin_repository.cc
@@ -21,7 +21,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/portage_repository_exceptions.hh>
#include <paludis/environment.hh>
#include <paludis/distribution.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
diff --git a/paludis/repositories/gentoo/make_ebin_repository.hh b/paludis/repositories/e/make_ebin_repository.hh
index e4e03b40d..a4fb4b5db 100644
--- a/paludis/repositories/gentoo/make_ebin_repository.hh
+++ b/paludis/repositories/e/make_ebin_repository.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_MAKE_EBIN_REPOSITORY_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_MAKE_EBIN_REPOSITORY_HH 1
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository.hh>
namespace paludis
{
diff --git a/paludis/repositories/gentoo/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index e1d50d9c4..1527698f6 100644
--- a/paludis/repositories/gentoo/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -21,7 +21,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/portage_repository_exceptions.hh>
#include <paludis/environment.hh>
#include <paludis/distribution.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
diff --git a/paludis/repositories/gentoo/make_ebuild_repository.hh b/paludis/repositories/e/make_ebuild_repository.hh
index dfbcf3e9f..259f8ad04 100644
--- a/paludis/repositories/gentoo/make_ebuild_repository.hh
+++ b/paludis/repositories/e/make_ebuild_repository.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH 1
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository.hh>
namespace paludis
{
diff --git a/paludis/repositories/gentoo/portage_repository.cc b/paludis/repositories/e/portage_repository.cc
index ec2b47e1a..3604d21ce 100644
--- a/paludis/repositories/gentoo/portage_repository.cc
+++ b/paludis/repositories/e/portage_repository.cc
@@ -20,14 +20,14 @@
#include "config.h"
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/portage_repository_profile.hh>
-#include <paludis/repositories/gentoo/portage_repository_news.hh>
-#include <paludis/repositories/gentoo/portage_repository_sets.hh>
-#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
-#include <paludis/repositories/gentoo/portage_repository_entries.hh>
-#include <paludis/repositories/gentoo/use_desc.hh>
-#include <paludis/repositories/gentoo/layout.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository_profile.hh>
+#include <paludis/repositories/e/portage_repository_news.hh>
+#include <paludis/repositories/e/portage_repository_sets.hh>
+#include <paludis/repositories/e/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/use_desc.hh>
+#include <paludis/repositories/e/layout.hh>
#include <paludis/repository_info.hh>
#include <paludis/config_file.hh>
diff --git a/paludis/repositories/gentoo/portage_repository.hh b/paludis/repositories/e/portage_repository.hh
index 110e14df7..89eb92d92 100644
--- a/paludis/repositories/gentoo/portage_repository.hh
+++ b/paludis/repositories/e/portage_repository.hh
@@ -25,9 +25,9 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/tr1_memory.hh>
-#include <paludis/repositories/gentoo/portage_repository_params.hh>
-#include <paludis/repositories/gentoo/portage_repository_profile.hh>
-#include <paludis/repositories/gentoo/layout.hh>
+#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/portage_repository_profile.hh>
+#include <paludis/repositories/e/layout.hh>
#include <string>
/** \file
diff --git a/paludis/repositories/gentoo/portage_repository_TEST.cc b/paludis/repositories/e/portage_repository_TEST.cc
index 350062513..88d4ff4ea 100644
--- a/paludis/repositories/gentoo/portage_repository_TEST.cc
+++ b/paludis/repositories/e/portage_repository_TEST.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/make_ebuild_repository.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/environments/test/test_environment.hh>
#include <paludis/util/system.hh>
diff --git a/paludis/repositories/gentoo/portage_repository_TEST_cleanup.sh b/paludis/repositories/e/portage_repository_TEST_cleanup.sh
index 8c0b2902d..8c0b2902d 100755
--- a/paludis/repositories/gentoo/portage_repository_TEST_cleanup.sh
+++ b/paludis/repositories/e/portage_repository_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/portage_repository_TEST_setup.sh b/paludis/repositories/e/portage_repository_TEST_setup.sh
index 3c5f5f3d9..3c5f5f3d9 100755
--- a/paludis/repositories/gentoo/portage_repository_TEST_setup.sh
+++ b/paludis/repositories/e/portage_repository_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/portage_repository_entries.cc b/paludis/repositories/e/portage_repository_entries.cc
index a5c76a413..a5c76a413 100644
--- a/paludis/repositories/gentoo/portage_repository_entries.cc
+++ b/paludis/repositories/e/portage_repository_entries.cc
diff --git a/paludis/repositories/gentoo/portage_repository_entries.hh b/paludis/repositories/e/portage_repository_entries.hh
index f0dad613e..3440461e5 100644
--- a/paludis/repositories/gentoo/portage_repository_entries.hh
+++ b/paludis/repositories/e/portage_repository_entries.hh
@@ -26,8 +26,8 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/repositories/gentoo/portage_repository_profile.hh>
-#include <paludis/repositories/gentoo/portage_repository_params.hh>
+#include <paludis/repositories/e/portage_repository_profile.hh>
+#include <paludis/repositories/e/portage_repository_params.hh>
#include <string>
/** \file
diff --git a/paludis/repositories/gentoo/portage_repository_exceptions.cc b/paludis/repositories/e/portage_repository_exceptions.cc
index f8e118697..f8e118697 100644
--- a/paludis/repositories/gentoo/portage_repository_exceptions.cc
+++ b/paludis/repositories/e/portage_repository_exceptions.cc
diff --git a/paludis/repositories/gentoo/portage_repository_exceptions.hh b/paludis/repositories/e/portage_repository_exceptions.hh
index 945182e5c..945182e5c 100644
--- a/paludis/repositories/gentoo/portage_repository_exceptions.hh
+++ b/paludis/repositories/e/portage_repository_exceptions.hh
diff --git a/paludis/repositories/gentoo/portage_repository_news.cc b/paludis/repositories/e/portage_repository_news.cc
index 16f9189f2..a5a22ba87 100644
--- a/paludis/repositories/gentoo/portage_repository_news.cc
+++ b/paludis/repositories/e/portage_repository_news.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/portage_repository_news.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository_news.hh>
#include <paludis/config_file.hh>
#include <paludis/environment.hh>
diff --git a/paludis/repositories/gentoo/portage_repository_news.hh b/paludis/repositories/e/portage_repository_news.hh
index 447c692b2..447c692b2 100644
--- a/paludis/repositories/gentoo/portage_repository_news.hh
+++ b/paludis/repositories/e/portage_repository_news.hh
diff --git a/paludis/repositories/gentoo/portage_repository_params.cc b/paludis/repositories/e/portage_repository_params.cc
index eebc8f6cd..692a8bf51 100644
--- a/paludis/repositories/gentoo/portage_repository_params.cc
+++ b/paludis/repositories/e/portage_repository_params.cc
@@ -4,5 +4,5 @@
using namespace paludis;
-#include <paludis/repositories/gentoo/portage_repository_params-sr.cc>
+#include <paludis/repositories/e/portage_repository_params-sr.cc>
diff --git a/paludis/repositories/gentoo/portage_repository_params.hh b/paludis/repositories/e/portage_repository_params.hh
index cfb905390..3c374406a 100644
--- a/paludis/repositories/gentoo/portage_repository_params.hh
+++ b/paludis/repositories/e/portage_repository_params.hh
@@ -36,7 +36,7 @@ namespace paludis
class PackageDatabase;
class PortageRepository;
-#include <paludis/repositories/gentoo/portage_repository_params-sr.hh>
+#include <paludis/repositories/e/portage_repository_params-sr.hh>
}
diff --git a/paludis/repositories/gentoo/portage_repository_params.sr b/paludis/repositories/e/portage_repository_params.sr
index 3e9045075..3e9045075 100644
--- a/paludis/repositories/gentoo/portage_repository_params.sr
+++ b/paludis/repositories/e/portage_repository_params.sr
diff --git a/paludis/repositories/gentoo/portage_repository_profile.cc b/paludis/repositories/e/portage_repository_profile.cc
index a636232e6..6fc9fe262 100644
--- a/paludis/repositories/gentoo/portage_repository_profile.cc
+++ b/paludis/repositories/e/portage_repository_profile.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/portage_repository_profile.hh>
-#include <paludis/repositories/gentoo/portage_repository_profile_file.hh>
-#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository_profile.hh>
+#include <paludis/repositories/e/portage_repository_profile_file.hh>
+#include <paludis/repositories/e/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/portage_repository.hh>
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
diff --git a/paludis/repositories/gentoo/portage_repository_profile.hh b/paludis/repositories/e/portage_repository_profile.hh
index 33b260186..33b260186 100644
--- a/paludis/repositories/gentoo/portage_repository_profile.hh
+++ b/paludis/repositories/e/portage_repository_profile.hh
diff --git a/paludis/repositories/gentoo/portage_repository_profile_file.cc b/paludis/repositories/e/portage_repository_profile_file.cc
index 4bcb4adac..4bcb4adac 100644
--- a/paludis/repositories/gentoo/portage_repository_profile_file.cc
+++ b/paludis/repositories/e/portage_repository_profile_file.cc
diff --git a/paludis/repositories/gentoo/portage_repository_profile_file.hh b/paludis/repositories/e/portage_repository_profile_file.hh
index 9aa9437ee..9aa9437ee 100644
--- a/paludis/repositories/gentoo/portage_repository_profile_file.hh
+++ b/paludis/repositories/e/portage_repository_profile_file.hh
diff --git a/paludis/repositories/gentoo/portage_repository_sets.cc b/paludis/repositories/e/portage_repository_sets.cc
index 102e8725f..898c324bc 100644
--- a/paludis/repositories/gentoo/portage_repository_sets.cc
+++ b/paludis/repositories/e/portage_repository_sets.cc
@@ -18,9 +18,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/portage_repository_sets.hh>
-#include <paludis/repositories/gentoo/glsa.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/portage_repository_sets.hh>
+#include <paludis/repositories/e/glsa.hh>
#include <paludis/environment.hh>
#include <paludis/config_file.hh>
diff --git a/paludis/repositories/gentoo/portage_repository_sets.hh b/paludis/repositories/e/portage_repository_sets.hh
index bdf4b65c4..bdf4b65c4 100644
--- a/paludis/repositories/gentoo/portage_repository_sets.hh
+++ b/paludis/repositories/e/portage_repository_sets.hh
diff --git a/paludis/repositories/gentoo/portage_repository_sets_TEST.cc b/paludis/repositories/e/portage_repository_sets_TEST.cc
index 0879527e2..07985a6d0 100644
--- a/paludis/repositories/gentoo/portage_repository_sets_TEST.cc
+++ b/paludis/repositories/e/portage_repository_sets_TEST.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/portage_repository.hh>
-#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
+#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/make_ebuild_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/dep_spec_pretty_printer.hh>
#include <paludis/util/collection_concrete.hh>
diff --git a/paludis/repositories/gentoo/portage_repository_sets_TEST_cleanup.sh b/paludis/repositories/e/portage_repository_sets_TEST_cleanup.sh
index 26cfada7a..26cfada7a 100755
--- a/paludis/repositories/gentoo/portage_repository_sets_TEST_cleanup.sh
+++ b/paludis/repositories/e/portage_repository_sets_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/portage_repository_sets_TEST_setup.sh b/paludis/repositories/e/portage_repository_sets_TEST_setup.sh
index 411199430..411199430 100755
--- a/paludis/repositories/gentoo/portage_repository_sets_TEST_setup.sh
+++ b/paludis/repositories/e/portage_repository_sets_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/registration.cc b/paludis/repositories/e/registration.cc
index f42ba19bc..7656a9bc8 100644
--- a/paludis/repositories/gentoo/registration.cc
+++ b/paludis/repositories/e/registration.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/repositories/repository_maker.hh>
-#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
-#include <paludis/repositories/gentoo/make_ebin_repository.hh>
-#include <paludis/repositories/gentoo/vdb_repository.hh>
+#include <paludis/repositories/e/make_ebuild_repository.hh>
+#include <paludis/repositories/e/make_ebin_repository.hh>
+#include <paludis/repositories/e/vdb_repository.hh>
#include <paludis/util/log.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <libwrapiter/libwrapiter_output_iterator.hh>
diff --git a/paludis/repositories/gentoo/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 2d7792974..aab039ce3 100644
--- a/paludis/repositories/gentoo/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -18,9 +18,9 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/traditional_layout.hh>
-#include <paludis/repositories/gentoo/portage_repository_entries.hh>
-#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/e/traditional_layout.hh>
+#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/portage_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/hashed_containers.hh>
diff --git a/paludis/repositories/gentoo/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh
index b2c6a39b5..95e61da90 100644
--- a/paludis/repositories/gentoo/traditional_layout.hh
+++ b/paludis/repositories/e/traditional_layout.hh
@@ -21,7 +21,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_TRADITIONAL_LAYOUT_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_TRADITIONAL_LAYOUT_HH 1
-#include <paludis/repositories/gentoo/layout.hh>
+#include <paludis/repositories/e/layout.hh>
#include <paludis/util/private_implementation_pattern.hh>
namespace paludis
diff --git a/paludis/repositories/gentoo/use_desc.cc b/paludis/repositories/e/use_desc.cc
index d374a9666..d374a9666 100644
--- a/paludis/repositories/gentoo/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
diff --git a/paludis/repositories/gentoo/use_desc.hh b/paludis/repositories/e/use_desc.hh
index 452267619..452267619 100644
--- a/paludis/repositories/gentoo/use_desc.hh
+++ b/paludis/repositories/e/use_desc.hh
diff --git a/paludis/repositories/gentoo/vdb_id.cc b/paludis/repositories/e/vdb_id.cc
index 10d583f2f..ba9fad281 100644
--- a/paludis/repositories/gentoo/vdb_id.cc
+++ b/paludis/repositories/e/vdb_id.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/vdb_id.hh>
-#include <paludis/repositories/gentoo/e_key.hh>
+#include <paludis/repositories/e/vdb_id.hh>
+#include <paludis/repositories/e/e_key.hh>
#include <paludis/name.hh>
#include <paludis/version_spec.hh>
diff --git a/paludis/repositories/gentoo/vdb_id.hh b/paludis/repositories/e/vdb_id.hh
index 2c14db381..2c14db381 100644
--- a/paludis/repositories/gentoo/vdb_id.hh
+++ b/paludis/repositories/e/vdb_id.hh
diff --git a/paludis/repositories/gentoo/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc
index 781f6e37d..4d80a7562 100644
--- a/paludis/repositories/gentoo/vdb_merger.cc
+++ b/paludis/repositories/e/vdb_merger.cc
@@ -37,7 +37,7 @@
using namespace paludis;
-#include <paludis/repositories/gentoo/vdb_merger-sr.cc>
+#include <paludis/repositories/e/vdb_merger-sr.cc>
namespace paludis
{
diff --git a/paludis/repositories/gentoo/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index c9b9baaf2..2108fe347 100644
--- a/paludis/repositories/gentoo/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -28,7 +28,7 @@ namespace paludis
{
class Hook;
-#include <paludis/repositories/gentoo/vdb_merger-sr.hh>
+#include <paludis/repositories/e/vdb_merger-sr.hh>
/**
* Merger for VDBRepository.
diff --git a/paludis/repositories/gentoo/vdb_merger.sr b/paludis/repositories/e/vdb_merger.sr
index ec521698d..ec521698d 100644
--- a/paludis/repositories/gentoo/vdb_merger.sr
+++ b/paludis/repositories/e/vdb_merger.sr
diff --git a/paludis/repositories/gentoo/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 81185d9dc..c4778daa0 100644
--- a/paludis/repositories/gentoo/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -17,11 +17,11 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/vdb_repository.hh>
-#include <paludis/repositories/gentoo/vdb_merger.hh>
-#include <paludis/repositories/gentoo/vdb_unmerger.hh>
-#include <paludis/repositories/gentoo/vdb_id.hh>
-#include <paludis/repositories/gentoo/eapi_phase.hh>
+#include <paludis/repositories/e/vdb_repository.hh>
+#include <paludis/repositories/e/vdb_merger.hh>
+#include <paludis/repositories/e/vdb_unmerger.hh>
+#include <paludis/repositories/e/vdb_id.hh>
+#include <paludis/repositories/e/eapi_phase.hh>
#include <paludis/config_file.hh>
#include <paludis/dep_spec.hh>
@@ -37,7 +37,7 @@
#include <paludis/package_database.hh>
#include <paludis/package_id.hh>
#include <paludis/portage_dep_parser.hh>
-#include <paludis/repositories/gentoo/ebuild.hh>
+#include <paludis/repositories/e/ebuild.hh>
#include <paludis/repository_info.hh>
#include <paludis/repository_name_cache.hh>
#include <paludis/set_file.hh>
@@ -79,7 +79,7 @@
using namespace paludis;
using namespace paludis::erepository;
-#include <paludis/repositories/gentoo/vdb_repository-sr.cc>
+#include <paludis/repositories/e/vdb_repository-sr.cc>
typedef MakeHashedMap<CategoryNamePart, tr1::shared_ptr<QualifiedPackageNameCollection> >::Type CategoryMap;
typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<PackageIDSequence> >::Type IDMap;
diff --git a/paludis/repositories/gentoo/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 0b8049d4a..d4bc566c8 100644
--- a/paludis/repositories/gentoo/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -35,7 +35,7 @@
namespace paludis
{
-#include <paludis/repositories/gentoo/vdb_repository-sr.hh>
+#include <paludis/repositories/e/vdb_repository-sr.hh>
/**
* A VDBRepository represents the /var/db/pkg database used for
diff --git a/paludis/repositories/gentoo/vdb_repository.sr b/paludis/repositories/e/vdb_repository.sr
index da550f2c6..da550f2c6 100644
--- a/paludis/repositories/gentoo/vdb_repository.sr
+++ b/paludis/repositories/e/vdb_repository.sr
diff --git a/paludis/repositories/gentoo/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 46d02b6ff..46d02b6ff 100644
--- a/paludis/repositories/gentoo/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
diff --git a/paludis/repositories/gentoo/vdb_repository_TEST_cleanup.sh b/paludis/repositories/e/vdb_repository_TEST_cleanup.sh
index e9f03a6b0..e9f03a6b0 100755
--- a/paludis/repositories/gentoo/vdb_repository_TEST_cleanup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index 138a6b134..138a6b134 100755
--- a/paludis/repositories/gentoo/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 28c47dc4c..093493c65 100644
--- a/paludis/repositories/gentoo/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -28,7 +28,7 @@ using namespace paludis;
#include <paludis/hook.hh>
#include <paludis/package_database.hh>
#include <paludis/package_id.hh>
-#include <paludis/repositories/gentoo/vdb_unmerger-sr.cc>
+#include <paludis/repositories/e/vdb_unmerger-sr.cc>
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/join.hh>
#include <paludis/util/log.hh>
diff --git a/paludis/repositories/gentoo/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index 5dfedaa31..85e0b4f13 100644
--- a/paludis/repositories/gentoo/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -31,7 +31,7 @@ namespace paludis
{
class Environment;
-#include <paludis/repositories/gentoo/vdb_unmerger-sr.hh>
+#include <paludis/repositories/e/vdb_unmerger-sr.hh>
/**
* Thrown if an unmerge from a VDBRepository using VDBUnmerger fails.
diff --git a/paludis/repositories/gentoo/vdb_unmerger.sr b/paludis/repositories/e/vdb_unmerger.sr
index ea070b6dc..ea070b6dc 100644
--- a/paludis/repositories/gentoo/vdb_unmerger.sr
+++ b/paludis/repositories/e/vdb_unmerger.sr
diff --git a/paludis/repositories/gentoo/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index 83815d28c..83815d28c 100644
--- a/paludis/repositories/gentoo/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
diff --git a/paludis/repositories/gentoo/vdb_unmerger_TEST_cleanup.sh b/paludis/repositories/e/vdb_unmerger_TEST_cleanup.sh
index 16dea1874..16dea1874 100755
--- a/paludis/repositories/gentoo/vdb_unmerger_TEST_cleanup.sh
+++ b/paludis/repositories/e/vdb_unmerger_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/vdb_unmerger_TEST_setup.sh b/paludis/repositories/e/vdb_unmerger_TEST_setup.sh
index 2930a48b8..2930a48b8 100755
--- a/paludis/repositories/gentoo/vdb_unmerger_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_unmerger_TEST_setup.sh
diff --git a/paludis/repositories/gentoo/xml_things.cc b/paludis/repositories/e/xml_things.cc
index f30057998..da67be482 100644
--- a/paludis/repositories/gentoo/xml_things.cc
+++ b/paludis/repositories/e/xml_things.cc
@@ -19,7 +19,7 @@
#include <libxml/tree.h>
#include <libxml/parser.h>
-#include <paludis/repositories/gentoo/glsa.hh>
+#include <paludis/repositories/e/glsa.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/join.hh>
#include <paludis/config_file.hh>
diff --git a/paludis/repositories/gentoo/xml_things.hh b/paludis/repositories/e/xml_things.hh
index 3b4095e9f..3b4095e9f 100644
--- a/paludis/repositories/gentoo/xml_things.hh
+++ b/paludis/repositories/e/xml_things.hh
diff --git a/paludis/repositories/gentoo/xml_things_TEST.cc b/paludis/repositories/e/xml_things_TEST.cc
index ec76571ad..65b81f47e 100644
--- a/paludis/repositories/gentoo/xml_things_TEST.cc
+++ b/paludis/repositories/e/xml_things_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/gentoo/glsa.hh>
+#include <paludis/repositories/e/glsa.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <paludis/util/join.hh>
#include <test/test_framework.hh>
diff --git a/paludis/repositories/gentoo/xml_things_TEST_cleanup.sh b/paludis/repositories/e/xml_things_TEST_cleanup.sh
index 5e0843fa2..5e0843fa2 100755
--- a/paludis/repositories/gentoo/xml_things_TEST_cleanup.sh
+++ b/paludis/repositories/e/xml_things_TEST_cleanup.sh
diff --git a/paludis/repositories/gentoo/xml_things_TEST_setup.sh b/paludis/repositories/e/xml_things_TEST_setup.sh
index 530af804b..530af804b 100755
--- a/paludis/repositories/gentoo/xml_things_TEST_setup.sh
+++ b/paludis/repositories/e/xml_things_TEST_setup.sh
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 4fdf93fa2..5ae61cb25 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -10,15 +10,15 @@ DEFS= \
paludis_repositories_libdir = $(libdir)/paludis/repositories
TESTS_ENVIRONMENT = env \
- PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
+ PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
TESTS = fake_repository_TEST fake_installed_repository_TEST
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index 0b0f9b9bd..522771c76 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -124,15 +124,15 @@ check_SCRIPTS = \
paludis_gems_libexec_SCRIPTS = gems.bash
TESTS_ENVIRONMENT = env \
- PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
+ PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/`:` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gems/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
TESTS = gems_repository_TEST installed_gems_repository_TEST yaml_TEST gem_specification_TEST gem_specifications_TEST
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index 3e6527e3a..7764e3508 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -54,15 +54,15 @@ check_SCRIPTS =
EXTRA_DIST = virtuals_repository_TEST_SOURCES installed_virtuals_repository_TEST_SOURCES
TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/`:` \
- $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs/`" \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
+ $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
virtuals_repository_TEST_LDADD = \
diff --git a/python/Makefile.am b/python/Makefile.am
index 1b56a283e..6882e24d8 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -75,25 +75,25 @@ EXTRA_DIST = $(IF_PYTHON_TESTS) $(IF_PYTHON_SOURCES) \
TESTS_ENVIRONMENT = env \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
+ PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+ PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
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/environments/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.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/environments/adapted/.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/tasks/.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\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/python/.libs\`" \
+ LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/adapted/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/tasks/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs\`" \
| tr -d ' '` \
PYTHONPATH="./.libs" \
bash $(top_srcdir)/test/run_test.sh "$(PYTHON)"
@@ -119,7 +119,7 @@ libpaludispython_la_LIBADD = \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/tasks/libpaludistasks.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
- $(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
$(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
$(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
@@ -137,7 +137,7 @@ libpaludispython_la_LIBADD = \
$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
$(top_builddir)/paludis/tasks/libpaludistasks.la \
$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
- $(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
+ $(top_builddir)/paludis/repositories/e/libpaludiserepository.la \
$(top_builddir)/paludis/environments/paludis/libpaludispaludisenvironment.la \
$(top_builddir)/paludis/environments/no_config/libpaludisnoconfigenvironment.la \
$(top_builddir)/paludis/environments/adapted/libpaludisadaptedenvironment.la \
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 264934c1d..b7c02adfe 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -87,25 +87,25 @@ EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
TESTS_ENVIRONMENT = env \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
+ PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+ PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
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/environments/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.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/environments/adapted/.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/tasks/.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\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
- \`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`:$$LD_LIBRARY_PATH" \
+ LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/no_config/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/adapted/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/tasks/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
+ \`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`:$$LD_LIBRARY_PATH" \
| tr -d ' '` \
bash $(top_srcdir)/test/run_test.sh "$(RUBY) -I ./.libs/"
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 39d4dfa54..9a9e41092 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -64,14 +64,14 @@ TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_NO_XTERM_TITLES="yes" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+ PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
SYSCONFDIR="$(sysconfdir)" \
ADJUTRIX_OPTIONS="" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
+ TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
bash $(top_srcdir)/test/run_test.sh bash
TESTS = version_TEST help_TEST find_stable_candidates_TEST args_from_environment_TEST
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index d2a543b07..1be16b785 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -61,11 +61,11 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_NO_XTERM_TITLES="yes" \
INQUISITIO_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+ PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
SYSCONFDIR="$(sysconfdir)" \
bash $(top_srcdir)/test/run_test.sh bash
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 723809c13..13506c189 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -81,15 +81,15 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_NO_XTERM_TITLES="yes" \
PALUDIS_OPTIONS="" \
- PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
- PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+ PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/eapis/" \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
- PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
+ PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+ PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
- TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
+ TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
bash $(top_srcdir)/test/run_test.sh bash