No need to rewrite virtuals now

6 files changed, 1 insertions, 37 deletions

diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index ed00a9b7d..1ffab5446 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -229,8 +229,7 @@ namespace
     std::shared_ptr<const EAPIPipeCommands> make_pipe_commands(const KeyValueConfigFile & k)
     {
         return std::make_shared<EAPIPipeCommands>(make_named_values<EAPIPipeCommands>(
-                        n::no_slot_or_repo() = destringify_key<bool>(k, "pipe_commands_no_slot_or_repo"),
-                        n::rewrite_virtuals() = destringify_key<bool>(k, "pipe_commands_rewrite_virtuals")
+                        n::no_slot_or_repo() = destringify_key<bool>(k, "pipe_commands_no_slot_or_repo")
                         ));
     }
 
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 1e9a87d1a..5ab037d84 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -182,7 +182,6 @@ namespace paludis
         typedef Name<struct name_restrict_mirror> restrict_mirror;
         typedef Name<struct name_restrict_primaryuri> restrict_primaryuri;
         typedef Name<struct name_restrictions> restrictions;
-        typedef Name<struct name_rewrite_virtuals> rewrite_virtuals;
         typedef Name<struct name_run_depend> run_depend;
         typedef Name<struct name_save_base_variables> save_base_variables;
         typedef Name<struct name_save_unmodifiable_variables> save_unmodifiable_variables;
@@ -477,7 +476,6 @@ namespace paludis
         struct EAPIPipeCommands
         {
             NamedValue<n::no_slot_or_repo, bool> no_slot_or_repo;
-            NamedValue<n::rewrite_virtuals, bool> rewrite_virtuals;
         };
 
         struct EAPIAnnotations
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 0f4616f5e..0e0bd11ee 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -269,7 +269,6 @@ restrict_mirror = mirror nomirror
 restrict_fetch = fetch nofetch
 restrict_primaryuri = primaryuri
 
-pipe_commands_rewrite_virtuals = true
 pipe_commands_no_slot_or_repo = true
 
 unpack_unrecognised_is_fatal = false
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index d172a959f..4ad8d3ac5 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -336,7 +336,6 @@ restrict_mirror = mirror
 restrict_fetch = fetch
 restrict_primaryuri =
 
-pipe_commands_rewrite_virtuals = false
 pipe_commands_no_slot_or_repo = false
 
 unpack_unrecognised_is_fatal = true
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index beec05d42..dd4af4b34 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -268,7 +268,6 @@ restrict_mirror = mirror
 restrict_fetch = fetch
 restrict_primaryuri =
 
-pipe_commands_rewrite_virtuals = true
 pipe_commands_no_slot_or_repo = true
 
 unpack_unrecognised_is_fatal = false
diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc
index 6af0d418a..bd3949f49 100644
--- a/paludis/repositories/e/pipe_command_handler.cc
+++ b/paludis/repositories/e/pipe_command_handler.cc
@@ -322,17 +322,6 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
                             eapi->supported()->version_spec_options()));
                 std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
                             generator::Matches(spec, package_id, { }) | root)]);
-                if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()) &&
-                        (*entries->last())->virtual_for_key())
-                {
-                    Log::get_instance()->message("e.pipe_commands.best_version.is_virtual", ll_qa, lc_context) << "best-version of '" << spec <<
-                        "' resolves to '" << **entries->last() << "', which is a virtual for '"
-                        << *(*entries->last())->virtual_for_key()->parse_value() << "'. This will break with "
-                        "new style virtuals.";
-                    std::shared_ptr<PackageIDSequence> new_entries(std::make_shared<PackageIDSequence>());
-                    new_entries->push_back((*entries->last())->virtual_for_key()->parse_value());
-                    entries = new_entries;
-                }
 
                 if (entries->empty())
                     return "O1;";
@@ -395,25 +384,6 @@ paludis::erepository::pipe_command_handler(const Environment * const environment
                             eapi->supported()->version_spec_options()));
                 std::shared_ptr<const PackageIDSequence> entries((*environment)[selection::AllVersionsSorted(
                             generator::Matches(spec, package_id, { }) | filter::InstalledAtRoot(environment->preferred_root_key()->parse_value()))]);
-                if (eapi->supported()->pipe_commands()->rewrite_virtuals() && (! entries->empty()))
-                {
-                    std::shared_ptr<PackageIDSequence> new_entries(std::make_shared<PackageIDSequence>());
-                    for (PackageIDSequence::ConstIterator i(entries->begin()), i_end(entries->end()) ;
-                            i != i_end ; ++i)
-                    {
-                        if ((*i)->virtual_for_key())
-                        {
-                            Log::get_instance()->message("e.pipe_commands.match.is_virtual", ll_qa, lc_context) << "match of '" << spec <<
-                                "' resolves to '" << **i << "', which is a virtual for '"
-                                << *(*i)->virtual_for_key()->parse_value() << "'. This will break with "
-                                "new style virtuals.";
-                            new_entries->push_back((*i)->virtual_for_key()->parse_value());
-                        }
-                        else
-                            new_entries->push_back(*i);
-                    }
-                    entries = new_entries;
-                }
 
                 if (entries->empty())
                     return "O1;";