aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-05 11:44:00 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-09-05 13:06:39 +0100
commit250deadc07a75f192ffbfc763f6238ed1ffaaf1a (patch)
tree07d1c651db247a236789504b551d40db578786ea
parent7ff864517bbd6591139b27dfea8d0e1b43152f2c (diff)
downloadpaludis-250deadc07a75f192ffbfc763f6238ed1ffaaf1a.tar.gz
paludis-250deadc07a75f192ffbfc763f6238ed1ffaaf1a.tar.xz
exheres-0 supports annotations
-rw-r--r--paludis/repositories/e/eapi.cc10
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf5
2 files changed, 10 insertions, 5 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 40c5eb7..7aa2beb 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -243,11 +243,11 @@ namespace
std::shared_ptr<const EAPIAnnotations> make_annotations(const KeyValueConfigFile & k)
{
return std::make_shared<EAPIAnnotations>(make_named_values<EAPIAnnotations>(
- n::blocker_resolution() = k.get("blocker_resolution"),
- n::blocker_resolution_manual() = k.get("blocker_resolution_manual"),
- n::blocker_resolution_uninstall_blocked_after() = k.get("blocker_resolution_uninstall_blocked_after"),
- n::blocker_resolution_uninstall_blocked_before() = k.get("blocker_resolution_uninstall_blocked_before"),
- n::blocker_resolution_upgrade_blocked_before() = k.get("blocker_resolution_upgrade_blocked_before"),
+ n::blocker_resolution() = k.get("annotations_blocker_resolution"),
+ n::blocker_resolution_manual() = k.get("annotations_blocker_resolution_manual"),
+ 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::myoptions_description() = k.get("annotations_myoptions_description"),
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/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 96e8e24..ca74e63 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -349,6 +349,11 @@ shell_options = extglob globstar
unpack_suffixes = tar tar.gz,tgz,tar.Z tar.bz2,tbz2,tbz zip,ZIP,jar gz,Z,z bz2 rar,RAR lha,LHa,LHA,lzh a,deb tar.lzma lzma 7z,7Z tar.xz xz
+annotations_blocker_resolution = resolution
+annotations_blocker_resolution_manual = manual
+annotations_blocker_resolution_uninstall_blocked_after = uninstall-blocked-after
+annotations_blocker_resolution_uninstall_blocked_before = uninstall-blocked-before
+annotations_blocker_resolution_upgrade_blocked_before = upgrade-blocked-before
annotations_myoptions_description = description
annotations_myoptions_requires = requires
annotations_myoptions_number_selected = number-selected