aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/unpackaged
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/unpackaged')
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc18
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc48
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh8
-rw-r--r--paludis/repositories/unpackaged/installed_repository_TEST.cc204
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc44
-rw-r--r--paludis/repositories/unpackaged/unpackaged_key.cc14
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc36
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh22
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository_TEST.cc154
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_stripper.hh14
11 files changed, 286 insertions, 286 deletions
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 2b1f3fb..94862c0 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -877,15 +877,15 @@ InstalledUnpackagedID::uninstall(const bool replace,
NDBAMUnmerger unmerger(
make_named_values<NDBAMUnmergerOptions>(
- value_for<n::config_protect>(getenv_with_default("CONFIG_PROTECT", "")),
- value_for<n::config_protect_mask>(getenv_with_default("CONFIG_PROTECT_MASK", "")),
- value_for<n::contents_file>(ver_dir / "contents"),
- value_for<n::environment>(_imp->env),
- value_for<n::ignore>(&ignore_nothing),
- value_for<n::ndbam>(_imp->ndbam),
- value_for<n::output_manager>(output_manager),
- value_for<n::package_id>(shared_from_this()),
- value_for<n::root>(_imp->root)
+ n::config_protect() = getenv_with_default("CONFIG_PROTECT", ""),
+ n::config_protect_mask() = getenv_with_default("CONFIG_PROTECT_MASK", ""),
+ n::contents_file() = ver_dir / "contents",
+ n::environment() = _imp->env,
+ n::ignore() = &ignore_nothing,
+ n::ndbam() = _imp->ndbam,
+ n::output_manager() = output_manager,
+ n::package_id() = shared_from_this(),
+ n::root() = _imp->root
));
unmerger.unmerge();
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 359521e..05225f7 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -92,12 +92,12 @@ InstalledUnpackagedRepository::InstalledUnpackagedRepository(
const RepositoryName & n, const InstalledUnpackagedRepositoryParams & p) :
PrivateImplementationPattern<InstalledUnpackagedRepository>(new Implementation<InstalledUnpackagedRepository>(p)),
Repository(p.environment(), n, make_named_values<RepositoryCapabilities>(
- value_for<n::destination_interface>(this),
- value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::make_virtuals_interface>(static_cast<RepositoryMakeVirtualsInterface *>(0)),
- value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
- value_for<n::provides_interface>(static_cast<RepositoryProvidesInterface *>(0)),
- value_for<n::virtuals_interface>(static_cast<RepositoryVirtualsInterface *>(0))
+ n::destination_interface() = this,
+ n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
+ n::make_virtuals_interface() = static_cast<RepositoryMakeVirtualsInterface *>(0),
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0),
+ n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
+ n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
_imp(PrivateImplementationPattern<InstalledUnpackagedRepository>::_imp)
{
@@ -349,20 +349,20 @@ InstalledUnpackagedRepository::merge(const MergeParams & m)
NDBAMMerger merger(
make_named_values<NDBAMMergerParams>(
- value_for<n::config_protect>(getenv_with_default("CONFIG_PROTECT", "")),
- value_for<n::config_protect_mask>(getenv_with_default("CONFIG_PROTECT_MASK", "")),
- value_for<n::contents_file>(target_ver_dir / "contents"),
- value_for<n::environment>(_imp->params.environment()),
- value_for<n::fix_mtimes_before>(m.build_start_time()),
- value_for<n::get_new_ids_or_minus_one>(std::tr1::bind(&get_new_ids_or_minus_one,
- _imp->params.environment(), rewrite_ids_over_to_root, _1)),
- value_for<n::image>(m.image_dir()),
- value_for<n::install_under>(install_under),
- value_for<n::merged_entries>(make_shared_ptr(new FSEntrySet)),
- value_for<n::options>(MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs),
- value_for<n::output_manager>(m.output_manager()),
- value_for<n::package_id>(m.package_id()),
- value_for<n::root>(installed_root_key()->value())
+ n::config_protect() = getenv_with_default("CONFIG_PROTECT", ""),
+ n::config_protect_mask() = getenv_with_default("CONFIG_PROTECT_MASK", ""),
+ n::contents_file() = target_ver_dir / "contents",
+ n::environment() = _imp->params.environment(),
+ n::fix_mtimes_before() = m.build_start_time(),
+ n::get_new_ids_or_minus_one() = std::tr1::bind(&get_new_ids_or_minus_one,
+ _imp->params.environment(), rewrite_ids_over_to_root, _1),
+ n::image() = m.image_dir(),
+ n::install_under() = install_under,
+ n::merged_entries() = make_shared_ptr(new FSEntrySet),
+ n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
+ n::output_manager() = m.output_manager(),
+ n::package_id() = m.package_id(),
+ n::root() = installed_root_key()->value()
));
if (! merger.check())
@@ -461,9 +461,9 @@ InstalledUnpackagedRepository::repository_factory_create(
return make_shared_ptr(new InstalledUnpackagedRepository(RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(env),
- value_for<n::location>(location),
- value_for<n::root>(root)
+ n::environment() = env,
+ n::location() = location,
+ n::root() = root
)));
}
@@ -492,7 +492,7 @@ InstalledUnpackagedRepository::populate_sets() const
HookResult
InstalledUnpackagedRepository::perform_hook(const Hook &)
{
- return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
+ return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
bool
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index a5b46cb..292172d 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -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
@@ -29,9 +29,9 @@ namespace paludis
{
namespace n
{
- struct environment;
- struct location;
- struct root;
+ typedef Name<struct environment_name> environment;
+ typedef Name<struct location_name> location;
+ typedef Name<struct root_name> root;
}
namespace unpackaged_repositories
diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc
index 1efb700..3c44058 100644
--- a/paludis/repositories/unpackaged/installed_repository_TEST.cc
+++ b/paludis/repositories/unpackaged/installed_repository_TEST.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
@@ -104,9 +104,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo1")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo1"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root")
)));
env.package_database()->add_repository(1, repo);
@@ -127,9 +127,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo1")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo1"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root")
)));
env.package_database()->add_repository(1, repo);
@@ -181,9 +181,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo1")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo1"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root")
)));
env.package_database()->add_repository(1, repo);
@@ -211,9 +211,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo1")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo1"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root")
)));
env.package_database()->add_repository(1, repo);
@@ -246,9 +246,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo2")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root2"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo2"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root2")
)));
env.package_database()->add_repository(1, repo);
@@ -265,11 +265,11 @@ namespace test_cases
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::All())]->begin());
UninstallAction action(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(""),
- 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>(&make_standard_output_manager)
+ n::config_protect() = "",
+ n::if_for_install_id() = make_null_shared_ptr(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = &make_standard_output_manager
));
id->perform_action(action);
@@ -302,9 +302,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo3")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root3"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo3"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root3")
)));
env.package_database()->add_repository(1, repo);
@@ -320,11 +320,11 @@ namespace test_cases
&env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin());
UninstallAction action(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(""),
- 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>(&make_standard_output_manager)
+ n::config_protect() = "",
+ n::if_for_install_id() = make_null_shared_ptr(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = &make_standard_output_manager
));
id->perform_action(action);
@@ -357,9 +357,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(1, repo);
@@ -376,25 +376,25 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(0, repo);
std::tr1::shared_ptr<Repository> source_repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/src4a")),
- value_for<n::name>(QualifiedPackageName("cat/pkg4a")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("installed_repository_TEST_dir/src4a"),
+ n::name() = QualifiedPackageName("cat/pkg4a"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, source_repo);
@@ -407,11 +407,11 @@ namespace test_cases
TEST_CHECK(! FSEntry("installed_repository_TEST_dir/root4/dir").exists());
InstallAction action(make_named_values<InstallActionOptions>(
- value_for<n::destination>(repo),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = repo,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
(*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -434,25 +434,25 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(0, repo);
std::tr1::shared_ptr<Repository> source_repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/src4b1")),
- value_for<n::name>(QualifiedPackageName("cat/pkg4b")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("installed_repository_TEST_dir/src4b1"),
+ n::name() = QualifiedPackageName("cat/pkg4b"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, source_repo);
@@ -464,11 +464,11 @@ namespace test_cases
}
InstallAction action(make_named_values<InstallActionOptions>(
- value_for<n::destination>(repo),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = repo,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
(*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -494,25 +494,25 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(0, repo);
std::tr1::shared_ptr<Repository> source_repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/src4b2")),
- value_for<n::name>(QualifiedPackageName("cat/pkg4b")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("installed_repository_TEST_dir/src4b2"),
+ n::name() = QualifiedPackageName("cat/pkg4b"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, source_repo);
@@ -524,11 +524,11 @@ namespace test_cases
}
InstallAction action(make_named_values<InstallActionOptions>(
- value_for<n::destination>(repo),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = repo,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
(*env[selection::RequireExactlyOne(generator::InRepository(RepositoryName("unpackaged")))]->begin())->perform_action(action);
@@ -554,9 +554,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(0, repo);
@@ -568,11 +568,11 @@ namespace test_cases
}
UninstallAction action(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(""),
- 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>(&make_standard_output_manager)
+ n::config_protect() = "",
+ n::if_for_install_id() = make_null_shared_ptr(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = &make_standard_output_manager
));
(*env[selection::RequireExactlyOne(generator::Matches(
parse_user_package_dep_spec("cat/pkg4a",
@@ -600,9 +600,9 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("installed_repository_TEST_dir/repo4")),
- value_for<n::root>(FSEntry("installed_repository_TEST_dir/root4"))
+ n::environment() = &env,
+ n::location() = FSEntry("installed_repository_TEST_dir/repo4"),
+ n::root() = FSEntry("installed_repository_TEST_dir/root4")
)));
env.package_database()->add_repository(0, repo);
@@ -614,11 +614,11 @@ namespace test_cases
}
UninstallAction action(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(""),
- 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>(&make_standard_output_manager)
+ n::config_protect() = "",
+ n::if_for_install_id() = make_null_shared_ptr(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = &make_standard_output_manager
));
(*env[selection::RequireExactlyOne(generator::Matches(
parse_user_package_dep_spec("cat/pkg4b",
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index d181132..7a90b4a 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -377,12 +377,12 @@ UnpackagedID::perform_action(Action & action) const
case wp_yes:
{
UnpackagedStripper stripper(make_named_values<UnpackagedStripperOptions>(
- value_for<n::debug_dir>(fs_location_key()->value() / "usr" / libdir / "debug"),
- value_for<n::image_dir>(fs_location_key()->value()),
- value_for<n::output_manager>(output_manager),
- value_for<n::package_id>(shared_from_this()),
- value_for<n::split>(split_choice && split_choice->enabled()),
- value_for<n::strip>(strip_choice && strip_choice->enabled())
+ n::debug_dir() = fs_location_key()->value() / "usr" / libdir / "debug",
+ n::image_dir() = fs_location_key()->value(),
+ n::output_manager() = output_manager,
+ n::package_id() = shared_from_this(),
+ n::split() = split_choice && split_choice->enabled(),
+ n::strip() = strip_choice && strip_choice->enabled()
));
stripper.strip();
@@ -408,17 +408,17 @@ UnpackagedID::perform_action(Action & action) const
extra_merger_options += mo_nondestructive;
(*install_action->options.destination()).destination_interface()->merge(
make_named_values<MergeParams>(
- value_for<n::build_start_time>(build_start_time),
- value_for<n::environment_file>(FSEntry("/dev/null")),
- value_for<n::image_dir>(fs_location_key()->value()),
- value_for<n::merged_entries>(make_shared_ptr(new FSEntrySet)),
- value_for<n::options>((MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs)
- | extra_merger_options),
- value_for<n::output_manager>(output_manager),
- value_for<n::package_id>(shared_from_this()),
- value_for<n::perform_uninstall>(install_action->options.perform_uninstall()),
- value_for<n::used_this_for_config_protect>(std::tr1::bind(
- &used_this_for_config_protect, std::tr1::ref(used_config_protect), std::tr1::placeholders::_1))
+ n::build_start_time() = build_start_time,
+ n::environment_file() = FSEntry("/dev/null"),
+ n::image_dir() = fs_location_key()->value(),
+ n::merged_entries() = make_shared_ptr(new FSEntrySet),
+ n::options() = (MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs)
+ | extra_merger_options,
+ n::output_manager() = output_manager,
+ n::package_id() = shared_from_this(),
+ n::perform_uninstall() = install_action->options.perform_uninstall(),
+ n::used_this_for_config_protect() = std::tr1::bind(
+ &used_this_for_config_protect, std::tr1::ref(used_config_protect), std::tr1::placeholders::_1)
));
}
break;
@@ -441,11 +441,11 @@ UnpackagedID::perform_action(Action & action) const
continue;
UninstallActionOptions uo(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(used_config_protect),
- value_for<n::if_for_install_id>(shared_from_this()),
- value_for<n::ignore_for_unmerge>(&ignore_nothing),
- value_for<n::is_overwrite>(false),
- value_for<n::make_output_manager>(std::tr1::bind(&this_output_manager, output_manager, std::tr1::placeholders::_1))
+ n::config_protect() = used_config_protect,
+ n::if_for_install_id() = shared_from_this(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = std::tr1::bind(&this_output_manager, output_manager, std::tr1::placeholders::_1)
));
install_action->options.perform_uninstall()(*i, uo);
}
diff --git a/paludis/repositories/unpackaged/unpackaged_key.cc b/paludis/repositories/unpackaged/unpackaged_key.cc
index 966168f..563d097 100644
--- a/paludis/repositories/unpackaged/unpackaged_key.cc
+++ b/paludis/repositories/unpackaged/unpackaged_key.cc
@@ -165,13 +165,13 @@ UnpackagedChoicesKey::value() const
{
_imp->value.reset(new Choices);
std::tr1::shared_ptr<Choice> build_options(new Choice(make_named_values<ChoiceParams>(
- value_for<n::consider_added_or_changed>(false),
- value_for<n::contains_every_value>(false),
- value_for<n::hidden>(false),
- value_for<n::human_name>(canonical_build_options_human_name()),
- value_for<n::prefix>(canonical_build_options_prefix()),
- value_for<n::raw_name>(canonical_build_options_raw_name()),
- value_for<n::show_with_no_prefix>(false)
+ n::consider_added_or_changed() = false,
+ n::contains_every_value() = false,
+ n::hidden() = false,
+ n::human_name() = canonical_build_options_human_name(),
+ n::prefix() = canonical_build_options_prefix(),
+ n::raw_name() = canonical_build_options_raw_name(),
+ n::show_with_no_prefix() = false
)));
build_options->add(make_shared_ptr(new ELikeSplitChoiceValue(_imp->id->shared_from_this(), _imp->env, build_options)));
build_options->add(make_shared_ptr(new ELikeStripChoiceValue(_imp->id->shared_from_this(), _imp->env, build_options)));
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index 055a37e..ae2b050 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, 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
@@ -96,12 +96,12 @@ UnpackagedRepository::UnpackagedRepository(const RepositoryName & n,
const UnpackagedRepositoryParams & params) :
PrivateImplementationPattern<UnpackagedRepository>(new Implementation<UnpackagedRepository>(n, params)),
Repository(params.environment(), n, make_named_values<RepositoryCapabilities>(
- value_for<n::destination_interface>(static_cast<RepositoryDestinationInterface *>(0)),
- value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::make_virtuals_interface>(static_cast<RepositoryMakeVirtualsInterface *>(0)),
- value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
- value_for<n::provides_interface>(static_cast<RepositoryProvidesInterface *>(0)),
- value_for<n::virtuals_interface>(static_cast<RepositoryVirtualsInterface *>(0))
+ n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
+ n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
+ n::make_virtuals_interface() = static_cast<RepositoryMakeVirtualsInterface *>(0),
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0),
+ n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
+ n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
_imp(PrivateImplementationPattern<UnpackagedRepository>::_imp)
{
@@ -250,16 +250,16 @@ UnpackagedRepository::repository_factory_create(
return make_shared_ptr(new UnpackagedRepository(RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(build_dependencies),
- value_for<n::description>(description),
- value_for<n::environment>(env),
- value_for<n::install_under>(install_under),
- value_for<n::location>(location),
- value_for<n::name>(QualifiedPackageName(name)),
- value_for<n::rewrite_ids_over_to_root>(rewrite_ids_over_to_root),
- value_for<n::run_dependencies>(run_dependencies),
- value_for<n::slot>(SlotName(slot)),
- value_for<n::version>(VersionSpec(version, user_version_spec_options()))
+ n::build_dependencies() = build_dependencies,
+ n::description() = description,
+ n::environment() = env,
+ n::install_under() = install_under,
+ n::location() = location,
+ n::name() = QualifiedPackageName(name),
+ n::rewrite_ids_over_to_root() = rewrite_ids_over_to_root,
+ n::run_dependencies() = run_dependencies,
+ n::slot() = SlotName(slot),
+ n::version() = VersionSpec(version, user_version_spec_options())
)));
}
@@ -287,7 +287,7 @@ UnpackagedRepository::populate_sets() const
HookResult
UnpackagedRepository::perform_hook(const Hook &)
{
- return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
+ return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
bool
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index 1dd96b6..16bae0f 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, 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
@@ -28,16 +28,16 @@ namespace paludis
{
namespace n
{
- struct build_dependencies;
- struct description;
- struct environment;
- struct install_under;
- struct location;
- struct name;
- struct rewrite_ids_over_to_root;
- struct run_dependencies;
- struct slot;
- struct version;
+ typedef Name<struct build_dependencies_name> build_dependencies;
+ typedef Name<struct description_name> description;
+ typedef Name<struct environment_name> environment;
+ typedef Name<struct install_under_name> install_under;
+ typedef Name<struct location_name> location;
+ typedef Name<struct name_name> name;
+ typedef Name<struct rewrite_ids_over_to_root_name> rewrite_ids_over_to_root;
+ typedef Name<struct run_dependencies_name> run_dependencies;
+ typedef Name<struct slot_name> slot;
+ typedef Name<struct version_name> version;
}
namespace unpackaged_repositories
diff --git a/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc b/paludis/repositories/unpackaged/unpackaged_repository_TEST.cc
index d82d003..1266698 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, 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
@@ -75,16 +75,16 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
@@ -105,16 +105,16 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
@@ -140,16 +140,16 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
@@ -170,16 +170,16 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
@@ -211,25 +211,25 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
std::tr1::shared_ptr<Repository> installed_repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/installed")),
- value_for<n::root>(FSEntry("unpackaged_repository_TEST_dir/root"))
+ n::environment() = &env,
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/installed"),
+ n::root() = FSEntry("unpackaged_repository_TEST_dir/root")
)));
env.package_database()->add_repository(0, installed_repo);
@@ -239,11 +239,11 @@ namespace test_cases
*env[selection::RequireExactlyOne(generator::All())]->begin());
InstallAction action(make_named_values<InstallActionOptions>(
- value_for<n::destination>(installed_repo),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = installed_repo,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
id->perform_action(action);
@@ -267,25 +267,25 @@ namespace test_cases
std::tr1::shared_ptr<Repository> repo(new UnpackagedRepository(
RepositoryName("unpackaged"),
make_named_values<unpackaged_repositories::UnpackagedRepositoryParams>(
- value_for<n::build_dependencies>(""),
- value_for<n::description>(""),
- value_for<n::environment>(&env),
- value_for<n::install_under>(FSEntry("/magic/pixie")),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/under_pkg")),
- value_for<n::name>(QualifiedPackageName("cat/pkg")),
- value_for<n::rewrite_ids_over_to_root>(-1),
- value_for<n::run_dependencies>(""),
- value_for<n::slot>(SlotName("foo")),
- value_for<n::version>(VersionSpec("1.0", VersionSpecOptions()))
+ n::build_dependencies() = "",
+ n::description() = "",
+ n::environment() = &env,
+ n::install_under() = FSEntry("/magic/pixie"),
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/under_pkg"),
+ n::name() = QualifiedPackageName("cat/pkg"),
+ n::rewrite_ids_over_to_root() = -1,
+ n::run_dependencies() = "",
+ n::slot() = SlotName("foo"),
+ n::version() = VersionSpec("1.0", VersionSpecOptions())
)));
env.package_database()->add_repository(1, repo);
std::tr1::shared_ptr<Repository> installed_repo(new InstalledUnpackagedRepository(
RepositoryName("installed-unpackaged"),
make_named_values<unpackaged_repositories::InstalledUnpackagedRepositoryParams>(
- value_for<n::environment>(&env),
- value_for<n::location>(FSEntry("unpackaged_repository_TEST_dir/under_installed")),
- value_for<n::root>(FSEntry("unpackaged_repository_TEST_dir/under_root"))
+ n::environment() = &env,
+ n::location() = FSEntry("unpackaged_repository_TEST_dir/under_installed"),
+ n::root() = FSEntry("unpackaged_repository_TEST_dir/under_root")
)));
env.package_database()->add_repository(0, installed_repo);
@@ -295,11 +295,11 @@ namespace test_cases
*env[selection::RequireExactlyOne(generator::All())]->begin());
InstallAction action(make_named_values<InstallActionOptions>(
- value_for<n::destination>(installed_repo),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = installed_repo,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
id->perform_action(action);
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.cc b/paludis/repositories/unpackaged/unpackaged_stripper.cc
index ccfe4a7..ddd7386 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.cc
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 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
@@ -43,10 +43,10 @@ namespace paludis
UnpackagedStripper::UnpackagedStripper(const UnpackagedStripperOptions & options) :
Stripper(make_named_values<StripperOptions>(
- value_for<n::debug_dir>(options.debug_dir()),
- value_for<n::image_dir>(options.image_dir()),
- value_for<n::split>(options.split()),
- value_for<n::strip>(options.strip())
+ n::debug_dir() = options.debug_dir(),
+ n::image_dir() = options.image_dir(),
+ n::split() = options.split(),
+ n::strip() = options.strip()
)),
PrivateImplementationPattern<UnpackagedStripper>(new Implementation<UnpackagedStripper>(options)),
_imp(PrivateImplementationPattern<UnpackagedStripper>::_imp)
diff --git a/paludis/repositories/unpackaged/unpackaged_stripper.hh b/paludis/repositories/unpackaged/unpackaged_stripper.hh
index 4d289e2..ce06d74 100644
--- a/paludis/repositories/unpackaged/unpackaged_stripper.hh
+++ b/paludis/repositories/unpackaged/unpackaged_stripper.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 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
@@ -29,12 +29,12 @@ namespace paludis
{
namespace n
{
- struct debug_dir;
- struct image_dir;
- struct output_manager;
- struct package_id;
- struct split;
- struct strip;
+ 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;
}
namespace unpackaged_repositories