aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--roverlay/config/const.py2
-rw-r--r--roverlay/config/defconfig.py4
-rw-r--r--roverlay/config/entrymap.py11
3 files changed, 10 insertions, 7 deletions
diff --git a/roverlay/config/const.py b/roverlay/config/const.py
index 0933689..046268b 100644
--- a/roverlay/config/const.py
+++ b/roverlay/config/const.py
@@ -49,7 +49,7 @@ _CONSTANTS = dict (
'# $Header: $\n'
).format ( year=time.gmtime()[0] ),
# EAPI=N and inherit <eclasses> are no longer part of the default header
- eapi = 4,
+ eapi = 5,
# number of workers used by OverlayCreator
# when 0 => dont use threads
diff --git a/roverlay/config/defconfig.py b/roverlay/config/defconfig.py
index 383bb96..145905f 100644
--- a/roverlay/config/defconfig.py
+++ b/roverlay/config/defconfig.py
@@ -426,6 +426,10 @@ class RoverlayConfigCreation ( object ):
defaults_to="no",
),
ConfigOption (
+ 'EBUILD_EAPI', '5', required=False, comment_default=True,
+ defaults_to="5",
+ ),
+ ConfigOption (
'MANIFEST_IMPLEMENTATION', 'ebuild', required=False,
use_default_desc=False, comment_default=True, defaults_to="next",
description=(
diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py
index 46c2f7f..3e188b3 100644
--- a/roverlay/config/entrymap.py
+++ b/roverlay/config/entrymap.py
@@ -366,11 +366,10 @@ CONFIG_ENTRY_MAP = dict (
# == ebuild ==
- ebuild_eapi = None,
-# ebuild_eapi = dict (
-# description = "EAPI of the created ebuilds",
-# value_type = str,
-# ),
+ ebuild_eapi = dict (
+ description = "EAPI of the created ebuilds",
+ value_type = str,
+ ),
ebuild_use_expand_desc = dict (
path = [ 'EBUILD', 'USE_EXPAND', 'desc_file', ],
@@ -394,7 +393,7 @@ CONFIG_ENTRY_MAP = dict (
),
# * alias
- #eapi = 'ebuild_eapi',
+ eapi = 'ebuild_eapi',
use_expand_desc = 'ebuild_use_expand_desc',
use_expand_name = 'ebuild_use_expand_name',
use_expand_rename = 'ebuild_use_expand_rename',