Tidy up some of the EAPI options.

2 files changed, 8 insertions, 7 deletions

diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index 5ad7ae0ab..83d7adec5 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -102,22 +102,22 @@ FakeMetadataKeywordSetKey::set_from_string(const std::string & s)
 }
 
 FakeMetadataIUseSetKey::FakeMetadataIUseSetKey(const std::string & r,
-        const std::string & h, const std::string & v, const IUseFlagParseMode m, const MetadataKeyType t,
+        const std::string & h, const std::string & v, const IUseFlagParseOptions & o, const MetadataKeyType t,
         const PackageID * const i, const Environment * const e) :
     FakeMetadataCollectionKey<IUseFlagSet>(r, h, t, i, e)
 {
-    set_from_string(v, m);
+    set_from_string(v, o);
 }
 
 void
-FakeMetadataIUseSetKey::set_from_string(const std::string & s, const IUseFlagParseMode m)
+FakeMetadataIUseSetKey::set_from_string(const std::string & s, const IUseFlagParseOptions & o)
 {
     _imp->collection.reset(new IUseFlagSet);
     std::list<std::string> tokens;
     tokenise_whitespace(s, std::back_inserter(tokens));
     for (std::list<std::string>::const_iterator t(tokens.begin()), t_end(tokens.end()) ;
             t != t_end ; ++t)
-        _imp->collection->insert(IUseFlag(*t, m, std::string::npos));
+        _imp->collection->insert(IUseFlag(*t, o, std::string::npos));
 }
 
 namespace paludis
@@ -401,7 +401,8 @@ namespace paludis
             post_dependencies_labels(new DependencyLabelSequence),
             suggested_dependencies_labels(new DependencyLabelSequence),
             keywords(new FakeMetadataKeywordSetKey("KEYWORDS", "Keywords", "test", mkt_normal, id, env)),
-            iuse(new FakeMetadataIUseSetKey("IUSE", "Used USE flags", "", iuse_pm_permissive, mkt_normal, id, env)),
+            iuse(new FakeMetadataIUseSetKey("IUSE", "Used USE flags", "",
+                            erepository::EAPIData::get_instance()->eapi_from_string(eapi)->supported->iuse_flag_parse_options, mkt_normal, id, env)),
             license(new FakeMetadataSpecTreeKey<LicenseSpecTree>("LICENSE", "Licenses",
                         "", tr1::bind(&erepository::parse_license, _1,
                             *erepository::EAPIData::get_instance()->eapi_from_string(eapi)), mkt_normal)),
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index 9925b4e1b..125674d9c 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -64,10 +64,10 @@ namespace paludis
         public FakeMetadataCollectionKey<IUseFlagSet>
     {
         public:
-            FakeMetadataIUseSetKey(const std::string &, const std::string &, const std::string &, const IUseFlagParseMode,
+            FakeMetadataIUseSetKey(const std::string &, const std::string &, const std::string &, const IUseFlagParseOptions &,
                     const MetadataKeyType, const PackageID * const, const Environment * const);
 
-            void set_from_string(const std::string &, const IUseFlagParseMode);
+            void set_from_string(const std::string &, const IUseFlagParseOptions &);
 
             virtual std::string pretty_print_flat(const Formatter<IUseFlag> &) const
                 PALUDIS_ATTRIBUTE((warn_unused_result));