Add RepositoryUseInterface::use_expand_separator.

4 files changed, 19 insertions, 0 deletions

diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 91eb2dbe4..15cb48ffb 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -924,6 +924,12 @@ FakePackageID::size_of_all_distfiles_key() const
     return tr1::shared_ptr<const MetadataSizeKey>();
 }
 
+char
+FakePackageID::use_expand_separator() const
+{
+    return erepository::EAPIData::get_instance()->eapi_from_string(_imp->eapi)->supported->ebuild_options->use_expand_separator;
+}
+
 std::string
 FakeMetadataIUseSetKey::pretty_print_flat(const Formatter<IUseFlag> & f) const
 {
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 8e5b7ab5a..473f7e457 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -236,6 +236,8 @@ namespace paludis
             const tr1::shared_ptr<FakeMetadataSpecTreeKey<FetchableURISpecTree> > fetches_key();
             const tr1::shared_ptr<FakeMetadataSpecTreeKey<SimpleURISpecTree> > homepage_key();
 
+            char use_expand_separator() const;
+
             void set_slot(const SlotName &);
 
             virtual bool arbitrary_less_than_comparison(const PackageID &) const;
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 082781c1d..b997f6330 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -201,6 +201,14 @@ FakeRepositoryBase::use_expand_prefixes() const
     return tr1::shared_ptr<const UseFlagNameSet>(new UseFlagNameSet);
 }
 
+char
+FakeRepositoryBase::use_expand_separator(const PackageID & id) const
+{
+    if (this != id.repository().get())
+        return '\0';
+    return static_cast<const FakePackageID &>(id).use_expand_separator();
+}
+
 void
 FakeRepositoryBase::add_package_set(const SetName & n, tr1::shared_ptr<SetSpecTree::ConstItem> s)
 {
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index ff64703ab..d05a0eea2 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -130,6 +130,9 @@ namespace paludis
             virtual tr1::shared_ptr<const UseFlagNameSet> use_expand_prefixes() const
                 PALUDIS_ATTRIBUTE((warn_unused_result));
 
+            virtual char use_expand_separator(const PackageID &) const
+                PALUDIS_ATTRIBUTE((warn_unused_result));
+
             virtual std::string describe_use_flag(const UseFlagName &,
                     const PackageID &) const
                 PALUDIS_ATTRIBUTE((warn_unused_result));