Allow EAPI 5 subslots in user package dep specs

3 files changed, 52 insertions, 4 deletions

diff --git a/paludis/user_dep_spec-fwd.hh b/paludis/user_dep_spec-fwd.hh
index 224176a53..d775ce6dc 100644
--- a/paludis/user_dep_spec-fwd.hh
+++ b/paludis/user_dep_spec-fwd.hh
@@ -63,6 +63,7 @@ namespace paludis
             ///\}
     };
 
+    struct UserSlotExactFullRequirement;
     struct UserSlotExactPartialRequirement;
 
     struct UserKeyRequirement;
diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc
index a35b46145..028101694 100644
--- a/paludis/user_dep_spec.cc
+++ b/paludis/user_dep_spec.cc
@@ -244,11 +244,21 @@ namespace
     void
     user_remove_trailing_slot_if_exists(std::string & s, PartiallyMadePackageDepSpec & result)
     {
-        std::string::size_type slot_p(s.rfind(':'));
-        if (std::string::npos != slot_p)
+        std::string::size_type slot_p;
+        if (std::string::npos == ((slot_p = s.rfind(':'))))
+            return;
+
+        std::string text(s.substr(slot_p + 1));
+        s.erase(slot_p);
+
+        auto p(text.find('/'));
+        if (std::string::npos != p)
+        {
+            result.slot_requirement(std::make_shared<UserSlotExactFullRequirement>(std::make_pair(SlotName(text.substr(0, p)), SlotName(text.substr(p + 1)))));
+        }
+        else
         {
-            result.slot_requirement(std::make_shared<UserSlotExactPartialRequirement>(SlotName(s.substr(slot_p + 1))));
-            s.erase(slot_p);
+            result.slot_requirement(std::make_shared<UserSlotExactPartialRequirement>(SlotName(text)));
         }
     }
 
@@ -387,6 +397,29 @@ paludis::envless_parse_package_dep_spec_for_tests(const std::string & ss)
 }
 
 
+UserSlotExactFullRequirement::UserSlotExactFullRequirement(const std::pair<SlotName, SlotName> & s) :
+    _s(s)
+{
+}
+
+const std::pair<SlotName, SlotName>
+UserSlotExactFullRequirement::slots() const
+{
+    return _s;
+}
+
+const std::string
+UserSlotExactFullRequirement::as_string() const
+{
+    return ":" + stringify(_s.first) + "/" + stringify(_s.second);
+}
+
+const std::shared_ptr<const SlotRequirement>
+UserSlotExactFullRequirement::maybe_original_requirement_if_rewritten() const
+{
+    return make_null_shared_ptr();
+}
+
 UserSlotExactPartialRequirement::UserSlotExactPartialRequirement(const SlotName & s) :
     _s(s)
 {
diff --git a/paludis/user_dep_spec.hh b/paludis/user_dep_spec.hh
index 92c01a979..9624412e2 100644
--- a/paludis/user_dep_spec.hh
+++ b/paludis/user_dep_spec.hh
@@ -53,6 +53,20 @@ namespace paludis
     PackageDepSpec envless_parse_package_dep_spec_for_tests(
             const std::string &) PALUDIS_VISIBLE;
 
+    class PALUDIS_VISIBLE UserSlotExactFullRequirement :
+        public SlotExactFullRequirement
+    {
+        private:
+            const std::pair<SlotName, SlotName> _s;
+
+        public:
+            UserSlotExactFullRequirement(const std::pair<SlotName, SlotName> &);
+
+            virtual const std::pair<SlotName, SlotName> slots() const PALUDIS_ATTRIBUTE((warn_unused_result));
+            virtual const std::string as_string() const PALUDIS_ATTRIBUTE((warn_unused_result));
+            virtual const std::shared_ptr<const SlotRequirement> maybe_original_requirement_if_rewritten() const PALUDIS_ATTRIBUTE((warn_unused_result));
+    };
+
     class PALUDIS_VISIBLE UserSlotExactPartialRequirement :
         public SlotExactPartialRequirement
     {