diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-10-09 16:32:14 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-10-09 16:34:58 +0100 |
| commit | d70bc9eaea6c39a479d0b4b0a6324f3ab5dedf57 (patch) | |
| tree | afba75ab1724b40de7fa7cc7ba8e04c47e137ccc | |
| parent | db323efa71b49126a5ca1c65853658ad7de41815 (diff) | |
| download | paludis-d70bc9eaea6c39a479d0b4b0a6324f3ab5dedf57.tar.gz paludis-d70bc9eaea6c39a479d0b4b0a6324f3ab5dedf57.tar.xz | |
Add last checked annotation
| -rw-r--r-- | paludis/repositories/e/eapi.cc | 1 | ||||
| -rw-r--r-- | paludis/repositories/e/eapi.hh | 2 | ||||
| -rw-r--r-- | paludis/repositories/e/eapis/exheres-0.conf | 1 | ||||
| -rw-r--r-- | paludis/repositories/e/parse_annotations.cc | 7 |
4 files changed, 11 insertions, 0 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc index aeabc5d07..a467359bf 100644 --- a/paludis/repositories/e/eapi.cc +++ b/paludis/repositories/e/eapi.cc @@ -262,6 +262,7 @@ namespace 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::licence_last_checked() = k.get("annotations_licence_last_checked"), 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"), n::myoptions_number_selected_at_most_one() = k.get("annotations_myoptions_number_selected_at_most_one"), diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh index fbdd87789..4159b8d69 100644 --- a/paludis/repositories/e/eapi.hh +++ b/paludis/repositories/e/eapi.hh @@ -148,6 +148,7 @@ namespace paludis typedef Name<struct name_iuse_effective> iuse_effective; typedef Name<struct name_iuse_flag_parse_options> iuse_flag_parse_options; typedef Name<struct name_keywords> keywords; + typedef Name<struct name_licence_last_checked> licence_last_checked; typedef Name<struct name_license> license; typedef Name<struct name_load_modules> load_modules; typedef Name<struct name_long_description> long_description; @@ -490,6 +491,7 @@ namespace paludis 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::licence_last_checked, std::string> licence_last_checked; 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; NamedValue<n::myoptions_number_selected_at_most_one, std::string> myoptions_number_selected_at_most_one; diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf index fe4ccc032..6d678f6d9 100644 --- a/paludis/repositories/e/eapis/exheres-0.conf +++ b/paludis/repositories/e/eapis/exheres-0.conf @@ -364,6 +364,7 @@ annotations_general_url = url annotations_general_author = author annotations_general_date = date annotations_general_token = token +annotations_licence_last_checked = last-checked 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 370a035ab..2b5ed6561 100644 --- a/paludis/repositories/e/parse_annotations.cc +++ b/paludis/repositories/e/parse_annotations.cc @@ -135,6 +135,13 @@ paludis::erepository::parse_annotations( role = dsar_general_defined_in; } + /* licences */ + if (dsar_none == role) + { + if (key == eapi.supported()->annotations()->licence_last_checked()) + role = dsar_licence_last_checked; + } + if (dsar_none == role) Log::get_instance()->message("e.dep_parser.unknown_annotation", ll_qa, lc_context) << "Unknown annotation '" << key << "' = '" << k->second << "'"; |