diff options
Diffstat (limited to 'src/clients')
| -rw-r--r-- | src/clients/accerso/accerso.cc | 36 | ||||
| -rw-r--r-- | src/clients/adjutrix/adjutrix.cc | 24 | ||||
| -rw-r--r-- | src/clients/adjutrix/display_default_system_resolution.cc | 10 | ||||
| -rw-r--r-- | src/clients/adjutrix/find_dropped_keywords.cc | 10 | ||||
| -rw-r--r-- | src/clients/adjutrix/find_stable_candidates.cc | 14 | ||||
| -rw-r--r-- | src/clients/adjutrix/what_needs_keywording.cc | 10 | ||||
| -rw-r--r-- | src/clients/appareo/appareo.cc | 36 | ||||
| -rw-r--r-- | src/clients/cave/cmd_config.cc | 2 | ||||
| -rw-r--r-- | src/clients/cave/cmd_execute_resolution.cc | 24 | ||||
| -rw-r--r-- | src/clients/cave/cmd_fix_linkage.cc | 4 | ||||
| -rw-r--r-- | src/clients/cave/cmd_perform.cc | 60 | ||||
| -rw-r--r-- | src/clients/cave/match_qpns.cc | 24 | ||||
| -rw-r--r-- | src/clients/cave/resolve_common.cc | 136 | ||||
| -rw-r--r-- | src/clients/instruo/instruo.cc | 22 | ||||
| -rw-r--r-- | src/clients/paludis/do_config.cc | 2 | ||||
| -rw-r--r-- | src/clients/paludis/info.cc | 2 | ||||
| -rw-r--r-- | src/clients/reconcilio/fix_linkage.cc | 4 |
17 files changed, 210 insertions, 210 deletions
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc index 934bd8e..2dacafb 100644 --- a/src/clients/accerso/accerso.cc +++ b/src/clients/accerso/accerso.cc @@ -116,16 +116,16 @@ main(int argc, char *argv[]) std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); keys->insert("distdir", CommandLine::get_instance()->a_download_directory.argument()); NoConfigEnvironment env(make_named_values<no_config_environment::Params>( - value_for<n::accept_unstable>(true), - value_for<n::disable_metadata_cache>(false), - value_for<n::extra_accept_keywords>(""), - value_for<n::extra_params>(keys), - value_for<n::extra_repository_dirs>(extra_repository_dirs), - value_for<n::master_repository_name>(CommandLine::get_instance()->a_master_repository_name.argument()), - value_for<n::profiles_if_not_auto>(""), - value_for<n::repository_dir>(CommandLine::get_instance()->a_repository_directory.argument()), - value_for<n::repository_type>(no_config_environment::ncer_ebuild), - value_for<n::write_cache>(CommandLine::get_instance()->a_write_cache_dir.argument()) + n::accept_unstable() = true, + n::disable_metadata_cache() = false, + n::extra_accept_keywords() = "", + n::extra_params() = keys, + n::extra_repository_dirs() = extra_repository_dirs, + n::master_repository_name() = CommandLine::get_instance()->a_master_repository_name.argument(), + n::profiles_if_not_auto() = "", + n::repository_dir() = CommandLine::get_instance()->a_repository_directory.argument(), + n::repository_type() = no_config_environment::ncer_ebuild, + n::write_cache() = CommandLine::get_instance()->a_write_cache_dir.argument() )); std::tr1::shared_ptr<const PackageIDSequence> ids(env[selection::AllVersionsSorted( @@ -144,14 +144,14 @@ main(int argc, char *argv[]) OutputManagerFromEnvironment output_manager_holder(&env, *i, oe_exclusive, ClientOutputFeatures()); FetchAction a(make_named_values<FetchActionOptions>( - value_for<n::errors>(make_shared_ptr(new Sequence<FetchActionFailure>)), - value_for<n::exclude_unmirrorable>(true), - value_for<n::fetch_parts>(FetchParts() + fp_regulars + fp_unneeded), - value_for<n::ignore_not_in_manifest>(false), - value_for<n::ignore_unfetched>(false), - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)), - value_for<n::safe_resume>(true), - value_for<n::want_phase>(std::tr1::bind(return_literal_function(wp_yes))) + n::errors() = make_shared_ptr(new Sequence<FetchActionFailure>), + n::exclude_unmirrorable() = true, + n::fetch_parts() = FetchParts() + fp_regulars + fp_unneeded, + n::ignore_not_in_manifest() = false, + n::ignore_unfetched() = false, + n::make_output_manager() = std::tr1::ref(output_manager_holder), + n::safe_resume() = true, + n::want_phase() = std::tr1::bind(return_literal_function(wp_yes)) )); try diff --git a/src/clients/adjutrix/adjutrix.cc b/src/clients/adjutrix/adjutrix.cc index 3e127da..a4bdd67 100644 --- a/src/clients/adjutrix/adjutrix.cc +++ b/src/clients/adjutrix/adjutrix.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -137,17 +137,17 @@ main(int argc, char *argv[]) extra_repository_dirs->push_back(*d); NoConfigEnvironment env(make_named_values<no_config_environment::Params>( - value_for<n::accept_unstable>(CommandLine::get_instance()->a_unstable.specified()), - value_for<n::disable_metadata_cache>(false), - value_for<n::extra_accept_keywords>(""), - value_for<n::extra_params>(std::tr1::shared_ptr<Map<std::string, std::string> >()), - value_for<n::extra_repository_dirs>(extra_repository_dirs), - value_for<n::master_repository_name>(CommandLine::get_instance()->a_master_repository_name.argument()), - value_for<n::profiles_if_not_auto>(CommandLine::get_instance()->a_profile.argument()), - value_for<n::repository_dir>(get_location_and_add_filters()), - value_for<n::repository_type>((CommandLine::get_instance()->a_reverse_deps.specified()) ? - no_config_environment::ncer_auto : no_config_environment::ncer_ebuild), - value_for<n::write_cache>(CommandLine::get_instance()->a_write_cache_dir.argument()) + n::accept_unstable() = CommandLine::get_instance()->a_unstable.specified(), + n::disable_metadata_cache() = false, + n::extra_accept_keywords() = "", + n::extra_params() = std::tr1::shared_ptr<Map<std::string, std::string> >(), + n::extra_repository_dirs() = extra_repository_dirs, + n::master_repository_name() = CommandLine::get_instance()->a_master_repository_name.argument(), + n::profiles_if_not_auto() = CommandLine::get_instance()->a_profile.argument(), + n::repository_dir() = get_location_and_add_filters(), + n::repository_type() = (CommandLine::get_instance()->a_reverse_deps.specified()) ? + no_config_environment::ncer_auto : no_config_environment::ncer_ebuild, + n::write_cache() = CommandLine::get_instance()->a_write_cache_dir.argument() )); if (CommandLine::get_instance()->a_find_stable_candidates.specified()) diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc index 02b4008..51d8e29 100644 --- a/src/clients/adjutrix/display_default_system_resolution.cc +++ b/src/clients/adjutrix/display_default_system_resolution.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -102,10 +102,10 @@ int do_display_default_system_resolution(NoConfigEnvironment & env) { std::tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( - value_for<n::environment>(&env), - value_for<n::name>(RepositoryName("fake_destination")), - value_for<n::suitable_destination>(true), - value_for<n::supports_uninstall>(true) + n::environment() = &env, + n::name() = RepositoryName("fake_destination"), + n::suitable_destination() = true, + n::supports_uninstall() = true ))); env.package_database()->add_repository(1, fake_destination); } diff --git a/src/clients/adjutrix/find_dropped_keywords.cc b/src/clients/adjutrix/find_dropped_keywords.cc index 9b679cc..1ecdd4a 100644 --- a/src/clients/adjutrix/find_dropped_keywords.cc +++ b/src/clients/adjutrix/find_dropped_keywords.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -48,8 +48,8 @@ namespace paludis { namespace n { - struct best_anywhere; - struct best_keyworded; + typedef Name<struct best_anywhere_name> best_anywhere; + typedef Name<struct best_keyworded_name> best_keyworded; } } @@ -151,8 +151,8 @@ namespace /* ensure that there's an entry for this SLOT */ versions_in_slots.insert(std::make_pair(slot_as_string(*v), VersionsEntry( make_named_values<VersionsEntry>( - value_for<n::best_anywhere>(VersionSpec("0", VersionSpecOptions())), - value_for<n::best_keyworded>(VersionSpec("0", VersionSpecOptions())) + n::best_anywhere() = VersionSpec("0", VersionSpecOptions()), + n::best_keyworded() = VersionSpec("0", VersionSpecOptions()) )))); if ((*v)->keywords_key()->value()->end() != (*v)->keywords_key()->value()->find(keyword) || diff --git a/src/clients/adjutrix/find_stable_candidates.cc b/src/clients/adjutrix/find_stable_candidates.cc index 9c33ff9..3dd851b 100644 --- a/src/clients/adjutrix/find_stable_candidates.cc +++ b/src/clients/adjutrix/find_stable_candidates.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -48,8 +48,8 @@ namespace paludis { namespace n { - struct best_version; - struct our_version; + typedef Name<struct best_version_name> best_version; + typedef Name<struct our_version_name> our_version; } } @@ -155,8 +155,8 @@ namespace slots_to_versions.erase(slot_as_string(*v)); slots_to_versions.insert(std::make_pair(slot_as_string(*v), make_named_values<SlotsEntry>( - value_for<n::best_version>(VersionSpec("0", VersionSpecOptions())), - value_for<n::our_version>((*v)->version()) + n::best_version() = VersionSpec("0", VersionSpecOptions()), + n::our_version() = (*v)->version() ))); } @@ -166,8 +166,8 @@ namespace /* ensure that an entry exists */ slots_to_versions.insert(std::make_pair(slot_as_string(*v), make_named_values<SlotsEntry>( - value_for<n::best_version>((*v)->version()), - value_for<n::our_version>(VersionSpec("0", VersionSpecOptions())) + n::best_version() = (*v)->version(), + n::our_version() = VersionSpec("0", VersionSpecOptions()) ))); /* update the entry to mark our current version as the best diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc index 53ea085..3492058 100644 --- a/src/clients/adjutrix/what_needs_keywording.cc +++ b/src/clients/adjutrix/what_needs_keywording.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -62,10 +62,10 @@ int do_what_needs_keywording(NoConfigEnvironment & env) { std::tr1::shared_ptr<Repository> fake_destination(new FakeInstalledRepository( make_named_values<FakeInstalledRepositoryParams>( - value_for<n::environment>(&env), - value_for<n::name>(RepositoryName("fake_destination")), - value_for<n::suitable_destination>(true), - value_for<n::supports_uninstall>(true) + n::environment() = &env, + n::name() = RepositoryName("fake_destination"), + n::suitable_destination() = true, + n::supports_uninstall() = true ))); env.package_database()->add_repository(1, fake_destination); } diff --git a/src/clients/appareo/appareo.cc b/src/clients/appareo/appareo.cc index 0383658..1fce254 100644 --- a/src/clients/appareo/appareo.cc +++ b/src/clients/appareo/appareo.cc @@ -106,14 +106,14 @@ namespace if ((*i)->supports_action(SupportsActionTest<FetchAction>())) { FetchAction a(make_named_values<FetchActionOptions>( - value_for<n::errors>(failures), - value_for<n::exclude_unmirrorable>(false), - value_for<n::fetch_parts>(FetchParts() + fp_regulars + fp_extras + fp_unneeded), - value_for<n::ignore_not_in_manifest>(true), - value_for<n::ignore_unfetched>(false), - value_for<n::make_output_manager>(&make_standard_output_manager), - value_for<n::safe_resume>(true), - value_for<n::want_phase>(std::tr1::bind(return_literal_function(wp_yes))) + n::errors() = failures, + n::exclude_unmirrorable() = false, + n::fetch_parts() = FetchParts() + fp_regulars + fp_extras + fp_unneeded, + n::ignore_not_in_manifest() = true, + n::ignore_unfetched() = false, + n::make_output_manager() = &make_standard_output_manager, + n::safe_resume() = true, + n::want_phase() = std::tr1::bind(return_literal_function(wp_yes)) )); (*i)->perform_action(a); ++success; @@ -234,16 +234,16 @@ main(int argc, char *argv[]) keys->insert("distdir", CommandLine::get_instance()->a_download_directory.argument()); NoConfigEnvironment env(make_named_values<no_config_environment::Params>( - value_for<n::accept_unstable>(true), - value_for<n::disable_metadata_cache>(false), - value_for<n::extra_accept_keywords>(""), - value_for<n::extra_params>(keys), - value_for<n::extra_repository_dirs>(extra_repository_dirs), - value_for<n::master_repository_name>(CommandLine::get_instance()->a_master_repository_name.argument()), - value_for<n::profiles_if_not_auto>(""), - value_for<n::repository_dir>(get_location_and_add_filters()), - value_for<n::repository_type>(no_config_environment::ncer_ebuild), - value_for<n::write_cache>(CommandLine::get_instance()->a_write_cache_dir.argument()) + n::accept_unstable() = true, + n::disable_metadata_cache() = false, + n::extra_accept_keywords() = "", + n::extra_params() = keys, + n::extra_repository_dirs() = extra_repository_dirs, + n::master_repository_name() = CommandLine::get_instance()->a_master_repository_name.argument(), + n::profiles_if_not_auto() = "", + n::repository_dir() = get_location_and_add_filters(), + n::repository_type() = no_config_environment::ncer_ebuild, + n::write_cache() = CommandLine::get_instance()->a_write_cache_dir.argument() )); IDMap results(PackageIDComparator(env.package_database().get())); diff --git a/src/clients/cave/cmd_config.cc b/src/clients/cave/cmd_config.cc index 82c9103..d80efec 100644 --- a/src/clients/cave/cmd_config.cc +++ b/src/clients/cave/cmd_config.cc @@ -106,7 +106,7 @@ ConfigCommand::run( OutputManagerFromEnvironment output_manager_holder(env.get(), id, oe_exclusive, ClientOutputFeatures()); ConfigAction action(make_named_values<ConfigActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); id->perform_action(action); diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc index 265b058..26a689f 100644 --- a/src/clients/cave/cmd_execute_resolution.cc +++ b/src/clients/cave/cmd_execute_resolution.cc @@ -823,18 +823,18 @@ namespace PackageDepSpec spec(parse_user_package_dep_spec(aa, env.get(), UserPackageDepSpecOptions())); if (package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - value_for<n::has_additional_requirements>(false), - value_for<n::has_category_name_part>(false), - value_for<n::has_from_repository>(false), - value_for<n::has_in_repository>(false), - value_for<n::has_installable_to_path>(false), - value_for<n::has_installable_to_repository>(false), - value_for<n::has_installed_at_path>(false), - value_for<n::has_package>(true), - value_for<n::has_package_name_part>(false), - value_for<n::has_slot_requirement>(false), - value_for<n::has_tag>(indeterminate), - value_for<n::has_version_requirements>(false) + n::has_additional_requirements() = false, + n::has_category_name_part() = false, + n::has_from_repository() = false, + n::has_in_repository() = false, + n::has_installable_to_path() = false, + n::has_installable_to_repository() = false, + n::has_installed_at_path() = false, + n::has_package() = true, + n::has_package_name_part() = false, + n::has_slot_requirement() = false, + n::has_tag() = indeterminate, + n::has_version_requirements() = false ))) { any = true; diff --git a/src/clients/cave/cmd_fix_linkage.cc b/src/clients/cave/cmd_fix_linkage.cc index dbe54ef..a8cf3bc 100644 --- a/src/clients/cave/cmd_fix_linkage.cc +++ b/src/clients/cave/cmd_fix_linkage.cc @@ -211,8 +211,8 @@ FixLinkageCommand::run( if (cmdline.a_exact.specified()) part_spec.version_requirement(make_named_values<VersionRequirement>( - value_for<n::version_operator>(vo_equal), - value_for<n::version_spec>((*pkg_it)->version()))); + n::version_operator() = vo_equal, + n::version_spec() = (*pkg_it)->version())); targets->push_back(stringify(PackageDepSpec(part_spec))); } diff --git a/src/clients/cave/cmd_perform.cc b/src/clients/cave/cmd_perform.cc index 2af0620..a7b3900 100644 --- a/src/clients/cave/cmd_perform.cc +++ b/src/clients/cave/cmd_perform.cc @@ -382,7 +382,7 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); ConfigActionOptions options(make_named_values<ConfigActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); ConfigAction config_action(options); execute(env, cmdline, id, action, config_action); @@ -395,14 +395,14 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); WantInstallPhase want_phase(cmdline, output_manager_holder); FetchActionOptions options(make_named_values<FetchActionOptions>( - value_for<n::errors>(make_shared_ptr(new Sequence<FetchActionFailure>)), - value_for<n::exclude_unmirrorable>(cmdline.a_exclude_unmirrorable.specified()), - value_for<n::fetch_parts>(parts), - value_for<n::ignore_not_in_manifest>(false), - value_for<n::ignore_unfetched>(cmdline.a_ignore_unfetched.specified()), - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)), - value_for<n::safe_resume>(true), - value_for<n::want_phase>(want_phase) + n::errors() = make_shared_ptr(new Sequence<FetchActionFailure>), + n::exclude_unmirrorable() = cmdline.a_exclude_unmirrorable.specified(), + n::fetch_parts() = parts, + n::ignore_not_in_manifest() = false, + n::ignore_unfetched() = cmdline.a_ignore_unfetched.specified(), + n::make_output_manager() = std::tr1::ref(output_manager_holder), + n::safe_resume() = true, + n::want_phase() = want_phase )); FetchAction fetch_action(options); execute(env, cmdline, id, action, fetch_action); @@ -414,14 +414,14 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); FetchActionOptions options(make_named_values<FetchActionOptions>( - value_for<n::errors>(make_shared_ptr(new Sequence<FetchActionFailure>)), - value_for<n::exclude_unmirrorable>(cmdline.a_exclude_unmirrorable.specified()), - value_for<n::fetch_parts>(parts), - value_for<n::ignore_not_in_manifest>(false), - value_for<n::ignore_unfetched>(cmdline.a_ignore_unfetched.specified()), - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)), - value_for<n::safe_resume>(true), - value_for<n::want_phase>(std::tr1::bind(return_literal_function(wp_yes))) + n::errors() = make_shared_ptr(new Sequence<FetchActionFailure>), + n::exclude_unmirrorable() = cmdline.a_exclude_unmirrorable.specified(), + n::fetch_parts() = parts, + n::ignore_not_in_manifest() = false, + n::ignore_unfetched() = cmdline.a_ignore_unfetched.specified(), + n::make_output_manager() = std::tr1::ref(output_manager_holder), + n::safe_resume() = true, + n::want_phase() = std::tr1::bind(return_literal_function(wp_yes)) )); OurPretendFetchAction pretend_fetch_action(options); execute(env, cmdline, id, action, pretend_fetch_action); @@ -443,7 +443,7 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); InfoActionOptions options(make_named_values<InfoActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); InfoAction info_action(options); execute(env, cmdline, id, action, info_action); @@ -478,14 +478,14 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); WantInstallPhase want_phase(cmdline, output_manager_holder); InstallActionOptions options(make_named_values<InstallActionOptions>( - value_for<n::destination>(destination), - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)), - value_for<n::perform_uninstall>(std::tr1::bind(&perform_uninstall, + n::destination() = destination, + n::make_output_manager() = std::tr1::ref(output_manager_holder), + n::perform_uninstall() = std::tr1::bind(&perform_uninstall, env, std::tr1::cref(cmdline), std::tr1::placeholders::_1, action, std::tr1::placeholders::_2 - )), - value_for<n::replacing>(replacing), - value_for<n::want_phase>(want_phase) + ), + n::replacing() = replacing, + n::want_phase() = want_phase )); InstallAction install_action(options); execute(env, cmdline, id, action, install_action); @@ -497,7 +497,7 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); PretendActionOptions options(make_named_values<PretendActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); PretendAction pretend_action(options); execute(env, cmdline, id, action, pretend_action); @@ -511,11 +511,11 @@ PerformCommand::run( OutputManagerFromIPCOrEnvironment output_manager_holder(env.get(), cmdline, id); UninstallActionOptions options(make_named_values<UninstallActionOptions>( - value_for<n::config_protect>(cmdline.a_config_protect.argument()), - value_for<n::if_for_install_id>(make_null_shared_ptr()), - value_for<n::ignore_for_unmerge>(&ignore_nothing), - value_for<n::is_overwrite>(false), - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::config_protect() = cmdline.a_config_protect.argument(), + n::if_for_install_id() = make_null_shared_ptr(), + n::ignore_for_unmerge() = &ignore_nothing, + n::is_overwrite() = false, + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); UninstallAction uninstall_action(options); execute(env, cmdline, id, action, uninstall_action); diff --git a/src/clients/cave/match_qpns.cc b/src/clients/cave/match_qpns.cc index 83b7f3c..884400c 100644 --- a/src/clients/cave/match_qpns.cc +++ b/src/clients/cave/match_qpns.cc @@ -38,18 +38,18 @@ paludis::cave::match_qpns( * either can be wildcards (we could work for :slot too, * but we're lazy) */ if (! package_dep_spec_has_properties(spec, make_named_values<PackageDepSpecProperties>( - value_for<n::has_additional_requirements>(false), - value_for<n::has_category_name_part>(indeterminate), - value_for<n::has_from_repository>(false), - value_for<n::has_in_repository>(false), - value_for<n::has_installable_to_path>(false), - value_for<n::has_installable_to_repository>(false), - value_for<n::has_installed_at_path>(false), - value_for<n::has_package>(indeterminate), - value_for<n::has_package_name_part>(indeterminate), - value_for<n::has_slot_requirement>(false), - value_for<n::has_tag>(false), - value_for<n::has_version_requirements>(false) + n::has_additional_requirements() = false, + n::has_category_name_part() = indeterminate, + n::has_from_repository() = false, + n::has_in_repository() = false, + n::has_installable_to_path() = false, + n::has_installable_to_repository() = false, + n::has_installed_at_path() = false, + n::has_package() = indeterminate, + n::has_package_name_part() = indeterminate, + n::has_slot_requirement() = false, + n::has_tag() = false, + n::has_version_requirements() = false ))) return false; diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc index 118e3ac..8364e77 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -459,18 +459,18 @@ namespace l != l_end ; ++l) { if (! package_dep_spec_has_properties(*l, make_named_values<PackageDepSpecProperties>( - value_for<n::has_additional_requirements>(false), - value_for<n::has_category_name_part>(false), - value_for<n::has_from_repository>(false), - value_for<n::has_in_repository>(false), - value_for<n::has_installable_to_path>(false), - value_for<n::has_installable_to_repository>(false), - value_for<n::has_installed_at_path>(false), - value_for<n::has_package>(true), - value_for<n::has_package_name_part>(false), - value_for<n::has_slot_requirement>(false), - value_for<n::has_tag>(indeterminate), - value_for<n::has_version_requirements>(false) + n::has_additional_requirements() = false, + n::has_category_name_part() = false, + n::has_from_repository() = false, + n::has_in_repository() = false, + n::has_installable_to_path() = false, + n::has_installable_to_repository() = false, + n::has_installed_at_path() = false, + n::has_package() = true, + n::has_package_name_part() = false, + n::has_slot_requirement() = false, + n::has_tag() = indeterminate, + n::has_version_requirements() = false ))) throw args::DoHelp("'" + stringify(*l) + "' is not a simple cat/pkg"); @@ -599,12 +599,12 @@ namespace && ! use_existing_from_withish(env, resolvent.package(), without)) { result->add(make_shared_ptr(new Constraint(make_named_values<Constraint>( - value_for<n::destination_type>(resolvent.destination_type()), - value_for<n::nothing_is_fine_too>(false), - value_for<n::reason>(make_shared_ptr(new PresetReason("is scm", make_null_shared_ptr()))), - value_for<n::spec>(make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(resolvent.package())), - value_for<n::untaken>(false), - value_for<n::use_existing>(ue_only_if_transient) + n::destination_type() = resolvent.destination_type(), + n::nothing_is_fine_too() = false, + n::reason() = make_shared_ptr(new PresetReason("is scm", make_null_shared_ptr())), + n::spec() = make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(resolvent.package()), + n::untaken() = false, + n::use_existing() = ue_only_if_transient )))); } @@ -1021,18 +1021,18 @@ namespace + stringify(s) + "':"); if (! package_dep_spec_has_properties(s, make_named_values<PackageDepSpecProperties>( - value_for<n::has_additional_requirements>(false), - value_for<n::has_category_name_part>(false), - value_for<n::has_from_repository>(false), - value_for<n::has_in_repository>(false), - value_for<n::has_installable_to_path>(false), - value_for<n::has_installable_to_repository>(false), - value_for<n::has_installed_at_path>(false), - value_for<n::has_package>(true), - value_for<n::has_package_name_part>(false), - value_for<n::has_slot_requirement>(false), - value_for<n::has_tag>(indeterminate), - value_for<n::has_version_requirements>(false) + n::has_additional_requirements() = false, + n::has_category_name_part() = false, + n::has_from_repository() = false, + n::has_in_repository() = false, + n::has_installable_to_path() = false, + n::has_installable_to_repository() = false, + n::has_installed_at_path() = false, + n::has_package() = true, + n::has_package_name_part() = false, + n::has_slot_requirement() = false, + n::has_tag() = indeterminate, + n::has_version_requirements() = false ))) throw args::DoHelp("'" + stringify(s) + "' is not a simple cat/pkg"); return *s.package_ptr() == q; @@ -1173,12 +1173,12 @@ namespace const std::tr1::shared_ptr<DependentReason> reason(new DependentReason(*i)); result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>( - value_for<n::destination_type>(dt_install_to_slash), - value_for<n::nothing_is_fine_too>(true), - value_for<n::reason>(reason), - value_for<n::spec>(BlockDepSpec("!" + stringify(*spec), *spec, false)), - value_for<n::untaken>(false), - value_for<n::use_existing>(ue_if_possible) + n::destination_type() = dt_install_to_slash, + n::nothing_is_fine_too() = true, + n::reason() = reason, + n::spec() = BlockDepSpec("!" + stringify(*spec), *spec, false), + n::untaken() = false, + n::use_existing() = ue_if_possible )))); } @@ -1580,12 +1580,12 @@ paludis::cave::resolve_common( r != r_end ; ++r) { const std::tr1::shared_ptr<Constraint> constraint(new Constraint(make_named_values<Constraint>( - value_for<n::destination_type>(r->destination_type()), - value_for<n::nothing_is_fine_too>(true), - value_for<n::reason>(reason), - value_for<n::spec>(spec), - value_for<n::untaken>(false), - value_for<n::use_existing>(ue_if_possible) + n::destination_type() = r->destination_type(), + n::nothing_is_fine_too() = true, + n::reason() = reason, + n::spec() = spec, + n::untaken() = false, + n::use_existing() = ue_if_possible ))); initial_constraints.insert(std::make_pair(*r, make_initial_constraints_for( env.get(), resolution_options, all_binary_repos_generator, without, *r))).first->second->add( @@ -1599,36 +1599,36 @@ paludis::cave::resolve_common( using std::tr1::placeholders::_4; ResolverFunctions resolver_functions(make_named_values<ResolverFunctions>( - value_for<n::allowed_to_break_fn>(std::tr1::bind(&allowed_to_break_fn, - env.get(), std::tr1::cref(allowed_to_break_specs), _1)), - value_for<n::allowed_to_remove_fn>(std::tr1::bind(&allowed_to_remove_fn, - env.get(), std::tr1::cref(allowed_to_remove_specs), _1)), - value_for<n::confirm_fn>(std::tr1::bind(&confirm_fn, + n::allowed_to_break_fn() = std::tr1::bind(&allowed_to_break_fn, + env.get(), std::tr1::cref(allowed_to_break_specs), _1), + n::allowed_to_remove_fn() = std::tr1::bind(&allowed_to_remove_fn, + env.get(), std::tr1::cref(allowed_to_remove_specs), _1), + n::confirm_fn() = std::tr1::bind(&confirm_fn, env.get(), std::tr1::cref(resolution_options), std::tr1::cref(permit_downgrade), - std::tr1::cref(permit_old_version), _1, _2, _3)), - value_for<n::find_repository_for_fn>(std::tr1::bind(&find_repository_for_fn, - env.get(), std::tr1::cref(resolution_options), _1, _2, _3)), - value_for<n::get_constraints_for_dependent_fn>(std::tr1::bind(&get_constraints_for_dependent_fn, - env.get(), std::tr1::cref(less_restrictive_remove_blockers_specs), _1, _2, _3, _4)), - value_for<n::get_destination_types_for_fn>(std::tr1::bind(&get_destination_types_for_fn, - env.get(), std::tr1::cref(resolution_options), _1, _2, _3)), - value_for<n::get_initial_constraints_for_fn>(std::tr1::bind(&initial_constraints_for_fn, + std::tr1::cref(permit_old_version), _1, _2, _3), + n::find_repository_for_fn() = std::tr1::bind(&find_repository_for_fn, + env.get(), std::tr1::cref(resolution_options), _1, _2, _3), + n::get_constraints_for_dependent_fn() = std::tr1::bind(&get_constraints_for_dependent_fn, + env.get(), std::tr1::cref(less_restrictive_remove_blockers_specs), _1, _2, _3, _4), + n::get_destination_types_for_fn() = std::tr1::bind(&get_destination_types_for_fn, + env.get(), std::tr1::cref(resolution_options), _1, _2, _3), + n::get_initial_constraints_for_fn() = std::tr1::bind(&initial_constraints_for_fn, env.get(), std::tr1::cref(resolution_options), std::tr1::cref(without), - std::tr1::cref(initial_constraints), all_binary_repos_generator, _1)), - value_for<n::get_resolvents_for_fn>(std::tr1::bind(&get_resolvents_for_fn, - env.get(), std::tr1::cref(resolution_options), _1, _2, _3)), - value_for<n::get_use_existing_fn>(std::tr1::bind(&use_existing_fn, - env.get(), std::tr1::cref(resolution_options), std::tr1::cref(without), std::tr1::cref(with), _1, _2, _3)), - value_for<n::interest_in_spec_fn>(std::tr1::bind(&interest_in_spec_fn, + std::tr1::cref(initial_constraints), all_binary_repos_generator, _1), + n::get_resolvents_for_fn() = std::tr1::bind(&get_resolvents_for_fn, + env.get(), std::tr1::cref(resolution_options), _1, _2, _3), + n::get_use_existing_fn() = std::tr1::bind(&use_existing_fn, + env.get(), std::tr1::cref(resolution_options), std::tr1::cref(without), std::tr1::cref(with), _1, _2, _3), + n::interest_in_spec_fn() = std::tr1::bind(&interest_in_spec_fn, env.get(), std::tr1::cref(resolution_options), std::tr1::cref(take), std::tr1::cref(take_from), std::tr1::cref(ignore), std::tr1::cref(ignore_from), std::tr1::cref(no_blockers_from), - std::tr1::cref(no_dependencies_from), _1, _2, _3)), - value_for<n::make_destination_filtered_generator_fn>(std::tr1::bind(&make_destination_filtered_generator, - env.get(), std::tr1::cref(resolution_options), all_binary_repos_generator, _1, _2)), - value_for<n::prefer_or_avoid_fn>(std::tr1::bind(&prefer_or_avoid_fn, - env.get(), std::tr1::cref(resolution_options), std::tr1::cref(favour), std::tr1::cref(avoid), _1)), - value_for<n::remove_if_dependent_fn>(std::tr1::bind(&remove_if_dependent_fn, - env.get(), std::tr1::cref(remove_if_dependent_specs), _1)) + std::tr1::cref(no_dependencies_from), _1, _2, _3), + n::make_destination_filtered_generator_fn() = std::tr1::bind(&make_destination_filtered_generator, + env.get(), std::tr1::cref(resolution_options), all_binary_repos_generator, _1, _2), + n::prefer_or_avoid_fn() = std::tr1::bind(&prefer_or_avoid_fn, + env.get(), std::tr1::cref(resolution_options), std::tr1::cref(favour), std::tr1::cref(avoid), _1), + n::remove_if_dependent_fn() = std::tr1::bind(&remove_if_dependent_fn, + env.get(), std::tr1::cref(remove_if_dependent_specs), _1) )); ScopedSelectionCache selection_cache(env.get()); diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc index 98a098c..fb22edb 100644 --- a/src/clients/instruo/instruo.cc +++ b/src/clients/instruo/instruo.cc @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh + * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -329,16 +329,16 @@ main(int argc, char *argv[]) std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>); keys->insert("append_repository_name_to_write_cache", "false"); NoConfigEnvironment env(make_named_values<no_config_environment::Params>( - value_for<n::accept_unstable>(true), - value_for<n::disable_metadata_cache>(true), - value_for<n::extra_accept_keywords>(""), - value_for<n::extra_params>(keys), - value_for<n::extra_repository_dirs>(extra_repository_dirs), - value_for<n::master_repository_name>(CommandLine::get_instance()->a_master_repository_name.argument()), - value_for<n::profiles_if_not_auto>(""), - value_for<n::repository_dir>(CommandLine::get_instance()->a_repository_directory.argument()), - value_for<n::repository_type>(no_config_environment::ncer_ebuild), - value_for<n::write_cache>(CommandLine::get_instance()->a_output_directory.argument()) + n::accept_unstable() = true, + n::disable_metadata_cache() = true, + n::extra_accept_keywords() = "", + n::extra_params() = keys, + n::extra_repository_dirs() = extra_repository_dirs, + n::master_repository_name() = CommandLine::get_instance()->a_master_repository_name.argument(), + n::profiles_if_not_auto() = "", + n::repository_dir() = CommandLine::get_instance()->a_repository_directory.argument(), + n::repository_type() = no_config_environment::ncer_ebuild, + n::write_cache() = CommandLine::get_instance()->a_output_directory.argument() )); std::tr1::shared_ptr<PackageIDSequence> ids(env[selection::AllVersionsSorted( diff --git a/src/clients/paludis/do_config.cc b/src/clients/paludis/do_config.cc index 963d3c3..2d67d18 100644 --- a/src/clients/paludis/do_config.cc +++ b/src/clients/paludis/do_config.cc @@ -53,7 +53,7 @@ namespace OutputManagerFromEnvironment output_manager_holder(env, p, oe_exclusive, ClientOutputFeatures()); ConfigActionOptions options(make_named_values<ConfigActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); ConfigAction a(options); try diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc index ad44864..1971d7b 100644 --- a/src/clients/paludis/info.cc +++ b/src/clients/paludis/info.cc @@ -247,7 +247,7 @@ int do_one_info( { OutputManagerFromEnvironment output_manager_holder(env.get(), *p, oe_exclusive, ClientOutputFeatures()); InfoActionOptions options(make_named_values<InfoActionOptions>( - value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)) + n::make_output_manager() = std::tr1::ref(output_manager_holder) )); InfoAction a(options); diff --git a/src/clients/reconcilio/fix_linkage.cc b/src/clients/reconcilio/fix_linkage.cc index 226bd30..efa8ed5 100644 --- a/src/clients/reconcilio/fix_linkage.cc +++ b/src/clients/reconcilio/fix_linkage.cc @@ -104,8 +104,8 @@ do_fix_linkage(const std::tr1::shared_ptr<Environment> & env) if (CommandLine::get_instance()->a_exact.specified()) part_spec.version_requirement(make_named_values<VersionRequirement>( - value_for<n::version_operator>(vo_equal), - value_for<n::version_spec>((*pkg_it)->version()))); + n::version_operator() = vo_equal, + n::version_spec() = (*pkg_it)->version())); targets->push_back(stringify(PackageDepSpec(part_spec))); } |