| 1 |
commit: 3082162095b944388a5b6942135a8d6326cb89d9 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Sat Aug 23 17:50:46 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Sat Aug 23 17:56:30 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=30821620 |
| 7 |
|
| 8 |
set default EAPI=5 and make it configurable |
| 9 |
|
| 10 |
SLOTted dependency rules allow to use EAPI 5 features, so default to 5. |
| 11 |
|
| 12 |
--- |
| 13 |
roverlay/config/const.py | 2 +- |
| 14 |
roverlay/config/defconfig.py | 4 ++++ |
| 15 |
roverlay/config/entrymap.py | 11 +++++------ |
| 16 |
3 files changed, 10 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/roverlay/config/const.py b/roverlay/config/const.py |
| 19 |
index 0933689..046268b 100644 |
| 20 |
--- a/roverlay/config/const.py |
| 21 |
+++ b/roverlay/config/const.py |
| 22 |
@@ -49,7 +49,7 @@ _CONSTANTS = dict ( |
| 23 |
'# $Header: $\n' |
| 24 |
).format ( year=time.gmtime()[0] ), |
| 25 |
# EAPI=N and inherit <eclasses> are no longer part of the default header |
| 26 |
- eapi = 4, |
| 27 |
+ eapi = 5, |
| 28 |
|
| 29 |
# number of workers used by OverlayCreator |
| 30 |
# when 0 => dont use threads |
| 31 |
|
| 32 |
diff --git a/roverlay/config/defconfig.py b/roverlay/config/defconfig.py |
| 33 |
index 383bb96..145905f 100644 |
| 34 |
--- a/roverlay/config/defconfig.py |
| 35 |
+++ b/roverlay/config/defconfig.py |
| 36 |
@@ -426,6 +426,10 @@ class RoverlayConfigCreation ( object ): |
| 37 |
defaults_to="no", |
| 38 |
), |
| 39 |
ConfigOption ( |
| 40 |
+ 'EBUILD_EAPI', '5', required=False, comment_default=True, |
| 41 |
+ defaults_to="5", |
| 42 |
+ ), |
| 43 |
+ ConfigOption ( |
| 44 |
'MANIFEST_IMPLEMENTATION', 'ebuild', required=False, |
| 45 |
use_default_desc=False, comment_default=True, defaults_to="next", |
| 46 |
description=( |
| 47 |
|
| 48 |
diff --git a/roverlay/config/entrymap.py b/roverlay/config/entrymap.py |
| 49 |
index 46c2f7f..3e188b3 100644 |
| 50 |
--- a/roverlay/config/entrymap.py |
| 51 |
+++ b/roverlay/config/entrymap.py |
| 52 |
@@ -366,11 +366,10 @@ CONFIG_ENTRY_MAP = dict ( |
| 53 |
|
| 54 |
# == ebuild == |
| 55 |
|
| 56 |
- ebuild_eapi = None, |
| 57 |
-# ebuild_eapi = dict ( |
| 58 |
-# description = "EAPI of the created ebuilds", |
| 59 |
-# value_type = str, |
| 60 |
-# ), |
| 61 |
+ ebuild_eapi = dict ( |
| 62 |
+ description = "EAPI of the created ebuilds", |
| 63 |
+ value_type = str, |
| 64 |
+ ), |
| 65 |
|
| 66 |
ebuild_use_expand_desc = dict ( |
| 67 |
path = [ 'EBUILD', 'USE_EXPAND', 'desc_file', ], |
| 68 |
@@ -394,7 +393,7 @@ CONFIG_ENTRY_MAP = dict ( |
| 69 |
), |
| 70 |
|
| 71 |
# * alias |
| 72 |
- #eapi = 'ebuild_eapi', |
| 73 |
+ eapi = 'ebuild_eapi', |
| 74 |
use_expand_desc = 'ebuild_use_expand_desc', |
| 75 |
use_expand_name = 'ebuild_use_expand_name', |
| 76 |
use_expand_rename = 'ebuild_use_expand_rename', |
Archives