aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-23 23:33:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-10-23 23:33:12 +0000
commit6e0aedd0a44450345364b2acb92f05be2d844b1e (patch)
tree793e4c7d38ba8cf2cc60010bed3d66ba826028b8
parentaaca01da9db14082c7af6a6be0363a3bb172a996 (diff)
downloadpaludis-6e0aedd0a44450345364b2acb92f05be2d844b1e.tar.gz
paludis-6e0aedd0a44450345364b2acb92f05be2d844b1e.tar.xz
Remove email addresses from places that aren't AUTHORS
-rw-r--r--TODO2
-rw-r--r--eselect/repo.eselect2
-rwxr-xr-xhooks/eselect_env_update.bash2
-rwxr-xr-xhooks/eselect_env_update_TEST2
-rwxr-xr-xhooks/find_config_updates.hook2
-rwxr-xr-xhooks/fix_symlinks.bash2
-rwxr-xr-xhooks/gnu_info_index.bash2
-rwxr-xr-xhooks/installable_cache_regen.bash2
-rwxr-xr-xhooks/installed_cache_regen.bash2
-rwxr-xr-xhooks/log.bash2
-rwxr-xr-xhooks/news.hook2
-rwxr-xr-xhooks/news_TEST2
-rwxr-xr-xhooks/update_config_protect_list.bash2
-rwxr-xr-xhooks/write_cache_clean.bash2
-rw-r--r--paludis/about.hh.in2
-rw-r--r--paludis/about_TEST.cc2
-rw-r--r--paludis/action-fwd.hh2
-rw-r--r--paludis/action.cc2
-rw-r--r--paludis/action.hh2
-rw-r--r--paludis/args/args.cc2
-rw-r--r--paludis/args/args.hh2
-rw-r--r--paludis/args/args_TEST.cc2
-rw-r--r--paludis/args/args_dumper.cc2
-rw-r--r--paludis/args/args_dumper.hh2
-rw-r--r--paludis/args/args_error.cc2
-rw-r--r--paludis/args/args_error.hh2
-rw-r--r--paludis/args/args_group.cc2
-rw-r--r--paludis/args/args_group.hh2
-rw-r--r--paludis/args/args_handler.cc2
-rw-r--r--paludis/args/args_handler.hh2
-rw-r--r--paludis/args/args_option.cc2
-rw-r--r--paludis/args/args_option.hh4
-rw-r--r--paludis/args/args_visitor.cc2
-rw-r--r--paludis/args/args_visitor.hh4
-rw-r--r--paludis/args/bad_argument.cc2
-rw-r--r--paludis/args/bad_argument.hh2
-rw-r--r--paludis/args/checks_arg.cc2
-rw-r--r--paludis/args/checks_arg.hh2
-rw-r--r--paludis/args/debug_build_arg.cc2
-rw-r--r--paludis/args/debug_build_arg.hh2
-rw-r--r--paludis/args/dep_list_args_group.cc4
-rw-r--r--paludis/args/dep_list_args_group.hh4
-rw-r--r--paludis/args/deps_option_arg.cc2
-rw-r--r--paludis/args/deps_option_arg.hh2
-rw-r--r--paludis/args/do_help.hh2
-rw-r--r--paludis/args/install_args_group.cc4
-rw-r--r--paludis/args/install_args_group.hh4
-rw-r--r--paludis/args/log_level_arg.cc2
-rw-r--r--paludis/args/log_level_arg.hh2
-rw-r--r--paludis/args/man.cc2
-rw-r--r--paludis/args/man.hh2
-rw-r--r--paludis/condition_tracker.cc2
-rw-r--r--paludis/condition_tracker.hh2
-rw-r--r--paludis/contents-fwd.hh2
-rw-r--r--paludis/contents.cc2
-rw-r--r--paludis/contents.hh2
-rw-r--r--paludis/dep_label-fwd.hh2
-rw-r--r--paludis/dep_label.cc2
-rw-r--r--paludis/dep_label.hh2
-rw-r--r--paludis/dep_list-fwd.hh2
-rw-r--r--paludis/dep_list.cc2
-rw-r--r--paludis/dep_list.hh2
-rw-r--r--paludis/dep_list_TEST.cc2
-rw-r--r--paludis/dep_list_TEST.hh2
-rw-r--r--paludis/dep_list_TEST_blockers.cc2
-rw-r--r--paludis/dep_list_exceptions.cc2
-rw-r--r--paludis/dep_list_exceptions.hh2
-rw-r--r--paludis/dep_list_options.cc2
-rw-r--r--paludis/dep_list_options.hh2
-rw-r--r--paludis/dep_spec-fwd.hh2
-rw-r--r--paludis/dep_spec.cc2
-rw-r--r--paludis/dep_spec.hh2
-rw-r--r--paludis/dep_spec_TEST.cc2
-rw-r--r--paludis/dep_spec_flattener.cc2
-rw-r--r--paludis/dep_spec_flattener.hh2
-rw-r--r--paludis/dep_tag-fwd.hh2
-rw-r--r--paludis/dep_tag.cc2
-rw-r--r--paludis/dep_tag.hh2
-rw-r--r--paludis/dep_tree-fwd.hh2
-rw-r--r--paludis/dep_tree.cc2
-rw-r--r--paludis/dep_tree.hh2
-rw-r--r--paludis/distribution-fwd.hh2
-rw-r--r--paludis/distribution.cc2
-rw-r--r--paludis/distribution.hh2
-rw-r--r--paludis/environment-fwd.hh2
-rw-r--r--paludis/environment.cc2
-rw-r--r--paludis/environment.hh2
-rw-r--r--paludis/environment_implementation.cc2
-rw-r--r--paludis/environment_implementation.hh2
-rw-r--r--paludis/environment_maker.cc2
-rw-r--r--paludis/environment_maker.hh2
-rw-r--r--paludis/environments/adapted/adapted_environment.cc2
-rw-r--r--paludis/environments/adapted/adapted_environment.hh2
-rw-r--r--paludis/environments/adapted/adapted_environment_TEST.cc2
-rw-r--r--paludis/environments/adapted/registration.cc2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
-rw-r--r--paludis/environments/no_config/no_config_environment.hh2
-rw-r--r--paludis/environments/no_config/no_config_environment_TEST.cc2
-rw-r--r--paludis/environments/no_config/registration.cc2
-rw-r--r--paludis/environments/paludis/bashable_conf.cc2
-rw-r--r--paludis/environments/paludis/bashable_conf.hh2
-rw-r--r--paludis/environments/paludis/keywords_conf.cc2
-rw-r--r--paludis/environments/paludis/keywords_conf.hh2
-rw-r--r--paludis/environments/paludis/licenses_conf.cc2
-rw-r--r--paludis/environments/paludis/licenses_conf.hh2
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc2
-rw-r--r--paludis/environments/paludis/mirrors_conf.hh2
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc2
-rw-r--r--paludis/environments/paludis/package_mask_conf.hh2
-rw-r--r--paludis/environments/paludis/paludis_config.cc2
-rw-r--r--paludis/environments/paludis/paludis_config.hh2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.hh2
-rw-r--r--paludis/environments/paludis/paludis_environment_TEST.cc2
-rw-r--r--paludis/environments/paludis/registration.cc2
-rw-r--r--paludis/environments/paludis/use_conf.cc2
-rw-r--r--paludis/environments/paludis/use_conf.hh2
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/environments/portage/portage_environment.hh2
-rw-r--r--paludis/environments/portage/portage_environment_TEST.cc2
-rw-r--r--paludis/environments/portage/registration.cc2
-rw-r--r--paludis/environments/test/registration.cc2
-rw-r--r--paludis/environments/test/test_environment.cc2
-rw-r--r--paludis/environments/test/test_environment.hh2
-rwxr-xr-xpaludis/fetchers/dowget.in2
-rw-r--r--paludis/find_unused_packages_task.cc2
-rw-r--r--paludis/find_unused_packages_task.hh2
-rw-r--r--paludis/formatter-fwd.hh2
-rw-r--r--paludis/formatter.cc2
-rw-r--r--paludis/formatter.hh2
-rw-r--r--paludis/handled_information-fwd.hh2
-rw-r--r--paludis/handled_information.cc2
-rw-r--r--paludis/handled_information.hh2
-rw-r--r--paludis/hashed_containers.cc2
-rw-r--r--paludis/hashed_containers.hh2
-rw-r--r--paludis/hashed_containers_TEST.cc2
-rw-r--r--paludis/hook-fwd.hh4
-rw-r--r--paludis/hook.cc4
-rw-r--r--paludis/hook.hh4
-rwxr-xr-xpaludis/hooker.bash2
-rw-r--r--paludis/hooker.cc4
-rw-r--r--paludis/hooker.hh2
-rw-r--r--paludis/hooker_TEST.cc2
-rw-r--r--paludis/host_tuple_name.cc2
-rw-r--r--paludis/host_tuple_name.hh2
-rw-r--r--paludis/host_tuple_name_TEST.cc2
-rw-r--r--paludis/install_task.cc2
-rw-r--r--paludis/install_task.hh2
-rw-r--r--paludis/mask-fwd.hh2
-rw-r--r--paludis/mask.cc2
-rw-r--r--paludis/mask.hh2
-rw-r--r--paludis/match_package.cc2
-rw-r--r--paludis/match_package.hh2
-rw-r--r--paludis/md5.cc2
-rw-r--r--paludis/md5.hh2
-rw-r--r--paludis/md5_TEST.cc2
-rw-r--r--paludis/merger.cc2
-rw-r--r--paludis/merger.hh2
-rw-r--r--paludis/merger_TEST.cc2
-rw-r--r--paludis/merger_entry_type.cc2
-rw-r--r--paludis/merger_entry_type.hh2
-rw-r--r--paludis/metadata_key-fwd.hh2
-rw-r--r--paludis/metadata_key.cc2
-rw-r--r--paludis/metadata_key.hh2
-rw-r--r--paludis/name-fwd.hh2
-rw-r--r--paludis/name.cc2
-rw-r--r--paludis/name.hh2
-rw-r--r--paludis/name_TEST.cc2
-rw-r--r--paludis/override_functions.cc2
-rw-r--r--paludis/override_functions.hh2
-rw-r--r--paludis/package_database-fwd.hh2
-rw-r--r--paludis/package_database.cc2
-rw-r--r--paludis/package_database.hh2
-rw-r--r--paludis/package_database_TEST.cc2
-rw-r--r--paludis/package_id-fwd.hh2
-rw-r--r--paludis/package_id.cc2
-rw-r--r--paludis/package_id.hh2
-rw-r--r--paludis/paludis.hh.m42
-rw-r--r--paludis/qa-fwd.hh2
-rw-r--r--paludis/qa.cc2
-rw-r--r--paludis/qa.hh2
-rw-r--r--paludis/query-fwd.hh2
-rw-r--r--paludis/query.cc2
-rw-r--r--paludis/query.hh2
-rw-r--r--paludis/query_delegate-fwd.hh2
-rw-r--r--paludis/query_delegate.cc2
-rw-r--r--paludis/query_delegate.hh2
-rw-r--r--paludis/query_visitor.cc2
-rw-r--r--paludis/query_visitor.hh2
-rw-r--r--paludis/range_rewriter.cc2
-rw-r--r--paludis/range_rewriter.hh2
-rw-r--r--paludis/range_rewriter_TEST.cc2
-rw-r--r--paludis/report_task.cc2
-rw-r--r--paludis/report_task.hh2
-rw-r--r--paludis/repositories/cran/cran/cran.bash2
-rw-r--r--paludis/repositories/cran/cran_dep_parser.cc2
-rw-r--r--paludis/repositories/cran/cran_dep_parser.hh4
-rw-r--r--paludis/repositories/cran/cran_dep_parser_TEST.cc2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc4
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh4
-rw-r--r--paludis/repositories/cran/cran_installed_repository_TEST.cc2
-rw-r--r--paludis/repositories/cran/cran_package_id.cc4
-rw-r--r--paludis/repositories/cran/cran_package_id.hh4
-rw-r--r--paludis/repositories/cran/cran_repository.cc4
-rw-r--r--paludis/repositories/cran/cran_repository.hh4
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc4
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.cc2
-rw-r--r--paludis/repositories/cran/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/cran/description_file.cc2
-rw-r--r--paludis/repositories/cran/description_file.hh2
-rw-r--r--paludis/repositories/cran/description_file_TEST.cc2
-rw-r--r--paludis/repositories/cran/keys.cc2
-rw-r--r--paludis/repositories/cran/keys.hh2
-rw-r--r--paludis/repositories/cran/masks.cc2
-rw-r--r--paludis/repositories/cran/masks.hh2
-rw-r--r--paludis/repositories/cran/normalise.cc2
-rw-r--r--paludis/repositories/cran/normalise.hh2
-rw-r--r--paludis/repositories/cran/registration.cc2
-rw-r--r--paludis/repositories/e/aa_visitor.cc2
-rw-r--r--paludis/repositories/e/aa_visitor.hh2
-rw-r--r--paludis/repositories/e/aa_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc2
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.hh2
-rw-r--r--paludis/repositories/e/dep_lexer.cc2
-rw-r--r--paludis/repositories/e/dep_lexer.hh2
-rw-r--r--paludis/repositories/e/dep_lexer_TEST.cc2
-rw-r--r--paludis/repositories/e/dep_parser-fwd.hh2
-rw-r--r--paludis/repositories/e/dep_parser.cc2
-rw-r--r--paludis/repositories/e/dep_parser.hh2
-rw-r--r--paludis/repositories/e/dep_parser_TEST.cc2
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc2
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.hh2
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer_TEST.cc2
-rw-r--r--paludis/repositories/e/e_key.cc2
-rw-r--r--paludis/repositories/e/e_key.hh2
-rw-r--r--paludis/repositories/e/e_mask.cc2
-rw-r--r--paludis/repositories/e/e_mask.hh2
-rw-r--r--paludis/repositories/e/e_repository.cc4
-rw-r--r--paludis/repositories/e/e_repository.hh2
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/e_repository_entries.cc2
-rw-r--r--paludis/repositories/e/e_repository_entries.hh2
-rw-r--r--paludis/repositories/e/e_repository_exceptions.cc2
-rw-r--r--paludis/repositories/e/e_repository_exceptions.hh2
-rw-r--r--paludis/repositories/e/e_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_repository_id.hh2
-rw-r--r--paludis/repositories/e/e_repository_mask_file.cc2
-rw-r--r--paludis/repositories/e/e_repository_mask_file.hh2
-rw-r--r--paludis/repositories/e/e_repository_news.cc2
-rw-r--r--paludis/repositories/e/e_repository_news.hh2
-rw-r--r--paludis/repositories/e/e_repository_params.cc2
-rw-r--r--paludis/repositories/e/e_repository_params.hh2
-rw-r--r--paludis/repositories/e/e_repository_profile.cc2
-rw-r--r--paludis/repositories/e/e_repository_profile.hh2
-rw-r--r--paludis/repositories/e/e_repository_profile_file.cc2
-rw-r--r--paludis/repositories/e/e_repository_profile_file.hh2
-rw-r--r--paludis/repositories/e/e_repository_sets.cc4
-rw-r--r--paludis/repositories/e/e_repository_sets.hh4
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc2
-rw-r--r--paludis/repositories/e/eapi-fwd.hh2
-rw-r--r--paludis/repositories/e/eapi.cc2
-rw-r--r--paludis/repositories/e/eapi.hh2
-rw-r--r--paludis/repositories/e/eapi_phase.cc2
-rw-r--r--paludis/repositories/e/eapi_phase.hh2
-rw-r--r--paludis/repositories/e/ebin.cc2
-rw-r--r--paludis/repositories/e/ebin.hh2
-rw-r--r--paludis/repositories/e/ebin_entries.cc2
-rw-r--r--paludis/repositories/e/ebin_entries.hh2
-rw-r--r--paludis/repositories/e/ebuild.cc2
-rw-r--r--paludis/repositories/e/ebuild.hh2
-rw-r--r--paludis/repositories/e/ebuild/1/src_compile.bash2
-rw-r--r--paludis/repositories/e/ebuild/build_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_infovars.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_init.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_initbin.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_loadenv.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_metadata.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_prepare.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_saveenv.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_strip.bash4
-rw-r--r--paludis/repositories/e/ebuild/builtin_tidyup.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_unpackbin.bash2
-rw-r--r--paludis/repositories/e/ebuild/builtin_variable.bash2
-rw-r--r--paludis/repositories/e/ebuild/die_functions.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
-rw-r--r--paludis/repositories/e/ebuild/echo_functions.bash.in2
-rw-r--r--paludis/repositories/e/ebuild/echo_functions_TEST.bash2
-rw-r--r--paludis/repositories/e/ebuild/eclass_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_fetch.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/echo_functions.bash.in2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/list_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/exheres-0/portage_stubs.bash2
-rw-r--r--paludis/repositories/e/ebuild/exlib_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/install_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/kernel_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/kernel_functions_TEST.bash2
-rw-r--r--paludis/repositories/e/ebuild/list_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/list_functions_TEST.bash2
-rw-r--r--paludis/repositories/e/ebuild/multilib_functions.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_config.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_info.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_nofetch.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_postinst.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_postrm.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_preinst.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_prerm.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_pretend.bash2
-rw-r--r--paludis/repositories/e/ebuild/pkg_setup.bash2
-rw-r--r--paludis/repositories/e/ebuild/portage_stubs.bash2
-rw-r--r--paludis/repositories/e/ebuild/sandbox.bash2
-rw-r--r--paludis/repositories/e/ebuild/src_compile.bash2
-rw-r--r--paludis/repositories/e/ebuild/src_install.bash2
-rw-r--r--paludis/repositories/e/ebuild/src_test.bash2
-rw-r--r--paludis/repositories/e/ebuild/src_unpack.bash2
-rw-r--r--paludis/repositories/e/ebuild/usage_error.bash2
-rw-r--r--paludis/repositories/e/ebuild/utils/awk_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dobin2
-rw-r--r--paludis/repositories/e/ebuild/utils/dobin_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doconfd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dodir2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dodoc2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doenvd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doexe2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dohard2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dohtml2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doinfo2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doinitd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doins2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dolib2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dolib.a.in2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dolib.so.in2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/doman2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/domo2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/donewins2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dosbin2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dosed2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/dosym2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/emake2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-02
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/dodoc4
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/emake2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/exheres-0/unpack2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/fowners2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/fperms2
-rw-r--r--paludis/repositories/e/ebuild/utils/make_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newbin2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newconfd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newdoc2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newenvd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newexe2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newinitd2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newins2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newlib.a.in2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newlib.so.in2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newman2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/newsbin2
-rw-r--r--paludis/repositories/e/ebuild/utils/patch_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/prep.in2
-rw-r--r--paludis/repositories/e/ebuild/utils/sed_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/unpack2
-rwxr-xr-xpaludis/repositories/e/ebuild/utils/wrapped_getfsize_TEST.bash2
-rwxr-xr-xpaludis/repositories/e/ebuild/write_vdb_entry.bash2
-rw-r--r--paludis/repositories/e/ebuild_entries.cc2
-rw-r--r--paludis/repositories/e/ebuild_entries.hh2
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.cc2
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh2
-rw-r--r--paludis/repositories/e/ebuild_id.cc2
-rw-r--r--paludis/repositories/e/ebuild_id.hh2
-rw-r--r--paludis/repositories/e/eclass_mtimes.cc2
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh2
-rw-r--r--paludis/repositories/e/exheres_layout.cc2
-rw-r--r--paludis/repositories/e/exheres_layout.hh2
-rw-r--r--paludis/repositories/e/fetch_visitor.cc2
-rw-r--r--paludis/repositories/e/fetch_visitor.hh2
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/glsa.cc2
-rw-r--r--paludis/repositories/e/glsa.hh2
-rw-r--r--paludis/repositories/e/layout.cc4
-rw-r--r--paludis/repositories/e/layout.hh4
-rw-r--r--paludis/repositories/e/make_ebin_repository.cc2
-rw-r--r--paludis/repositories/e/make_ebin_repository.hh2
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc2
-rw-r--r--paludis/repositories/e/make_ebuild_repository.hh2
-rw-r--r--paludis/repositories/e/manifest2_reader.cc2
-rw-r--r--paludis/repositories/e/manifest2_reader.hh2
-rw-r--r--paludis/repositories/e/qa/eapi_supported.cc2
-rw-r--r--paludis/repositories/e/qa/eapi_supported.hh2
-rw-r--r--paludis/repositories/e/qa/extractors.cc2
-rw-r--r--paludis/repositories/e/qa/extractors.hh2
-rw-r--r--paludis/repositories/e/qa/extractors_TEST.cc2
-rw-r--r--paludis/repositories/e/qa/homepage_key.cc2
-rw-r--r--paludis/repositories/e/qa/homepage_key.hh2
-rw-r--r--paludis/repositories/e/qa/qa.cc2
-rw-r--r--paludis/repositories/e/qa/qa_checks.cc2
-rw-r--r--paludis/repositories/e/qa/qa_checks.hh2
-rw-r--r--paludis/repositories/e/qa/qa_checks_group.cc2
-rw-r--r--paludis/repositories/e/qa/qa_checks_group.hh2
-rw-r--r--paludis/repositories/e/qa/qa_controller.cc2
-rw-r--r--paludis/repositories/e/qa/qa_controller.hh2
-rw-r--r--paludis/repositories/e/qa/short_description_key.cc2
-rw-r--r--paludis/repositories/e/qa/short_description_key.hh2
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc2
-rw-r--r--paludis/repositories/e/qa/spec_keys.hh2
-rw-r--r--paludis/repositories/e/qa/spec_keys_TEST.cc2
-rw-r--r--paludis/repositories/e/qa/stray_files.cc2
-rw-r--r--paludis/repositories/e/qa/stray_files.hh2
-rw-r--r--paludis/repositories/e/qa/stray_files_TEST.cc2
-rw-r--r--paludis/repositories/e/qa/test_extras.cc2
-rw-r--r--paludis/repositories/e/qa/visibility.cc2
-rw-r--r--paludis/repositories/e/qa/visibility.hh2
-rw-r--r--paludis/repositories/e/qa/visibility_TEST.cc2
-rw-r--r--paludis/repositories/e/registration.cc2
-rw-r--r--paludis/repositories/e/source_uri_finder.cc2
-rw-r--r--paludis/repositories/e/source_uri_finder.hh2
-rw-r--r--paludis/repositories/e/source_uri_finder_TEST.cc2
-rw-r--r--paludis/repositories/e/traditional_layout.cc4
-rw-r--r--paludis/repositories/e/traditional_layout.hh4
-rw-r--r--paludis/repositories/e/use_desc.cc2
-rw-r--r--paludis/repositories/e/use_desc.hh2
-rw-r--r--paludis/repositories/e/vdb_id.cc2
-rw-r--r--paludis/repositories/e/vdb_id.hh2
-rw-r--r--paludis/repositories/e/vdb_merger.cc2
-rw-r--r--paludis/repositories/e/vdb_merger.hh2
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc4
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.hh2
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc4
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh4
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc2
-rw-r--r--paludis/repositories/e/xml_things.cc2
-rw-r--r--paludis/repositories/e/xml_things.hh2
-rw-r--r--paludis/repositories/e/xml_things_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh2
-rw-r--r--paludis/repositories/fake/fake_installed_repository_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_package_id.cc2
-rw-r--r--paludis/repositories/fake/fake_package_id.hh2
-rw-r--r--paludis/repositories/fake/fake_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_repository.hh2
-rw-r--r--paludis/repositories/fake/fake_repository_TEST.cc2
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc2
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh2
-rw-r--r--paludis/repositories/gems/exceptions.cc2
-rw-r--r--paludis/repositories/gems/exceptions.hh2
-rw-r--r--paludis/repositories/gems/gem_specification-fwd.hh2
-rw-r--r--paludis/repositories/gems/gem_specification.cc2
-rw-r--r--paludis/repositories/gems/gem_specification.hh2
-rw-r--r--paludis/repositories/gems/gem_specification_TEST.cc2
-rw-r--r--paludis/repositories/gems/gem_specifications.cc2
-rw-r--r--paludis/repositories/gems/gem_specifications.hh2
-rw-r--r--paludis/repositories/gems/gem_specifications_TEST.cc2
-rwxr-xr-xpaludis/repositories/gems/gems.bash2
-rw-r--r--paludis/repositories/gems/gems_repository.cc2
-rw-r--r--paludis/repositories/gems/gems_repository.hh2
-rw-r--r--paludis/repositories/gems/gems_repository_TEST.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh2
-rw-r--r--paludis/repositories/gems/installed_gems_repository_TEST.cc2
-rw-r--r--paludis/repositories/gems/params-fwd.hh2
-rw-r--r--paludis/repositories/gems/params.cc2
-rw-r--r--paludis/repositories/gems/params.hh2
-rw-r--r--paludis/repositories/gems/registration.cc2
-rw-r--r--paludis/repositories/gems/yaml-fwd.hh2
-rw-r--r--paludis/repositories/gems/yaml.cc2
-rw-r--r--paludis/repositories/gems/yaml.hh2
-rw-r--r--paludis/repositories/gems/yaml_TEST.cc2
-rw-r--r--paludis/repositories/unpackaged/exceptions.cc2
-rw-r--r--paludis/repositories/unpackaged/exceptions.hh2
-rw-r--r--paludis/repositories/unpackaged/installed_unpackaged_id.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_unpackaged_id.hh2
-rw-r--r--paludis/repositories/unpackaged/installed_unpackaged_repository.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_unpackaged_repository.hh2
-rw-r--r--paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam-fwd.hh2
-rw-r--r--paludis/repositories/unpackaged/ndbam.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam.hh2
-rw-r--r--paludis/repositories/unpackaged/ndbam_merger.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam_merger.hh2
-rw-r--r--paludis/repositories/unpackaged/ndbam_unmerger.cc4
-rw-r--r--paludis/repositories/unpackaged/ndbam_unmerger.hh4
-rw-r--r--paludis/repositories/unpackaged/registration.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.hh2
-rw-r--r--paludis/repositories/virtuals/registration.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository_TEST.cc2
-rw-r--r--paludis/repository-fwd.hh2
-rw-r--r--paludis/repository.cc2
-rw-r--r--paludis/repository.hh2
-rw-r--r--paludis/repository_info-fwd.hh2
-rw-r--r--paludis/repository_info.cc2
-rw-r--r--paludis/repository_info.hh2
-rw-r--r--paludis/repository_maker.cc2
-rw-r--r--paludis/repository_maker.hh2
-rw-r--r--paludis/repository_name_cache.cc2
-rw-r--r--paludis/repository_name_cache.hh2
-rw-r--r--paludis/repository_name_cache_TEST.cc2
-rw-r--r--paludis/rmd160.cc2
-rw-r--r--paludis/rmd160.hh2
-rw-r--r--paludis/rmd160_TEST.cc2
-rw-r--r--paludis/selinux/security_context.cc2
-rw-r--r--paludis/selinux/security_context.hh2
-rw-r--r--paludis/set_file.cc2
-rw-r--r--paludis/set_file.hh2
-rw-r--r--paludis/set_file_TEST.cc2
-rw-r--r--paludis/sha256.cc2
-rw-r--r--paludis/sha256.hh2
-rw-r--r--paludis/sha256_TEST.cc2
-rw-r--r--paludis/show_suggest_visitor.cc2
-rw-r--r--paludis/show_suggest_visitor.hh2
-rw-r--r--paludis/sohooks_TEST.cc2
-rw-r--r--paludis/stage_builder_task.cc2
-rw-r--r--paludis/stage_builder_task.hh2
-rw-r--r--paludis/stringify_formatter-fwd.hh2
-rw-r--r--paludis/stringify_formatter-impl.hh2
-rw-r--r--paludis/stringify_formatter.cc2
-rw-r--r--paludis/stringify_formatter.hh2
-rw-r--r--paludis/stringify_formatter_TEST.cc2
-rw-r--r--paludis/sync_task.cc2
-rw-r--r--paludis/sync_task.hh2
-rw-r--r--paludis/syncer.cc6
-rw-r--r--paludis/syncer.hh2
-rw-r--r--paludis/tasks_exceptions.cc2
-rw-r--r--paludis/tasks_exceptions.hh2
-rw-r--r--paludis/test_extras.cc2
-rw-r--r--paludis/uninstall_list.cc2
-rw-r--r--paludis/uninstall_list.hh2
-rw-r--r--paludis/uninstall_list_TEST.cc2
-rw-r--r--paludis/uninstall_task.cc2
-rw-r--r--paludis/uninstall_task.hh2
-rw-r--r--paludis/unmerger.cc4
-rw-r--r--paludis/unmerger.hh4
-rw-r--r--paludis/util/action_queue.cc2
-rw-r--r--paludis/util/action_queue.hh2
-rw-r--r--paludis/util/action_queue_TEST.cc2
-rw-r--r--paludis/util/attributes.hh2
-rw-r--r--paludis/util/clone-impl.hh2
-rw-r--r--paludis/util/clone.hh2
-rw-r--r--paludis/util/condition_variable.cc2
-rw-r--r--paludis/util/condition_variable.hh2
-rw-r--r--paludis/util/condition_variable_TEST.cc2
-rw-r--r--paludis/util/config_file.cc4
-rw-r--r--paludis/util/config_file.hh2
-rw-r--r--paludis/util/config_file_TEST.cc2
-rw-r--r--paludis/util/destringify.cc2
-rw-r--r--paludis/util/destringify.hh2
-rw-r--r--paludis/util/destringify_TEST.cc2
-rw-r--r--paludis/util/dir_iterator.cc2
-rw-r--r--paludis/util/dir_iterator.hh2
-rw-r--r--paludis/util/dir_iterator_TEST.cc2
-rw-r--r--paludis/util/exception.cc2
-rw-r--r--paludis/util/exception.hh2
-rw-r--r--paludis/util/fast_unique_copy.hh2
-rw-r--r--paludis/util/fast_unique_copy_TEST.cc2
-rw-r--r--paludis/util/fd_holder.hh2
-rw-r--r--paludis/util/fd_output_stream.hh2
-rw-r--r--paludis/util/fs_entry-fwd.hh4
-rw-r--r--paludis/util/fs_entry.cc4
-rw-r--r--paludis/util/fs_entry.hh4
-rw-r--r--paludis/util/fs_entry_TEST.cc4
-rw-r--r--paludis/util/future-impl.hh2
-rw-r--r--paludis/util/future.cc2
-rw-r--r--paludis/util/future.hh2
-rw-r--r--paludis/util/future_TEST.cc2
-rw-r--r--paludis/util/graph-fwd.hh2
-rw-r--r--paludis/util/graph-impl.hh2
-rw-r--r--paludis/util/graph.cc2
-rw-r--r--paludis/util/graph.hh2
-rw-r--r--paludis/util/graph_TEST.cc2
-rw-r--r--paludis/util/idle_action_pool-fwd.hh2
-rw-r--r--paludis/util/idle_action_pool.cc2
-rw-r--r--paludis/util/idle_action_pool.hh2
-rw-r--r--paludis/util/idle_action_pool_TEST.cc2
-rw-r--r--paludis/util/instantiation_policy-impl.hh2
-rw-r--r--paludis/util/instantiation_policy.hh2
-rw-r--r--paludis/util/instantiation_policy_TEST.cc2
-rw-r--r--paludis/util/is_file_with_extension.cc2
-rw-r--r--paludis/util/is_file_with_extension.hh2
-rw-r--r--paludis/util/is_file_with_extension_TEST.cc2
-rw-r--r--paludis/util/iterator.hh4
-rw-r--r--paludis/util/iterator_TEST.cc4
-rw-r--r--paludis/util/join.hh2
-rw-r--r--paludis/util/join_TEST.cc2
-rw-r--r--paludis/util/log.cc2
-rw-r--r--paludis/util/log.hh2
-rw-r--r--paludis/util/log_TEST.cc2
-rw-r--r--paludis/util/make_shared_ptr-fwd.hh2
-rw-r--r--paludis/util/make_shared_ptr.hh2
-rw-r--r--paludis/util/map-fwd.hh2
-rw-r--r--paludis/util/map-impl.hh2
-rw-r--r--paludis/util/map.cc2
-rw-r--r--paludis/util/map.hh2
-rw-r--r--paludis/util/mutex.cc2
-rw-r--r--paludis/util/mutex.hh2
-rw-r--r--paludis/util/mutex_TEST.cc2
-rw-r--r--paludis/util/no_type.hh2
-rw-r--r--paludis/util/operators.hh2
-rw-r--r--paludis/util/options-fwd.hh2
-rw-r--r--paludis/util/options.cc2
-rw-r--r--paludis/util/options.hh2
-rw-r--r--paludis/util/options_TEST.cc2
-rw-r--r--paludis/util/output_wrapper.cc2
-rw-r--r--paludis/util/output_wrapper_TEST.cc2
-rw-r--r--paludis/util/parallel_for_each.cc2
-rw-r--r--paludis/util/parallel_for_each.hh2
-rw-r--r--paludis/util/parallel_for_each_TEST.cc2
-rw-r--r--paludis/util/pipe.cc2
-rw-r--r--paludis/util/pipe.hh2
-rw-r--r--paludis/util/private_implementation_pattern-impl.hh2
-rw-r--r--paludis/util/private_implementation_pattern.hh2
-rw-r--r--paludis/util/pstream.cc2
-rw-r--r--paludis/util/pstream.hh2
-rw-r--r--paludis/util/pstream_TEST.cc2
-rw-r--r--paludis/util/random.cc2
-rw-r--r--paludis/util/random.hh2
-rw-r--r--paludis/util/random_TEST.cc2
-rw-r--r--paludis/util/save.hh2
-rw-r--r--paludis/util/save_TEST.cc2
-rw-r--r--paludis/util/sequence-fwd.hh2
-rw-r--r--paludis/util/sequence-impl.hh2
-rw-r--r--paludis/util/sequence.hh2
-rw-r--r--paludis/util/set-fwd.hh2
-rw-r--r--paludis/util/set-impl.hh2
-rw-r--r--paludis/util/set.hh2
-rw-r--r--paludis/util/sr.cc2
-rw-r--r--paludis/util/sr.hh2
-rw-r--r--paludis/util/stringify.hh2
-rw-r--r--paludis/util/stringify_TEST.cc2
-rw-r--r--paludis/util/strip.cc2
-rw-r--r--paludis/util/strip.hh2
-rw-r--r--paludis/util/strip_TEST.cc2
-rw-r--r--paludis/util/system.cc2
-rw-r--r--paludis/util/system.hh2
-rw-r--r--paludis/util/system_TEST.cc2
-rw-r--r--paludis/util/test_extras.cc2
-rw-r--r--paludis/util/thread.cc2
-rw-r--r--paludis/util/thread.hh2
-rw-r--r--paludis/util/thread_TEST.cc2
-rw-r--r--paludis/util/thread_pool.cc2
-rw-r--r--paludis/util/thread_pool.hh2
-rw-r--r--paludis/util/thread_pool_TEST.cc2
-rw-r--r--paludis/util/tokeniser.hh2
-rw-r--r--paludis/util/tokeniser_TEST.cc2
-rw-r--r--paludis/util/tr1_functional.hh2
-rw-r--r--paludis/util/tr1_memory.hh2
-rw-r--r--paludis/util/tr1_type_traits.hh2
-rw-r--r--paludis/util/util.hh.m42
-rw-r--r--paludis/util/validated-fwd.hh2
-rw-r--r--paludis/util/validated.hh2
-rw-r--r--paludis/util/validated_TEST.cc2
-rw-r--r--paludis/util/virtual_constructor-impl.hh2
-rw-r--r--paludis/util/virtual_constructor.hh2
-rw-r--r--paludis/util/virtual_constructor_TEST.cc2
-rw-r--r--paludis/util/visitor-fwd.hh2
-rw-r--r--paludis/util/visitor-impl.hh2
-rw-r--r--paludis/util/visitor.hh2
-rw-r--r--paludis/util/visitor_TEST.cc2
-rw-r--r--paludis/util/visitor_cast.hh2
-rw-r--r--paludis/util/visitor_cast_TEST.cc2
-rw-r--r--paludis/version_operator-fwd.hh2
-rw-r--r--paludis/version_operator.cc2
-rw-r--r--paludis/version_operator.hh2
-rw-r--r--paludis/version_operator_TEST.cc2
-rw-r--r--paludis/version_requirements-fwd.hh2
-rw-r--r--paludis/version_requirements.cc2
-rw-r--r--paludis/version_requirements.hh2
-rw-r--r--paludis/version_spec-fwd.hh2
-rw-r--r--paludis/version_spec.cc2
-rw-r--r--paludis/version_spec.hh2
-rw-r--r--paludis/version_spec_TEST.cc2
-rw-r--r--python/action.cc2
-rwxr-xr-xpython/action_TEST.py2
-rw-r--r--python/additional_tests.cc2
-rw-r--r--python/additional_tests.hh2
-rw-r--r--python/additional_tests_so.cc2
-rw-r--r--python/contents.cc2
-rwxr-xr-xpython/contents_TEST.py2
-rw-r--r--python/dep_label.cc2
-rwxr-xr-xpython/dep_label_TEST.py2
-rw-r--r--python/dep_list.cc2
-rwxr-xr-xpython/dep_list_TEST.py2
-rw-r--r--python/dep_spec.cc2
-rw-r--r--python/dep_spec.hh2
-rwxr-xr-xpython/dep_spec_TEST.py2
-rw-r--r--python/dep_tag.cc2
-rwxr-xr-xpython/dep_tag_TEST.py2
-rw-r--r--python/environment.cc2
-rwxr-xr-xpython/environment_TEST.py2
-rw-r--r--python/exception.cc2
-rw-r--r--python/exception.hh2
-rw-r--r--python/formatter.cc2
-rwxr-xr-xpython/formatter_TEST.py2
-rw-r--r--python/fs_entry.cc2
-rw-r--r--python/iterable.hh2
-rw-r--r--python/log.cc2
-rwxr-xr-xpython/log_TEST.py2
-rw-r--r--python/mask.cc2
-rwxr-xr-xpython/mask_TEST.py2
-rw-r--r--python/metadata_key.cc2
-rwxr-xr-xpython/metadata_key_TEST.py2
-rw-r--r--python/mutex.cc2
-rw-r--r--python/mutex.hh2
-rw-r--r--python/name.cc2
-rwxr-xr-xpython/name_TEST.py2
-rw-r--r--python/options.hh2
-rw-r--r--python/package_database.cc2
-rwxr-xr-xpython/package_database_TEST.py2
-rw-r--r--python/package_id.cc2
-rwxr-xr-xpython/package_id_TEST.py2
-rw-r--r--python/paludis_output_wrapper.py2
-rw-r--r--python/paludis_python.hh2
-rw-r--r--python/paludis_python_so.cc2
-rw-r--r--python/qa.cc2
-rwxr-xr-xpython/qa_TEST.py2
-rw-r--r--python/query.cc2
-rwxr-xr-xpython/query_TEST.py2
-rw-r--r--python/repository.cc2
-rwxr-xr-xpython/repository_TEST.py2
-rw-r--r--python/validated.hh2
-rw-r--r--python/version_operator.cc2
-rwxr-xr-xpython/version_operator_TEST.py2
-rw-r--r--python/version_requirements.cc2
-rwxr-xr-xpython/version_requirements_TEST.py2
-rw-r--r--python/version_spec.cc2
-rwxr-xr-xpython/version_spec_TEST.py2
-rw-r--r--ruby/contents.cc2
-rw-r--r--ruby/contents_TEST.rb2
-rw-r--r--ruby/dep_list.cc2
-rw-r--r--ruby/dep_list_TEST.rb2
-rw-r--r--ruby/dep_spec.cc4
-rw-r--r--ruby/dep_spec_TEST.rb4
-rw-r--r--ruby/dep_tag.cc4
-rw-r--r--ruby/dep_tag_TEST.rb2
-rw-r--r--ruby/environment.cc4
-rw-r--r--ruby/environment_TEST.rb4
-rw-r--r--ruby/find_unused_packages_task.cc2
-rw-r--r--ruby/find_unused_packages_task_TEST.rb2
-rw-r--r--ruby/log.cc2
-rw-r--r--ruby/log_TEST.rb2
-rw-r--r--ruby/name.cc2
-rw-r--r--ruby/package_database.cc2
-rw-r--r--ruby/package_database_TEST.rb4
-rw-r--r--ruby/package_id.cc2
-rw-r--r--ruby/package_id_TEST.rb2
-rw-r--r--ruby/paludis_ruby.cc4
-rw-r--r--ruby/paludis_ruby.hh4
-rw-r--r--ruby/paludis_ruby_TEST.rb2
-rw-r--r--ruby/paludis_ruby_so.cc2
-rw-r--r--ruby/qa.cc2
-rw-r--r--ruby/qa_TEST.rb2
-rw-r--r--ruby/qualified_package_name.cc2
-rw-r--r--ruby/qualified_package_name_TEST.rb2
-rw-r--r--ruby/query.cc4
-rw-r--r--ruby/query_TEST.rb4
-rw-r--r--ruby/repository.cc6
-rw-r--r--ruby/repository_TEST.rb4
-rw-r--r--ruby/version_spec.cc2
-rw-r--r--ruby/version_spec_TEST.rb2
-rw-r--r--src/clients/accerso/accerso.cc2
-rw-r--r--src/clients/accerso/command_line.cc2
-rw-r--r--src/clients/accerso/command_line.hh2
-rw-r--r--src/clients/accerso/man_accerso.cc2
-rw-r--r--src/clients/adjutrix/adjutrix.cc2
-rw-r--r--src/clients/adjutrix/command_line.cc2
-rw-r--r--src/clients/adjutrix/command_line.hh2
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc2
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.hh2
-rw-r--r--src/clients/adjutrix/downgrade_check.cc2
-rw-r--r--src/clients/adjutrix/downgrade_check.hh2
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.cc2
-rw-r--r--src/clients/adjutrix/find_dropped_keywords.hh2
-rw-r--r--src/clients/adjutrix/find_insecure_packages.cc2
-rw-r--r--src/clients/adjutrix/find_insecure_packages.hh2
-rw-r--r--src/clients/adjutrix/find_reverse_deps.cc2
-rw-r--r--src/clients/adjutrix/find_reverse_deps.hh2
-rw-r--r--src/clients/adjutrix/find_stable_candidates.cc2
-rw-r--r--src/clients/adjutrix/find_stable_candidates.hh2
-rw-r--r--src/clients/adjutrix/find_unused_packages.cc2
-rw-r--r--src/clients/adjutrix/find_unused_packages.hh2
-rw-r--r--src/clients/adjutrix/keywords_graph.cc2
-rw-r--r--src/clients/adjutrix/keywords_graph.hh2
-rw-r--r--src/clients/adjutrix/man_adjutrix.cc2
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc2
-rw-r--r--src/clients/adjutrix/what_needs_keywording.hh2
-rw-r--r--src/clients/contrarius/command_line.cc2
-rw-r--r--src/clients/contrarius/contrarius.cc2
-rw-r--r--src/clients/contrarius/install.cc4
-rw-r--r--src/clients/contrarius/install.hh2
-rw-r--r--src/clients/contrarius/man_contrarius.cc4
-rw-r--r--src/clients/contrarius/stage.cc2
-rw-r--r--src/clients/contrarius/stage.hh2
-rw-r--r--src/clients/contrarius/stage_builder.cc2
-rw-r--r--src/clients/contrarius/stage_builder.hh2
-rw-r--r--src/clients/contrarius/target_config.cc2
-rw-r--r--src/clients/contrarius/target_config.hh2
-rw-r--r--src/clients/gtkpaludis/vtemm/reaper.ccg2
-rw-r--r--src/clients/gtkpaludis/vtemm/reaper.hg2
-rw-r--r--src/clients/gtkpaludis/vtemm/terminal_widget.ccg2
-rw-r--r--src/clients/gtkpaludis/vtemm/terminal_widget.hg2
-rw-r--r--src/clients/importare/command_line.cc2
-rw-r--r--src/clients/importare/command_line.hh2
-rw-r--r--src/clients/importare/importare.cc2
-rw-r--r--src/clients/importare/install.cc2
-rw-r--r--src/clients/importare/install.hh2
-rw-r--r--src/clients/importare/man_importare.cc2
-rw-r--r--src/clients/inquisitio/command_line.cc2
-rw-r--r--src/clients/inquisitio/command_line.hh2
-rw-r--r--src/clients/inquisitio/description_extractor.cc2
-rw-r--r--src/clients/inquisitio/description_extractor.hh2
-rw-r--r--src/clients/inquisitio/do_search.cc2
-rw-r--r--src/clients/inquisitio/do_search.hh2
-rw-r--r--src/clients/inquisitio/extractor.cc2
-rw-r--r--src/clients/inquisitio/extractor.hh2
-rw-r--r--src/clients/inquisitio/inquisitio.cc2
-rw-r--r--src/clients/inquisitio/man_inquisitio.cc2
-rw-r--r--src/clients/inquisitio/matcher.cc2
-rw-r--r--src/clients/inquisitio/matcher.hh2
-rw-r--r--src/clients/inquisitio/name_extractor.cc2
-rw-r--r--src/clients/inquisitio/name_extractor.hh2
-rw-r--r--src/clients/inquisitio/pcre_matcher.cc2
-rw-r--r--src/clients/inquisitio/pcre_matcher.hh2
-rw-r--r--src/clients/inquisitio/query_task.cc2
-rw-r--r--src/clients/inquisitio/query_task.hh2
-rw-r--r--src/clients/inquisitio/text_matcher.cc2
-rw-r--r--src/clients/inquisitio/text_matcher.hh2
-rw-r--r--src/clients/instruo/command_line.cc2
-rw-r--r--src/clients/instruo/command_line.hh2
-rw-r--r--src/clients/instruo/instruo.cc2
-rw-r--r--src/clients/instruo/man_instruo.cc2
-rw-r--r--src/clients/paludis/applets.cc2
-rw-r--r--src/clients/paludis/applets.hh2
-rw-r--r--src/clients/paludis/command_line.cc2
-rw-r--r--src/clients/paludis/command_line.hh2
-rw-r--r--src/clients/paludis/do_config.cc2
-rw-r--r--src/clients/paludis/do_config.hh2
-rw-r--r--src/clients/paludis/do_contents.cc2
-rw-r--r--src/clients/paludis/do_contents.hh2
-rw-r--r--src/clients/paludis/info.cc2
-rw-r--r--src/clients/paludis/info.hh2
-rw-r--r--src/clients/paludis/install.cc2
-rw-r--r--src/clients/paludis/install.hh2
-rw-r--r--src/clients/paludis/list.cc2
-rw-r--r--src/clients/paludis/list.hh2
-rw-r--r--src/clients/paludis/man_paludis.cc2
-rw-r--r--src/clients/paludis/owner.cc2
-rw-r--r--src/clients/paludis/owner.hh2
-rw-r--r--src/clients/paludis/paludis.cc2
-rw-r--r--src/clients/paludis/query.cc2
-rw-r--r--src/clients/paludis/query.hh2
-rw-r--r--src/clients/paludis/report.cc2
-rw-r--r--src/clients/paludis/report.hh2
-rw-r--r--src/clients/paludis/sync.cc2
-rw-r--r--src/clients/paludis/sync.hh2
-rw-r--r--src/clients/paludis/uninstall.cc2
-rw-r--r--src/clients/paludis/uninstall.hh2
-rw-r--r--src/clients/qualudis/man_qualudis.cc2
-rw-r--r--src/clients/qualudis/qualudis.cc2
-rw-r--r--src/clients/qualudis/qualudis_command_line.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/broken_linkage_finder.hh2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/configuration.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/configuration.hh2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/configuration_TEST.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/elf_linkage_checker.hh2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/libtool_linkage_checker.hh2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/linkage_checker.cc2
-rw-r--r--src/clients/reconcilio/broken_linkage_finder/linkage_checker.hh2
-rw-r--r--src/clients/reconcilio/command_line.cc2
-rw-r--r--src/clients/reconcilio/command_line.hh2
-rw-r--r--src/clients/reconcilio/fix_linkage.cc2
-rw-r--r--src/clients/reconcilio/fix_linkage.hh2
-rw-r--r--src/clients/reconcilio/install.cc4
-rw-r--r--src/clients/reconcilio/install.hh2
-rw-r--r--src/clients/reconcilio/man_reconcilio.cc2
-rw-r--r--src/clients/reconcilio/reconcilio.cc4
-rw-r--r--src/clients/reconcilio/util/realpath.cc2
-rw-r--r--src/clients/reconcilio/util/realpath.hh2
-rw-r--r--src/clients/reconcilio/util/realpath_TEST.cc2
-rw-r--r--src/clients/reconcilio/util/wildcard_expander.cc2
-rw-r--r--src/clients/reconcilio/util/wildcard_expander.hh2
-rw-r--r--src/clients/reconcilio/util/wildcard_expander_TEST.cc2
-rw-r--r--src/output/colour.cc2
-rw-r--r--src/output/colour.hh2
-rw-r--r--src/output/colour_formatter.cc2
-rw-r--r--src/output/colour_formatter.hh2
-rw-r--r--src/output/console_install_task.cc2
-rw-r--r--src/output/console_install_task.hh2
-rw-r--r--src/output/console_query_task.cc2
-rw-r--r--src/output/console_query_task.hh2
-rw-r--r--src/output/console_task.cc2
-rw-r--r--src/output/console_task.hh2
-rw-r--r--src/output/mask_displayer.cc2
-rw-r--r--src/output/mask_displayer.hh2
-rw-r--r--test/test_fail_TEST.cc2
-rw-r--r--test/test_framework.cc2
-rw-r--r--test/test_framework.hh2
-rw-r--r--test/test_pass_TEST.cc2
-rw-r--r--test/test_runner.cc2
-rw-r--r--test/test_runner.hh2
-rw-r--r--vim/ftdetect/paludis.vim2
-rw-r--r--vim/syntax/paludis-environment-conf.vim2
-rw-r--r--vim/syntax/paludis-keywords-conf.vim2
-rw-r--r--vim/syntax/paludis-licenses-conf.vim2
-rw-r--r--vim/syntax/paludis-mirrors-conf.vim2
-rw-r--r--vim/syntax/paludis-package-mask-conf.vim2
-rw-r--r--vim/syntax/paludis-repositories-conf.vim2
-rw-r--r--vim/syntax/paludis-use-conf.vim2
920 files changed, 980 insertions, 980 deletions
diff --git a/TODO b/TODO
index 3d8b8f6..08e0e41 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ Do not write Changelog entries for this file.
Crossdev-like repository
------------------------
-Assigned to: Danny van Dyk <kugelfang@gentoo.org>
+Assigned to: Danny van Dyk
* Format is 'cross'.
diff --git a/eselect/repo.eselect b/eselect/repo.eselect
index 682f29a..8f929d9 100644
--- a/eselect/repo.eselect
+++ b/eselect/repo.eselect
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Stephen Bennett <spb@gentoo.org>
+# Copyright 1999-2006 Stephen Bennett
# Distributed under the terms of the GNU General Public License v2
# $Id: $
diff --git a/hooks/eselect_env_update.bash b/hooks/eselect_env_update.bash
index 03258c4..dd87bed 100755
--- a/hooks/eselect_env_update.bash
+++ b/hooks/eselect_env_update.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/eselect_env_update_TEST b/hooks/eselect_env_update_TEST
index dace356..3c1de0c 100755
--- a/hooks/eselect_env_update_TEST
+++ b/hooks/eselect_env_update_TEST
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/find_config_updates.hook b/hooks/find_config_updates.hook
index cee7d21..6864487 100755
--- a/hooks/find_config_updates.hook
+++ b/hooks/find_config_updates.hook
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/fix_symlinks.bash b/hooks/fix_symlinks.bash
index efde46e..2c78212 100755
--- a/hooks/fix_symlinks.bash
+++ b/hooks/fix_symlinks.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/gnu_info_index.bash b/hooks/gnu_info_index.bash
index 2ff7cfa..799f92f 100755
--- a/hooks/gnu_info_index.bash
+++ b/hooks/gnu_info_index.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/installable_cache_regen.bash b/hooks/installable_cache_regen.bash
index 18471ce..2889196 100755
--- a/hooks/installable_cache_regen.bash
+++ b/hooks/installable_cache_regen.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/installed_cache_regen.bash b/hooks/installed_cache_regen.bash
index 7ccc7a4..617277c 100755
--- a/hooks/installed_cache_regen.bash
+++ b/hooks/installed_cache_regen.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/log.bash b/hooks/log.bash
index fa9c333..e1761be 100755
--- a/hooks/log.bash
+++ b/hooks/log.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/news.hook b/hooks/news.hook
index c2ee1a1..12d3e08 100755
--- a/hooks/news.hook
+++ b/hooks/news.hook
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/news_TEST b/hooks/news_TEST
index 0b9a69b..08d5a07 100755
--- a/hooks/news_TEST
+++ b/hooks/news_TEST
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/update_config_protect_list.bash b/hooks/update_config_protect_list.bash
index ab51277..37febc3 100755
--- a/hooks/update_config_protect_list.bash
+++ b/hooks/update_config_protect_list.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2006 Mike Kelly <pioto@pioto.org>
+# Copyright (c) 2006 Mike Kelly
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/hooks/write_cache_clean.bash b/hooks/write_cache_clean.bash
index 7d68e9d..03e6c74 100755
--- a/hooks/write_cache_clean.bash
+++ b/hooks/write_cache_clean.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set et sw=4 sts=4 :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/about.hh.in b/paludis/about.hh.in
index 8827abd..1791749 100644
--- a/paludis/about.hh.in
+++ b/paludis/about.hh.in
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/about_TEST.cc b/paludis/about_TEST.cc
index 61ec0ae..cd5bac4 100644
--- a/paludis/about_TEST.cc
+++ b/paludis/about_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/action-fwd.hh b/paludis/action-fwd.hh
index ceb1b3c..8a4bd75 100644
--- a/paludis/action-fwd.hh
+++ b/paludis/action-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/action.cc b/paludis/action.cc
index bf8b614..e343160 100644
--- a/paludis/action.cc
+++ b/paludis/action.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/action.hh b/paludis/action.hh
index 995b02d..7743853 100644
--- a/paludis/action.hh
+++ b/paludis/action.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args.cc b/paludis/args/args.cc
index cb7f5e1..5acf508 100644
--- a/paludis/args/args.cc
+++ b/paludis/args/args.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args.hh b/paludis/args/args.hh
index 877de08..23306b1 100644
--- a/paludis/args/args.hh
+++ b/paludis/args/args.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_TEST.cc b/paludis/args/args_TEST.cc
index 9a29fd6..13a75fb 100644
--- a/paludis/args/args_TEST.cc
+++ b/paludis/args/args_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_dumper.cc b/paludis/args/args_dumper.cc
index 5eacfc4..d1d96ed 100644
--- a/paludis/args/args_dumper.cc
+++ b/paludis/args/args_dumper.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_dumper.hh b/paludis/args/args_dumper.hh
index 60a7f27..078f82f 100644
--- a/paludis/args/args_dumper.hh
+++ b/paludis/args/args_dumper.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_error.cc b/paludis/args/args_error.cc
index 8b8a7a0..fb64b8c 100644
--- a/paludis/args/args_error.cc
+++ b/paludis/args/args_error.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_error.hh b/paludis/args/args_error.hh
index aa96fc8..762fb34 100644
--- a/paludis/args/args_error.hh
+++ b/paludis/args/args_error.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_group.cc b/paludis/args/args_group.cc
index 1198542..07c5459 100644
--- a/paludis/args/args_group.cc
+++ b/paludis/args/args_group.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_group.hh b/paludis/args/args_group.hh
index ca4f846..c030c0f 100644
--- a/paludis/args/args_group.hh
+++ b/paludis/args/args_group.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc
index ef1a2c4..34140e9 100644
--- a/paludis/args/args_handler.cc
+++ b/paludis/args/args_handler.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh
index ac4fb75..48af1da 100644
--- a/paludis/args/args_handler.hh
+++ b/paludis/args/args_handler.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_option.cc b/paludis/args/args_option.cc
index 3f2f093..d79b9f7 100644
--- a/paludis/args/args_option.cc
+++ b/paludis/args/args_option.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_option.hh b/paludis/args/args_option.hh
index f0f500c..c170ad3 100644
--- a/paludis/args/args_option.hh
+++ b/paludis/args/args_option.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_visitor.cc b/paludis/args/args_visitor.cc
index 3c2fb6b..9df2b15 100644
--- a/paludis/args/args_visitor.cc
+++ b/paludis/args/args_visitor.cc
@@ -1,6 +1,6 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/args_visitor.hh b/paludis/args/args_visitor.hh
index 1db4fbe..855cea1 100644
--- a/paludis/args/args_visitor.hh
+++ b/paludis/args/args_visitor.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/bad_argument.cc b/paludis/args/bad_argument.cc
index aff38b0..c1a6c9e 100644
--- a/paludis/args/bad_argument.cc
+++ b/paludis/args/bad_argument.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/bad_argument.hh b/paludis/args/bad_argument.hh
index 4d09aed..adf35f3 100644
--- a/paludis/args/bad_argument.hh
+++ b/paludis/args/bad_argument.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/checks_arg.cc b/paludis/args/checks_arg.cc
index a1181e9..33adb97 100644
--- a/paludis/args/checks_arg.cc
+++ b/paludis/args/checks_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/checks_arg.hh b/paludis/args/checks_arg.hh
index d6ecc98..11689b0 100644
--- a/paludis/args/checks_arg.hh
+++ b/paludis/args/checks_arg.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/debug_build_arg.cc b/paludis/args/debug_build_arg.cc
index 9a7fe1c..be9372d 100644
--- a/paludis/args/debug_build_arg.cc
+++ b/paludis/args/debug_build_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/debug_build_arg.hh b/paludis/args/debug_build_arg.hh
index afe99fd..e523150 100644
--- a/paludis/args/debug_build_arg.hh
+++ b/paludis/args/debug_build_arg.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/dep_list_args_group.cc b/paludis/args/dep_list_args_group.cc
index dd8d92e..a18ace3 100644
--- a/paludis/args/dep_list_args_group.cc
+++ b/paludis/args/dep_list_args_group.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/dep_list_args_group.hh b/paludis/args/dep_list_args_group.hh
index fa41c99..16e8da6 100644
--- a/paludis/args/dep_list_args_group.hh
+++ b/paludis/args/dep_list_args_group.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/deps_option_arg.cc b/paludis/args/deps_option_arg.cc
index 538ebcc..b5e84a1 100644
--- a/paludis/args/deps_option_arg.cc
+++ b/paludis/args/deps_option_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/deps_option_arg.hh b/paludis/args/deps_option_arg.hh
index 560b8e3..f138f52 100644
--- a/paludis/args/deps_option_arg.hh
+++ b/paludis/args/deps_option_arg.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/do_help.hh b/paludis/args/do_help.hh
index 80f9771..19bdb60 100644
--- a/paludis/args/do_help.hh
+++ b/paludis/args/do_help.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/install_args_group.cc b/paludis/args/install_args_group.cc
index 86bac56..01f8ea6 100644
--- a/paludis/args/install_args_group.cc
+++ b/paludis/args/install_args_group.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/install_args_group.hh b/paludis/args/install_args_group.hh
index 3a6ce79..82effbb 100644
--- a/paludis/args/install_args_group.hh
+++ b/paludis/args/install_args_group.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/log_level_arg.cc b/paludis/args/log_level_arg.cc
index c42111e..a38a352 100644
--- a/paludis/args/log_level_arg.cc
+++ b/paludis/args/log_level_arg.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/log_level_arg.hh b/paludis/args/log_level_arg.hh
index 9772548..fb6610c 100644
--- a/paludis/args/log_level_arg.hh
+++ b/paludis/args/log_level_arg.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/man.cc b/paludis/args/man.cc
index 5c140b9..bf77454 100644
--- a/paludis/args/man.cc
+++ b/paludis/args/man.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/args/man.hh b/paludis/args/man.hh
index 9476777..261549b 100644
--- a/paludis/args/man.hh
+++ b/paludis/args/man.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/condition_tracker.cc b/paludis/condition_tracker.cc
index b915198..a0314d2 100644
--- a/paludis/condition_tracker.cc
+++ b/paludis/condition_tracker.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/condition_tracker.hh b/paludis/condition_tracker.hh
index 8ff43cb..0f7b6e5 100644
--- a/paludis/condition_tracker.hh
+++ b/paludis/condition_tracker.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/contents-fwd.hh b/paludis/contents-fwd.hh
index 3518bb3..606c23a 100644
--- a/paludis/contents-fwd.hh
+++ b/paludis/contents-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/contents.cc b/paludis/contents.cc
index 7c39373..020e407 100644
--- a/paludis/contents.cc
+++ b/paludis/contents.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/contents.hh b/paludis/contents.hh
index ab51d9b..3317706 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_label-fwd.hh b/paludis/dep_label-fwd.hh
index 68a2056..d3c577f 100644
--- a/paludis/dep_label-fwd.hh
+++ b/paludis/dep_label-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_label.cc b/paludis/dep_label.cc
index 34580f6..8d1ce63 100644
--- a/paludis/dep_label.cc
+++ b/paludis/dep_label.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_label.hh b/paludis/dep_label.hh
index 1b8bfc5..b9caffb 100644
--- a/paludis/dep_label.hh
+++ b/paludis/dep_label.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list-fwd.hh b/paludis/dep_list-fwd.hh
index 50bafee..2d826ae 100644
--- a/paludis/dep_list-fwd.hh
+++ b/paludis/dep_list-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 17a7d82..9791aa6 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list.hh b/paludis/dep_list.hh
index fb8f6f4..dc6c490 100644
--- a/paludis/dep_list.hh
+++ b/paludis/dep_list.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_TEST.cc b/paludis/dep_list_TEST.cc
index e69f0ff..a054a89 100644
--- a/paludis/dep_list_TEST.cc
+++ b/paludis/dep_list_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_TEST.hh b/paludis/dep_list_TEST.hh
index 73ec16f..6fe044d 100644
--- a/paludis/dep_list_TEST.hh
+++ b/paludis/dep_list_TEST.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_TEST_blockers.cc b/paludis/dep_list_TEST_blockers.cc
index f05d691..f99acbd 100644
--- a/paludis/dep_list_TEST_blockers.cc
+++ b/paludis/dep_list_TEST_blockers.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_exceptions.cc b/paludis/dep_list_exceptions.cc
index 30b93b5..8309a46 100644
--- a/paludis/dep_list_exceptions.cc
+++ b/paludis/dep_list_exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_exceptions.hh b/paludis/dep_list_exceptions.hh
index 6137d3b..948e46c 100644
--- a/paludis/dep_list_exceptions.hh
+++ b/paludis/dep_list_exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_options.cc b/paludis/dep_list_options.cc
index ccddb6e..72676e2 100644
--- a/paludis/dep_list_options.cc
+++ b/paludis/dep_list_options.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_list_options.hh b/paludis/dep_list_options.hh
index 362ab95..ecd29e6 100644
--- a/paludis/dep_list_options.hh
+++ b/paludis/dep_list_options.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec-fwd.hh b/paludis/dep_spec-fwd.hh
index fac7a75..6b4f593 100644
--- a/paludis/dep_spec-fwd.hh
+++ b/paludis/dep_spec-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec.cc b/paludis/dep_spec.cc
index 4fae9c6..48f2001 100644
--- a/paludis/dep_spec.cc
+++ b/paludis/dep_spec.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec.hh b/paludis/dep_spec.hh
index f164046..27506de 100644
--- a/paludis/dep_spec.hh
+++ b/paludis/dep_spec.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec_TEST.cc b/paludis/dep_spec_TEST.cc
index ea449e8..8c76fbf 100644
--- a/paludis/dep_spec_TEST.cc
+++ b/paludis/dep_spec_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc
index e99cf7f..764c40f 100644
--- a/paludis/dep_spec_flattener.cc
+++ b/paludis/dep_spec_flattener.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_spec_flattener.hh b/paludis/dep_spec_flattener.hh
index 81be10d..54148a7 100644
--- a/paludis/dep_spec_flattener.hh
+++ b/paludis/dep_spec_flattener.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tag-fwd.hh b/paludis/dep_tag-fwd.hh
index 7b25959..a480cac 100644
--- a/paludis/dep_tag-fwd.hh
+++ b/paludis/dep_tag-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 79c09ea..5d9a460 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tag.hh b/paludis/dep_tag.hh
index e7c7344..a8e5a7b 100644
--- a/paludis/dep_tag.hh
+++ b/paludis/dep_tag.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tree-fwd.hh b/paludis/dep_tree-fwd.hh
index 2b6e925..96b88d2 100644
--- a/paludis/dep_tree-fwd.hh
+++ b/paludis/dep_tree-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tree.cc b/paludis/dep_tree.cc
index e191c6c..fd8d3ab 100644
--- a/paludis/dep_tree.cc
+++ b/paludis/dep_tree.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/dep_tree.hh b/paludis/dep_tree.hh
index d34fa57..ef49c1a 100644
--- a/paludis/dep_tree.hh
+++ b/paludis/dep_tree.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/distribution-fwd.hh b/paludis/distribution-fwd.hh
index 5b49f9f..01a8563 100644
--- a/paludis/distribution-fwd.hh
+++ b/paludis/distribution-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index 723c5f8..bff51e6 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index 1f19a66..1e8e6e4 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment-fwd.hh b/paludis/environment-fwd.hh
index a272870..c0a4284 100644
--- a/paludis/environment-fwd.hh
+++ b/paludis/environment-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment.cc b/paludis/environment.cc
index 92c7fef..8ee26b4 100644
--- a/paludis/environment.cc
+++ b/paludis/environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment.hh b/paludis/environment.hh
index be5b7c4..21f70f3 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index 50813e8..abb417e 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh
index 85a27e4..14146a3 100644
--- a/paludis/environment_implementation.hh
+++ b/paludis/environment_implementation.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment_maker.cc b/paludis/environment_maker.cc
index 7c2015e..7a8e34b 100644
--- a/paludis/environment_maker.cc
+++ b/paludis/environment_maker.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environment_maker.hh b/paludis/environment_maker.hh
index a41a2c2..c3cf3a6 100644
--- a/paludis/environment_maker.hh
+++ b/paludis/environment_maker.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/adapted/adapted_environment.cc b/paludis/environments/adapted/adapted_environment.cc
index 263d04a..d4736ff 100644
--- a/paludis/environments/adapted/adapted_environment.cc
+++ b/paludis/environments/adapted/adapted_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/adapted/adapted_environment.hh b/paludis/environments/adapted/adapted_environment.hh
index 8eb43e4..0683eb1 100644
--- a/paludis/environments/adapted/adapted_environment.hh
+++ b/paludis/environments/adapted/adapted_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/adapted/adapted_environment_TEST.cc b/paludis/environments/adapted/adapted_environment_TEST.cc
index b23e330..e39cbf0 100644
--- a/paludis/environments/adapted/adapted_environment_TEST.cc
+++ b/paludis/environments/adapted/adapted_environment_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/adapted/registration.cc b/paludis/environments/adapted/registration.cc
index 26ed939..f6bf5f2 100644
--- a/paludis/environments/adapted/registration.cc
+++ b/paludis/environments/adapted/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index b112f9c..ceecf85 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 669e7b2..2ad970c 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/no_config/no_config_environment_TEST.cc b/paludis/environments/no_config/no_config_environment_TEST.cc
index 107d7a3..8b38e9e 100644
--- a/paludis/environments/no_config/no_config_environment_TEST.cc
+++ b/paludis/environments/no_config/no_config_environment_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/no_config/registration.cc b/paludis/environments/no_config/registration.cc
index b237105..a11623b 100644
--- a/paludis/environments/no_config/registration.cc
+++ b/paludis/environments/no_config/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/bashable_conf.cc b/paludis/environments/paludis/bashable_conf.cc
index 9bd8015..595053d 100644
--- a/paludis/environments/paludis/bashable_conf.cc
+++ b/paludis/environments/paludis/bashable_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/bashable_conf.hh b/paludis/environments/paludis/bashable_conf.hh
index aad3c59..ab91a12 100644
--- a/paludis/environments/paludis/bashable_conf.hh
+++ b/paludis/environments/paludis/bashable_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index 210de50..3ceead0 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/keywords_conf.hh b/paludis/environments/paludis/keywords_conf.hh
index 5a607eb..58471c6 100644
--- a/paludis/environments/paludis/keywords_conf.hh
+++ b/paludis/environments/paludis/keywords_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 2cbe69f..51c1b84 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/licenses_conf.hh b/paludis/environments/paludis/licenses_conf.hh
index ae5cb41..c92adf2 100644
--- a/paludis/environments/paludis/licenses_conf.hh
+++ b/paludis/environments/paludis/licenses_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc
index cf011f7..cc0cda5 100644
--- a/paludis/environments/paludis/mirrors_conf.cc
+++ b/paludis/environments/paludis/mirrors_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/mirrors_conf.hh b/paludis/environments/paludis/mirrors_conf.hh
index a528e38..faacca3 100644
--- a/paludis/environments/paludis/mirrors_conf.hh
+++ b/paludis/environments/paludis/mirrors_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 52fdfea..857fb39 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/package_mask_conf.hh b/paludis/environments/paludis/package_mask_conf.hh
index 93f36a2..702dae1 100644
--- a/paludis/environments/paludis/package_mask_conf.hh
+++ b/paludis/environments/paludis/package_mask_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index f7ce793..5617e31 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index 7f93a7c..666864a 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 97a82dd..55463ad 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index 2479be9..148ec44 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/paludis_environment_TEST.cc b/paludis/environments/paludis/paludis_environment_TEST.cc
index 7559d9d..d6ff229 100644
--- a/paludis/environments/paludis/paludis_environment_TEST.cc
+++ b/paludis/environments/paludis/paludis_environment_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/registration.cc b/paludis/environments/paludis/registration.cc
index d8cfc41..a230f9f 100644
--- a/paludis/environments/paludis/registration.cc
+++ b/paludis/environments/paludis/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 12dee30..6a9b22c 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/paludis/use_conf.hh b/paludis/environments/paludis/use_conf.hh
index ab67a0c..f5fe56e 100644
--- a/paludis/environments/paludis/use_conf.hh
+++ b/paludis/environments/paludis/use_conf.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index ef1ee4a..6ed94fd 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index b1f5925..faeeb31 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/portage/portage_environment_TEST.cc b/paludis/environments/portage/portage_environment_TEST.cc
index be099ab..4168aff 100644
--- a/paludis/environments/portage/portage_environment_TEST.cc
+++ b/paludis/environments/portage/portage_environment_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/portage/registration.cc b/paludis/environments/portage/registration.cc
index d378ee5..9f589d3 100644
--- a/paludis/environments/portage/registration.cc
+++ b/paludis/environments/portage/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/test/registration.cc b/paludis/environments/test/registration.cc
index c6672eb..cc99da3 100644
--- a/paludis/environments/test/registration.cc
+++ b/paludis/environments/test/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 19b25d0..70560bbd 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index 79cb3c4..a79121e 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/fetchers/dowget.in b/paludis/fetchers/dowget.in
index 9626e1a..8f4f9ab 100755
--- a/paludis/fetchers/dowget.in
+++ b/paludis/fetchers/dowget.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/find_unused_packages_task.cc b/paludis/find_unused_packages_task.cc
index df956f4..fcd8b3a 100644
--- a/paludis/find_unused_packages_task.cc
+++ b/paludis/find_unused_packages_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2007 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/find_unused_packages_task.hh b/paludis/find_unused_packages_task.hh
index f2edf5f..1807650 100644
--- a/paludis/find_unused_packages_task.hh
+++ b/paludis/find_unused_packages_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2007 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/formatter-fwd.hh b/paludis/formatter-fwd.hh
index fedf796..a9120d9 100644
--- a/paludis/formatter-fwd.hh
+++ b/paludis/formatter-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/formatter.cc b/paludis/formatter.cc
index 9b06a75..6cc13d3 100644
--- a/paludis/formatter.cc
+++ b/paludis/formatter.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/formatter.hh b/paludis/formatter.hh
index 84b8dcc..ad28c62 100644
--- a/paludis/formatter.hh
+++ b/paludis/formatter.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/handled_information-fwd.hh b/paludis/handled_information-fwd.hh
index c045869..751186f 100644
--- a/paludis/handled_information-fwd.hh
+++ b/paludis/handled_information-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/handled_information.cc b/paludis/handled_information.cc
index 98e4bc9..fd1190e 100644
--- a/paludis/handled_information.cc
+++ b/paludis/handled_information.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/handled_information.hh b/paludis/handled_information.hh
index cf1f935..2cfd8e0 100644
--- a/paludis/handled_information.hh
+++ b/paludis/handled_information.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hashed_containers.cc b/paludis/hashed_containers.cc
index 0d27df5..7e104da 100644
--- a/paludis/hashed_containers.cc
+++ b/paludis/hashed_containers.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hashed_containers.hh b/paludis/hashed_containers.hh
index 1019276..076562d 100644
--- a/paludis/hashed_containers.hh
+++ b/paludis/hashed_containers.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hashed_containers_TEST.cc b/paludis/hashed_containers_TEST.cc
index b5264e2..d09b443 100644
--- a/paludis/hashed_containers_TEST.cc
+++ b/paludis/hashed_containers_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hook-fwd.hh b/paludis/hook-fwd.hh
index 7c040b8..498f180 100644
--- a/paludis/hook-fwd.hh
+++ b/paludis/hook-fwd.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hook.cc b/paludis/hook.cc
index 082b6b4..2407401 100644
--- a/paludis/hook.cc
+++ b/paludis/hook.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hook.hh b/paludis/hook.hh
index 0871705..c1c81ed 100644
--- a/paludis/hook.hh
+++ b/paludis/hook.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hooker.bash b/paludis/hooker.bash
index f6ab35a..c97e56c 100755
--- a/paludis/hooker.bash
+++ b/paludis/hooker.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hooker.cc b/paludis/hooker.cc
index 0e1c029..d6937d9 100644
--- a/paludis/hooker.cc
+++ b/paludis/hooker.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hooker.hh b/paludis/hooker.hh
index d1b4190..f463dde 100644
--- a/paludis/hooker.hh
+++ b/paludis/hooker.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/hooker_TEST.cc b/paludis/hooker_TEST.cc
index 55dcf21..7d95f18 100644
--- a/paludis/hooker_TEST.cc
+++ b/paludis/hooker_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/host_tuple_name.cc b/paludis/host_tuple_name.cc
index 2b46e69..f3be82d 100644
--- a/paludis/host_tuple_name.cc
+++ b/paludis/host_tuple_name.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/host_tuple_name.hh b/paludis/host_tuple_name.hh
index 544fa7c..6b6a149 100644
--- a/paludis/host_tuple_name.hh
+++ b/paludis/host_tuple_name.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/host_tuple_name_TEST.cc b/paludis/host_tuple_name_TEST.cc
index c7f701f..766f3cf 100644
--- a/paludis/host_tuple_name_TEST.cc
+++ b/paludis/host_tuple_name_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 9a2430f..a0ea773 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index 6fc3c31..9688d06 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/mask-fwd.hh b/paludis/mask-fwd.hh
index 280089b..6ae3e59 100644
--- a/paludis/mask-fwd.hh
+++ b/paludis/mask-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/mask.cc b/paludis/mask.cc
index c30bc13..bc88800 100644
--- a/paludis/mask.cc
+++ b/paludis/mask.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/mask.hh b/paludis/mask.hh
index 39db950..0a2bfc8 100644
--- a/paludis/mask.hh
+++ b/paludis/mask.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/match_package.cc b/paludis/match_package.cc
index ece0cac..f529f12 100644
--- a/paludis/match_package.cc
+++ b/paludis/match_package.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/match_package.hh b/paludis/match_package.hh
index c9834b8..ccff1cd 100644
--- a/paludis/match_package.hh
+++ b/paludis/match_package.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/md5.cc b/paludis/md5.cc
index 05ae2f0..11f1cca 100644
--- a/paludis/md5.cc
+++ b/paludis/md5.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/md5.hh b/paludis/md5.hh
index 5057f17..f1cdcf2 100644
--- a/paludis/md5.hh
+++ b/paludis/md5.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/md5_TEST.cc b/paludis/md5_TEST.cc
index 3684686..cfdbb14 100644
--- a/paludis/md5_TEST.cc
+++ b/paludis/md5_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/merger.cc b/paludis/merger.cc
index 4a6b249..032d294 100644
--- a/paludis/merger.cc
+++ b/paludis/merger.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/merger.hh b/paludis/merger.hh
index 2533eac..5fbf3ee 100644
--- a/paludis/merger.hh
+++ b/paludis/merger.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/merger_TEST.cc b/paludis/merger_TEST.cc
index dbdbf57..1a4ae5c 100644
--- a/paludis/merger_TEST.cc
+++ b/paludis/merger_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/merger_entry_type.cc b/paludis/merger_entry_type.cc
index 3496ebf..2b2c7f9 100644
--- a/paludis/merger_entry_type.cc
+++ b/paludis/merger_entry_type.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/merger_entry_type.hh b/paludis/merger_entry_type.hh
index 39e229a..71e9313 100644
--- a/paludis/merger_entry_type.hh
+++ b/paludis/merger_entry_type.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/metadata_key-fwd.hh b/paludis/metadata_key-fwd.hh
index 2d8d429..f9e5eca 100644
--- a/paludis/metadata_key-fwd.hh
+++ b/paludis/metadata_key-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/metadata_key.cc b/paludis/metadata_key.cc
index 63a7c4b..25f3787 100644
--- a/paludis/metadata_key.cc
+++ b/paludis/metadata_key.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/metadata_key.hh b/paludis/metadata_key.hh
index bf75426..516f059 100644
--- a/paludis/metadata_key.hh
+++ b/paludis/metadata_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/name-fwd.hh b/paludis/name-fwd.hh
index ab87f88..787864d 100644
--- a/paludis/name-fwd.hh
+++ b/paludis/name-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/name.cc b/paludis/name.cc
index b5cc5da..7e42f3d 100644
--- a/paludis/name.cc
+++ b/paludis/name.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/name.hh b/paludis/name.hh
index ea22597..f2682bc 100644
--- a/paludis/name.hh
+++ b/paludis/name.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/name_TEST.cc b/paludis/name_TEST.cc
index 37e3264..4de4856 100644
--- a/paludis/name_TEST.cc
+++ b/paludis/name_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/override_functions.cc b/paludis/override_functions.cc
index 175460a..db8aeb2 100644
--- a/paludis/override_functions.cc
+++ b/paludis/override_functions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/override_functions.hh b/paludis/override_functions.hh
index a58ef97..ef21b2f 100644
--- a/paludis/override_functions.hh
+++ b/paludis/override_functions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_database-fwd.hh b/paludis/package_database-fwd.hh
index 8ca3f49..15509c7 100644
--- a/paludis/package_database-fwd.hh
+++ b/paludis/package_database-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_database.cc b/paludis/package_database.cc
index a0bc694..d4176b5 100644
--- a/paludis/package_database.cc
+++ b/paludis/package_database.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_database.hh b/paludis/package_database.hh
index 000b654..eedd905 100644
--- a/paludis/package_database.hh
+++ b/paludis/package_database.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_database_TEST.cc b/paludis/package_database_TEST.cc
index cefa061..6cefaf1 100644
--- a/paludis/package_database_TEST.cc
+++ b/paludis/package_database_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_id-fwd.hh b/paludis/package_id-fwd.hh
index 6de7ea0..a7090b5 100644
--- a/paludis/package_id-fwd.hh
+++ b/paludis/package_id-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_id.cc b/paludis/package_id.cc
index f61ed2e..d51c11b 100644
--- a/paludis/package_id.cc
+++ b/paludis/package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 84ac49b..2c8f4ce 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/paludis.hh.m4 b/paludis/paludis.hh.m4
index 7a3d317..69cb96c 100644
--- a/paludis/paludis.hh.m4
+++ b/paludis/paludis.hh.m4
@@ -5,7 +5,7 @@ dnl vim: set ft=cpp et sw=4 sts=4 :
#endif
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/qa-fwd.hh b/paludis/qa-fwd.hh
index a7e6794..209767a 100644
--- a/paludis/qa-fwd.hh
+++ b/paludis/qa-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/qa.cc b/paludis/qa.cc
index ff0ef32..e640742 100644
--- a/paludis/qa.cc
+++ b/paludis/qa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/qa.hh b/paludis/qa.hh
index 24fff1d..47f2937 100644
--- a/paludis/qa.hh
+++ b/paludis/qa.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query-fwd.hh b/paludis/query-fwd.hh
index ed8a714..2548bb4 100644
--- a/paludis/query-fwd.hh
+++ b/paludis/query-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query.cc b/paludis/query.cc
index 6dedc04..a250676 100644
--- a/paludis/query.cc
+++ b/paludis/query.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query.hh b/paludis/query.hh
index 4b9775e..e6ba115 100644
--- a/paludis/query.hh
+++ b/paludis/query.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query_delegate-fwd.hh b/paludis/query_delegate-fwd.hh
index 8288d01..2466289 100644
--- a/paludis/query_delegate-fwd.hh
+++ b/paludis/query_delegate-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query_delegate.cc b/paludis/query_delegate.cc
index 2490d3f..2cb6a34 100644
--- a/paludis/query_delegate.cc
+++ b/paludis/query_delegate.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query_delegate.hh b/paludis/query_delegate.hh
index 1b52aad..87be015 100644
--- a/paludis/query_delegate.hh
+++ b/paludis/query_delegate.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query_visitor.cc b/paludis/query_visitor.cc
index aa6c329..25c4a8b 100644
--- a/paludis/query_visitor.cc
+++ b/paludis/query_visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/query_visitor.hh b/paludis/query_visitor.hh
index dfde56a..9679951 100644
--- a/paludis/query_visitor.hh
+++ b/paludis/query_visitor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/range_rewriter.cc b/paludis/range_rewriter.cc
index 32f2a7e..81c679a 100644
--- a/paludis/range_rewriter.cc
+++ b/paludis/range_rewriter.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/range_rewriter.hh b/paludis/range_rewriter.hh
index 315d346..2f8a97f 100644
--- a/paludis/range_rewriter.hh
+++ b/paludis/range_rewriter.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/range_rewriter_TEST.cc b/paludis/range_rewriter_TEST.cc
index c66664f..d4584c0 100644
--- a/paludis/range_rewriter_TEST.cc
+++ b/paludis/range_rewriter_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/report_task.cc b/paludis/report_task.cc
index 3e9b277..d10ce63 100644
--- a/paludis/report_task.cc
+++ b/paludis/report_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Fernando J. Pereda <ferdy@gentoo.org>
+ * Copyright (c) 2006 Fernando J. Pereda
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/report_task.hh b/paludis/report_task.hh
index 5b1b488..165157b 100644
--- a/paludis/report_task.hh
+++ b/paludis/report_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Fernando J. Pereda <ferdy@gentoo.org>
+ * Copyright (c) 2006 Fernando J. Pereda
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran/cran.bash b/paludis/repositories/cran/cran/cran.bash
index db88e28..e472088 100644
--- a/paludis/repositories/cran/cran/cran.bash
+++ b/paludis/repositories/cran/cran/cran.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006,2007 Danny van Dyk <kugelfang@gentoo.org>
+# Copyright (c) 2006,2007 Danny van Dyk
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_dep_parser.cc b/paludis/repositories/cran/cran_dep_parser.cc
index b44002b..ce96b08 100644
--- a/paludis/repositories/cran/cran_dep_parser.cc
+++ b/paludis/repositories/cran/cran_dep_parser.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006, 2007 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_dep_parser.hh b/paludis/repositories/cran/cran_dep_parser.hh
index e3769db..1490dc1 100644
--- a/paludis/repositories/cran/cran_dep_parser.hh
+++ b/paludis/repositories/cran/cran_dep_parser.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_dep_parser_TEST.cc b/paludis/repositories/cran/cran_dep_parser_TEST.cc
index 37803c5..54a33a0 100644
--- a/paludis/repositories/cran/cran_dep_parser_TEST.cc
+++ b/paludis/repositories/cran/cran_dep_parser_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 8efa82f..8f823ac 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 7cce445..df5aeee 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_installed_repository_TEST.cc b/paludis/repositories/cran/cran_installed_repository_TEST.cc
index dc85d97..95423dd 100644
--- a/paludis/repositories/cran/cran_installed_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_installed_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index 6635ec4..40e3730 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index bb53e12..f46c103 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 7581cc5..1f14c0a 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index b36ddd0..ce0734e 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index 006c1ef..a1bc400 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Danny van Dyk
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.cc b/paludis/repositories/cran/dep_spec_pretty_printer.cc
index 78877b8..0d7d711 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/dep_spec_pretty_printer.hh b/paludis/repositories/cran/dep_spec_pretty_printer.hh
index e0d7d13..311d678 100644
--- a/paludis/repositories/cran/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/cran/dep_spec_pretty_printer.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/description_file.cc b/paludis/repositories/cran/description_file.cc
index c5e68e9..8cbf285 100644
--- a/paludis/repositories/cran/description_file.cc
+++ b/paludis/repositories/cran/description_file.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/description_file.hh b/paludis/repositories/cran/description_file.hh
index e38cd8e..1088ffb 100644
--- a/paludis/repositories/cran/description_file.hh
+++ b/paludis/repositories/cran/description_file.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/description_file_TEST.cc b/paludis/repositories/cran/description_file_TEST.cc
index a818a70..660345e 100644
--- a/paludis/repositories/cran/description_file_TEST.cc
+++ b/paludis/repositories/cran/description_file_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/keys.cc b/paludis/repositories/cran/keys.cc
index b307064..fbc06c3 100644
--- a/paludis/repositories/cran/keys.cc
+++ b/paludis/repositories/cran/keys.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/keys.hh b/paludis/repositories/cran/keys.hh
index f499c81..6207250 100644
--- a/paludis/repositories/cran/keys.hh
+++ b/paludis/repositories/cran/keys.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/masks.cc b/paludis/repositories/cran/masks.cc
index 9bc1d48..2953f51 100644
--- a/paludis/repositories/cran/masks.cc
+++ b/paludis/repositories/cran/masks.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/masks.hh b/paludis/repositories/cran/masks.hh
index ca3b35b..53b5280 100644
--- a/paludis/repositories/cran/masks.hh
+++ b/paludis/repositories/cran/masks.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/normalise.cc b/paludis/repositories/cran/normalise.cc
index a84c37f..f07ca77 100644
--- a/paludis/repositories/cran/normalise.cc
+++ b/paludis/repositories/cran/normalise.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/normalise.hh b/paludis/repositories/cran/normalise.hh
index 5b06376..7836647 100644
--- a/paludis/repositories/cran/normalise.hh
+++ b/paludis/repositories/cran/normalise.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/cran/registration.cc b/paludis/repositories/cran/registration.cc
index 9b5768e..79d1bcf 100644
--- a/paludis/repositories/cran/registration.cc
+++ b/paludis/repositories/cran/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc
index 85f665e..4bf69d3 100644
--- a/paludis/repositories/e/aa_visitor.cc
+++ b/paludis/repositories/e/aa_visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Mike Kelly <pioto@pioto.org>
+ * Copyright (c) 2007 Mike Kelly
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/aa_visitor.hh b/paludis/repositories/e/aa_visitor.hh
index c69eb7e..18fa5e7 100644
--- a/paludis/repositories/e/aa_visitor.hh
+++ b/paludis/repositories/e/aa_visitor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Mike Kelly <pioto@pioto.org>
+ * Copyright (c) 2007 Mike Kelly
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/aa_visitor_TEST.cc b/paludis/repositories/e/aa_visitor_TEST.cc
index 3589b09..9dcf2b4 100644
--- a/paludis/repositories/e/aa_visitor_TEST.cc
+++ b/paludis/repositories/e/aa_visitor_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Mike Kelly <pioto@pioto.org>
+ * Copyright (c) 2007 Mike Kelly
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index b3ce913..ccd728f 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/check_fetched_files_visitor.hh b/paludis/repositories/e/check_fetched_files_visitor.hh
index eac7d5a..aa06218 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.hh
+++ b/paludis/repositories/e/check_fetched_files_visitor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_lexer.cc b/paludis/repositories/e/dep_lexer.cc
index 417cd72..794f08d 100644
--- a/paludis/repositories/e/dep_lexer.cc
+++ b/paludis/repositories/e/dep_lexer.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_lexer.hh b/paludis/repositories/e/dep_lexer.hh
index e935590..7939a2a 100644
--- a/paludis/repositories/e/dep_lexer.hh
+++ b/paludis/repositories/e/dep_lexer.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_lexer_TEST.cc b/paludis/repositories/e/dep_lexer_TEST.cc
index b08a063..4be9c70 100644
--- a/paludis/repositories/e/dep_lexer_TEST.cc
+++ b/paludis/repositories/e/dep_lexer_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_parser-fwd.hh b/paludis/repositories/e/dep_parser-fwd.hh
index 035906f..52c5df2 100644
--- a/paludis/repositories/e/dep_parser-fwd.hh
+++ b/paludis/repositories/e/dep_parser-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index 361723b..78ab158 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_parser.hh b/paludis/repositories/e/dep_parser.hh
index 80dae01..124aaab 100644
--- a/paludis/repositories/e/dep_parser.hh
+++ b/paludis/repositories/e/dep_parser.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_parser_TEST.cc b/paludis/repositories/e/dep_parser_TEST.cc
index 33d55e8..6a42439 100644
--- a/paludis/repositories/e/dep_parser_TEST.cc
+++ b/paludis/repositories/e/dep_parser_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 86f803e..6d2b0c8 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.hh b/paludis/repositories/e/dep_spec_pretty_printer.hh
index 48871cc..fb2918a 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.hh
+++ b/paludis/repositories/e/dep_spec_pretty_printer.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
index 41f5963..a9b1335 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_key.cc b/paludis/repositories/e/e_key.cc
index 87ca927..6f7c5c3 100644
--- a/paludis/repositories/e/e_key.cc
+++ b/paludis/repositories/e/e_key.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_key.hh b/paludis/repositories/e/e_key.hh
index bdad1ac..1f9aaa0 100644
--- a/paludis/repositories/e/e_key.hh
+++ b/paludis/repositories/e/e_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_mask.cc b/paludis/repositories/e/e_mask.cc
index 8e843b0..9bb3405 100644
--- a/paludis/repositories/e/e_mask.cc
+++ b/paludis/repositories/e/e_mask.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_mask.hh b/paludis/repositories/e/e_mask.hh
index 9991af1..27bc51e 100644
--- a/paludis/repositories/e/e_mask.hh
+++ b/paludis/repositories/e/e_mask.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 648b2e2..522ed8f 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index d265c88..b5c53bf 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index be8b30f..413ea89 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_entries.cc b/paludis/repositories/e/e_repository_entries.cc
index ed2c145..e342fae 100644
--- a/paludis/repositories/e/e_repository_entries.cc
+++ b/paludis/repositories/e/e_repository_entries.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_entries.hh b/paludis/repositories/e/e_repository_entries.hh
index 0e600d8..556199e 100644
--- a/paludis/repositories/e/e_repository_entries.hh
+++ b/paludis/repositories/e/e_repository_entries.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_exceptions.cc b/paludis/repositories/e/e_repository_exceptions.cc
index c9f6d38..5accf26 100644
--- a/paludis/repositories/e/e_repository_exceptions.cc
+++ b/paludis/repositories/e/e_repository_exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_exceptions.hh b/paludis/repositories/e/e_repository_exceptions.hh
index 65cde58..0e9d174 100644
--- a/paludis/repositories/e/e_repository_exceptions.hh
+++ b/paludis/repositories/e/e_repository_exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_id.cc b/paludis/repositories/e/e_repository_id.cc
index 317e66b..12e6224 100644
--- a/paludis/repositories/e/e_repository_id.cc
+++ b/paludis/repositories/e/e_repository_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index f8c486c..55f3f92 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_mask_file.cc b/paludis/repositories/e/e_repository_mask_file.cc
index 4f3dc63..6bafed6 100644
--- a/paludis/repositories/e/e_repository_mask_file.cc
+++ b/paludis/repositories/e/e_repository_mask_file.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_mask_file.hh b/paludis/repositories/e/e_repository_mask_file.hh
index 1587a32..bc200b9 100644
--- a/paludis/repositories/e/e_repository_mask_file.hh
+++ b/paludis/repositories/e/e_repository_mask_file.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 6e0b84e..37c2cec 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_news.hh b/paludis/repositories/e/e_repository_news.hh
index 7ec8d41..3f25770 100644
--- a/paludis/repositories/e/e_repository_news.hh
+++ b/paludis/repositories/e/e_repository_news.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_params.cc b/paludis/repositories/e/e_repository_params.cc
index ce0cc20..8640fce 100644
--- a/paludis/repositories/e/e_repository_params.cc
+++ b/paludis/repositories/e/e_repository_params.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_params.hh b/paludis/repositories/e/e_repository_params.hh
index 39e53c9..8ba4c91 100644
--- a/paludis/repositories/e/e_repository_params.hh
+++ b/paludis/repositories/e/e_repository_params.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index 498487e..cdf885e 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_profile.hh b/paludis/repositories/e/e_repository_profile.hh
index 7bc7075..db44b19 100644
--- a/paludis/repositories/e/e_repository_profile.hh
+++ b/paludis/repositories/e/e_repository_profile.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_profile_file.cc b/paludis/repositories/e/e_repository_profile_file.cc
index cdaaef0..a05d277 100644
--- a/paludis/repositories/e/e_repository_profile_file.cc
+++ b/paludis/repositories/e/e_repository_profile_file.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_profile_file.hh b/paludis/repositories/e/e_repository_profile_file.hh
index e6629b8..ddf967b 100644
--- a/paludis/repositories/e/e_repository_profile_file.hh
+++ b/paludis/repositories/e/e_repository_profile_file.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 98e19e7..36f8ebd 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_sets.hh b/paludis/repositories/e/e_repository_sets.hh
index 9dcd2e9..c8244fe 100644
--- a/paludis/repositories/e/e_repository_sets.hh
+++ b/paludis/repositories/e/e_repository_sets.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/e_repository_sets_TEST.cc b/paludis/repositories/e/e_repository_sets_TEST.cc
index e11fc4e..460b2d9 100644
--- a/paludis/repositories/e/e_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eapi-fwd.hh b/paludis/repositories/e/eapi-fwd.hh
index d06a15b..416d9ba 100644
--- a/paludis/repositories/e/eapi-fwd.hh
+++ b/paludis/repositories/e/eapi-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 79728b9..4cbe391 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index fde748e..2772b56 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eapi_phase.cc b/paludis/repositories/e/eapi_phase.cc
index d3d5bfc..3df4ab3 100644
--- a/paludis/repositories/e/eapi_phase.cc
+++ b/paludis/repositories/e/eapi_phase.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eapi_phase.hh b/paludis/repositories/e/eapi_phase.hh
index de27498..5138a80 100644
--- a/paludis/repositories/e/eapi_phase.hh
+++ b/paludis/repositories/e/eapi_phase.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebin.cc b/paludis/repositories/e/ebin.cc
index 8f26c68..b488137 100644
--- a/paludis/repositories/e/ebin.cc
+++ b/paludis/repositories/e/ebin.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebin.hh b/paludis/repositories/e/ebin.hh
index eb0190e..9052627 100644
--- a/paludis/repositories/e/ebin.hh
+++ b/paludis/repositories/e/ebin.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebin_entries.cc b/paludis/repositories/e/ebin_entries.cc
index 11cff01..2bea89f 100644
--- a/paludis/repositories/e/ebin_entries.cc
+++ b/paludis/repositories/e/ebin_entries.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebin_entries.hh b/paludis/repositories/e/ebin_entries.hh
index bfd9c93..f25e31d 100644
--- a/paludis/repositories/e/ebin_entries.hh
+++ b/paludis/repositories/e/ebin_entries.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index e60fe35..026aff3 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 2594d0a..9101c6d 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/1/src_compile.bash b/paludis/repositories/e/ebuild/1/src_compile.bash
index 9810965..110d60b 100644
--- a/paludis/repositories/e/ebuild/1/src_compile.bash
+++ b/paludis/repositories/e/ebuild/1/src_compile.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/build_functions.bash b/paludis/repositories/e/ebuild/build_functions.bash
index 37f6c43..6492858 100644
--- a/paludis/repositories/e/ebuild/build_functions.bash
+++ b/paludis/repositories/e/ebuild/build_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_infovars.bash b/paludis/repositories/e/ebuild/builtin_infovars.bash
index 7a8ba16..e21bbaf 100644
--- a/paludis/repositories/e/ebuild/builtin_infovars.bash
+++ b/paludis/repositories/e/ebuild/builtin_infovars.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_init.bash b/paludis/repositories/e/ebuild/builtin_init.bash
index 161346b..d5df8e9 100644
--- a/paludis/repositories/e/ebuild/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/builtin_init.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_initbin.bash b/paludis/repositories/e/ebuild/builtin_initbin.bash
index 1194ec9..42b4b71 100644
--- a/paludis/repositories/e/ebuild/builtin_initbin.bash
+++ b/paludis/repositories/e/ebuild/builtin_initbin.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_loadenv.bash b/paludis/repositories/e/ebuild/builtin_loadenv.bash
index ff57231..1a6e6f3 100644
--- a/paludis/repositories/e/ebuild/builtin_loadenv.bash
+++ b/paludis/repositories/e/ebuild/builtin_loadenv.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_metadata.bash b/paludis/repositories/e/ebuild/builtin_metadata.bash
index 541a503..07c9dc7 100644
--- a/paludis/repositories/e/ebuild/builtin_metadata.bash
+++ b/paludis/repositories/e/ebuild/builtin_metadata.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_prepare.bash b/paludis/repositories/e/ebuild/builtin_prepare.bash
index 972d9d8..dbcaa86 100644
--- a/paludis/repositories/e/ebuild/builtin_prepare.bash
+++ b/paludis/repositories/e/ebuild/builtin_prepare.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_saveenv.bash b/paludis/repositories/e/ebuild/builtin_saveenv.bash
index 16c8b2a..e9cdc62 100644
--- a/paludis/repositories/e/ebuild/builtin_saveenv.bash
+++ b/paludis/repositories/e/ebuild/builtin_saveenv.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_strip.bash b/paludis/repositories/e/ebuild/builtin_strip.bash
index 583eeef..4d21bf3 100644
--- a/paludis/repositories/e/ebuild/builtin_strip.bash
+++ b/paludis/repositories/e/ebuild/builtin_strip.bash
@@ -1,8 +1,8 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Ciaran McCreesh
+# Copyright (c) 2006 Stephen Bennett
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_tidyup.bash b/paludis/repositories/e/ebuild/builtin_tidyup.bash
index 50ed096..27f8bba 100644
--- a/paludis/repositories/e/ebuild/builtin_tidyup.bash
+++ b/paludis/repositories/e/ebuild/builtin_tidyup.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_unpackbin.bash b/paludis/repositories/e/ebuild/builtin_unpackbin.bash
index b1999f4..33ddbda 100644
--- a/paludis/repositories/e/ebuild/builtin_unpackbin.bash
+++ b/paludis/repositories/e/ebuild/builtin_unpackbin.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/builtin_variable.bash b/paludis/repositories/e/ebuild/builtin_variable.bash
index 0690a1f..ce0c0b1 100644
--- a/paludis/repositories/e/ebuild/builtin_variable.bash
+++ b/paludis/repositories/e/ebuild/builtin_variable.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/die_functions.bash b/paludis/repositories/e/ebuild/die_functions.bash
index 0c57c70..f5ab4a5 100644
--- a/paludis/repositories/e/ebuild/die_functions.bash
+++ b/paludis/repositories/e/ebuild/die_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index a913ce2..2b982a5 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/echo_functions.bash.in b/paludis/repositories/e/ebuild/echo_functions.bash.in
index a9f0f8e..a759bd4 100644
--- a/paludis/repositories/e/ebuild/echo_functions.bash.in
+++ b/paludis/repositories/e/ebuild/echo_functions.bash.in
@@ -3,7 +3,7 @@
@GENERATED_FILE@
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/echo_functions_TEST.bash b/paludis/repositories/e/ebuild/echo_functions_TEST.bash
index 4c85918..68abc07 100644
--- a/paludis/repositories/e/ebuild/echo_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/echo_functions_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/eclass_functions.bash b/paludis/repositories/e/ebuild/eclass_functions.bash
index 4bde71e..5aed2e6 100644
--- a/paludis/repositories/e/ebuild/eclass_functions.bash
+++ b/paludis/repositories/e/ebuild/eclass_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_fetch.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_fetch.bash
index b3ebedf..93b30e9 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_fetch.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_fetch.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exheres-0/echo_functions.bash.in b/paludis/repositories/e/ebuild/exheres-0/echo_functions.bash.in
index 09d41df..664cd7b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/echo_functions.bash.in
+++ b/paludis/repositories/e/ebuild/exheres-0/echo_functions.bash.in
@@ -3,7 +3,7 @@
@GENERATED_FILE@
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exheres-0/list_functions.bash b/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
index 3f0b491..babd5c7 100644
--- a/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/list_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
index 9c33675..2560890 100644
--- a/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/pkg_nofetch.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exheres-0/portage_stubs.bash b/paludis/repositories/e/ebuild/exheres-0/portage_stubs.bash
index 8eefa3a..f8223d3 100755
--- a/paludis/repositories/e/ebuild/exheres-0/portage_stubs.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/portage_stubs.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/exlib_functions.bash b/paludis/repositories/e/ebuild/exlib_functions.bash
index a497cf5..de79aee 100644
--- a/paludis/repositories/e/ebuild/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exlib_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/install_functions.bash b/paludis/repositories/e/ebuild/install_functions.bash
index 75ec47a..9c00e38 100644
--- a/paludis/repositories/e/ebuild/install_functions.bash
+++ b/paludis/repositories/e/ebuild/install_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/kernel_functions.bash b/paludis/repositories/e/ebuild/kernel_functions.bash
index 9126376..9cf8724 100644
--- a/paludis/repositories/e/ebuild/kernel_functions.bash
+++ b/paludis/repositories/e/ebuild/kernel_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon functions.sh from Baselayout, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/kernel_functions_TEST.bash b/paludis/repositories/e/ebuild/kernel_functions_TEST.bash
index 4b3271d..503b6f2 100644
--- a/paludis/repositories/e/ebuild/kernel_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/kernel_functions_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/list_functions.bash b/paludis/repositories/e/ebuild/list_functions.bash
index fc94849..4cd49fa 100644
--- a/paludis/repositories/e/ebuild/list_functions.bash
+++ b/paludis/repositories/e/ebuild/list_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/list_functions_TEST.bash b/paludis/repositories/e/ebuild/list_functions_TEST.bash
index 3bbbc70..4c99c57 100644
--- a/paludis/repositories/e/ebuild/list_functions_TEST.bash
+++ b/paludis/repositories/e/ebuild/list_functions_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/multilib_functions.bash b/paludis/repositories/e/ebuild/multilib_functions.bash
index f656933..febcb11 100644
--- a/paludis/repositories/e/ebuild/multilib_functions.bash
+++ b/paludis/repositories/e/ebuild/multilib_functions.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_config.bash b/paludis/repositories/e/ebuild/pkg_config.bash
index e171d1a..e119a9a 100644
--- a/paludis/repositories/e/ebuild/pkg_config.bash
+++ b/paludis/repositories/e/ebuild/pkg_config.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_info.bash b/paludis/repositories/e/ebuild/pkg_info.bash
index ab0df1f..856730d 100644
--- a/paludis/repositories/e/ebuild/pkg_info.bash
+++ b/paludis/repositories/e/ebuild/pkg_info.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_nofetch.bash b/paludis/repositories/e/ebuild/pkg_nofetch.bash
index 07473ca..ed6976a 100644
--- a/paludis/repositories/e/ebuild/pkg_nofetch.bash
+++ b/paludis/repositories/e/ebuild/pkg_nofetch.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_postinst.bash b/paludis/repositories/e/ebuild/pkg_postinst.bash
index 98aef4b..de74ee3 100644
--- a/paludis/repositories/e/ebuild/pkg_postinst.bash
+++ b/paludis/repositories/e/ebuild/pkg_postinst.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_postrm.bash b/paludis/repositories/e/ebuild/pkg_postrm.bash
index 4708c3a..8dc437b 100644
--- a/paludis/repositories/e/ebuild/pkg_postrm.bash
+++ b/paludis/repositories/e/ebuild/pkg_postrm.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_preinst.bash b/paludis/repositories/e/ebuild/pkg_preinst.bash
index a054f04..cbfb009 100644
--- a/paludis/repositories/e/ebuild/pkg_preinst.bash
+++ b/paludis/repositories/e/ebuild/pkg_preinst.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_prerm.bash b/paludis/repositories/e/ebuild/pkg_prerm.bash
index 50b914c..81c72cd 100644
--- a/paludis/repositories/e/ebuild/pkg_prerm.bash
+++ b/paludis/repositories/e/ebuild/pkg_prerm.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_pretend.bash b/paludis/repositories/e/ebuild/pkg_pretend.bash
index eea366d..046470d 100644
--- a/paludis/repositories/e/ebuild/pkg_pretend.bash
+++ b/paludis/repositories/e/ebuild/pkg_pretend.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/pkg_setup.bash b/paludis/repositories/e/ebuild/pkg_setup.bash
index 8123d01..5234449 100644
--- a/paludis/repositories/e/ebuild/pkg_setup.bash
+++ b/paludis/repositories/e/ebuild/pkg_setup.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/portage_stubs.bash b/paludis/repositories/e/ebuild/portage_stubs.bash
index a81c724..1efc470 100644
--- a/paludis/repositories/e/ebuild/portage_stubs.bash
+++ b/paludis/repositories/e/ebuild/portage_stubs.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/sandbox.bash b/paludis/repositories/e/ebuild/sandbox.bash
index be81b8a..9a36a28 100644
--- a/paludis/repositories/e/ebuild/sandbox.bash
+++ b/paludis/repositories/e/ebuild/sandbox.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/src_compile.bash b/paludis/repositories/e/ebuild/src_compile.bash
index fab5ea6..282dba8 100644
--- a/paludis/repositories/e/ebuild/src_compile.bash
+++ b/paludis/repositories/e/ebuild/src_compile.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/src_install.bash b/paludis/repositories/e/ebuild/src_install.bash
index f52aa56..44d51d6 100644
--- a/paludis/repositories/e/ebuild/src_install.bash
+++ b/paludis/repositories/e/ebuild/src_install.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/src_test.bash b/paludis/repositories/e/ebuild/src_test.bash
index 1420623..15ea99b 100644
--- a/paludis/repositories/e/ebuild/src_test.bash
+++ b/paludis/repositories/e/ebuild/src_test.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/src_unpack.bash b/paludis/repositories/e/ebuild/src_unpack.bash
index ea63280..84d47bd 100644
--- a/paludis/repositories/e/ebuild/src_unpack.bash
+++ b/paludis/repositories/e/ebuild/src_unpack.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/usage_error.bash b/paludis/repositories/e/ebuild/usage_error.bash
index 392a013..4172177 100644
--- a/paludis/repositories/e/ebuild/usage_error.bash
+++ b/paludis/repositories/e/ebuild/usage_error.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/awk_TEST.bash b/paludis/repositories/e/ebuild/utils/awk_TEST.bash
index 04e45e3..5c69862 100644
--- a/paludis/repositories/e/ebuild/utils/awk_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/awk_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dobin b/paludis/repositories/e/ebuild/utils/dobin
index 506f50f..8c62f2b 100755
--- a/paludis/repositories/e/ebuild/utils/dobin
+++ b/paludis/repositories/e/ebuild/utils/dobin
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dobin from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dobin_TEST.bash b/paludis/repositories/e/ebuild/utils/dobin_TEST.bash
index b9d0d9c..4f10e4d 100644
--- a/paludis/repositories/e/ebuild/utils/dobin_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/dobin_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doconfd b/paludis/repositories/e/ebuild/utils/doconfd
index 37c453c..75479b7 100755
--- a/paludis/repositories/e/ebuild/utils/doconfd
+++ b/paludis/repositories/e/ebuild/utils/doconfd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doconfd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dodir b/paludis/repositories/e/ebuild/utils/dodir
index 52b7c20..79c6254 100755
--- a/paludis/repositories/e/ebuild/utils/dodir
+++ b/paludis/repositories/e/ebuild/utils/dodir
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dodir from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dodoc b/paludis/repositories/e/ebuild/utils/dodoc
index edd6b65..6a54006 100755
--- a/paludis/repositories/e/ebuild/utils/dodoc
+++ b/paludis/repositories/e/ebuild/utils/dodoc
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dodoc from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doenvd b/paludis/repositories/e/ebuild/utils/doenvd
index 7299776..427fdeb 100755
--- a/paludis/repositories/e/ebuild/utils/doenvd
+++ b/paludis/repositories/e/ebuild/utils/doenvd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doenvd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doexe b/paludis/repositories/e/ebuild/utils/doexe
index a67166b..61189fb 100755
--- a/paludis/repositories/e/ebuild/utils/doexe
+++ b/paludis/repositories/e/ebuild/utils/doexe
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doexe from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dohard b/paludis/repositories/e/ebuild/utils/dohard
index b0758e5..707bc32 100755
--- a/paludis/repositories/e/ebuild/utils/dohard
+++ b/paludis/repositories/e/ebuild/utils/dohard
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dohard from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dohtml b/paludis/repositories/e/ebuild/utils/dohtml
index 09743c9..db8d768 100755
--- a/paludis/repositories/e/ebuild/utils/dohtml
+++ b/paludis/repositories/e/ebuild/utils/dohtml
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dohtml from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doinfo b/paludis/repositories/e/ebuild/utils/doinfo
index df3040e..6072379 100755
--- a/paludis/repositories/e/ebuild/utils/doinfo
+++ b/paludis/repositories/e/ebuild/utils/doinfo
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doinfo from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doinitd b/paludis/repositories/e/ebuild/utils/doinitd
index 8fc7080..85a3e06 100755
--- a/paludis/repositories/e/ebuild/utils/doinitd
+++ b/paludis/repositories/e/ebuild/utils/doinitd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doinitd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doins b/paludis/repositories/e/ebuild/utils/doins
index 2d70f5a..b37099e 100755
--- a/paludis/repositories/e/ebuild/utils/doins
+++ b/paludis/repositories/e/ebuild/utils/doins
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doins from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dolib b/paludis/repositories/e/ebuild/utils/dolib
index c35b202..d636764 100755
--- a/paludis/repositories/e/ebuild/utils/dolib
+++ b/paludis/repositories/e/ebuild/utils/dolib
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dolib from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dolib.a.in b/paludis/repositories/e/ebuild/utils/dolib.a.in
index e766554..abb2fef 100755
--- a/paludis/repositories/e/ebuild/utils/dolib.a.in
+++ b/paludis/repositories/e/ebuild/utils/dolib.a.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dolib.a from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dolib.so.in b/paludis/repositories/e/ebuild/utils/dolib.so.in
index d4dcb4a..dc324a0 100755
--- a/paludis/repositories/e/ebuild/utils/dolib.so.in
+++ b/paludis/repositories/e/ebuild/utils/dolib.so.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dolib.so from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/doman b/paludis/repositories/e/ebuild/utils/doman
index ff54356..20fc7a2 100755
--- a/paludis/repositories/e/ebuild/utils/doman
+++ b/paludis/repositories/e/ebuild/utils/doman
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon doman from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/domo b/paludis/repositories/e/ebuild/utils/domo
index b7a0dd4..9a7ec51 100755
--- a/paludis/repositories/e/ebuild/utils/domo
+++ b/paludis/repositories/e/ebuild/utils/domo
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon domo from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/donewins b/paludis/repositories/e/ebuild/utils/donewins
index 2a9af0e..193dd11 100755
--- a/paludis/repositories/e/ebuild/utils/donewins
+++ b/paludis/repositories/e/ebuild/utils/donewins
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon donewins from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dosbin b/paludis/repositories/e/ebuild/utils/dosbin
index 25c6258..218baa4 100755
--- a/paludis/repositories/e/ebuild/utils/dosbin
+++ b/paludis/repositories/e/ebuild/utils/dosbin
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dosbin from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dosed b/paludis/repositories/e/ebuild/utils/dosed
index ca9dc04..e387bb4 100755
--- a/paludis/repositories/e/ebuild/utils/dosed
+++ b/paludis/repositories/e/ebuild/utils/dosed
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dosed from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/dosym b/paludis/repositories/e/ebuild/utils/dosym
index 818ef1a..756713a 100755
--- a/paludis/repositories/e/ebuild/utils/dosym
+++ b/paludis/repositories/e/ebuild/utils/dosym
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon dosym from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/emake b/paludis/repositories/e/ebuild/utils/emake
index 642d060..f6fa8ca 100755
--- a/paludis/repositories/e/ebuild/utils/emake
+++ b/paludis/repositories/e/ebuild/utils/emake
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0 b/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
index a0e3d15..e888259 100755
--- a/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/banned_in_eapi_exheres-0
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/dodoc b/paludis/repositories/e/ebuild/utils/exheres-0/dodoc
index f62b70c..58e23f7 100755
--- a/paludis/repositories/e/ebuild/utils/exheres-0/dodoc
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/dodoc
@@ -1,8 +1,8 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006 Stephen Bennett
+# Copyright (c) 2007 Ciaran McCreesh
#
# Based in part upon dodoc from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/emake b/paludis/repositories/e/ebuild/utils/exheres-0/emake
index 6c16f76..b092f7f 100755
--- a/paludis/repositories/e/ebuild/utils/exheres-0/emake
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/emake
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/unpack b/paludis/repositories/e/ebuild/utils/exheres-0/unpack
index 0a3287a..a71efd1 100755
--- a/paludis/repositories/e/ebuild/utils/exheres-0/unpack
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/unpack
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/fowners b/paludis/repositories/e/ebuild/utils/fowners
index 4eb208c..b0b3af1 100755
--- a/paludis/repositories/e/ebuild/utils/fowners
+++ b/paludis/repositories/e/ebuild/utils/fowners
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon fowners from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/fperms b/paludis/repositories/e/ebuild/utils/fperms
index 04c5db7..4b94e4e 100755
--- a/paludis/repositories/e/ebuild/utils/fperms
+++ b/paludis/repositories/e/ebuild/utils/fperms
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon fperms from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/make_TEST.bash b/paludis/repositories/e/ebuild/utils/make_TEST.bash
index a1e6e4e..a352618 100644
--- a/paludis/repositories/e/ebuild/utils/make_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/make_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newbin b/paludis/repositories/e/ebuild/utils/newbin
index 21792c6..aa5ae16 100755
--- a/paludis/repositories/e/ebuild/utils/newbin
+++ b/paludis/repositories/e/ebuild/utils/newbin
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newbin from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newconfd b/paludis/repositories/e/ebuild/utils/newconfd
index 7783865..4270bc5 100755
--- a/paludis/repositories/e/ebuild/utils/newconfd
+++ b/paludis/repositories/e/ebuild/utils/newconfd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newconfd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newdoc b/paludis/repositories/e/ebuild/utils/newdoc
index b4cb507..167efa8 100755
--- a/paludis/repositories/e/ebuild/utils/newdoc
+++ b/paludis/repositories/e/ebuild/utils/newdoc
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newdoc from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newenvd b/paludis/repositories/e/ebuild/utils/newenvd
index 76f0a7f..e147843 100755
--- a/paludis/repositories/e/ebuild/utils/newenvd
+++ b/paludis/repositories/e/ebuild/utils/newenvd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newenvd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newexe b/paludis/repositories/e/ebuild/utils/newexe
index 9a5cb35..911a565 100755
--- a/paludis/repositories/e/ebuild/utils/newexe
+++ b/paludis/repositories/e/ebuild/utils/newexe
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newexe from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newinitd b/paludis/repositories/e/ebuild/utils/newinitd
index 01ca12b..69c6149 100755
--- a/paludis/repositories/e/ebuild/utils/newinitd
+++ b/paludis/repositories/e/ebuild/utils/newinitd
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newinitd from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newins b/paludis/repositories/e/ebuild/utils/newins
index 2b692ad..5d385e3 100755
--- a/paludis/repositories/e/ebuild/utils/newins
+++ b/paludis/repositories/e/ebuild/utils/newins
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newins from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newlib.a.in b/paludis/repositories/e/ebuild/utils/newlib.a.in
index 415a057..c146ed2 100755
--- a/paludis/repositories/e/ebuild/utils/newlib.a.in
+++ b/paludis/repositories/e/ebuild/utils/newlib.a.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newlib.a from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newlib.so.in b/paludis/repositories/e/ebuild/utils/newlib.so.in
index 0701351..3916298 100755
--- a/paludis/repositories/e/ebuild/utils/newlib.so.in
+++ b/paludis/repositories/e/ebuild/utils/newlib.so.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newlib.so from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newman b/paludis/repositories/e/ebuild/utils/newman
index 0dab5fc..c228a16 100755
--- a/paludis/repositories/e/ebuild/utils/newman
+++ b/paludis/repositories/e/ebuild/utils/newman
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newman from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/newsbin b/paludis/repositories/e/ebuild/utils/newsbin
index da94577..b8f5927 100755
--- a/paludis/repositories/e/ebuild/utils/newsbin
+++ b/paludis/repositories/e/ebuild/utils/newsbin
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# Based in part upon newsbin from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/patch_TEST.bash b/paludis/repositories/e/ebuild/utils/patch_TEST.bash
index 0e96871..073b1d0 100644
--- a/paludis/repositories/e/ebuild/utils/patch_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/patch_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/prep.in b/paludis/repositories/e/ebuild/utils/prep.in
index f1e0daa..38a43b0 100755
--- a/paludis/repositories/e/ebuild/utils/prep.in
+++ b/paludis/repositories/e/ebuild/utils/prep.in
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+# Copyright (c) 2006 Stephen Bennett
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/sed_TEST.bash b/paludis/repositories/e/ebuild/utils/sed_TEST.bash
index d7f1b31..200ee44 100644
--- a/paludis/repositories/e/ebuild/utils/sed_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/sed_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/unpack b/paludis/repositories/e/ebuild/utils/unpack
index fd13be8..5b88d70 100755
--- a/paludis/repositories/e/ebuild/utils/unpack
+++ b/paludis/repositories/e/ebuild/utils/unpack
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# Based in part upon ebuild.sh from Portage, which is Copyright 1995-2005
# Gentoo Foundation and distributed under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/utils/wrapped_getfsize_TEST.bash b/paludis/repositories/e/ebuild/utils/wrapped_getfsize_TEST.bash
index 10b8aa8..e432102 100755
--- a/paludis/repositories/e/ebuild/utils/wrapped_getfsize_TEST.bash
+++ b/paludis/repositories/e/ebuild/utils/wrapped_getfsize_TEST.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild/write_vdb_entry.bash b/paludis/repositories/e/ebuild/write_vdb_entry.bash
index 3a6bfcb..c39f674 100755
--- a/paludis/repositories/e/ebuild/write_vdb_entry.bash
+++ b/paludis/repositories/e/ebuild/write_vdb_entry.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2006, 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 52da685..4999ba1 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_entries.hh b/paludis/repositories/e/ebuild_entries.hh
index a9249b4..4c629f5 100644
--- a/paludis/repositories/e/ebuild_entries.hh
+++ b/paludis/repositories/e/ebuild_entries.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index f75c55a..56d54b9 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.hh b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
index 93a6c67..9537741 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 257f7df..1c65296 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index f8325fd..1508e91 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eclass_mtimes.cc b/paludis/repositories/e/eclass_mtimes.cc
index 04ff720..a1d613d 100644
--- a/paludis/repositories/e/eclass_mtimes.cc
+++ b/paludis/repositories/e/eclass_mtimes.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/eclass_mtimes.hh b/paludis/repositories/e/eclass_mtimes.hh
index 026ada9..28f5b1e 100644
--- a/paludis/repositories/e/eclass_mtimes.hh
+++ b/paludis/repositories/e/eclass_mtimes.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 22c1857..386323f 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh
index 57bfedf..e837abf 100644
--- a/paludis/repositories/e/exheres_layout.hh
+++ b/paludis/repositories/e/exheres_layout.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc
index 58330d0..25f4b45 100644
--- a/paludis/repositories/e/fetch_visitor.cc
+++ b/paludis/repositories/e/fetch_visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/fetch_visitor.hh b/paludis/repositories/e/fetch_visitor.hh
index d097b0e..d3362df 100644
--- a/paludis/repositories/e/fetch_visitor.hh
+++ b/paludis/repositories/e/fetch_visitor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 01432d4..9023476 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index 67c2785..3eb97b7 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 679eb3a..aa758db 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc
index 87ba299..a8ed096 100644
--- a/paludis/repositories/e/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh
index d0753c0..75f2825 100644
--- a/paludis/repositories/e/layout.hh
+++ b/paludis/repositories/e/layout.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/make_ebin_repository.cc b/paludis/repositories/e/make_ebin_repository.cc
index 79e28b0..0e3cc26 100644
--- a/paludis/repositories/e/make_ebin_repository.cc
+++ b/paludis/repositories/e/make_ebin_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/make_ebin_repository.hh b/paludis/repositories/e/make_ebin_repository.hh
index a0056d5..d2c05a0 100644
--- a/paludis/repositories/e/make_ebin_repository.hh
+++ b/paludis/repositories/e/make_ebin_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 7781af5..c0860ff 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/make_ebuild_repository.hh b/paludis/repositories/e/make_ebuild_repository.hh
index aa17338..1c0e010 100644
--- a/paludis/repositories/e/make_ebuild_repository.hh
+++ b/paludis/repositories/e/make_ebuild_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index 2ba414c..36d8ec2 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Mike Kelly <pioto@pioto.org>
+ * Copyright (c) 2007 Mike Kelly
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/manifest2_reader.hh b/paludis/repositories/e/manifest2_reader.hh
index 7cd1940..ba33e76 100644
--- a/paludis/repositories/e/manifest2_reader.hh
+++ b/paludis/repositories/e/manifest2_reader.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Mike Kelly <pioto@pioto.org>
+ * Copyright (c) 2007 Mike Kelly
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/eapi_supported.cc b/paludis/repositories/e/qa/eapi_supported.cc
index c090699..4c56c23 100644
--- a/paludis/repositories/e/qa/eapi_supported.cc
+++ b/paludis/repositories/e/qa/eapi_supported.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/eapi_supported.hh b/paludis/repositories/e/qa/eapi_supported.hh
index d23d4f9..51fe7a7 100644
--- a/paludis/repositories/e/qa/eapi_supported.hh
+++ b/paludis/repositories/e/qa/eapi_supported.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index cfd33b1..2e2274d 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/extractors.hh b/paludis/repositories/e/qa/extractors.hh
index d50163c..14d5779 100644
--- a/paludis/repositories/e/qa/extractors.hh
+++ b/paludis/repositories/e/qa/extractors.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/extractors_TEST.cc b/paludis/repositories/e/qa/extractors_TEST.cc
index 678bf1f..205b9e1 100644
--- a/paludis/repositories/e/qa/extractors_TEST.cc
+++ b/paludis/repositories/e/qa/extractors_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/homepage_key.cc b/paludis/repositories/e/qa/homepage_key.cc
index d03ef43..574443b 100644
--- a/paludis/repositories/e/qa/homepage_key.cc
+++ b/paludis/repositories/e/qa/homepage_key.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/homepage_key.hh b/paludis/repositories/e/qa/homepage_key.hh
index ca72e23..7ba8190 100644
--- a/paludis/repositories/e/qa/homepage_key.hh
+++ b/paludis/repositories/e/qa/homepage_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa.cc b/paludis/repositories/e/qa/qa.cc
index e2b1267..76815be 100644
--- a/paludis/repositories/e/qa/qa.cc
+++ b/paludis/repositories/e/qa/qa.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_checks.cc b/paludis/repositories/e/qa/qa_checks.cc
index a457aa0..7ae5f20 100644
--- a/paludis/repositories/e/qa/qa_checks.cc
+++ b/paludis/repositories/e/qa/qa_checks.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_checks.hh b/paludis/repositories/e/qa/qa_checks.hh
index 89c9284..58977be 100644
--- a/paludis/repositories/e/qa/qa_checks.hh
+++ b/paludis/repositories/e/qa/qa_checks.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_checks_group.cc b/paludis/repositories/e/qa/qa_checks_group.cc
index d4c21b6..56f9ac5 100644
--- a/paludis/repositories/e/qa/qa_checks_group.cc
+++ b/paludis/repositories/e/qa/qa_checks_group.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_checks_group.hh b/paludis/repositories/e/qa/qa_checks_group.hh
index e60b63b..0417501 100644
--- a/paludis/repositories/e/qa/qa_checks_group.hh
+++ b/paludis/repositories/e/qa/qa_checks_group.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_controller.cc b/paludis/repositories/e/qa/qa_controller.cc
index 59afebf..be82f10 100644
--- a/paludis/repositories/e/qa/qa_controller.cc
+++ b/paludis/repositories/e/qa/qa_controller.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/qa_controller.hh b/paludis/repositories/e/qa/qa_controller.hh
index 69c9419..66d469e 100644
--- a/paludis/repositories/e/qa/qa_controller.hh
+++ b/paludis/repositories/e/qa/qa_controller.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/short_description_key.cc b/paludis/repositories/e/qa/short_description_key.cc
index 589dde3..e4ebb2b 100644
--- a/paludis/repositories/e/qa/short_description_key.cc
+++ b/paludis/repositories/e/qa/short_description_key.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/short_description_key.hh b/paludis/repositories/e/qa/short_description_key.hh
index 594efa2..2b884f7 100644
--- a/paludis/repositories/e/qa/short_description_key.hh
+++ b/paludis/repositories/e/qa/short_description_key.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index 8ac7c4f..2b87fde 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/spec_keys.hh b/paludis/repositories/e/qa/spec_keys.hh
index 236def1..5595abf 100644
--- a/paludis/repositories/e/qa/spec_keys.hh
+++ b/paludis/repositories/e/qa/spec_keys.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/spec_keys_TEST.cc b/paludis/repositories/e/qa/spec_keys_TEST.cc
index 35565fd..82a14b4 100644
--- a/paludis/repositories/e/qa/spec_keys_TEST.cc
+++ b/paludis/repositories/e/qa/spec_keys_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/stray_files.cc b/paludis/repositories/e/qa/stray_files.cc
index 314f792..941bfdc 100644
--- a/paludis/repositories/e/qa/stray_files.cc
+++ b/paludis/repositories/e/qa/stray_files.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/stray_files.hh b/paludis/repositories/e/qa/stray_files.hh
index e8175a0..ddf7be3 100644
--- a/paludis/repositories/e/qa/stray_files.hh
+++ b/paludis/repositories/e/qa/stray_files.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/stray_files_TEST.cc b/paludis/repositories/e/qa/stray_files_TEST.cc
index 8882c61..8607d52 100644
--- a/paludis/repositories/e/qa/stray_files_TEST.cc
+++ b/paludis/repositories/e/qa/stray_files_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/test_extras.cc b/paludis/repositories/e/qa/test_extras.cc
index 4431c96..08da203 100644
--- a/paludis/repositories/e/qa/test_extras.cc
+++ b/paludis/repositories/e/qa/test_extras.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/visibility.cc b/paludis/repositories/e/qa/visibility.cc
index da48aaa..898b29a 100644
--- a/paludis/repositories/e/qa/visibility.cc
+++ b/paludis/repositories/e/qa/visibility.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/visibility.hh b/paludis/repositories/e/qa/visibility.hh
index 358dec4..51b2b3d 100644
--- a/paludis/repositories/e/qa/visibility.hh
+++ b/paludis/repositories/e/qa/visibility.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/qa/visibility_TEST.cc b/paludis/repositories/e/qa/visibility_TEST.cc
index b4603ed..7240173 100644
--- a/paludis/repositories/e/qa/visibility_TEST.cc
+++ b/paludis/repositories/e/qa/visibility_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/registration.cc b/paludis/repositories/e/registration.cc
index 3d26efd..a8e5dd8 100644
--- a/paludis/repositories/e/registration.cc
+++ b/paludis/repositories/e/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/source_uri_finder.cc b/paludis/repositories/e/source_uri_finder.cc
index 8d6bc96..c082899 100644
--- a/paludis/repositories/e/source_uri_finder.cc
+++ b/paludis/repositories/e/source_uri_finder.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/source_uri_finder.hh b/paludis/repositories/e/source_uri_finder.hh
index 7abca03..86a2db0 100644
--- a/paludis/repositories/e/source_uri_finder.hh
+++ b/paludis/repositories/e/source_uri_finder.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/source_uri_finder_TEST.cc b/paludis/repositories/e/source_uri_finder_TEST.cc
index ab5d70f..f990e11 100644
--- a/paludis/repositories/e/source_uri_finder_TEST.cc
+++ b/paludis/repositories/e/source_uri_finder_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 7fa282b..e51e1fe 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh
index 6a52697..adac744 100644
--- a/paludis/repositories/e/traditional_layout.hh
+++ b/paludis/repositories/e/traditional_layout.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 4bba68d..ffb4c11 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/use_desc.hh b/paludis/repositories/e/use_desc.hh
index 43e786b..f386d36 100644
--- a/paludis/repositories/e/use_desc.hh
+++ b/paludis/repositories/e/use_desc.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_id.cc b/paludis/repositories/e/vdb_id.cc
index 46ac69d..b86b3c2 100644
--- a/paludis/repositories/e/vdb_id.cc
+++ b/paludis/repositories/e/vdb_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_id.hh b/paludis/repositories/e/vdb_id.hh
index 32471fc..d1582a9 100644
--- a/paludis/repositories/e/vdb_id.hh
+++ b/paludis/repositories/e/vdb_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc
index 60acde6..0a2d5ab 100644
--- a/paludis/repositories/e/vdb_merger.cc
+++ b/paludis/repositories/e/vdb_merger.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index f31afd2..9838de6 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index 1f9300c..d5b96e2 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 Piotr Jaroszyński
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 5678aa4..d3cf9d2 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 8473bb4..2843cbb 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 4bb2152..72d9805 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 6d1e36a..bd6ff3f 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index cc1b2dd..892b97f 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index e52f9c9..1c564d7 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/xml_things.cc b/paludis/repositories/e/xml_things.cc
index 05f9988..fcfb4d6 100644
--- a/paludis/repositories/e/xml_things.cc
+++ b/paludis/repositories/e/xml_things.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/xml_things.hh b/paludis/repositories/e/xml_things.hh
index 28385ec..486cfd5 100644
--- a/paludis/repositories/e/xml_things.hh
+++ b/paludis/repositories/e/xml_things.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/e/xml_things_TEST.cc b/paludis/repositories/e/xml_things_TEST.cc
index d56d994..3539945 100644
--- a/paludis/repositories/e/xml_things_TEST.cc
+++ b/paludis/repositories/e/xml_things_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 227f8cf..5bc37c6 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index 4400ff0..bbc26d9 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_installed_repository_TEST.cc b/paludis/repositories/fake/fake_installed_repository_TEST.cc
index 7588143..192dfbc 100644
--- a/paludis/repositories/fake/fake_installed_repository_TEST.cc
+++ b/paludis/repositories/fake/fake_installed_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index d74213e..4e5a3af 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 35ea628..69a89c9 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 30a1485..e666f79 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index 70f8c7c..c79b98f 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_repository_TEST.cc b/paludis/repositories/fake/fake_repository_TEST.cc
index 9762050..1384c08 100644
--- a/paludis/repositories/fake/fake_repository_TEST.cc
+++ b/paludis/repositories/fake/fake_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 0c9dd10..645d8d7 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index c43988e..ae11527 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/exceptions.cc b/paludis/repositories/gems/exceptions.cc
index e2fa93a..eb106fd 100644
--- a/paludis/repositories/gems/exceptions.cc
+++ b/paludis/repositories/gems/exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/exceptions.hh b/paludis/repositories/gems/exceptions.hh
index ea0a1cd..ebb47b5 100644
--- a/paludis/repositories/gems/exceptions.hh
+++ b/paludis/repositories/gems/exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specification-fwd.hh b/paludis/repositories/gems/gem_specification-fwd.hh
index 2833459..44a8c18 100644
--- a/paludis/repositories/gems/gem_specification-fwd.hh
+++ b/paludis/repositories/gems/gem_specification-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index 4dfcb77..9a76526 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specification.hh b/paludis/repositories/gems/gem_specification.hh
index edb9d41..06388dd 100644
--- a/paludis/repositories/gems/gem_specification.hh
+++ b/paludis/repositories/gems/gem_specification.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specification_TEST.cc b/paludis/repositories/gems/gem_specification_TEST.cc
index 22f5b27..54fb01a 100644
--- a/paludis/repositories/gems/gem_specification_TEST.cc
+++ b/paludis/repositories/gems/gem_specification_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specifications.cc b/paludis/repositories/gems/gem_specifications.cc
index fad1d9a..0be53d7 100644
--- a/paludis/repositories/gems/gem_specifications.cc
+++ b/paludis/repositories/gems/gem_specifications.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specifications.hh b/paludis/repositories/gems/gem_specifications.hh
index b583070..a50f0b6 100644
--- a/paludis/repositories/gems/gem_specifications.hh
+++ b/paludis/repositories/gems/gem_specifications.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gem_specifications_TEST.cc b/paludis/repositories/gems/gem_specifications_TEST.cc
index 944c842..7c3571d 100644
--- a/paludis/repositories/gems/gem_specifications_TEST.cc
+++ b/paludis/repositories/gems/gem_specifications_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gems.bash b/paludis/repositories/gems/gems.bash
index 87d3774..302241a 100755
--- a/paludis/repositories/gems/gems.bash
+++ b/paludis/repositories/gems/gems.bash
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+# Copyright (c) 2007 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 6efd5da..2b9a202 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gems_repository.hh b/paludis/repositories/gems/gems_repository.hh
index 1159ee6..b47d1a5 100644
--- a/paludis/repositories/gems/gems_repository.hh
+++ b/paludis/repositories/gems/gems_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/gems_repository_TEST.cc b/paludis/repositories/gems/gems_repository_TEST.cc
index 5be62de..3e687e8 100644
--- a/paludis/repositories/gems/gems_repository_TEST.cc
+++ b/paludis/repositories/gems/gems_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index ad01096..6e269f6 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/installed_gems_repository.hh b/paludis/repositories/gems/installed_gems_repository.hh
index 8d1cf2a..aa12f01 100644
--- a/paludis/repositories/gems/installed_gems_repository.hh
+++ b/paludis/repositories/gems/installed_gems_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/installed_gems_repository_TEST.cc b/paludis/repositories/gems/installed_gems_repository_TEST.cc
index 1302408..6269ac1 100644
--- a/paludis/repositories/gems/installed_gems_repository_TEST.cc
+++ b/paludis/repositories/gems/installed_gems_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/params-fwd.hh b/paludis/repositories/gems/params-fwd.hh
index a59e4ac..4ee3026 100644
--- a/paludis/repositories/gems/params-fwd.hh
+++ b/paludis/repositories/gems/params-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/params.cc b/paludis/repositories/gems/params.cc
index 54498a5..69a67e9 100644
--- a/paludis/repositories/gems/params.cc
+++ b/paludis/repositories/gems/params.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/params.hh b/paludis/repositories/gems/params.hh
index 72d751b..06e11f6 100644
--- a/paludis/repositories/gems/params.hh
+++ b/paludis/repositories/gems/params.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/registration.cc b/paludis/repositories/gems/registration.cc
index 0be9d55..9984a7a 100644
--- a/paludis/repositories/gems/registration.cc
+++ b/paludis/repositories/gems/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/yaml-fwd.hh b/paludis/repositories/gems/yaml-fwd.hh
index ac27e42..f4f1569 100644
--- a/paludis/repositories/gems/yaml-fwd.hh
+++ b/paludis/repositories/gems/yaml-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/yaml.cc b/paludis/repositories/gems/yaml.cc
index 3c4b378..510da78 100644
--- a/paludis/repositories/gems/yaml.cc
+++ b/paludis/repositories/gems/yaml.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/yaml.hh b/paludis/repositories/gems/yaml.hh
index ae6f266..43046d4 100644
--- a/paludis/repositories/gems/yaml.hh
+++ b/paludis/repositories/gems/yaml.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/gems/yaml_TEST.cc b/paludis/repositories/gems/yaml_TEST.cc
index 76a309d..040186e 100644
--- a/paludis/repositories/gems/yaml_TEST.cc
+++ b/paludis/repositories/gems/yaml_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/exceptions.cc b/paludis/repositories/unpackaged/exceptions.cc
index 53243f5..fb3fdb7 100644
--- a/paludis/repositories/unpackaged/exceptions.cc
+++ b/paludis/repositories/unpackaged/exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/exceptions.hh b/paludis/repositories/unpackaged/exceptions.hh
index 18464d0..4c44901 100644
--- a/paludis/repositories/unpackaged/exceptions.hh
+++ b/paludis/repositories/unpackaged/exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_id.cc b/paludis/repositories/unpackaged/installed_unpackaged_id.cc
index 5535888..19bdce7 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/installed_unpackaged_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_id.hh b/paludis/repositories/unpackaged/installed_unpackaged_id.hh
index 4625562..959ddf4 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/installed_unpackaged_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository.cc b/paludis/repositories/unpackaged/installed_unpackaged_repository.cc
index 16b0aa8..0cd44cb 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/installed_unpackaged_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository.hh b/paludis/repositories/unpackaged/installed_unpackaged_repository.hh
index 13bcbe5..9b15ee5 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/installed_unpackaged_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc
index 47e56f0..b66d9a9 100644
--- a/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_unpackaged_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam-fwd.hh b/paludis/repositories/unpackaged/ndbam-fwd.hh
index 831d20c..6f10c72 100644
--- a/paludis/repositories/unpackaged/ndbam-fwd.hh
+++ b/paludis/repositories/unpackaged/ndbam-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam.cc b/paludis/repositories/unpackaged/ndbam.cc
index 0922935..0276422 100644
--- a/paludis/repositories/unpackaged/ndbam.cc
+++ b/paludis/repositories/unpackaged/ndbam.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam.hh b/paludis/repositories/unpackaged/ndbam.hh
index 54fc88e..ad007eb 100644
--- a/paludis/repositories/unpackaged/ndbam.hh
+++ b/paludis/repositories/unpackaged/ndbam.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam_merger.cc b/paludis/repositories/unpackaged/ndbam_merger.cc
index 4c7e53d..151539d 100644
--- a/paludis/repositories/unpackaged/ndbam_merger.cc
+++ b/paludis/repositories/unpackaged/ndbam_merger.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam_merger.hh b/paludis/repositories/unpackaged/ndbam_merger.hh
index e156ce6..1c5e023 100644
--- a/paludis/repositories/unpackaged/ndbam_merger.hh
+++ b/paludis/repositories/unpackaged/ndbam_merger.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam_unmerger.cc b/paludis/repositories/unpackaged/ndbam_unmerger.cc
index bc46b3b..b1c6b40 100644
--- a/paludis/repositories/unpackaged/ndbam_unmerger.cc
+++ b/paludis/repositories/unpackaged/ndbam_unmerger.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/ndbam_unmerger.hh b/paludis/repositories/unpackaged/ndbam_unmerger.hh
index 8c268d2..cacb9c7 100644
--- a/paludis/repositories/unpackaged/ndbam_unmerger.hh
+++ b/paludis/repositories/unpackaged/ndbam_unmerger.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/registration.cc b/paludis/repositories/unpackaged/registration.cc
index adb2648..aa5149c 100644
--- a/paludis/repositories/unpackaged/registration.cc
+++ b/paludis/repositories/unpackaged/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 59d6eb9..e805ed3 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index d3073e8..c30e10b 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index 3763237..78ba8e3 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index 648a691..40853e6 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index 501788c..f05dfcb 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index e17c4f8..fff9ffa 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 6dc2980..513d697 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
index 9d3f763..7585414 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index de77781..b9acbca 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index fb4f5de..e20c6e0 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/registration.cc b/paludis/repositories/virtuals/registration.cc
index 41e53c1..61776fa 100644
--- a/paludis/repositories/virtuals/registration.cc
+++ b/paludis/repositories/virtuals/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index fd76289..a9424ad 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index f4cadce..affd769 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repositories/virtuals/virtuals_repository_TEST.cc b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
index 099ac2f..135025c 100644
--- a/paludis/repositories/virtuals/virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/virtuals_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository-fwd.hh b/paludis/repository-fwd.hh
index 341f743..4651a64 100644
--- a/paludis/repository-fwd.hh
+++ b/paludis/repository-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository.cc b/paludis/repository.cc
index 15a265c..5cbec3b 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 307c772..792c72a 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_info-fwd.hh b/paludis/repository_info-fwd.hh
index 634a95a..48b2ac1 100644
--- a/paludis/repository_info-fwd.hh
+++ b/paludis/repository_info-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_info.cc b/paludis/repository_info.cc
index 30c26df..c150187 100644
--- a/paludis/repository_info.cc
+++ b/paludis/repository_info.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_info.hh b/paludis/repository_info.hh
index 9013aa5..c913764 100644
--- a/paludis/repository_info.hh
+++ b/paludis/repository_info.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_maker.cc b/paludis/repository_maker.cc
index 3e146d2..ff05799 100644
--- a/paludis/repository_maker.cc
+++ b/paludis/repository_maker.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_maker.hh b/paludis/repository_maker.hh
index 7fbbfb0..d695b0d 100644
--- a/paludis/repository_maker.hh
+++ b/paludis/repository_maker.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_name_cache.cc b/paludis/repository_name_cache.cc
index a1c3a0c..ea25335 100644
--- a/paludis/repository_name_cache.cc
+++ b/paludis/repository_name_cache.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_name_cache.hh b/paludis/repository_name_cache.hh
index f471b32..c4ed067 100644
--- a/paludis/repository_name_cache.hh
+++ b/paludis/repository_name_cache.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/repository_name_cache_TEST.cc b/paludis/repository_name_cache_TEST.cc
index b029f78..0092c32 100644
--- a/paludis/repository_name_cache_TEST.cc
+++ b/paludis/repository_name_cache_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/rmd160.cc b/paludis/rmd160.cc
index d8973eb..024459b 100644
--- a/paludis/rmd160.cc
+++ b/paludis/rmd160.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/rmd160.hh b/paludis/rmd160.hh
index 3d3c312..a805214 100644
--- a/paludis/rmd160.hh
+++ b/paludis/rmd160.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/rmd160_TEST.cc b/paludis/rmd160_TEST.cc
index af4a340..115b0a9 100644
--- a/paludis/rmd160_TEST.cc
+++ b/paludis/rmd160_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/selinux/security_context.cc b/paludis/selinux/security_context.cc
index 2d514d3..f6425a2 100644
--- a/paludis/selinux/security_context.cc
+++ b/paludis/selinux/security_context.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/selinux/security_context.hh b/paludis/selinux/security_context.hh
index d94dacf..07016fe 100644
--- a/paludis/selinux/security_context.hh
+++ b/paludis/selinux/security_context.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index 826f7eb..0b81f76 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/set_file.hh b/paludis/set_file.hh
index 8bca8a9..1126db3 100644
--- a/paludis/set_file.hh
+++ b/paludis/set_file.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/set_file_TEST.cc b/paludis/set_file_TEST.cc
index 6a6497e..26a29ea 100644
--- a/paludis/set_file_TEST.cc
+++ b/paludis/set_file_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sha256.cc b/paludis/sha256.cc
index d2f1a63..d9900f5 100644
--- a/paludis/sha256.cc
+++ b/paludis/sha256.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sha256.hh b/paludis/sha256.hh
index 9dc0fee..7d99786 100644
--- a/paludis/sha256.hh
+++ b/paludis/sha256.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sha256_TEST.cc b/paludis/sha256_TEST.cc
index 2662fbc..c1d9f28 100644
--- a/paludis/sha256_TEST.cc
+++ b/paludis/sha256_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/show_suggest_visitor.cc b/paludis/show_suggest_visitor.cc
index 8ff5e63..5c60377 100644
--- a/paludis/show_suggest_visitor.cc
+++ b/paludis/show_suggest_visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/show_suggest_visitor.hh b/paludis/show_suggest_visitor.hh
index 7f3e485..cd1f916 100644
--- a/paludis/show_suggest_visitor.hh
+++ b/paludis/show_suggest_visitor.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sohooks_TEST.cc b/paludis/sohooks_TEST.cc
index 00df71a..c1fff74 100644
--- a/paludis/sohooks_TEST.cc
+++ b/paludis/sohooks_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stage_builder_task.cc b/paludis/stage_builder_task.cc
index c074d96..0990e38 100644
--- a/paludis/stage_builder_task.cc
+++ b/paludis/stage_builder_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stage_builder_task.hh b/paludis/stage_builder_task.hh
index 2f801f6..dec7541 100644
--- a/paludis/stage_builder_task.hh
+++ b/paludis/stage_builder_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stringify_formatter-fwd.hh b/paludis/stringify_formatter-fwd.hh
index 5bb1131..9bd6eda 100644
--- a/paludis/stringify_formatter-fwd.hh
+++ b/paludis/stringify_formatter-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stringify_formatter-impl.hh b/paludis/stringify_formatter-impl.hh
index fe3325f..ab71c29 100644
--- a/paludis/stringify_formatter-impl.hh
+++ b/paludis/stringify_formatter-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stringify_formatter.cc b/paludis/stringify_formatter.cc
index af3a5bd..3f3bb64 100644
--- a/paludis/stringify_formatter.cc
+++ b/paludis/stringify_formatter.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stringify_formatter.hh b/paludis/stringify_formatter.hh
index 716851c..4b3c778 100644
--- a/paludis/stringify_formatter.hh
+++ b/paludis/stringify_formatter.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/stringify_formatter_TEST.cc b/paludis/stringify_formatter_TEST.cc
index 6e3bbdf..e40a1e2 100644
--- a/paludis/stringify_formatter_TEST.cc
+++ b/paludis/stringify_formatter_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sync_task.cc b/paludis/sync_task.cc
index 15d5f50..004d476 100644
--- a/paludis/sync_task.cc
+++ b/paludis/sync_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/sync_task.hh b/paludis/sync_task.hh
index be9a128..6670705 100644
--- a/paludis/sync_task.hh
+++ b/paludis/sync_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/syncer.cc b/paludis/syncer.cc
index d1b3d5f..75222a5 100644
--- a/paludis/syncer.cc
+++ b/paludis/syncer.cc
@@ -1,9 +1,9 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Stephen Klimaszewski <steev@gentoo.org>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Stephen Klimaszewski
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/syncer.hh b/paludis/syncer.hh
index c329170..f985077 100644
--- a/paludis/syncer.hh
+++ b/paludis/syncer.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/tasks_exceptions.cc b/paludis/tasks_exceptions.cc
index 868f06e..4d31735 100644
--- a/paludis/tasks_exceptions.cc
+++ b/paludis/tasks_exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/tasks_exceptions.hh b/paludis/tasks_exceptions.hh
index c2005c2..9d8a733 100644
--- a/paludis/tasks_exceptions.hh
+++ b/paludis/tasks_exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/test_extras.cc b/paludis/test_extras.cc
index 8cc3d24..ada3482 100644
--- a/paludis/test_extras.cc
+++ b/paludis/test_extras.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/uninstall_list.cc b/paludis/uninstall_list.cc
index acd5ce7..3643ee1 100644
--- a/paludis/uninstall_list.cc
+++ b/paludis/uninstall_list.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/uninstall_list.hh b/paludis/uninstall_list.hh
index 831c34b..2ebcb5d 100644
--- a/paludis/uninstall_list.hh
+++ b/paludis/uninstall_list.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/uninstall_list_TEST.cc b/paludis/uninstall_list_TEST.cc
index 50d4b73..f62c46a 100644
--- a/paludis/uninstall_list_TEST.cc
+++ b/paludis/uninstall_list_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/uninstall_task.cc b/paludis/uninstall_task.cc
index 2d6da76..a147e9b 100644
--- a/paludis/uninstall_task.cc
+++ b/paludis/uninstall_task.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/uninstall_task.hh b/paludis/uninstall_task.hh
index 49295bc..a89df25 100644
--- a/paludis/uninstall_task.hh
+++ b/paludis/uninstall_task.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/unmerger.cc b/paludis/unmerger.cc
index f23596f..5964bea 100644
--- a/paludis/unmerger.cc
+++ b/paludis/unmerger.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/unmerger.hh b/paludis/unmerger.hh
index 9ce4f9a..544d9d4 100644
--- a/paludis/unmerger.hh
+++ b/paludis/unmerger.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 Piotr Jaroszyński <peper@gentoo.org>
+ * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007 Piotr Jaroszyński
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/action_queue.cc b/paludis/util/action_queue.cc
index 40d0274..95f229f 100644
--- a/paludis/util/action_queue.cc
+++ b/paludis/util/action_queue.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/action_queue.hh b/paludis/util/action_queue.hh
index 38839b9..d42eaca 100644
--- a/paludis/util/action_queue.hh
+++ b/paludis/util/action_queue.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/action_queue_TEST.cc b/paludis/util/action_queue_TEST.cc
index 22eaf6b..6a8a0ce 100644
--- a/paludis/util/action_queue_TEST.cc
+++ b/paludis/util/action_queue_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/attributes.hh b/paludis/util/attributes.hh
index a7ef76d..28a1a83 100644
--- a/paludis/util/attributes.hh
+++ b/paludis/util/attributes.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/clone-impl.hh b/paludis/util/clone-impl.hh
index b517e1b..784b49b 100644
--- a/paludis/util/clone-impl.hh
+++ b/paludis/util/clone-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/clone.hh b/paludis/util/clone.hh
index 85487ea..ea9b272 100644
--- a/paludis/util/clone.hh
+++ b/paludis/util/clone.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/condition_variable.cc b/paludis/util/condition_variable.cc
index 32c7112..bc55da3 100644
--- a/paludis/util/condition_variable.cc
+++ b/paludis/util/condition_variable.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/condition_variable.hh b/paludis/util/condition_variable.hh
index 8b9ac4c..404f990 100644
--- a/paludis/util/condition_variable.hh
+++ b/paludis/util/condition_variable.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/condition_variable_TEST.cc b/paludis/util/condition_variable_TEST.cc
index 9be89a0..c6a061a 100644
--- a/paludis/util/condition_variable_TEST.cc
+++ b/paludis/util/condition_variable_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/config_file.cc b/paludis/util/config_file.cc
index 9130126..058e8af 100644
--- a/paludis/util/config_file.cc
+++ b/paludis/util/config_file.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Danny van Dyk <kugelfang@gentoo.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Danny van Dyk
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/config_file.hh b/paludis/util/config_file.hh
index 285a9cd..730f504 100644
--- a/paludis/util/config_file.hh
+++ b/paludis/util/config_file.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/config_file_TEST.cc b/paludis/util/config_file_TEST.cc
index 07fe720..4c23497 100644
--- a/paludis/util/config_file_TEST.cc
+++ b/paludis/util/config_file_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/destringify.cc b/paludis/util/destringify.cc
index 066978d..a402a7a 100644
--- a/paludis/util/destringify.cc
+++ b/paludis/util/destringify.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/destringify.hh b/paludis/util/destringify.hh
index f903c31..aabe2fa 100644
--- a/paludis/util/destringify.hh
+++ b/paludis/util/destringify.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/destringify_TEST.cc b/paludis/util/destringify_TEST.cc
index 51ec070..ca968bc 100644
--- a/paludis/util/destringify_TEST.cc
+++ b/paludis/util/destringify_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Stephen Bennett <spb@gentoo.org>
+ * Copyright (c) 2006 Stephen Bennett
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/dir_iterator.cc b/paludis/util/dir_iterator.cc
index 24d216a..c9b57cd 100644
--- a/paludis/util/dir_iterator.cc
+++ b/paludis/util/dir_iterator.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/dir_iterator.hh b/paludis/util/dir_iterator.hh
index fbc5d61..f228ae4 100644
--- a/paludis/util/dir_iterator.hh
+++ b/paludis/util/dir_iterator.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/dir_iterator_TEST.cc b/paludis/util/dir_iterator_TEST.cc
index 217f48a..7915d62 100644
--- a/paludis/util/dir_iterator_TEST.cc
+++ b/paludis/util/dir_iterator_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/exception.cc b/paludis/util/exception.cc
index a89e2db..8fa85a3 100644
--- a/paludis/util/exception.cc
+++ b/paludis/util/exception.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/exception.hh b/paludis/util/exception.hh
index 26f9db0..96779b9 100644
--- a/paludis/util/exception.hh
+++ b/paludis/util/exception.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fast_unique_copy.hh b/paludis/util/fast_unique_copy.hh
index 22c924f..80dc0e0 100644
--- a/paludis/util/fast_unique_copy.hh
+++ b/paludis/util/fast_unique_copy.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fast_unique_copy_TEST.cc b/paludis/util/fast_unique_copy_TEST.cc
index 052cc46..f946591 100644
--- a/paludis/util/fast_unique_copy_TEST.cc
+++ b/paludis/util/fast_unique_copy_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fd_holder.hh b/paludis/util/fd_holder.hh
index 6620b4c..fbf7185 100644
--- a/paludis/util/fd_holder.hh
+++ b/paludis/util/fd_holder.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fd_output_stream.hh b/paludis/util/fd_output_stream.hh
index 2e19f4d..9d55966 100644
--- a/paludis/util/fd_output_stream.hh
+++ b/paludis/util/fd_output_stream.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fs_entry-fwd.hh b/paludis/util/fs_entry-fwd.hh
index 369f1cb..5f9da7f 100644
--- a/paludis/util/fs_entry-fwd.hh
+++ b/paludis/util/fs_entry-fwd.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fs_entry.cc b/paludis/util/fs_entry.cc
index eb6dff3..8abdba9 100644
--- a/paludis/util/fs_entry.cc
+++ b/paludis/util/fs_entry.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fs_entry.hh b/paludis/util/fs_entry.hh
index 8f33cff..0055928 100644
--- a/paludis/util/fs_entry.hh
+++ b/paludis/util/fs_entry.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/fs_entry_TEST.cc b/paludis/util/fs_entry_TEST.cc
index 3f7c0de..0bc3b05 100644
--- a/paludis/util/fs_entry_TEST.cc
+++ b/paludis/util/fs_entry_TEST.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/future-impl.hh b/paludis/util/future-impl.hh
index 72bec1f..e53eefc 100644
--- a/paludis/util/future-impl.hh
+++ b/paludis/util/future-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/future.cc b/paludis/util/future.cc
index d13f88c..7d0bd69 100644
--- a/paludis/util/future.cc
+++ b/paludis/util/future.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/future.hh b/paludis/util/future.hh
index 73f71c3..14c1f7f 100644
--- a/paludis/util/future.hh
+++ b/paludis/util/future.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/future_TEST.cc b/paludis/util/future_TEST.cc
index 3d9b93e..777a7c9 100644
--- a/paludis/util/future_TEST.cc
+++ b/paludis/util/future_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/graph-fwd.hh b/paludis/util/graph-fwd.hh
index 825f08e..55bc03c 100644
--- a/paludis/util/graph-fwd.hh
+++ b/paludis/util/graph-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/graph-impl.hh b/paludis/util/graph-impl.hh
index bafe03b..e644dfe 100644
--- a/paludis/util/graph-impl.hh
+++ b/paludis/util/graph-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/graph.cc b/paludis/util/graph.cc
index 1e0d97c..f1f94de 100644
--- a/paludis/util/graph.cc
+++ b/paludis/util/graph.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/graph.hh b/paludis/util/graph.hh
index fc9f286..cc5438f 100644
--- a/paludis/util/graph.hh
+++ b/paludis/util/graph.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/graph_TEST.cc b/paludis/util/graph_TEST.cc
index f03c4b9..2e6f686 100644
--- a/paludis/util/graph_TEST.cc
+++ b/paludis/util/graph_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/idle_action_pool-fwd.hh b/paludis/util/idle_action_pool-fwd.hh
index 34c9193..a855b32 100644
--- a/paludis/util/idle_action_pool-fwd.hh
+++ b/paludis/util/idle_action_pool-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/idle_action_pool.cc b/paludis/util/idle_action_pool.cc
index 39e63d6..44be47c 100644
--- a/paludis/util/idle_action_pool.cc
+++ b/paludis/util/idle_action_pool.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/idle_action_pool.hh b/paludis/util/idle_action_pool.hh
index d9b650b..cf452a7 100644
--- a/paludis/util/idle_action_pool.hh
+++ b/paludis/util/idle_action_pool.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/idle_action_pool_TEST.cc b/paludis/util/idle_action_pool_TEST.cc
index 73434c7..8c72686 100644
--- a/paludis/util/idle_action_pool_TEST.cc
+++ b/paludis/util/idle_action_pool_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/instantiation_policy-impl.hh b/paludis/util/instantiation_policy-impl.hh
index 8425b7d..d70d872 100644
--- a/paludis/util/instantiation_policy-impl.hh
+++ b/paludis/util/instantiation_policy-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/instantiation_policy.hh b/paludis/util/instantiation_policy.hh
index 8c6c1a5..a60cfc9 100644
--- a/paludis/util/instantiation_policy.hh
+++ b/paludis/util/instantiation_policy.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/instantiation_policy_TEST.cc b/paludis/util/instantiation_policy_TEST.cc
index 43e955f..6666f50 100644
--- a/paludis/util/instantiation_policy_TEST.cc
+++ b/paludis/util/instantiation_policy_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/is_file_with_extension.cc b/paludis/util/is_file_with_extension.cc
index 953e5be..c86561c 100644
--- a/paludis/util/is_file_with_extension.cc
+++ b/paludis/util/is_file_with_extension.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/is_file_with_extension.hh b/paludis/util/is_file_with_extension.hh
index f98ae5a..0d47ef3 100644
--- a/paludis/util/is_file_with_extension.hh
+++ b/paludis/util/is_file_with_extension.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/is_file_with_extension_TEST.cc b/paludis/util/is_file_with_extension_TEST.cc
index 9e34061..0a4b919 100644
--- a/paludis/util/is_file_with_extension_TEST.cc
+++ b/paludis/util/is_file_with_extension_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Mark Loeser <halcy0n@gentoo.org>
+ * Copyright (c) 2006 Mark Loeser
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/iterator.hh b/paludis/util/iterator.hh
index 076000f..a1cd793 100644
--- a/paludis/util/iterator.hh
+++ b/paludis/util/iterator.hh
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/iterator_TEST.cc b/paludis/util/iterator_TEST.cc
index c195b72..d012c03 100644
--- a/paludis/util/iterator_TEST.cc
+++ b/paludis/util/iterator_TEST.cc
@@ -1,8 +1,8 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
- * Copyright (c) 2007 David Leverton <levertond@googlemail.com>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
+ * Copyright (c) 2007 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/join.hh b/paludis/util/join.hh
index c8863d8..51def6f 100644
--- a/paludis/util/join.hh
+++ b/paludis/util/join.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/join_TEST.cc b/paludis/util/join_TEST.cc
index b20cf74..3038c8d 100644
--- a/paludis/util/join_TEST.cc
+++ b/paludis/util/join_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/log.cc b/paludis/util/log.cc
index 47f16d2..31cbfcb 100644
--- a/paludis/util/log.cc
+++ b/paludis/util/log.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/log.hh b/paludis/util/log.hh
index b485dfc..77fd9f8 100644
--- a/paludis/util/log.hh
+++ b/paludis/util/log.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/log_TEST.cc b/paludis/util/log_TEST.cc
index 2dcdda8..8117af5 100644
--- a/paludis/util/log_TEST.cc
+++ b/paludis/util/log_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/make_shared_ptr-fwd.hh b/paludis/util/make_shared_ptr-fwd.hh
index a950463..68f912a 100644
--- a/paludis/util/make_shared_ptr-fwd.hh
+++ b/paludis/util/make_shared_ptr-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/make_shared_ptr.hh b/paludis/util/make_shared_ptr.hh
index 3c18546..49e5002 100644
--- a/paludis/util/make_shared_ptr.hh
+++ b/paludis/util/make_shared_ptr.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/map-fwd.hh b/paludis/util/map-fwd.hh
index ec4fe59..508b68d 100644
--- a/paludis/util/map-fwd.hh
+++ b/paludis/util/map-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/map-impl.hh b/paludis/util/map-impl.hh
index b6b7d36..46e2241 100644
--- a/paludis/util/map-impl.hh
+++ b/paludis/util/map-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/map.cc b/paludis/util/map.cc
index 8f9027d..c562eb6 100644
--- a/paludis/util/map.cc
+++ b/paludis/util/map.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/map.hh b/paludis/util/map.hh
index 91cd755..8945000 100644
--- a/paludis/util/map.hh
+++ b/paludis/util/map.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/mutex.cc b/paludis/util/mutex.cc
index 6b44f9d..40a3ffc 100644
--- a/paludis/util/mutex.cc
+++ b/paludis/util/mutex.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/mutex.hh b/paludis/util/mutex.hh
index 57a2f22..410894b 100644
--- a/paludis/util/mutex.hh
+++ b/paludis/util/mutex.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/mutex_TEST.cc b/paludis/util/mutex_TEST.cc
index cb7c4d6..afd1e3c 100644
--- a/paludis/util/mutex_TEST.cc
+++ b/paludis/util/mutex_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/no_type.hh b/paludis/util/no_type.hh
index 796732a..5c41172 100644
--- a/paludis/util/no_type.hh
+++ b/paludis/util/no_type.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+ * Copyright (c) 2007 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
diff --git a/paludis/util/operators.hh b/paludis/util/operators.hh
index 9f15176..adb3529 100644
--- a/paludis/util/operators.hh
+++ b/paludis/util/operators.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*<