aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
commit637a8d521b304dec1ec4db201d5d71d509efb6c1 (patch)
treefa4f7f5b0537c7f7361e4d76341b53d121c5d003 /paludis/repositories/e
parentd3b974490cf7482b034f1a6779b65e411616f84c (diff)
downloadpaludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.gz
paludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.xz
Make use of Options init lists
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/dep_spec_pretty_printer.cc4
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc2
-rw-r--r--paludis/repositories/e/e_repository.cc24
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc54
-rw-r--r--paludis/repositories/e/e_repository_TEST_0.cc48
-rw-r--r--paludis/repositories/e/e_repository_TEST_1.cc10
-rw-r--r--paludis/repositories/e/e_repository_TEST_2.cc16
-rw-r--r--paludis/repositories/e/e_repository_TEST_3.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc24
-rw-r--r--paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc108
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc6
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc2
-rw-r--r--paludis/repositories/e/e_repository_news.cc7
-rw-r--r--paludis/repositories/e/e_repository_sets.cc6
-rw-r--r--paludis/repositories/e/eapi.cc4
-rw-r--r--paludis/repositories/e/ebuild.cc5
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc90
-rw-r--r--paludis/repositories/e/ebuild_id.cc2
-rw-r--r--paludis/repositories/e/exheres_layout.cc8
-rw-r--r--paludis/repositories/e/exheres_profile.cc9
-rw-r--r--paludis/repositories/e/exndbam_repository.cc6
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc4
-rw-r--r--paludis/repositories/e/fetch_visitor_TEST.cc2
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc2
-rw-r--r--paludis/repositories/e/info_metadata_key.cc6
-rw-r--r--paludis/repositories/e/manifest2_reader.cc2
-rw-r--r--paludis/repositories/e/pipe_command_handler.cc6
-rw-r--r--paludis/repositories/e/profile_file.cc2
-rw-r--r--paludis/repositories/e/traditional_layout.cc18
-rw-r--r--paludis/repositories/e/traditional_profile.cc17
-rw-r--r--paludis/repositories/e/use_desc.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc24
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc60
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger_TEST.cc4
40 files changed, 298 insertions, 302 deletions
diff --git a/paludis/repositories/e/dep_spec_pretty_printer.cc b/paludis/repositories/e/dep_spec_pretty_printer.cc
index 0c7431227..fb1feab05 100644
--- a/paludis/repositories/e/dep_spec_pretty_printer.cc
+++ b/paludis/repositories/e/dep_spec_pretty_printer.cc
@@ -318,10 +318,10 @@ DepSpecPrettyPrinter::visit(const GenericSpecTree::NodeType<PackageDepSpec>::Typ
if (_imp->env && _imp->check_conditions)
{
- if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::InstalledAtRoot(_imp->env->root()))]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installed());
- else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions()) |
+ else if (! (*_imp->env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), { }) |
filter::SupportsAction<InstallAction>() | filter::NotMasked())]->empty())
_imp->s << _imp->formatter.format(*node.spec(), format::Installable());
else
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 1c276c13e..ac41804eb 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -614,7 +614,7 @@ EInstalledRepositoryID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->environment, UserPackageDepSpecOptions());
+ _imp->environment, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 04b491212..440fb6d30 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -357,7 +357,7 @@ namespace paludis
if ((params.location() / "metadata" / "about.conf").is_regular_file_or_symlink_to_regular_file())
{
Context context("When loading about.conf:");
- KeyValueConfigFile k(params.location() / "metadata" / "about.conf", KeyValueConfigFileOptions(),
+ KeyValueConfigFile k(params.location() / "metadata" / "about.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
if (! k.get("description").empty())
about_keys.push_back(std::make_shared<LiteralMetadataValueKey<std::string>>("description", "description",
@@ -414,7 +414,7 @@ namespace paludis
else
{
Context context("When loading profiles.desc file '" + stringify(profiles_desc) + "':");
- LineConfigFile f(profiles_desc, LineConfigFileOptions());
+ LineConfigFile f(profiles_desc, { });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -462,7 +462,7 @@ namespace
if (! name_file.is_regular_file())
break;
- LineConfigFile f(name_file, LineConfigFileOptions() + lcfo_disallow_comments + lcfo_disallow_continuations + lcfo_no_skip_blank_lines);
+ LineConfigFile f(name_file, { lcfo_disallow_comments, lcfo_disallow_continuations, lcfo_no_skip_blank_lines });
if (f.begin() == f.end())
break;
return RepositoryName(*f.begin());
@@ -648,7 +648,7 @@ ERepository::repository_masked(const PackageID & id) const
else
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator
k(r->second.begin()), k_end(r->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->params.environment(), *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->params.environment(), *k->first, id, { }))
return k->second;
return std::shared_ptr<const RepositoryMaskInfo>();
@@ -671,7 +671,7 @@ ERepository::arch_flags() const
if (! p->exists())
continue;
- LineConfigFile archs(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile archs(*p, { lcfo_disallow_continuations });
std::copy(archs.begin(), archs.end(), create_inserter<UnprefixedChoiceName>(_imp->arch_flags->inserter()));
found_one = true;
}
@@ -701,7 +701,7 @@ ERepository::need_mirrors() const
{
if (p->exists())
{
- LineConfigFile mirrors(*p, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile mirrors(*p, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(mirrors.begin()) ; line != mirrors.end() ; ++line)
{
std::vector<std::string> ee;
@@ -812,12 +812,12 @@ ERepository::purge_invalid_cache() const
if (master_mtime_file.exists())
master_mtime = master_mtime_file.mtim().seconds();
- for (DirIterator dc(write_cache, DirIteratorOptions() + dio_inode_sort), dc_end ; dc != dc_end ; ++dc)
+ for (DirIterator dc(write_cache, { dio_inode_sort }), dc_end ; dc != dc_end ; ++dc)
{
if (! dc->is_directory_or_symlink_to_directory())
continue;
- for (DirIterator dp(*dc, DirIteratorOptions() + dio_inode_sort), dp_end ; dp != dp_end ; ++dp)
+ for (DirIterator dp(*dc, { dio_inode_sort }), dp_end ; dp != dp_end ; ++dp)
{
if (! dp->is_regular_file_or_symlink_to_regular_file())
continue;
@@ -1229,7 +1229,7 @@ ERepository::repository_factory_create(
throw ERepositoryConfigurationError("Key 'location' must start with a / (relative paths are not allowed)");
std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
- new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
+ new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
@@ -1551,7 +1551,7 @@ ERepository::repository_factory_dependencies(
throw ERepositoryConfigurationError("Key 'location' not specified or empty");
std::shared_ptr<KeyValueConfigFile> layout_conf((FSEntry(location) / "metadata/layout.conf").exists() ?
- new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", KeyValueConfigFileOptions(),
+ new KeyValueConfigFile(FSEntry(location) / "metadata/layout.conf", { },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
: 0);
@@ -1591,7 +1591,7 @@ ERepository::eapi_for_file(const FSEntry & f) const
Context context("When finding the EAPI to use for file '" + stringify(f) + "':");
if ((dir / "eapi").is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile file(dir / "eapi", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(dir / "eapi", { lcfo_disallow_continuations });
if (file.begin() == file.end())
{
Log::get_instance()->message("e.ebuild.profile_eapi_file.empty", ll_warning, lc_no_context)
@@ -1680,7 +1680,7 @@ namespace
Suffixes() :
file(FSEntry(getenv_with_default("PALUDIS_SUFFIXES_FILE", DATADIR "/paludis/ebuild_entries_suffixes.conf")),
- KeyValueConfigFileOptions(), &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
+ { }, &KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation)
{
}
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 6ef25fcea..836b18a98 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -493,7 +493,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK(simple_visitor_cast<const MetadataValueKey<std::string> >(**id1->find_metadata("EAPI")));
@@ -512,7 +512,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id2->end_metadata() != id2->find_metadata("EAPI"));
TEST_CHECK(bool(id2->short_description_key()));
@@ -528,7 +528,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id3(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-3",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id3->end_metadata() != id3->find_metadata("EAPI"));
TEST_CHECK(bool(id3->short_description_key()));
@@ -574,7 +574,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-two-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(id1->end_metadata() != id1->find_metadata("EAPI"));
TEST_CHECK_EQUAL(std::static_pointer_cast<const erepository::ERepositoryID>(id1)->eapi()->name(), "UNKNOWN");
@@ -618,13 +618,13 @@ namespace test_cases
const std::shared_ptr<const PackageID> p1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
const std::shared_ptr<const PackageID> p2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-two/pkg-two-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
const std::shared_ptr<const PackageID> p4(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
test_choice(p1, "flag1", true, true, false);
test_choice(p1, "flag2", false, false, true);
@@ -705,29 +705,29 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-18",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-1::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-2::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-3::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=category/package-4::test-repo-19",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
}
} test_e_repository_repository_masks;
@@ -755,13 +755,13 @@ namespace test_cases
TEST_CHECK((*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/was_masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
TEST_CHECK(! (*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/not_masked-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->masked());
+ &env, { })), { }))]->begin())->masked());
}
}
} test_e_repository_query_profile_masks;
@@ -939,7 +939,7 @@ namespace test_cases
TestMessageSuffix suffix("no files", true);
const std::shared_ptr<const PackageID> no_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(no_files_id));
TEST_CHECK(bool(no_files_id->short_description_key()));
TEST_CHECK_EQUAL(no_files_id->short_description_key()->value(), "The Short Description");
@@ -950,7 +950,7 @@ namespace test_cases
TestMessageSuffix suffix("fetched files", true);
const std::shared_ptr<const PackageID> fetched_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetched_files_id));
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "already-fetched.txt").is_regular_file());
fetched_files_id->perform_action(action);
@@ -962,7 +962,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
const std::shared_ptr<const PackageID> fetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetchable_files_id));
fetchable_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "fetchable-1.txt").is_regular_file());
@@ -973,7 +973,7 @@ namespace test_cases
TEST_CHECK(! (FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
const std::shared_ptr<const PackageID> arrow_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/arrow-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(arrow_files_id));
arrow_files_id->perform_action(action);
TEST_CHECK((FSEntry("e_repository_TEST_dir") / "distdir" / "arrowed.txt").is_regular_file());
@@ -983,7 +983,7 @@ namespace test_cases
TestMessageSuffix suffix("unfetchable files", true);
const std::shared_ptr<const PackageID> unfetchable_files_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unfetchable-files",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(unfetchable_files_id));
TEST_CHECK_THROWS(unfetchable_files_id->perform_action(action), ActionFailedError);
}
@@ -991,7 +991,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> no_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/no-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(no_files_restricted_id));
no_files_restricted_id->perform_action(action);
}
@@ -999,7 +999,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> fetched_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetched-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetched_files_restricted_id));
fetched_files_restricted_id->perform_action(action);
}
@@ -1007,7 +1007,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> fetchable_files_restricted_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fetchable-files-restricted",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(fetchable_files_restricted_id));
TEST_CHECK_THROWS(fetchable_files_restricted_id->perform_action(action), ActionFailedError);
}
@@ -1045,7 +1045,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
repo->make_manifest(id->name());
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index fa3b7bfc6..8dab2f616 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -161,7 +161,7 @@ namespace test_cases
{
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=virtual/virtual-pretend-installed-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
}
#endif
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -179,7 +179,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -188,7 +188,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -197,7 +197,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -206,7 +206,7 @@ namespace test_cases
TestMessageSuffix suffix("econf die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -215,7 +215,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -224,7 +224,7 @@ namespace test_cases
TestMessageSuffix suffix("emake die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -233,7 +233,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -242,7 +242,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -251,7 +251,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -260,7 +260,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -269,7 +269,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -278,7 +278,7 @@ namespace test_cases
TestMessageSuffix suffix("fperms die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/fperms-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -287,7 +287,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -297,7 +297,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -307,7 +307,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_prepare 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -317,7 +317,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_configure 0", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
@@ -327,7 +327,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -336,7 +336,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -345,7 +345,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -354,7 +354,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -363,7 +363,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -372,7 +372,7 @@ namespace test_cases
TestMessageSuffix suffix("econf disable dependency tracking", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "0");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_1.cc b/paludis/repositories/e/e_repository_TEST_1.cc
index b2bf570a1..417c7b2e5 100644
--- a/paludis/repositories/e/e_repository_TEST_1.cc
+++ b/paludis/repositories/e/e_repository_TEST_1.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -150,7 +150,7 @@ namespace test_cases
TestMessageSuffix suffix("dosym success 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -160,7 +160,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_prepare 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
@@ -180,7 +180,7 @@ namespace test_cases
TestMessageSuffix suffix("no src_configure 1", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "1");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_2.cc b/paludis/repositories/e/e_repository_TEST_2.cc
index ef6abb309..6a63c6d93 100644
--- a/paludis/repositories/e/e_repository_TEST_2.cc
+++ b/paludis/repositories/e/e_repository_TEST_2.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("econf source 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -150,7 +150,7 @@ namespace test_cases
TestMessageSuffix suffix("doman 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -160,7 +160,7 @@ namespace test_cases
TestMessageSuffix suffix("src_prepare 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("src_configure 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -180,7 +180,7 @@ namespace test_cases
TestMessageSuffix suffix("default src_configure 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_configure-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -190,7 +190,7 @@ namespace test_cases
TestMessageSuffix suffix("default src_compile 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default-src_compile-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -200,7 +200,7 @@ namespace test_cases
TestMessageSuffix suffix("default_src_compile 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_compile-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
@@ -210,7 +210,7 @@ namespace test_cases
TestMessageSuffix suffix("src_compile via default function 2", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/src_compile-via-default-func-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "2");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_3.cc b/paludis/repositories/e/e_repository_TEST_3.cc
index 9ddd48169..ee8419216 100644
--- a/paludis/repositories/e/e_repository_TEST_3.cc
+++ b/paludis/repositories/e/e_repository_TEST_3.cc
@@ -140,7 +140,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/prefix-3",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "3");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 6b1d96660..5e801a3f1 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -144,7 +144,7 @@ namespace test_cases
TestMessageSuffix suffix("pkg_pretend", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(pretend_action);
@@ -155,7 +155,7 @@ namespace test_cases
TestMessageSuffix suffix("pkg_pretend-failure", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg_pretend-failure-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(pretend_action);
@@ -166,7 +166,7 @@ namespace test_cases
TestMessageSuffix suffix("default_src_install 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/default_src_install-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -176,7 +176,7 @@ namespace test_cases
TestMessageSuffix suffix("docompress 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/docompress-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -186,7 +186,7 @@ namespace test_cases
TestMessageSuffix suffix("dodoc -r", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/dodoc-r-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -196,7 +196,7 @@ namespace test_cases
TestMessageSuffix suffix("doins symlink", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doins-symlink-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -206,7 +206,7 @@ namespace test_cases
TestMessageSuffix suffix("banned functions 4", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -216,7 +216,7 @@ namespace test_cases
TestMessageSuffix suffix("econf disable dependency tracking", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-disable-dependency-tracking-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -226,7 +226,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -236,7 +236,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-fail-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
@@ -246,7 +246,7 @@ namespace test_cases
TestMessageSuffix suffix("strict use injection", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-injection-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
@@ -256,7 +256,7 @@ namespace test_cases
TestMessageSuffix suffix("global scope use", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/global-scope-use-4",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
index 42b4471a7..704b86db4 100644
--- a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
+++ b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
@@ -106,7 +106,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
StringifyFormatter ff;
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index 94c33e2b7..f29ed9dec 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -160,7 +160,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 773fe6e83..0f5d831df 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -159,7 +159,7 @@ namespace test_cases
TestMessageSuffix suffix("in-ebuild die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-ebuild-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -168,7 +168,7 @@ namespace test_cases
TestMessageSuffix suffix("in-subshell die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/in-subshell-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -177,7 +177,7 @@ namespace test_cases
TestMessageSuffix suffix("success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -186,7 +186,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -195,7 +195,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch success-dir", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-success-dir",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -204,7 +204,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -213,7 +213,7 @@ namespace test_cases
TestMessageSuffix suffix("expatch unrecognised", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/expatch-unrecognised",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -222,7 +222,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -231,7 +231,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal expatch die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-expatch-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -240,7 +240,7 @@ namespace test_cases
TestMessageSuffix suffix("unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -249,7 +249,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -258,7 +258,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal unpack die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-unpack-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -267,7 +267,7 @@ namespace test_cases
TestMessageSuffix suffix("econf fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/econf-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -276,7 +276,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -285,7 +285,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal econf die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-econf-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -294,7 +294,7 @@ namespace test_cases
TestMessageSuffix suffix("emake fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/emake-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -303,7 +303,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -312,7 +312,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal emake die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-emake-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -321,7 +321,7 @@ namespace test_cases
TestMessageSuffix suffix("einstall fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/einstall-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -330,7 +330,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -339,7 +339,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal einstall die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -348,7 +348,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -357,7 +357,7 @@ namespace test_cases
TestMessageSuffix suffix("keepdir fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -366,7 +366,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -375,7 +375,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal keepdir die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-keepdir-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -384,7 +384,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -393,7 +393,7 @@ namespace test_cases
TestMessageSuffix suffix("dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -402,7 +402,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -411,7 +411,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -420,7 +420,7 @@ namespace test_cases
TestMessageSuffix suffix("nonfatal dobin die", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-dobin-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -429,7 +429,7 @@ namespace test_cases
TestMessageSuffix suffix("herebin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -438,7 +438,7 @@ namespace test_cases
TestMessageSuffix suffix("herebin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/herebin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -447,7 +447,7 @@ namespace test_cases
TestMessageSuffix suffix("hereconfd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -456,7 +456,7 @@ namespace test_cases
TestMessageSuffix suffix("hereconfd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereconfd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -465,7 +465,7 @@ namespace test_cases
TestMessageSuffix suffix("hereenvd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -474,7 +474,7 @@ namespace test_cases
TestMessageSuffix suffix("hereenvd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereenvd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -483,7 +483,7 @@ namespace test_cases
TestMessageSuffix suffix("hereinitd success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -492,7 +492,7 @@ namespace test_cases
TestMessageSuffix suffix("hereinitd fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereinitd-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -501,7 +501,7 @@ namespace test_cases
TestMessageSuffix suffix("hereins success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -510,7 +510,7 @@ namespace test_cases
TestMessageSuffix suffix("hereins fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/hereins-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -519,7 +519,7 @@ namespace test_cases
TestMessageSuffix suffix("heresbin success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -528,7 +528,7 @@ namespace test_cases
TestMessageSuffix suffix("heresbin fail", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/heresbin-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -537,7 +537,7 @@ namespace test_cases
TestMessageSuffix suffix("best version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -546,7 +546,7 @@ namespace test_cases
TestMessageSuffix suffix("has version", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/has-version-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -555,7 +555,7 @@ namespace test_cases
TestMessageSuffix suffix("match", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/match-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -564,7 +564,7 @@ namespace test_cases
TestMessageSuffix suffix("econf phase", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-phase-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -573,7 +573,7 @@ namespace test_cases
TestMessageSuffix suffix("econf vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/econf-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -582,7 +582,7 @@ namespace test_cases
TestMessageSuffix suffix("expand vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/expand-vars-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -591,7 +591,7 @@ namespace test_cases
TestMessageSuffix suffix("doman success", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-success-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -600,7 +600,7 @@ namespace test_cases
TestMessageSuffix suffix("doman nofatal", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-nonfatal-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -609,7 +609,7 @@ namespace test_cases
TestMessageSuffix suffix("doman failure", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/doman-failure-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -618,7 +618,7 @@ namespace test_cases
TestMessageSuffix suffix("change globals", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/change-globals-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
@@ -627,7 +627,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
}
@@ -636,7 +636,7 @@ namespace test_cases
TestMessageSuffix suffix("install s", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/install-s-0",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
}
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 518f376e6..9e9254f7a 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -154,7 +154,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
switch (expected_result)
{
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index 39148346a..9a860ec0f 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -170,7 +170,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), base_eapi);
id->perform_action(bin_action);
@@ -191,7 +191,7 @@ namespace test_cases
TestMessageSuffix suffix("prefix", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/simple-1::binrepo" + base_eapi,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(),
"pbin-1+" + base_eapi);
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index f090ce493..1129c5be3 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -170,7 +170,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
TEST_CHECK_EQUAL(!! id->choices_key()->value()->find_by_name_with_prefix(
ChoiceNameWithPrefix("build_options:expensive_tests")), expect_expensive_test);
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index f9a8f2f15..406303d44 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -142,8 +142,8 @@ namespace
env.package_database()->add_repository(2, installed_repo);
const std::shared_ptr<const PackageIDSequence> rlist(env[selection::AllVersionsSorted(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec(replacing, &env, UserPackageDepSpecOptions())),
- MatchPackageOptions()) |
+ PackageDepSpec(parse_user_package_dep_spec(replacing, &env, { })),
+ { }) |
filter::InstalledAtRoot(env.root()))]);
InstallAction action(make_named_values<InstallActionOptions>(
@@ -156,7 +156,7 @@ namespace
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/" + test,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()) |
+ &env, { })), { }) |
filter::SupportsAction<InstallAction>())]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index 6ad4bb402..c8fcbb3f6 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -142,7 +142,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("cat/pkg",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
+ &env, { })), { }))]->last());
TEST_CHECK(bool(id));
id->perform_action(action);
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index ce6e1c440..aa07b19dc 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -131,7 +131,7 @@ ERepositoryNews::update_news() const
{
Context local_context("When handling news skip file '" + stringify(
_imp->skip_file) + "':");
- LineConfigFile s(_imp->skip_file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile s(_imp->skip_file, { lcfo_disallow_continuations });
std::copy(s.begin(), s.end(), std::inserter(skip, skip.end()));
}
@@ -174,7 +174,7 @@ ERepositoryNews::update_news() const
generator::Matches(PackageDepSpec(parse_elike_package_dep_spec(*i,
eapi.supported()->package_dep_spec_parse_options(),
eapi.supported()->version_spec_options(),
- std::shared_ptr<const PackageID>())), MatchPackageOptions()) |
+ std::shared_ptr<const PackageID>())), { }) |
filter::InstalledAtRoot(_imp->environment->root()))]->empty())
local_show = true;
show &= local_show;
@@ -274,8 +274,7 @@ NewsFile::NewsFile(const FSEntry & our_filename) :
bool seen_content_type(false), seen_title(false), seen_author(false), seen_news_item_format(false), seen_posted(false),
seen_revision(false);
- LineConfigFile line_file(our_filename, LineConfigFileOptions() + lcfo_disallow_continuations + lcfo_no_skip_blank_lines
- + lcfo_disallow_comments);
+ LineConfigFile line_file(our_filename, { lcfo_disallow_continuations, lcfo_no_skip_blank_lines, lcfo_disallow_comments });
for (LineConfigFile::ConstIterator line(line_file.begin()), line_end(line_file.end()) ;
line != line_end ; ++line)
{
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 0bf7847fb..f32abff15 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -264,7 +264,7 @@ ERepositorySets::security_set(bool insecurity) const
for (DirIterator f(_imp->params.securitydir()), f_end ; f != f_end; ++f)
{
- if (! is_file_with_prefix_extension(*f, "glsa-", ".xml", IsFileWithOptions()))
+ if (! is_file_with_prefix_extension(*f, "glsa-", ".xml", { }))
continue;
Context local_context("When parsing security advisory '" + stringify(*f) + "':");
@@ -308,7 +308,7 @@ ERepositorySets::security_set(bool insecurity) const
if (insecurity)
{
std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ make_package_dep_spec({ })
.package((*c)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
@@ -341,7 +341,7 @@ ERepositorySets::security_set(bool insecurity) const
continue;
}
- std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec(PartiallyMadePackageDepSpecOptions())
+ std::shared_ptr<PackageDepSpec> spec(std::make_shared<PackageDepSpec>(make_package_dep_spec({ })
.package((*r)->name())
.version_requirement(make_named_values<VersionRequirement>(
n::version_operator() = vo_equal,
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index ce9d36c8d..a6aee2e54 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -349,11 +349,11 @@ namespace paludis
for (DirIterator d(getenv_with_default("PALUDIS_EAPIS_DIR", DATADIR "/paludis/eapis")), d_end ;
d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
Context cc("When loading EAPI file '" + stringify(*d) + "':");
- KeyValueConfigFile k(*d, KeyValueConfigFileOptions(),
+ KeyValueConfigFile k(*d, { },
std::bind(&predefined, stringify(d->dirname()), std::placeholders::_1, std::placeholders::_2),
&KeyValueConfigFile::no_transformation);
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index dd595580f..e643b5663 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -424,9 +424,8 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
int exit_status(run_command(real_cmd));
- KeyValueConfigFile f(metadata, KeyValueConfigFileOptions() + kvcfo_disallow_continuations + kvcfo_disallow_comments
- + kvcfo_disallow_space_around_equals + kvcfo_disallow_unquoted_values + kvcfo_disallow_source
- + kvcfo_disallow_variables + kvcfo_preserve_whitespace,
+ KeyValueConfigFile f(metadata, { kvcfo_disallow_continuations, kvcfo_disallow_comments , kvcfo_disallow_space_around_equals,
+ kvcfo_disallow_unquoted_values, kvcfo_disallow_source , kvcfo_disallow_variables, kvcfo_preserve_whitespace },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
std::copy(f.begin(), f.end(), keys->inserter());
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
index 27c1eedbe..993ecf2b8 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
@@ -77,7 +77,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list");
@@ -105,7 +105,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-stale");
@@ -134,7 +134,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-guessed-eapi");
@@ -162,7 +162,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list-eclass");
@@ -193,7 +193,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-stale");
@@ -221,7 +221,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-wrong");
@@ -249,7 +249,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_list-eclass-gone");
@@ -277,7 +277,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_list-detection-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_list-detection");
@@ -305,7 +305,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash");
@@ -334,7 +334,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-guessed-eapi");
@@ -362,7 +362,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-guessed-eapi-extension-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-guessed-eapi-extension");
@@ -390,7 +390,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-guessed-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-no-guessed-eapi");
@@ -418,7 +418,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-empty-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "");
@@ -447,7 +447,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-stale");
@@ -475,7 +475,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "the-description-flat_hash-no-mtime");
@@ -503,7 +503,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-mtime-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-no-mtime-stale");
@@ -531,7 +531,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-bad-mtime");
@@ -559,7 +559,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-no-eapi-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-no-eapi");
@@ -587,7 +587,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-duplicate-key-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id1->short_description_key()));
TEST_CHECK_EQUAL(id1->short_description_key()->value(), "The Generated Description flat_hash-duplicate-key");
@@ -615,7 +615,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-eclass");
@@ -646,7 +646,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-stale");
@@ -674,7 +674,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-wrong");
@@ -701,7 +701,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclass-gone");
@@ -729,7 +729,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-full-eclass");
@@ -760,7 +760,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-nonstandard-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-full-eclass-nonstandard");
@@ -791,7 +791,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-stale");
@@ -819,7 +819,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-wrong");
@@ -847,7 +847,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-full-eclass-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-full-eclass-gone");
@@ -875,14 +875,14 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-truncated-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-truncated");
std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-truncated-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id2->short_description_key()));
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "The Generated Description flat_hash-eclasses-truncated-2");
@@ -910,7 +910,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-bad-mtime");
@@ -938,7 +938,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-eclasses-spaces-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-eclasses-spaces");
@@ -967,7 +967,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-exlib");
@@ -999,7 +999,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-percat-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description-flat_hash-exlib-percat");
@@ -1031,7 +1031,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-stale-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-stale");
@@ -1060,7 +1060,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-wrong-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-wrong");
@@ -1089,7 +1089,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlib-gone-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlib-gone");
@@ -1118,14 +1118,14 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-truncated-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-truncated");
std::shared_ptr<const PackageID> id2(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-truncated-2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id2->short_description_key()));
TEST_CHECK_EQUAL(id2->short_description_key()->value(), "The Generated Description flat_hash-exlibs-truncated-2");
@@ -1154,7 +1154,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-bad-mtime-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-bad-mtime");
@@ -1183,7 +1183,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/flat_hash-exlibs-spaces-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(id->short_description_key()->value(), "The Generated Description flat_hash-exlibs-spaces");
@@ -1218,7 +1218,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-1"));
@@ -1254,7 +1254,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-eapi1-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-eapi1-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-eapi1-1"));
@@ -1292,7 +1292,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-eclasses-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-eclasses-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-eclasses-1"));
@@ -1329,7 +1329,7 @@ namespace test_cases
std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/write-exlibs-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id->short_description_key()));
TEST_CHECK_EQUAL(contents("ebuild_flat_metadata_cache_TEST_dir/cache/test-repo/cat/write-exlibs-1"), contents("ebuild_flat_metadata_cache_TEST_dir/cache/expected/cat/write-exlibs-1"));
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index a35c128f4..9456bf5fe 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -609,7 +609,7 @@ EbuildID::uniquely_identifying_spec() const
{
return parse_user_package_dep_spec("=" + stringify(name()) + "-" + stringify(version()) +
(slot_key() ? ":" + stringify(slot_key()->value()) : "") + "::" + stringify(repository()->name()),
- _imp->environment, UserPackageDepSpecOptions());
+ _imp->environment, { });
}
const QualifiedPackageName
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index c2445fe73..d7f36b9f1 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -117,7 +117,7 @@ ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_r
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
std::string p(strip_trailing_string(strip_trailing_string(d->basename(), ".conf"), ".local"));
@@ -142,7 +142,7 @@ ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_r
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".conf", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".conf", { }))
continue;
std::string p(strip_trailing_string(strip_trailing_string(d->basename(), ".conf"), ".local"));
@@ -191,7 +191,7 @@ ExheresLayout::need_category_names() const
if (! i->exists())
continue;
- LineConfigFile cats(*i, LineConfigFileOptions());
+ LineConfigFile cats(*i, { });
for (LineConfigFile::ConstIterator line(cats.begin()), line_end(cats.end()) ;
line != line_end ; ++line)
@@ -591,7 +591,7 @@ namespace
continue;
if (is_file_with_prefix_extension((*f),
("digest-"+stringify(qpn.package())), "",
- IsFileWithOptions()))
+ { }))
continue;
m->insert((*f), "AUX");
}
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index 7796de6c0..ace0fbeba 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -215,7 +215,7 @@ ExheresProfile::_load_dir(const FSEntry & f)
if ((f / "parents.conf").exists())
{
- LineConfigFile file(f / "parents.conf", LineConfigFileOptions());
+ LineConfigFile file(f / "parents.conf", { });
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
_load_dir((f / *line).realpath());
@@ -238,9 +238,8 @@ ExheresProfile::_load_dir(const FSEntry & f)
throw ERepositoryConfigurationError("Can't use profile directory '" + stringify(f) +
"' because it uses an unsupported EAPI");
- KeyValueConfigFile file(f / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values +
- kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
+ KeyValueConfigFile file(f / "make.defaults", { kvcfo_disallow_source, kvcfo_disallow_space_inside_unquoted_values,
+ kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -366,7 +365,7 @@ ExheresProfile::profile_masked(const PackageID & id) const
{
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->env, *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->env, *k->first, id, { }))
return k->second;
}
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index a93af04c1..29b822f55 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -428,7 +428,7 @@ ExndbamRepository::merge(const MergeParams & m)
if (! merger.check())
{
- for (DirIterator d(target_ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end
+ for (DirIterator d(target_ver_dir, { dio_include_dotfiles }), d_end
; d != d_end ; ++d)
FSEntry(*d).unlink();
target_ver_dir.rmdir();
@@ -599,14 +599,14 @@ ExndbamRepository::perform_uninstall(
}
}
- for (DirIterator d(ver_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(ver_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
ver_dir.rmdir();
_imp->ndbam.remove_entry(id->name(), ver_dir);
FSEntry pkg_dir(ver_dir.dirname());
- if (DirIterator() == DirIterator(pkg_dir, DirIteratorOptions() + dio_include_dotfiles + dio_inode_sort + dio_first_only))
+ if (DirIterator() == DirIterator(pkg_dir, { dio_include_dotfiles, dio_inode_sort, dio_first_only }))
{
pkg_dir.rmdir();
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index 660a51f45..e4bf483b5 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -108,7 +108,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = exndbam_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -118,7 +118,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
diff --git a/paludis/repositories/e/fetch_visitor_TEST.cc b/paludis/repositories/e/fetch_visitor_TEST.cc
index 273a74506..40b17e82a 100644
--- a/paludis/repositories/e/fetch_visitor_TEST.cc
+++ b/paludis/repositories/e/fetch_visitor_TEST.cc
@@ -77,7 +77,7 @@ namespace test_cases
const std::shared_ptr<const EAPI> eapi(EAPIData::get_instance()->eapi_from_string("exheres-0"));
FetchVisitor v(&env, *env[selection::RequireExactlyOne(
generator::Matches(parse_user_package_dep_spec("=cat/pkg-1",
- &env, UserPackageDepSpecOptions()), MatchPackageOptions()))]->begin(),
+ &env, { }), { }))]->begin(),
*eapi, FSEntry("fetch_visitor_TEST_dir/out"),
false, false, "test", std::make_shared<URIListedThenMirrorsLabel>("listed-then-mirrors"), false,
std::make_shared<StandardOutputManager>(), get_mirrors_fn);
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index 570b5fe98..e4a517f91 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -107,7 +107,7 @@ namespace
break;
std::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
- generator::Matches(*node.spec(), MatchPackageOptions()) | filter::InstalledAtRoot(FSEntry("/")))]);
+ generator::Matches(*node.spec(), { }) | filter::InstalledAtRoot(FSEntry("/")))]);
if (matches->empty())
break;
diff --git a/paludis/repositories/e/info_metadata_key.cc b/paludis/repositories/e/info_metadata_key.cc
index b8eee1ae8..2b1eb88f9 100644
--- a/paludis/repositories/e/info_metadata_key.cc
+++ b/paludis/repositories/e/info_metadata_key.cc
@@ -109,7 +109,7 @@ InfoVarsMetadataKey::value() const
if (location->is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile f(*location, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(*location, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
_imp->value->insert(*line);
@@ -166,7 +166,7 @@ InfoPkgsMetadataKey::need_keys_added() const
if (location->is_regular_file_or_symlink_to_regular_file())
{
std::string eapi(_imp->e_repository->eapi_for_file(*location));
- LineConfigFile p(*location, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile p(*location, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(p.begin()), line_end(p.end()) ;
line != line_end ; ++line)
info_pkgs.insert(std::make_pair(*line, eapi));
@@ -185,7 +185,7 @@ InfoPkgsMetadataKey::need_keys_added() const
generator::Matches(parse_elike_package_dep_spec(i->first,
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(),
- std::shared_ptr<const PackageID>()), MatchPackageOptions()) |
+ std::shared_ptr<const PackageID>()), { }) |
filter::InstalledAtRoot(_imp->env->root()))]);
if (q->empty())
diff --git a/paludis/repositories/e/manifest2_reader.cc b/paludis/repositories/e/manifest2_reader.cc
index aa45fe5c0..3041aa70d 100644
--- a/paludis/repositories/e/manifest2_reader.cc
+++ b/paludis/repositories/e/manifest2_reader.cc
@@ -70,7 +70,7 @@ Manifest2Reader::Manifest2Reader(const FSEntry & f) :
if (! f.exists())
return;
- LineConfigFile lines(_imp->manifest, LineConfigFileOptions());
+ LineConfigFile lines(_imp->manifest, { });
for (LineConfigFile::ConstIterator l(lines.begin()), l_end(lines.end()) ;
l != l_end ; ++l)
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 4ca05b040..b73fce65b 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -264,7 +264,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()) &&
(*entries->last())->virtual_for_key())
{
@@ -305,7 +305,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::SomeArbitraryVersion(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (entries->empty())
return "O1;";
else
@@ -329,7 +329,7 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
eapi->supported()->package_dep_spec_parse_options(),
eapi->supported()->version_spec_options(), package_id));
std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
- generator::Matches(spec, MatchPackageOptions()) | filter::InstalledAtRoot(environment->root()))]);
+ generator::Matches(spec, { }) | filter::InstalledAtRoot(environment->root()))]);
if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()))
{
std::shared_ptr<PackageIDSequence> new_entries(std::make_shared<PackageIDSequence>());
diff --git a/paludis/repositories/e/profile_file.cc b/paludis/repositories/e/profile_file.cc
index 30fbebcb8..f788c81b6 100644
--- a/paludis/repositories/e/profile_file.cc
+++ b/paludis/repositories/e/profile_file.cc
@@ -127,7 +127,7 @@ ProfileFile<F_>::add_file(const FSEntry & f)
throw ERepositoryConfigurationError("Can't use profile file '" + stringify(f) +
"' because it uses an unsupported EAPI");
- F_ file(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ F_ file(f, { lcfo_disallow_continuations });
for (typename F_::ConstIterator line(file.begin()), line_end(file.end()) ; line != line_end ; ++line)
{
const std::string key(FileEntryTraits<const typename std::remove_reference<typename F_::ConstIterator::value_type>::type>::extract_key(*line));
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index 2f9c07052..e9e316320 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -117,7 +117,7 @@ TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEnt
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".desc", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".desc", { }))
continue;
_imp->use_desc_files->push_back(std::make_pair(*d, ChoicePrefixName(strip_trailing_string(d->basename(), ".desc"))));
}
@@ -139,7 +139,7 @@ TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEnt
{
for (DirIterator d(descs), d_end ; d != d_end ; ++d)
{
- if (! is_file_with_extension(*d, ".desc", IsFileWithOptions()))
+ if (! is_file_with_extension(*d, ".desc", { }))
continue;
_imp->use_desc_files->push_back(std::make_pair(*d, strip_trailing_string(d->basename(), ".desc")));
}
@@ -183,7 +183,7 @@ TraditionalLayout::need_category_names() const
if (! i->exists())
continue;
- LineConfigFile cats(*i, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile cats(*i, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(cats.begin()), line_end(cats.end()) ;
line != line_end ; ++line)
@@ -207,7 +207,7 @@ TraditionalLayout::need_category_names() const
{
Log::get_instance()->message("e.traditional_layout.categories.no_file", ll_qa, lc_context)
<< "No categories file for repository at '" << _imp->tree_root << "', faking it";
- for (DirIterator d(_imp->tree_root, DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->tree_root, { dio_inode_sort }), d_end ; d != d_end ; ++d)
{
if (! d->is_directory_or_symlink_to_directory())
continue;
@@ -247,7 +247,7 @@ TraditionalLayout::need_package_ids(const QualifiedPackageName & n) const
FSEntry path(_imp->tree_root / stringify(n.category()) / stringify(n.package()));
- for (DirIterator e(path, DirIteratorOptions() + dio_inode_sort), e_end ; e != e_end ; ++e)
+ for (DirIterator e(path, { dio_inode_sort }), e_end ; e != e_end ; ++e)
{
if (! _imp->repository->is_package_file(n, *e))
continue;
@@ -373,7 +373,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
return std::make_shared<QualifiedPackageNameSet>();
if ((_imp->tree_root / stringify(c)).is_directory_or_symlink_to_directory())
- for (DirIterator d(_imp->tree_root / stringify(c), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->tree_root / stringify(c), { dio_inode_sort }), d_end ; d != d_end ; ++d)
{
try
{
@@ -586,7 +586,7 @@ namespace
if (! d.exists())
return;
- std::list<FSEntry> files((DirIterator(d, DirIteratorOptions() + dio_inode_sort)),
+ std::list<FSEntry> files((DirIterator(d, { dio_inode_sort })),
DirIterator());
for (std::list<FSEntry>::iterator f(files.begin()) ;
f != files.end() ; ++f)
@@ -602,7 +602,7 @@ namespace
continue;
if (is_file_with_prefix_extension((*f),
("digest-"+stringify(qpn.package())), "",
- IsFileWithOptions()))
+ { }))
continue;
m->insert((*f), "AUX");
}
@@ -616,7 +616,7 @@ TraditionalLayout::manifest_files(const QualifiedPackageName & qpn) const
std::shared_ptr<Map<FSEntry, std::string> > result(std::make_shared<Map<FSEntry, std::string>>());
FSEntry package_dir = _imp->repository->layout()->package_directory(qpn);
- std::list<FSEntry> package_files((DirIterator(package_dir, DirIteratorOptions() + dio_inode_sort)),
+ std::list<FSEntry> package_files((DirIterator(package_dir, { dio_inode_sort })),
DirIterator());
for (std::list<FSEntry>::iterator f(package_files.begin()) ;
f != package_files.end() ; ++f)
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index a92a0d3ff..e8ea1ae4e 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -293,7 +293,7 @@ Imp<TraditionalProfile>::load_profile_parent(const FSEntry & dir)
if (! (dir / "parent").exists())
return;
- LineConfigFile file(dir / "parent", LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile file(dir / "parent", { lcfo_disallow_continuations });
LineConfigFile::ConstIterator i(file.begin()), i_end(file.end());
bool once(false);
@@ -345,8 +345,7 @@ Imp<TraditionalProfile>::load_profile_make_defaults(const FSEntry & dir)
throw ERepositoryConfigurationError("Can't use profile directory '" + stringify(dir) +
"' because it uses an unsupported EAPI");
- KeyValueConfigFile file(dir / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values + kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
+ KeyValueConfigFile file(dir / "make.defaults", { kvcfo_disallow_source, kvcfo_disallow_space_inside_unquoted_values, kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -667,7 +666,7 @@ Imp<TraditionalProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap
return;
Context context("When loading basic use file '" + stringify(file) + ":");
- LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(file, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -706,7 +705,7 @@ Imp<TraditionalProfile>::load_spec_use_file(const EAPI & eapi, const FSEntry & f
return;
Context context("When loading specised use file '" + stringify(file) + ":");
- LineConfigFile f(file, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile f(file, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
{
@@ -871,7 +870,7 @@ TraditionalProfile::use_masked(
for (PackageFlagStatusMapList::const_iterator g(i->package_use_mask.begin()),
g_end(i->package_use_mask.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -907,7 +906,7 @@ TraditionalProfile::use_forced(
for (PackageFlagStatusMapList::const_iterator g(i->package_use_force.begin()),
g_end(i->package_use_force.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -936,7 +935,7 @@ TraditionalProfile::use_state_ignoring_masks(
for (PackageFlagStatusMapList::const_iterator g(i->package_use.begin()),
g_end(i->package_use.end()) ; g != g_end ; ++g)
{
- if (! match_package(*_imp->env, *g->first, *id, MatchPackageOptions()))
+ if (! match_package(*_imp->env, *g->first, *id, { }))
continue;
FlagStatusMap::const_iterator h(g->second.find(value_prefixed));
@@ -1045,7 +1044,7 @@ TraditionalProfile::profile_masked(const PackageID & id) const
{
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->env, *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->env, *k->first, id, { }))
return k->second;
}
diff --git a/paludis/repositories/e/use_desc.cc b/paludis/repositories/e/use_desc.cc
index 51bb9ca10..3b8511631 100644
--- a/paludis/repositories/e/use_desc.cc
+++ b/paludis/repositories/e/use_desc.cc
@@ -51,7 +51,7 @@ namespace paludis
{
if (f.is_regular_file_or_symlink_to_regular_file())
{
- LineConfigFile ff(f, LineConfigFileOptions() + lcfo_disallow_continuations);
+ LineConfigFile ff(f, { lcfo_disallow_continuations });
for (LineConfigFile::ConstIterator line(ff.begin()), line_end(ff.end()) ;
line != line_end ; ++line)
{
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 85580e78e..77cef49e6 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -520,7 +520,7 @@ VDBRepository::perform_uninstall(
}
/* remove vdb entry */
- for (DirIterator d(pkg_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(pkg_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
pkg_dir.rmdir();
@@ -956,7 +956,7 @@ VDBRepository::merge(const MergeParams & m)
if (! merger.check())
{
- for (DirIterator d(tmp_vdb_dir, DirIteratorOptions() + dio_include_dotfiles), d_end ; d != d_end ; ++d)
+ for (DirIterator d(tmp_vdb_dir, { dio_include_dotfiles }), d_end ; d != d_end ; ++d)
FSEntry(*d).unlink();
tmp_vdb_dir.rmdir();
throw ActionFailedError("Not proceeding with install due to merge sanity check failing");
@@ -1063,7 +1063,7 @@ VDBRepository::need_category_names() const
Context context("When loading category names from '" + stringify(_imp->params.location()) + "':");
- for (DirIterator d(_imp->params.location(), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->params.location(), { dio_inode_sort }), d_end ; d != d_end ; ++d)
try
{
if (d->is_directory_or_symlink_to_directory())
@@ -1096,7 +1096,7 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
std::shared_ptr<QualifiedPackageNameSet> q(std::make_shared<QualifiedPackageNameSet>());
- for (DirIterator d(_imp->params.location() / stringify(c), DirIteratorOptions() + dio_inode_sort), d_end ; d != d_end ; ++d)
+ for (DirIterator d(_imp->params.location() / stringify(c), { dio_inode_sort }), d_end ; d != d_end ; ++d)
try
{
if (d->is_directory_or_symlink_to_directory())
@@ -1106,7 +1106,7 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
continue;
PackageDepSpec p(parse_user_package_dep_spec("=" + stringify(c) + "/" + s,
- _imp->params.environment(), UserPackageDepSpecOptions()));
+ _imp->params.environment(), { }));
q->insert(*p.package_ptr());
IDMap::iterator i(_imp->ids.find(*p.package_ptr()));
if (_imp->ids.end() == i)
@@ -1320,7 +1320,7 @@ VDBRepository::perform_updates()
if (cache_file.is_regular_file_or_symlink_to_regular_file())
{
Context ctx2("When reading update file timestamps from '" + stringify(cache_file) + "':");
- LineConfigFile f(cache_file, LineConfigFileOptions() + lcfo_preserve_whitespace);
+ LineConfigFile f(cache_file, { lcfo_preserve_whitespace });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
@@ -1385,7 +1385,7 @@ VDBRepository::perform_updates()
continue;
}
- for (DirIterator d(k->value(), DirIteratorOptions()), d_end ;
+ for (DirIterator d(k->value(), { }), d_end ;
d != d_end ; ++d)
{
Context context_3("When performing updates from '" + stringify(*d) + "':");
@@ -1404,7 +1404,7 @@ VDBRepository::perform_updates()
std::cout << " Considering " << *d << std::endl;
- LineConfigFile f(*d, LineConfigFileOptions());
+ LineConfigFile f(*d, { });
for (LineConfigFile::ConstIterator line(f.begin()), line_end(f.end()) ;
line != line_end ; ++line)
@@ -1447,11 +1447,11 @@ VDBRepository::perform_updates()
if (4 == tokens.size())
{
PackageDepSpec old_spec(parse_user_package_dep_spec(tokens.at(1), _imp->params.environment(),
- UserPackageDepSpecOptions()));
+ { }));
SlotName old_slot(tokens.at(2)), new_slot(tokens.at(3));
const std::shared_ptr<const PackageIDSequence> ids((*_imp->params.environment())[selection::AllVersionsSorted(
- (generator::Matches(old_spec, MatchPackageOptions()) & generator::InRepository(name())) |
+ (generator::Matches(old_spec, { }) & generator::InRepository(name())) |
filter::Slot(old_slot)
)]);
if (! ids->empty())
@@ -1531,7 +1531,7 @@ VDBRepository::perform_updates()
if (newpf != oldpf)
{
- for (DirIterator it(to_dir, DirIteratorOptions() + dio_inode_sort),
+ for (DirIterator it(to_dir, { dio_inode_sort }),
it_end; it_end != it; ++it)
{
std::string::size_type lastdot(it->basename().rfind('.'));
@@ -1601,7 +1601,7 @@ VDBRepository::perform_updates()
for (DepRewrites::const_iterator i(dep_rewrites.begin()), i_end(dep_rewrites.end()) ;
i != i_end ; ++i)
_imp->params.environment()->update_config_files_for_package_move(
- make_package_dep_spec(PartiallyMadePackageDepSpecOptions()).package(i->first),
+ make_package_dep_spec({ }).package(i->first),
i->second
);
}
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index ca0b2f92a..9b9e4c236 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -151,7 +151,7 @@ namespace test_cases
std::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(e1->choices_key()));
TEST_CHECK(bool(e1->choices_key()->value()));
@@ -222,7 +222,7 @@ namespace test_cases
std::shared_ptr<const PackageID> e1(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
ContentsGatherer gatherer;
std::for_each(indirect_iterator(e1->contents_key()->value()->begin()),
indirect_iterator(e1->contents_key()->value()->end()),
@@ -276,7 +276,7 @@ namespace test_cases
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("category/package",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
StringifyFormatter ff;
@@ -379,7 +379,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -390,7 +390,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -401,7 +401,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(info_action);
}
@@ -410,7 +410,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(config_action);
}
@@ -419,7 +419,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(uninstall_action);
}
@@ -509,7 +509,7 @@ namespace test_cases
TestMessageSuffix suffix("vars", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -520,7 +520,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::srcrepo",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(install_action);
}
@@ -531,7 +531,7 @@ namespace test_cases
TestMessageSuffix suffix("info", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(info_action);
}
@@ -540,7 +540,7 @@ namespace test_cases
TestMessageSuffix suffix("config", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(config_action);
}
@@ -549,7 +549,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/target-" + eapi + "::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
TEST_CHECK(bool(id));
id->perform_action(uninstall_action);
}
@@ -586,7 +586,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -596,7 +596,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
@@ -708,7 +708,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -737,7 +737,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -764,7 +764,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other category", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat2/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -779,7 +779,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -816,7 +816,7 @@ namespace test_cases
void read_cache(std::vector<FSEntry> & vec)
{
using namespace std::placeholders;
- std::remove_copy_if(DirIterator(names_cache, DirIteratorOptions() + dio_include_dotfiles),
+ std::remove_copy_if(DirIterator(names_cache, { dio_include_dotfiles }),
DirIterator(), std::back_inserter(vec),
std::bind(&std::equal_to<std::string>::operator(),
std::equal_to<std::string>(),
@@ -949,7 +949,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -959,7 +959,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
@@ -1079,7 +1079,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other slot", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-2::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1098,7 +1098,7 @@ namespace test_cases
TestMessageSuffix suffix("remove other package", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg2-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1109,7 +1109,7 @@ namespace test_cases
TestMessageSuffix suffix("uninstall", true);
const std::shared_ptr<const PackageID> inst_id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat1/pkg1-1::installed",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
inst_id->perform_action(uninstall_action);
vdb_repo->invalidate();
@@ -1218,7 +1218,7 @@ namespace test_cases
TestMessageSuffix suffix("install", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1230,7 +1230,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src1",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1242,7 +1242,7 @@ namespace test_cases
TestMessageSuffix suffix("reinstall equivalent", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/pkg-1::reinstalltest_src2",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
id->perform_action(install_action);
vdb_repo->invalidate();
@@ -1275,7 +1275,7 @@ namespace test_cases
if (! victim.empty())
replacing->push_back(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(victim,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin());
+ &env, { })), { }))]->begin());
InstallAction install_action(make_named_values<InstallActionOptions>(
n::destination() = vdb_repo,
n::make_output_manager() = &make_standard_output_manager,
@@ -1285,7 +1285,7 @@ namespace test_cases
));
(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(chosen_one,
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->begin())->perform_action(install_action);
+ &env, { })), { }))]->begin())->perform_action(install_action);
}
void run()
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 447e9dea4..3aba09462 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -286,7 +286,7 @@ VDBUnmerger::check_dir(const std::shared_ptr<const ContentsEntry> & e) const
display("--- [gone ] " + stringify(f));
else if (! (_imp->options.root() / f).is_directory())
display("--- [!type] " + stringify(f));
- else if (DirIterator(_imp->options.root() / f, DirIteratorOptions() + dio_include_dotfiles + dio_first_only) != DirIterator())
+ else if (DirIterator(_imp->options.root() / f, { dio_include_dotfiles, dio_first_only }) != DirIterator())
display("--- [!empt] " + stringify(f));
else
return true;
diff --git a/paludis/repositories/e/vdb_unmerger_TEST.cc b/paludis/repositories/e/vdb_unmerger_TEST.cc
index d365b6b80..6ad4e028d 100644
--- a/paludis/repositories/e/vdb_unmerger_TEST.cc
+++ b/paludis/repositories/e/vdb_unmerger_TEST.cc
@@ -128,8 +128,8 @@ namespace
n::ignore() = &ignore_nothing,
n::output_manager() = std::make_shared<StandardOutputManager>(),
n::package_id() = *env[selection::RequireExactlyOne(generator::Matches(
- parse_user_package_dep_spec("cat/" + fix(what), &env, UserPackageDepSpecOptions()),
- MatchPackageOptions()))]->begin(),
+ parse_user_package_dep_spec("cat/" + fix(what), &env, { }),
+ { }))]->begin(),
n::root() = root_dir
));