aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eapi.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-04 14:20:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-04 20:51:26 +0000
commit821693b16c1f997ff5567c1bbf3966244bb835fa (patch)
treee65f37866579032e9c5489aeed7a9a93fe831ca1 /paludis/repositories/e/eapi.hh
parentc8840c14f37099fb74cc68684a260eff7641a7ce (diff)
downloadpaludis-821693b16c1f997ff5567c1bbf3966244bb835fa.tar.gz
paludis-821693b16c1f997ff5567c1bbf3966244bb835fa.tar.xz
EAPI 4 has MERGE_TYPE
Diffstat (limited to 'paludis/repositories/e/eapi.hh')
-rw-r--r--paludis/repositories/e/eapi.hh2
1 files changed, 2 insertions, 0 deletions
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 6faa046d2..bc28929a6 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -101,6 +101,7 @@ namespace paludis
typedef Name<struct env_iuse_implicit_name> env_iuse_implicit;
typedef Name<struct env_jobs_name> env_jobs;
typedef Name<struct env_kv_name> env_kv;
+ typedef Name<struct env_merge_type_name> env_merge_type;
typedef Name<struct env_p_name> env_p;
typedef Name<struct env_pf_name> env_pf;
typedef Name<struct env_portdir_name> env_portdir;
@@ -318,6 +319,7 @@ namespace paludis
NamedValue<n::env_iuse_implicit, std::string> env_iuse_implicit;
NamedValue<n::env_jobs, std::string> env_jobs;
NamedValue<n::env_kv, std::string> env_kv;
+ NamedValue<n::env_merge_type, std::string> env_merge_type;
NamedValue<n::env_p, std::string> env_p;
NamedValue<n::env_pf, std::string> env_pf;
NamedValue<n::env_portdir, std::string> env_portdir;