aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 23:06:43 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 23:06:43 +0000
commitee941e4ee6b04d9680e8a310435e8942ee41d9a1 (patch)
treea898bd4f443511a87338fa24024882e43af0d86b /paludis/repositories/e
parentcb7234bc6046bf4614bf8850486f0679641c6bfc (diff)
downloadpaludis-ee941e4ee6b04d9680e8a310435e8942ee41d9a1.tar.gz
paludis-ee941e4ee6b04d9680e8a310435e8942ee41d9a1.tar.xz
Use name_foo rather than foo_name
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/dep_parser.cc4
-rw-r--r--paludis/repositories/e/e_choices_key.cc4
-rw-r--r--paludis/repositories/e/e_installed_repository.hh6
-rw-r--r--paludis/repositories/e/e_repository_params.hh62
-rw-r--r--paludis/repositories/e/e_stripper.hh12
-rw-r--r--paludis/repositories/e/eapi.hh338
-rw-r--r--paludis/repositories/e/ebuild.hh100
-rw-r--r--paludis/repositories/e/exndbam_repository.hh10
-rw-r--r--paludis/repositories/e/extra_distribution_data.hh34
-rw-r--r--paludis/repositories/e/glsa.hh6
-rw-r--r--paludis/repositories/e/manifest2_reader.hh12
-rw-r--r--paludis/repositories/e/metadata_xml.hh8
-rw-r--r--paludis/repositories/e/pbin_merger.hh22
-rw-r--r--paludis/repositories/e/vdb_merger.hh20
-rw-r--r--paludis/repositories/e/vdb_repository.hh14
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh14
16 files changed, 333 insertions, 333 deletions
diff --git a/paludis/repositories/e/dep_parser.cc b/paludis/repositories/e/dep_parser.cc
index a5893070a..51b2aaa10 100644
--- a/paludis/repositories/e/dep_parser.cc
+++ b/paludis/repositories/e/dep_parser.cc
@@ -63,8 +63,8 @@ namespace paludis
{
namespace n
{
- typedef Name<struct item_name> item;
- typedef Name<struct spec_name> spec;
+ typedef Name<struct name_item> item;
+ typedef Name<struct name_spec> spec;
}
}
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index 023a79a35..10da64351 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -213,8 +213,8 @@ namespace paludis
{
namespace n
{
- typedef Name<struct default_value_name> default_value;
- typedef Name<struct implicit_name> implicit;
+ typedef Name<struct name_default_value> default_value;
+ typedef Name<struct name_implicit> implicit;
}
}
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 49a95ad79..a0c47362a 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -27,9 +27,9 @@ namespace paludis
{
namespace n
{
- typedef Name<struct builddir_name> builddir;
- typedef Name<struct environment_name> environment;
- typedef Name<struct root_name> root;
+ typedef Name<struct name_builddir> builddir;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_root> root;
}
namespace erepository
diff --git a/paludis/repositories/e/e_repository_params.hh b/paludis/repositories/e/e_repository_params.hh
index 66c7b731e..a5dc7ded9 100644
--- a/paludis/repositories/e/e_repository_params.hh
+++ b/paludis/repositories/e/e_repository_params.hh
@@ -41,37 +41,37 @@ namespace paludis
namespace n
{
- typedef Name<struct append_repository_name_to_write_cache_name> append_repository_name_to_write_cache;
- typedef Name<struct auto_profiles_name> auto_profiles;
- typedef Name<struct binary_destination_name> binary_destination;
- typedef Name<struct binary_distdir_name> binary_distdir;
- typedef Name<struct binary_keywords_filter_name> binary_keywords_filter;
- typedef Name<struct binary_uri_prefix_name> binary_uri_prefix;
- typedef Name<struct builddir_name> builddir;
- typedef Name<struct cache_name> cache;
- typedef Name<struct distdir_name> distdir;
- typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
- typedef Name<struct eapi_when_unspecified_name> eapi_when_unspecified;
- typedef Name<struct eclassdirs_name> eclassdirs;
- typedef Name<struct entry_format_name> entry_format;
- typedef Name<struct environment_name> environment;
- typedef Name<struct ignore_deprecated_profiles_name> ignore_deprecated_profiles;
- typedef Name<struct layout_name> layout;
- typedef Name<struct location_name> location;
- typedef Name<struct master_repositories_name> master_repositories;
- typedef Name<struct names_cache_name> names_cache;
- typedef Name<struct newsdir_name> newsdir;
- typedef Name<struct profile_eapi_when_unspecified_name> profile_eapi_when_unspecified;
- typedef Name<struct profile_layout_name> profile_layout;
- typedef Name<struct profiles_name> profiles;
- typedef Name<struct profiles_explicitly_set_name> profiles_explicitly_set;
- typedef Name<struct securitydir_name> securitydir;
- typedef Name<struct setsdir_name> setsdir;
- typedef Name<struct sync_name> sync;
- typedef Name<struct sync_options_name> sync_options;
- typedef Name<struct use_manifest_name> use_manifest;
- typedef Name<struct write_bin_uri_prefix_name> write_bin_uri_prefix;
- typedef Name<struct write_cache_name> write_cache;
+ typedef Name<struct name_append_repository_name_to_write_cache> append_repository_name_to_write_cache;
+ typedef Name<struct name_auto_profiles> auto_profiles;
+ typedef Name<struct name_binary_destination> binary_destination;
+ typedef Name<struct name_binary_distdir> binary_distdir;
+ typedef Name<struct name_binary_keywords_filter> binary_keywords_filter;
+ typedef Name<struct name_binary_uri_prefix> binary_uri_prefix;
+ typedef Name<struct name_builddir> builddir;
+ typedef Name<struct name_cache> cache;
+ typedef Name<struct name_distdir> distdir;
+ typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+ typedef Name<struct name_eapi_when_unspecified> eapi_when_unspecified;
+ typedef Name<struct name_eclassdirs> eclassdirs;
+ typedef Name<struct name_entry_format> entry_format;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_ignore_deprecated_profiles> ignore_deprecated_profiles;
+ typedef Name<struct name_layout> layout;
+ typedef Name<struct name_location> location;
+ typedef Name<struct name_master_repositories> master_repositories;
+ typedef Name<struct name_names_cache> names_cache;
+ typedef Name<struct name_newsdir> newsdir;
+ typedef Name<struct name_profile_eapi_when_unspecified> profile_eapi_when_unspecified;
+ typedef Name<struct name_profile_layout> profile_layout;
+ typedef Name<struct name_profiles> profiles;
+ typedef Name<struct name_profiles_explicitly_set> profiles_explicitly_set;
+ typedef Name<struct name_securitydir> securitydir;
+ typedef Name<struct name_setsdir> setsdir;
+ typedef Name<struct name_sync> sync;
+ typedef Name<struct name_sync_options> sync_options;
+ typedef Name<struct name_use_manifest> use_manifest;
+ typedef Name<struct name_write_bin_uri_prefix> write_bin_uri_prefix;
+ typedef Name<struct name_write_cache> write_cache;
}
namespace erepository
diff --git a/paludis/repositories/e/e_stripper.hh b/paludis/repositories/e/e_stripper.hh
index 36937ad31..70924bbc3 100644
--- a/paludis/repositories/e/e_stripper.hh
+++ b/paludis/repositories/e/e_stripper.hh
@@ -29,12 +29,12 @@ namespace paludis
{
namespace n
{
- typedef Name<struct debug_dir_name> debug_dir;
- typedef Name<struct image_dir_name> image_dir;
- typedef Name<struct output_manager_name> output_manager;
- typedef Name<struct package_id_name> package_id;
- typedef Name<struct split_name> split;
- typedef Name<struct strip_name> strip;
+ typedef Name<struct name_debug_dir> debug_dir;
+ typedef Name<struct name_image_dir> image_dir;
+ typedef Name<struct name_output_manager> output_manager;
+ typedef Name<struct name_package_id> package_id;
+ typedef Name<struct name_split> split;
+ typedef Name<struct name_strip> strip;
}
namespace erepository
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 65dfb9f80..ae977fb98 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -37,176 +37,176 @@ namespace paludis
{
namespace n
{
- typedef Name<struct annotations_name> annotations;
- typedef Name<struct binary_from_env_variables_name> binary_from_env_variables;
- typedef Name<struct blocker_resolution_name> blocker_resolution;
- typedef Name<struct blocker_resolution_manual_name> blocker_resolution_manual;
- typedef Name<struct blocker_resolution_uninstall_blocked_after_name> blocker_resolution_uninstall_blocked_after;
- typedef Name<struct blocker_resolution_uninstall_blocked_before_name> blocker_resolution_uninstall_blocked_before;
- typedef Name<struct blocker_resolution_upgrade_blocked_before_name> blocker_resolution_upgrade_blocked_before;
- typedef Name<struct bracket_merged_variables_name> bracket_merged_variables;
- typedef Name<struct bracket_merged_variables_annotatable_name> bracket_merged_variables_annotatable;
- typedef Name<struct bracket_merged_variables_annotation_name> bracket_merged_variables_annotation;
- typedef Name<struct breaks_portage_name> breaks_portage;
- typedef Name<struct bugs_to_name> bugs_to;
- typedef Name<struct build_depend_name> build_depend;
- typedef Name<struct can_be_pbin_name> can_be_pbin;
- typedef Name<struct choices_options_name> choices_options;
- typedef Name<struct defined_phases_name> defined_phases;
- typedef Name<struct dependencies_name> dependencies;
- typedef Name<struct dependency_labels_name> dependency_labels;
- typedef Name<struct dependency_spec_tree_parse_options_name> dependency_spec_tree_parse_options;
- typedef Name<struct description_name> description;
- typedef Name<struct description_choices_name> description_choices;
- typedef Name<struct description_use_name> description_use;
- typedef Name<struct directory_if_exists_variables_name> directory_if_exists_variables;
- typedef Name<struct directory_variables_name> directory_variables;
- typedef Name<struct dodoc_r_name> dodoc_r;
- typedef Name<struct doins_symlink_name> doins_symlink;
- typedef Name<struct doman_lang_filenames_name> doman_lang_filenames;
- typedef Name<struct doman_lang_filenames_overrides_name> doman_lang_filenames_overrides;
- typedef Name<struct dosym_mkdir_name> dosym_mkdir;
- typedef Name<struct eapi_name> eapi;
- typedef Name<struct ebuild_bad_options_name> ebuild_bad_options;
- typedef Name<struct ebuild_config_name> ebuild_config;
- typedef Name<struct ebuild_environment_variables_name> ebuild_environment_variables;
- typedef Name<struct ebuild_fetch_extra_name> ebuild_fetch_extra;
- typedef Name<struct ebuild_functions_name> ebuild_functions;
- typedef Name<struct ebuild_info_name> ebuild_info;
- typedef Name<struct ebuild_install_name> ebuild_install;
- typedef Name<struct ebuild_metadata_name> ebuild_metadata;
- typedef Name<struct ebuild_metadata_variables_name> ebuild_metadata_variables;
- typedef Name<struct ebuild_module_suffixes_name> ebuild_module_suffixes;
- typedef Name<struct ebuild_must_not_set_variables_name> ebuild_must_not_set_variables;
- typedef Name<struct ebuild_nofetch_name> ebuild_nofetch;
- typedef Name<struct ebuild_options_name> ebuild_options;
- typedef Name<struct ebuild_phases_name> ebuild_phases;
- typedef Name<struct ebuild_pretend_name> ebuild_pretend;
- typedef Name<struct ebuild_uninstall_name> ebuild_uninstall;
- typedef Name<struct ebuild_variable_name> ebuild_variable;
- typedef Name<struct ebuild_new_upgrade_phase_order_name> ebuild_new_upgrade_phase_order;
- typedef Name<struct econf_extra_options_name> econf_extra_options;
- typedef Name<struct eclass_must_not_set_variables_name> eclass_must_not_set_variables;
- typedef Name<struct env_a_name> env_a;
- typedef Name<struct env_aa_name> env_aa;
- typedef Name<struct env_accept_keywords_name> env_accept_keywords;
- typedef Name<struct env_accept_license_name> env_accept_license;
- typedef Name<struct env_arch_name> env_arch;
- typedef Name<struct env_d_name> env_d;
- typedef Name<struct env_distdir_name> env_distdir;
- typedef Name<struct env_ebuild_phase_name> env_ebuild_phase;
- typedef Name<struct env_ed_name> env_ed;
- typedef Name<struct env_eprefix_name> env_eprefix;
- typedef Name<struct env_eroot_name> env_eroot;
- typedef Name<struct env_filesdir_name> env_filesdir;
- typedef Name<struct env_iuse_implicit_name> env_iuse_implicit;
- typedef Name<struct env_jobs_name> env_jobs;
- typedef Name<struct env_kv_name> env_kv;
- typedef Name<struct env_merge_type_name> env_merge_type;
- typedef Name<struct env_p_name> env_p;
- typedef Name<struct env_pf_name> env_pf;
- typedef Name<struct env_portdir_name> env_portdir;
- typedef Name<struct env_replaced_by_id_name> env_replaced_by_id;
- typedef Name<struct env_replaced_by_version_name> env_replaced_by_version;
- typedef Name<struct env_replacing_ids_name> env_replacing_ids;
- typedef Name<struct env_replacing_versions_name> env_replacing_versions;
- typedef Name<struct env_t_name> env_t;
- typedef Name<struct env_use_name> env_use;
- typedef Name<struct env_use_expand_name> env_use_expand;
- typedef Name<struct env_use_expand_hidden_name> env_use_expand_hidden;
- typedef Name<struct env_use_expand_implicit_name> env_use_expand_implicit;
- typedef Name<struct env_use_expand_unprefixed_name> env_use_expand_unprefixed;
- typedef Name<struct env_use_expand_values_part_name> env_use_expand_values_part;
- typedef Name<struct exported_name_name> exported_name;
- typedef Name<struct f_function_prefix_name> f_function_prefix;
- typedef Name<struct failure_is_fatal_name> failure_is_fatal;
- typedef Name<struct fancy_test_flag_name> fancy_test_flag;
- typedef Name<struct fix_mtimes_name> fix_mtimes;
- typedef Name<struct flat_list_index_name> flat_list_index;
- typedef Name<struct general_description_name> general_description;
- typedef Name<struct general_lang_name> general_lang;
- typedef Name<struct general_note_name> general_note;
- typedef Name<struct general_url_name> general_url;
- typedef Name<struct generated_from_name> generated_from;
- typedef Name<struct generated_time_name> generated_time;
- typedef Name<struct generated_using_name> generated_using;
- typedef Name<struct has_expensive_tests_name> has_expensive_tests;
- typedef Name<struct has_optional_tests_name> has_optional_tests;
- typedef Name<struct has_recommended_tests_name> has_recommended_tests;
- typedef Name<struct homepage_name> homepage;
- typedef Name<struct ignore_pivot_env_functions_name> ignore_pivot_env_functions;
- typedef Name<struct ignore_pivot_env_variables_name> ignore_pivot_env_variables;
- typedef Name<struct inherited_name> inherited;
- typedef Name<struct is_pbin_name> is_pbin;
- typedef Name<struct iuse_name> iuse;
- typedef Name<struct iuse_effective_name> iuse_effective;
- typedef Name<struct iuse_flag_parse_options_name> iuse_flag_parse_options;
- typedef Name<struct keywords_name> keywords;
- typedef Name<struct license_name> license;
- typedef Name<struct load_modules_name> load_modules;
- typedef Name<struct long_description_name> long_description;
- typedef Name<struct merger_options_name> merger_options;
- typedef Name<struct metadata_key_name> metadata_key;
- typedef Name<struct minimum_flat_list_size_name> minimum_flat_list_size;
- typedef Name<struct myoptions_name> myoptions;
- typedef Name<struct myoptions_number_selected_name> myoptions_number_selected;
- typedef Name<struct myoptions_number_selected_at_least_one_name> myoptions_number_selected_at_least_one;
- typedef Name<struct myoptions_number_selected_at_most_one_name> myoptions_number_selected_at_most_one;
- typedef Name<struct myoptions_number_selected_exactly_one_name> myoptions_number_selected_exactly_one;
- typedef Name<struct myoptions_requires_name> myoptions_requires;
- typedef Name<struct must_not_change_after_source_variables_name> must_not_change_after_source_variables;
- typedef Name<struct must_not_change_variables_name> must_not_change_variables;
- typedef Name<struct must_not_set_vars_starting_with_name> must_not_set_vars_starting_with;
+ typedef Name<struct name_annotations> annotations;
+ typedef Name<struct name_binary_from_env_variables> binary_from_env_variables;
+ typedef Name<struct name_blocker_resolution> blocker_resolution;
+ typedef Name<struct name_blocker_resolution_manual> blocker_resolution_manual;
+ typedef Name<struct name_blocker_resolution_uninstall_blocked_after> blocker_resolution_uninstall_blocked_after;
+ typedef Name<struct name_blocker_resolution_uninstall_blocked_before> blocker_resolution_uninstall_blocked_before;
+ typedef Name<struct name_blocker_resolution_upgrade_blocked_before> blocker_resolution_upgrade_blocked_before;
+ typedef Name<struct name_bracket_merged_variables> bracket_merged_variables;
+ typedef Name<struct name_bracket_merged_variables_annotatable> bracket_merged_variables_annotatable;
+ typedef Name<struct name_bracket_merged_variables_annotation> bracket_merged_variables_annotation;
+ typedef Name<struct name_breaks_portage> breaks_portage;
+ typedef Name<struct name_bugs_to> bugs_to;
+ typedef Name<struct name_build_depend> build_depend;
+ typedef Name<struct name_can_be_pbin> can_be_pbin;
+ typedef Name<struct name_choices_options> choices_options;
+ typedef Name<struct name_defined_phases> defined_phases;
+ typedef Name<struct name_dependencies> dependencies;
+ typedef Name<struct name_dependency_labels> dependency_labels;
+ typedef Name<struct name_dependency_spec_tree_parse_options> dependency_spec_tree_parse_options;
+ typedef Name<struct name_description> description;
+ typedef Name<struct name_description_choices> description_choices;
+ typedef Name<struct name_description_use> description_use;
+ typedef Name<struct name_directory_if_exists_variables> directory_if_exists_variables;
+ typedef Name<struct name_directory_variables> directory_variables;
+ typedef Name<struct name_dodoc_r> dodoc_r;
+ typedef Name<struct name_doins_symlink> doins_symlink;
+ typedef Name<struct name_doman_lang_filenames> doman_lang_filenames;
+ typedef Name<struct name_doman_lang_filenames_overrides> doman_lang_filenames_overrides;
+ typedef Name<struct name_dosym_mkdir> dosym_mkdir;
+ typedef Name<struct name_eapi> eapi;
+ typedef Name<struct name_ebuild_bad_options> ebuild_bad_options;
+ typedef Name<struct name_ebuild_config> ebuild_config;
+ typedef Name<struct name_ebuild_environment_variables> ebuild_environment_variables;
+ typedef Name<struct name_ebuild_fetch_extra> ebuild_fetch_extra;
+ typedef Name<struct name_ebuild_functions> ebuild_functions;
+ typedef Name<struct name_ebuild_info> ebuild_info;
+ typedef Name<struct name_ebuild_install> ebuild_install;
+ typedef Name<struct name_ebuild_metadata> ebuild_metadata;
+ typedef Name<struct name_ebuild_metadata_variables> ebuild_metadata_variables;
+ typedef Name<struct name_ebuild_module_suffixes> ebuild_module_suffixes;
+ typedef Name<struct name_ebuild_must_not_set_variables> ebuild_must_not_set_variables;
+ typedef Name<struct name_ebuild_nofetch> ebuild_nofetch;
+ typedef Name<struct name_ebuild_options> ebuild_options;
+ typedef Name<struct name_ebuild_phases> ebuild_phases;
+ typedef Name<struct name_ebuild_pretend> ebuild_pretend;
+ typedef Name<struct name_ebuild_uninstall> ebuild_uninstall;
+ typedef Name<struct name_ebuild_variable> ebuild_variable;
+ typedef Name<struct name_ebuild_new_upgrade_phase_order> ebuild_new_upgrade_phase_order;
+ typedef Name<struct name_econf_extra_options> econf_extra_options;
+ typedef Name<struct name_eclass_must_not_set_variables> eclass_must_not_set_variables;
+ typedef Name<struct name_env_a> env_a;
+ typedef Name<struct name_env_aa> env_aa;
+ typedef Name<struct name_env_accept_keywords> env_accept_keywords;
+ typedef Name<struct name_env_accept_license> env_accept_license;
+ typedef Name<struct name_env_arch> env_arch;
+ typedef Name<struct name_env_d> env_d;
+ typedef Name<struct name_env_distdir> env_distdir;
+ typedef Name<struct name_env_ebuild_phase> env_ebuild_phase;
+ typedef Name<struct name_env_ed> env_ed;
+ typedef Name<struct name_env_eprefix> env_eprefix;
+ typedef Name<struct name_env_eroot> env_eroot;
+ typedef Name<struct name_env_filesdir> env_filesdir;
+ typedef Name<struct name_env_iuse_implicit> env_iuse_implicit;
+ typedef Name<struct name_env_jobs> env_jobs;
+ typedef Name<struct name_env_kv> env_kv;
+ typedef Name<struct name_env_merge_type> env_merge_type;
+ typedef Name<struct name_env_p> env_p;
+ typedef Name<struct name_env_pf> env_pf;
+ typedef Name<struct name_env_portdir> env_portdir;
+ typedef Name<struct name_env_replaced_by_id> env_replaced_by_id;
+ typedef Name<struct name_env_replaced_by_version> env_replaced_by_version;
+ typedef Name<struct name_env_replacing_ids> env_replacing_ids;
+ typedef Name<struct name_env_replacing_versions> env_replacing_versions;
+ typedef Name<struct name_env_t> env_t;
+ typedef Name<struct name_env_use> env_use;
+ typedef Name<struct name_env_use_expand> env_use_expand;
+ typedef Name<struct name_env_use_expand_hidden> env_use_expand_hidden;
+ typedef Name<struct name_env_use_expand_implicit> env_use_expand_implicit;
+ typedef Name<struct name_env_use_expand_unprefixed> env_use_expand_unprefixed;
+ typedef Name<struct name_env_use_expand_values_part> env_use_expand_values_part;
+ typedef Name<struct name_exported_name> exported_name;
+ typedef Name<struct name_f_function_prefix> f_function_prefix;
+ typedef Name<struct name_failure_is_fatal> failure_is_fatal;
+ typedef Name<struct name_fancy_test_flag> fancy_test_flag;
+ typedef Name<struct name_fix_mtimes> fix_mtimes;
+ typedef Name<struct name_flat_list_index> flat_list_index;
+ typedef Name<struct name_general_description> general_description;
+ typedef Name<struct name_general_lang> general_lang;
+ typedef Name<struct name_general_note> general_note;
+ typedef Name<struct name_general_url> general_url;
+ typedef Name<struct name_generated_from> generated_from;
+ typedef Name<struct name_generated_time> generated_time;
+ typedef Name<struct name_generated_using> generated_using;
+ typedef Name<struct name_has_expensive_tests> has_expensive_tests;
+ typedef Name<struct name_has_optional_tests> has_optional_tests;
+ typedef Name<struct name_has_recommended_tests> has_recommended_tests;
+ typedef Name<struct name_homepage> homepage;
+ typedef Name<struct name_ignore_pivot_env_functions> ignore_pivot_env_functions;
+ typedef Name<struct name_ignore_pivot_env_variables> ignore_pivot_env_variables;
+ typedef Name<struct name_inherited> inherited;
+ typedef Name<struct name_is_pbin> is_pbin;
+ typedef Name<struct name_iuse> iuse;
+ typedef Name<struct name_iuse_effective> iuse_effective;
+ typedef Name<struct name_iuse_flag_parse_options> iuse_flag_parse_options;
+ typedef Name<struct name_keywords> keywords;
+ typedef Name<struct name_license> license;
+ typedef Name<struct name_load_modules> load_modules;
+ typedef Name<struct name_long_description> long_description;
+ typedef Name<struct name_merger_options> merger_options;
+ typedef Name<struct name_metadata_key> metadata_key;
+ typedef Name<struct name_minimum_flat_list_size> minimum_flat_list_size;
+ typedef Name<struct name_myoptions> myoptions;
+ typedef Name<struct name_myoptions_number_selected> myoptions_number_selected;
+ typedef Name<struct name_myoptions_number_selected_at_least_one> myoptions_number_selected_at_least_one;
+ typedef Name<struct name_myoptions_number_selected_at_most_one> myoptions_number_selected_at_most_one;
+ typedef Name<struct name_myoptions_number_selected_exactly_one> myoptions_number_selected_exactly_one;
+ typedef Name<struct name_myoptions_requires> myoptions_requires;
+ typedef Name<struct name_must_not_change_after_source_variables> must_not_change_after_source_variables;
+ typedef Name<struct name_must_not_change_variables> must_not_change_variables;
+ typedef Name<struct name_must_not_set_vars_starting_with> must_not_set_vars_starting_with;
typedef Name<struct name_name> name;
- typedef Name<struct no_s_workdir_fallback_name> no_s_workdir_fallback;
- typedef Name<struct no_slot_or_repo_name> no_slot_or_repo;
- typedef Name<struct non_empty_variables_name> non_empty_variables;
- typedef Name<struct package_dep_spec_parse_options_name> package_dep_spec_parse_options;
- typedef Name<struct pdepend_name> pdepend;
- typedef Name<struct pipe_commands_name> pipe_commands;
- typedef Name<struct profile_iuse_injection_name> profile_iuse_injection;
- typedef Name<struct properties_name> properties;
- typedef Name<struct provide_name> provide;
- typedef Name<struct rdepend_defaults_to_depend_name> rdepend_defaults_to_depend;
- typedef Name<struct remote_ids_name> remote_ids;
- typedef Name<struct require_use_expand_in_iuse_name> require_use_expand_in_iuse;
- typedef Name<struct required_use_name> required_use;
- typedef Name<struct restrict_fetch_name> restrict_fetch;
- typedef Name<struct restrict_mirror_name> restrict_mirror;
- typedef Name<struct restrict_primaryuri_name> restrict_primaryuri;
- typedef Name<struct restrictions_name> restrictions;
- typedef Name<struct rewrite_virtuals_name> rewrite_virtuals;
- typedef Name<struct run_depend_name> run_depend;
- typedef Name<struct save_base_variables_name> save_base_variables;
- typedef Name<struct save_unmodifiable_variables_name> save_unmodifiable_variables;
- typedef Name<struct save_variables_name> save_variables;
- typedef Name<struct shell_options_name> shell_options;
- typedef Name<struct short_description_name> short_description;
- typedef Name<struct slot_name> slot;
- typedef Name<struct source_merged_variables_name> source_merged_variables;
- typedef Name<struct src_uri_name> src_uri;
- typedef Name<struct suggestions_group_name_name> suggestions_group_name;
- typedef Name<struct support_eclasses_name> support_eclasses;
- typedef Name<struct support_exlibs_name> support_exlibs;
- typedef Name<struct supported_name> supported;
- typedef Name<struct tools_options_name> tools_options;
- typedef Name<struct unpack_fix_permissions_name> unpack_fix_permissions;
- typedef Name<struct unpack_suffixes_name> unpack_suffixes;
- typedef Name<struct unpack_unrecognised_is_fatal_name> unpack_unrecognised_is_fatal;
- typedef Name<struct upstream_changelog_name> upstream_changelog;
- typedef Name<struct upstream_documentation_name> upstream_documentation;
- typedef Name<struct upstream_release_notes_name> upstream_release_notes;
- typedef Name<struct uri_labels_name> uri_labels;
- typedef Name<struct use_name> use;
- typedef Name<struct use_expand_name> use_expand;
- typedef Name<struct use_expand_hidden_name> use_expand_hidden;
- typedef Name<struct use_expand_separator_name> use_expand_separator;
- typedef Name<struct userpriv_cannot_use_root_name> userpriv_cannot_use_root;
- typedef Name<struct utility_path_suffixes_name> utility_path_suffixes;
- typedef Name<struct vdb_from_env_unless_empty_variables_name> vdb_from_env_unless_empty_variables;
- typedef Name<struct vdb_from_env_variables_name> vdb_from_env_variables;
- typedef Name<struct version_spec_options_name> version_spec_options;
- typedef Name<struct want_portage_emulation_vars_name> want_portage_emulation_vars;
+ typedef Name<struct name_no_s_workdir_fallback> no_s_workdir_fallback;
+ typedef Name<struct name_no_slot_or_repo> no_slot_or_repo;
+ typedef Name<struct name_non_empty_variables> non_empty_variables;
+ typedef Name<struct name_package_dep_spec_parse_options> package_dep_spec_parse_options;
+ typedef Name<struct name_pdepend> pdepend;
+ typedef Name<struct name_pipe_commands> pipe_commands;
+ typedef Name<struct name_profile_iuse_injection> profile_iuse_injection;
+ typedef Name<struct name_properties> properties;
+ typedef Name<struct name_provide> provide;
+ typedef Name<struct name_rdepend_defaults_to_depend> rdepend_defaults_to_depend;
+ typedef Name<struct name_remote_ids> remote_ids;
+ typedef Name<struct name_require_use_expand_in_iuse> require_use_expand_in_iuse;
+ typedef Name<struct name_required_use> required_use;
+ typedef Name<struct name_restrict_fetch> restrict_fetch;
+ typedef Name<struct name_restrict_mirror> restrict_mirror;
+ typedef Name<struct name_restrict_primaryuri> restrict_primaryuri;
+ typedef Name<struct name_restrictions> restrictions;
+ typedef Name<struct name_rewrite_virtuals> rewrite_virtuals;
+ typedef Name<struct name_run_depend> run_depend;
+ typedef Name<struct name_save_base_variables> save_base_variables;
+ typedef Name<struct name_save_unmodifiable_variables> save_unmodifiable_variables;
+ typedef Name<struct name_save_variables> save_variables;
+ typedef Name<struct name_shell_options> shell_options;
+ typedef Name<struct name_short_description> short_description;
+ typedef Name<struct name_slot> slot;
+ typedef Name<struct name_source_merged_variables> source_merged_variables;
+ typedef Name<struct name_src_uri> src_uri;
+ typedef Name<struct name_suggestions_group_name> suggestions_group_name;
+ typedef Name<struct name_support_eclasses> support_eclasses;
+ typedef Name<struct name_support_exlibs> support_exlibs;
+ typedef Name<struct name_supported> supported;
+ typedef Name<struct name_tools_options> tools_options;
+ typedef Name<struct name_unpack_fix_permissions> unpack_fix_permissions;
+ typedef Name<struct name_unpack_suffixes> unpack_suffixes;
+ typedef Name<struct name_unpack_unrecognised_is_fatal> unpack_unrecognised_is_fatal;
+ typedef Name<struct name_upstream_changelog> upstream_changelog;
+ typedef Name<struct name_upstream_documentation> upstream_documentation;
+ typedef Name<struct name_upstream_release_notes> upstream_release_notes;
+ typedef Name<struct name_uri_labels> uri_labels;
+ typedef Name<struct name_use> use;
+ typedef Name<struct name_use_expand> use_expand;
+ typedef Name<struct name_use_expand_hidden> use_expand_hidden;
+ typedef Name<struct name_use_expand_separator> use_expand_separator;
+ typedef Name<struct name_userpriv_cannot_use_root> userpriv_cannot_use_root;
+ typedef Name<struct name_utility_path_suffixes> utility_path_suffixes;
+ typedef Name<struct name_vdb_from_env_unless_empty_variables> vdb_from_env_unless_empty_variables;
+ typedef Name<struct name_vdb_from_env_variables> vdb_from_env_variables;
+ typedef Name<struct name_version_spec_options> version_spec_options;
+ typedef Name<struct name_want_portage_emulation_vars> want_portage_emulation_vars;
}
namespace erepository
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 9aa6a1604..538399bee 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -41,56 +41,56 @@ namespace paludis
namespace n
{
- typedef Name<struct a_name> a;
- typedef Name<struct aa_name> aa;
- typedef Name<struct accept_license_name> accept_license;
- typedef Name<struct binary_dist_base_name> binary_dist_base;
- typedef Name<struct binary_distdir_name> binary_distdir;
- typedef Name<struct binary_ebuild_location_name> binary_ebuild_location;
- typedef Name<struct binary_keywords_name> binary_keywords;
- typedef Name<struct binary_uri_extension_name> binary_uri_extension;
- typedef Name<struct builddir_name> builddir;
- typedef Name<struct clearenv_name> clearenv;
- typedef Name<struct commands_name> commands;
- typedef Name<struct config_protect_name> config_protect;
- typedef Name<struct config_protect_mask_name> config_protect_mask;
- typedef Name<struct destination_name> destination;
- typedef Name<struct destination_repository_name> destination_repository;
- typedef Name<struct distdir_name> distdir;
- typedef Name<struct ebuild_dir_name> ebuild_dir;
- typedef Name<struct ebuild_file_name> ebuild_file;
- typedef Name<struct eclassdirs_name> eclassdirs;
- typedef Name<struct environment_name> environment;
- typedef Name<struct environment_file_name> environment_file;
- typedef Name<struct exlibsdirs_name> exlibsdirs;
- typedef Name<struct expand_vars_name> expand_vars;
- typedef Name<struct files_dir_name> files_dir;
- typedef Name<struct image_name> image;
- typedef Name<struct info_vars_name> info_vars;
- typedef Name<struct is_from_pbin_name> is_from_pbin;
- typedef Name<struct load_environment_name> load_environment;
- typedef Name<struct loadsaveenv_dir_name> loadsaveenv_dir;
- typedef Name<struct maybe_output_manager_name> maybe_output_manager;
- typedef Name<struct merger_options_name> merger_options;
- typedef Name<struct output_directory_name> output_directory;
- typedef Name<struct package_builddir_name> package_builddir;
- typedef Name<struct package_id_name> package_id;
- typedef Name<struct portdir_name> portdir;
- typedef Name<struct profiles_name> profiles;
- typedef Name<struct profiles_with_parents_name> profiles_with_parents;
- typedef Name<struct replaced_by_name> replaced_by;
- typedef Name<struct replacing_ids_name> replacing_ids;
- typedef Name<struct root_name> root;
- typedef Name<struct sandbox_name> sandbox;
- typedef Name<struct sydbox_name> sydbox;
- typedef Name<struct slot_name> slot;
- typedef Name<struct unmerge_only_name> unmerge_only;
- typedef Name<struct unmet_requirements_name> unmet_requirements;
- typedef Name<struct use_name> use;
- typedef Name<struct use_ebuild_file_name> use_ebuild_file;
- typedef Name<struct use_expand_name> use_expand;
- typedef Name<struct use_expand_hidden_name> use_expand_hidden;
- typedef Name<struct userpriv_name> userpriv;
+ typedef Name<struct name_a> a;
+ typedef Name<struct name_aa> aa;
+ typedef Name<struct name_accept_license> accept_license;
+ typedef Name<struct name_binary_dist_base> binary_dist_base;
+ typedef Name<struct name_binary_distdir> binary_distdir;
+ typedef Name<struct name_binary_ebuild_location> binary_ebuild_location;
+ typedef Name<struct name_binary_keywords> binary_keywords;
+ typedef Name<struct name_binary_uri_extension> binary_uri_extension;
+ typedef Name<struct name_builddir> builddir;
+ typedef Name<struct name_clearenv> clearenv;
+ typedef Name<struct name_commands> commands;
+ typedef Name<struct name_config_protect> config_protect;
+ typedef Name<struct name_config_protect_mask> config_protect_mask;
+ typedef Name<struct name_destination> destination;
+ typedef Name<struct name_destination_repository> destination_repository;
+ typedef Name<struct name_distdir> distdir;
+ typedef Name<struct name_ebuild_dir> ebuild_dir;
+ typedef Name<struct name_ebuild_file> ebuild_file;
+ typedef Name<struct name_eclassdirs> eclassdirs;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_environment_file> environment_file;
+ typedef Name<struct name_exlibsdirs> exlibsdirs;
+ typedef Name<struct name_expand_vars> expand_vars;
+ typedef Name<struct name_files_dir> files_dir;
+ typedef Name<struct name_image> image;
+ typedef Name<struct name_info_vars> info_vars;
+ typedef Name<struct name_is_from_pbin> is_from_pbin;
+ typedef Name<struct name_load_environment> load_environment;
+ typedef Name<struct name_loadsaveenv_dir> loadsaveenv_dir;
+ typedef Name<struct name_maybe_output_manager> maybe_output_manager;
+ typedef Name<struct name_merger_options> merger_options;
+ typedef Name<struct name_output_directory> output_directory;
+ typedef Name<struct name_package_builddir> package_builddir;
+ typedef Name<struct name_package_id> package_id;
+ typedef Name<struct name_portdir> portdir;
+ typedef Name<struct name_profiles> profiles;
+ typedef Name<struct name_profiles_with_parents> profiles_with_parents;
+ typedef Name<struct name_replaced_by> replaced_by;
+ typedef Name<struct name_replacing_ids> replacing_ids;
+ typedef Name<struct name_root> root;
+ typedef Name<struct name_sandbox> sandbox;
+ typedef Name<struct name_sydbox> sydbox;
+ typedef Name<struct name_slot> slot;
+ typedef Name<struct name_unmerge_only> unmerge_only;
+ typedef Name<struct name_unmet_requirements> unmet_requirements;
+ typedef Name<struct name_use> use;
+ typedef Name<struct name_use_ebuild_file> use_ebuild_file;
+ typedef Name<struct name_use_expand> use_expand;
+ typedef Name<struct name_use_expand_hidden> use_expand_hidden;
+ typedef Name<struct name_userpriv> userpriv;
}
namespace erepository
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index 0c6fbb7f9..4467bb69e 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -31,11 +31,11 @@ namespace paludis
{
namespace n
{
- typedef Name<struct builddir_name> builddir;
- typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
- typedef Name<struct environment_name> environment;
- typedef Name<struct location_name> location;
- typedef Name<struct root_name> root;
+ typedef Name<struct name_builddir> builddir;
+ typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_location> location;
+ typedef Name<struct name_root> root;
}
namespace erepository
diff --git a/paludis/repositories/e/extra_distribution_data.hh b/paludis/repositories/e/extra_distribution_data.hh
index 718863574..85aad1f67 100644
--- a/paludis/repositories/e/extra_distribution_data.hh
+++ b/paludis/repositories/e/extra_distribution_data.hh
@@ -31,23 +31,23 @@ namespace paludis
{
namespace n
{
- typedef Name<struct default_buildroot_name> default_buildroot;
- typedef Name<struct default_distdir_name> default_distdir;
- typedef Name<struct default_eapi_when_unknown_name> default_eapi_when_unknown;
- typedef Name<struct default_eapi_when_unspecified_name> default_eapi_when_unspecified;
- typedef Name<struct default_layout_name> default_layout;
- typedef Name<struct default_names_cache_name> default_names_cache;
- typedef Name<struct default_profile_eapi_name> default_profile_eapi;
- typedef Name<struct default_profile_layout_name> default_profile_layout;
- typedef Name<struct default_provides_cache_name> default_provides_cache;
- typedef Name<struct default_write_cache_name> default_write_cache;
- typedef Name<struct news_directory_name> news_directory;
- typedef Name<struct qa_category_dir_checks_name> qa_category_dir_checks;
- typedef Name<struct qa_eclass_file_contents_checks_name> qa_eclass_file_contents_checks;
- typedef Name<struct qa_package_dir_checks_name> qa_package_dir_checks;
- typedef Name<struct qa_package_id_checks_name> qa_package_id_checks;
- typedef Name<struct qa_package_id_file_contents_checks_name> qa_package_id_file_contents_checks;
- typedef Name<struct qa_tree_checks_name> qa_tree_checks;
+ typedef Name<struct name_default_buildroot> default_buildroot;
+ typedef Name<struct name_default_distdir> default_distdir;
+ typedef Name<struct name_default_eapi_when_unknown> default_eapi_when_unknown;
+ typedef Name<struct name_default_eapi_when_unspecified> default_eapi_when_unspecified;
+ typedef Name<struct name_default_layout> default_layout;
+ typedef Name<struct name_default_names_cache> default_names_cache;
+ typedef Name<struct name_default_profile_eapi> default_profile_eapi;
+ typedef Name<struct name_default_profile_layout> default_profile_layout;
+ typedef Name<struct name_default_provides_cache> default_provides_cache;
+ typedef Name<struct name_default_write_cache> default_write_cache;
+ typedef Name<struct name_news_directory> news_directory;
+ typedef Name<struct name_qa_category_dir_checks> qa_category_dir_checks;
+ typedef Name<struct name_qa_eclass_file_contents_checks> qa_eclass_file_contents_checks;
+ typedef Name<struct name_qa_package_dir_checks> qa_package_dir_checks;
+ typedef Name<struct name_qa_package_id_checks> qa_package_id_checks;
+ typedef Name<struct name_qa_package_id_file_contents_checks> qa_package_id_file_contents_checks;
+ typedef Name<struct name_qa_tree_checks> qa_tree_checks;
}
namespace erepository
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 6d4517038..7dac38c1c 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -32,9 +32,9 @@ namespace paludis
{
namespace n
{
- typedef Name<struct op_name> op;
- typedef Name<struct slot_name> slot;
- typedef Name<struct version_name> version;
+ typedef Name<struct name_op> op;
+ typedef Name<struct name_slot> slot;
+ typedef Name<struct name_version> version;
}
namespace erepository
diff --git a/paludis/repositories/e/manifest2_reader.hh b/paludis/repositories/e/manifest2_reader.hh
index f228f147a..2d362a5cb 100644
--- a/paludis/repositories/e/manifest2_reader.hh
+++ b/paludis/repositories/e/manifest2_reader.hh
@@ -35,13 +35,13 @@ namespace paludis
{
namespace n
{
- typedef Name<struct md5_name> md5;
+ typedef Name<struct name_md5> md5;
typedef Name<struct name_name> name;
- typedef Name<struct rmd160_name> rmd160;
- typedef Name<struct sha1_name> sha1;
- typedef Name<struct sha256_name> sha256;
- typedef Name<struct size_name> size;
- typedef Name<struct type_name> type;
+ typedef Name<struct name_rmd160> rmd160;
+ typedef Name<struct name_sha1> sha1;
+ typedef Name<struct name_sha256> sha256;
+ typedef Name<struct name_size> size;
+ typedef Name<struct name_type> type;
}
namespace erepository
diff --git a/paludis/repositories/e/metadata_xml.hh b/paludis/repositories/e/metadata_xml.hh
index 7e0e99a25..3792024ed 100644
--- a/paludis/repositories/e/metadata_xml.hh
+++ b/paludis/repositories/e/metadata_xml.hh
@@ -34,10 +34,10 @@ namespace paludis
{
namespace n
{
- typedef Name<struct herds_name> herds;
- typedef Name<struct long_description_name> long_description;
- typedef Name<struct maintainers_name> maintainers;
- typedef Name<struct uses_name> uses;
+ typedef Name<struct name_herds> herds;
+ typedef Name<struct name_long_description> long_description;
+ typedef Name<struct name_maintainers> maintainers;
+ typedef Name<struct name_uses> uses;
}
namespace erepository
diff --git a/paludis/repositories/e/pbin_merger.hh b/paludis/repositories/e/pbin_merger.hh
index 5b3620a53..ccd3e37a4 100644
--- a/paludis/repositories/e/pbin_merger.hh
+++ b/paludis/repositories/e/pbin_merger.hh
@@ -30,17 +30,17 @@ namespace paludis
{
namespace n
{
- typedef Name<struct environment_name> environment;
- typedef Name<struct environment_file_name> environment_file;
- typedef Name<struct fix_mtimes_before_name> fix_mtimes_before;
- typedef Name<struct image_name> image;
- typedef Name<struct install_under_name> install_under;
- typedef Name<struct merged_entries_name> merged_entries;
- typedef Name<struct options_name> options;
- typedef Name<struct output_manager_name> output_manager;
- typedef Name<struct package_id_name> package_id;
- typedef Name<struct root_name> root;
- typedef Name<struct tar_file_name> tar_file;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_environment_file> environment_file;
+ typedef Name<struct name_fix_mtimes_before> fix_mtimes_before;
+ typedef Name<struct name_image> image;
+ typedef Name<struct name_install_under> install_under;
+ typedef Name<struct name_merged_entries> merged_entries;
+ typedef Name<struct name_options> options;
+ typedef Name<struct name_output_manager> output_manager;
+ typedef Name<struct name_package_id> package_id;
+ typedef Name<struct name_root> root;
+ typedef Name<struct name_tar_file> tar_file;
}
namespace erepository
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index d76a33e57..57ad1fd32 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -31,16 +31,16 @@ namespace paludis
namespace n
{
- typedef Name<struct config_protect_name> config_protect;
- typedef Name<struct config_protect_mask_name> config_protect_mask;
- typedef Name<struct contents_file_name> contents_file;
- typedef Name<struct environment_name> environment;
- typedef Name<struct image_name> image;
- typedef Name<struct merged_entries_name> merged_entries;
- typedef Name<struct options_name> options;
- typedef Name<struct output_manager_name> output_manager;
- typedef Name<struct package_id_name> package_id;
- typedef Name<struct root_name> root;
+ typedef Name<struct name_config_protect> config_protect;
+ typedef Name<struct name_config_protect_mask> config_protect_mask;
+ typedef Name<struct name_contents_file> contents_file;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_image> image;
+ typedef Name<struct name_merged_entries> merged_entries;
+ typedef Name<struct name_options> options;
+ typedef Name<struct name_output_manager> output_manager;
+ typedef Name<struct name_package_id> package_id;
+ typedef Name<struct name_root> root;
}
/**
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 56b02f364..fba4b0839 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -39,14 +39,14 @@ namespace paludis
{
namespace n
{
- typedef Name<struct builddir_name> builddir;
- typedef Name<struct eapi_when_unknown_name> eapi_when_unknown;
- typedef Name<struct environment_name> environment;
- typedef Name<struct location_name> location;
+ typedef Name<struct name_builddir> builddir;
+ typedef Name<struct name_eapi_when_unknown> eapi_when_unknown;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_location> location;
typedef Name<struct name_name> name;
- typedef Name<struct names_cache_name> names_cache;
- typedef Name<struct provides_cache_name> provides_cache;
- typedef Name<struct root_name> root;
+ typedef Name<struct name_names_cache> names_cache;
+ typedef Name<struct name_provides_cache> provides_cache;
+ typedef Name<struct name_root> root;
}
namespace erepository
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index a336b8c02..8fdd83af5 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -31,13 +31,13 @@ namespace paludis
namespace n
{
- typedef Name<struct config_protect_name> config_protect;
- typedef Name<struct config_protect_mask_name> config_protect_mask;
- typedef Name<struct environment_name> environment;
- typedef Name<struct ignore_name> ignore;
- typedef Name<struct output_manager_name> output_manager;
- typedef Name<struct package_id_name> package_id;
- typedef Name<struct root_name> root;
+ typedef Name<struct name_config_protect> config_protect;
+ typedef Name<struct name_config_protect_mask> config_protect_mask;
+ typedef Name<struct name_environment> environment;
+ typedef Name<struct name_ignore> ignore;
+ typedef Name<struct name_output_manager> output_manager;
+ typedef Name<struct name_package_id> package_id;
+ typedef Name<struct name_root> root;
}
/**