Add date, author, token annotations

6 files changed, 24 insertions, 0 deletions

diff --git a/paludis/dep_spec_annotations.cc b/paludis/dep_spec_annotations.cc
index d86cd2d96..68305134b 100644
--- a/paludis/dep_spec_annotations.cc
+++ b/paludis/dep_spec_annotations.cc
@@ -126,6 +126,9 @@ paludis::find_blocker_role_in_annotations(
             case dsar_general_note:
             case dsar_general_lang:
             case dsar_general_defined_in:
+            case dsar_general_date:
+            case dsar_general_author:
+            case dsar_general_token:
             case dsar_myoptions_requires:
             case dsar_myoptions_n_at_least_one:
             case dsar_myoptions_n_at_most_one:
diff --git a/paludis/dep_spec_annotations.se b/paludis/dep_spec_annotations.se
index ebe553771..82f67d527 100644
--- a/paludis/dep_spec_annotations.se
+++ b/paludis/dep_spec_annotations.se
@@ -11,6 +11,9 @@ make_enum_DepSpecAnnotationRole()
     key dsar_general_url                      "A url"
     key dsar_general_note                     "A note"
     key dsar_general_lang                     "A language"
+    key dsar_general_date                     "A date"
+    key dsar_general_author                   "An author"
+    key dsar_general_token                    "A token"
     key dsar_general_defined_in               "Defined in"
 
     # update find_blocker_role_in_annotations when adding here
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 401da2718..c6450968e 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -254,9 +254,12 @@ namespace
                     n::blocker_resolution_uninstall_blocked_after() = k.get("annotations_blocker_resolution_uninstall_blocked_after"),
                     n::blocker_resolution_uninstall_blocked_before() = k.get("annotations_blocker_resolution_uninstall_blocked_before"),
                     n::blocker_resolution_upgrade_blocked_before() = k.get("annotations_blocker_resolution_upgrade_blocked_before"),
+                    n::general_author() = k.get("annotations_general_author"),
+                    n::general_date() = k.get("annotations_general_date"),
                     n::general_description() = k.get("annotations_general_description"),
                     n::general_lang() = k.get("annotations_general_lang"),
                     n::general_note() = k.get("annotations_general_note"),
+                    n::general_token() = k.get("annotations_general_token"),
                     n::general_url() = k.get("annotations_general_url"),
                     n::myoptions_number_selected() = k.get("annotations_myoptions_number_selected"),
                     n::myoptions_number_selected_at_least_one() = k.get("annotations_myoptions_number_selected_at_least_one"),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index d7a667435..50d601abb 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -126,9 +126,12 @@ namespace paludis
         typedef Name<struct name_flat_list_index> flat_list_index;
         typedef Name<struct name_fs_location_description> fs_location_description;
         typedef Name<struct name_fs_location_name> fs_location_name;
+        typedef Name<struct name_general_author> general_author;
+        typedef Name<struct name_general_date> general_date;
         typedef Name<struct name_general_description> general_description;
         typedef Name<struct name_general_lang> general_lang;
         typedef Name<struct name_general_note> general_note;
+        typedef Name<struct name_general_token> general_token;
         typedef Name<struct name_general_url> general_url;
         typedef Name<struct name_generated_from> generated_from;
         typedef Name<struct name_generated_time> generated_time;
@@ -479,9 +482,12 @@ namespace paludis
             NamedValue<n::blocker_resolution_uninstall_blocked_after, std::string> blocker_resolution_uninstall_blocked_after;
             NamedValue<n::blocker_resolution_uninstall_blocked_before, std::string> blocker_resolution_uninstall_blocked_before;
             NamedValue<n::blocker_resolution_upgrade_blocked_before, std::string> blocker_resolution_upgrade_blocked_before;
+            NamedValue<n::general_author, std::string> general_author;
+            NamedValue<n::general_date, std::string> general_date;
             NamedValue<n::general_description, std::string> general_description;
             NamedValue<n::general_lang, std::string> general_lang;
             NamedValue<n::general_note, std::string> general_note;
+            NamedValue<n::general_token, std::string> general_token;
             NamedValue<n::general_url, std::string> general_url;
             NamedValue<n::myoptions_number_selected, std::string> myoptions_number_selected;
             NamedValue<n::myoptions_number_selected_at_least_one, std::string> myoptions_number_selected_at_least_one;
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 318d731d8..c37a01265 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -362,6 +362,9 @@ annotations_general_description = description
 annotations_general_lang = lang
 annotations_general_note = note
 annotations_general_url = url
+annotations_general_author = author
+annotations_general_date = date
+annotations_general_token = token
 annotations_myoptions_requires = requires
 annotations_myoptions_number_selected = number-selected
 annotations_myoptions_number_selected_at_least_one = at-least-one
diff --git a/paludis/repositories/e/parse_annotations.cc b/paludis/repositories/e/parse_annotations.cc
index e6b3cf8a6..66e5e5509 100644
--- a/paludis/repositories/e/parse_annotations.cc
+++ b/paludis/repositories/e/parse_annotations.cc
@@ -118,6 +118,12 @@ paludis::erepository::parse_annotations(
                 role = dsar_general_note;
             else if (key == eapi.supported()->annotations()->general_lang())
                 role = dsar_general_lang;
+            else if (key == eapi.supported()->annotations()->general_author())
+                role = dsar_general_author;
+            else if (key == eapi.supported()->annotations()->general_date())
+                role = dsar_general_date;
+            else if (key == eapi.supported()->annotations()->general_token())
+                role = dsar_general_token;
             else if (key == eapi.supported()->ebuild_options()->bracket_merged_variables_annotation())
                 role = dsar_general_defined_in;
         }