| 1 |
commit: 925f11b49cd410c164c822c29ef36884e6c22b99 |
| 2 |
Author: Andre Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Wed May 30 19:35:47 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Wed May 30 19:35:47 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=925f11b4 |
| 7 |
|
| 8 |
roverlay, ebuild: reduce lines of code by not writing unchanged vars (IUSE="${IUSE:-}" etc.) |
| 9 |
modified: roverlay/ebuild.py |
| 10 |
|
| 11 |
--- |
| 12 |
roverlay/ebuild.py | 21 ++++++++++++++++----- |
| 13 |
1 files changed, 16 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/roverlay/ebuild.py b/roverlay/ebuild.py |
| 16 |
index df2d028..8c960a2 100644 |
| 17 |
--- a/roverlay/ebuild.py |
| 18 |
+++ b/roverlay/ebuild.py |
| 19 |
@@ -163,9 +163,11 @@ class Ebuild: |
| 20 |
have_suggests = bool ( 'RSUGGESTS' in self._data and self._data ['RSUGGESTS'] ) |
| 21 |
|
| 22 |
# set defaults: inherit eclass + include depend in rdepend |
| 23 |
+ # TODO: is ${DEPEND:-},... necessary? |
| 24 |
ret = dict ( |
| 25 |
DEPEND = [ '${DEPEND:-}' ], |
| 26 |
- RDEPEND = [ '${DEPEND:-}', '${RDEPEND:-}' ], |
| 27 |
+ # RDEPEND: assuming that the eclass includes it's DEPEND in RDEPEND |
| 28 |
+ RDEPEND = [ '${RDEPEND:-}' ], |
| 29 |
IUSE = [ '${IUSE:-}' ], |
| 30 |
) |
| 31 |
|
| 32 |
@@ -305,7 +307,9 @@ class Ebuild: |
| 33 |
|
| 34 |
add_easyvar ( ebuild_lines, "PKG_FILE" ) |
| 35 |
if 'PKG_ORIGIN' in self._data: |
| 36 |
- add_easyvar ( ebuild_lines, "PKG_ORIGIN", None, True ) |
| 37 |
+ add_easyvar ( ebuild_lines, "PKG_ORIGIN", None, False ) |
| 38 |
+ |
| 39 |
+ ebuild_lines.append ( "" ) |
| 40 |
|
| 41 |
add_easyvar ( ebuild_lines, "DESCRIPTION" ) |
| 42 |
|
| 43 |
@@ -323,13 +327,20 @@ class Ebuild: |
| 44 |
|
| 45 |
dep_and_use = get_dep_and_use () |
| 46 |
|
| 47 |
- ebuild_lines.append ( make_var ( "IUSE", dep_and_use ['IUSE'], True ) ) |
| 48 |
+ # check that IUSE has more than one element, don't write IUSE="${IUSE:-}" etc. |
| 49 |
+ if len ( dep_and_use ['IUSE'] ) > 1: |
| 50 |
+ ebuild_lines.append ( make_var ( "IUSE", dep_and_use ['IUSE'], True ) ) |
| 51 |
|
| 52 |
if 'R_SUGGESTS' in dep_and_use: |
| 53 |
ebuild_lines.append ( make_var ( "R_SUGGESTS", dep_and_use ['R_SUGGESTS'], False ) ) |
| 54 |
|
| 55 |
- ebuild_lines.append ( make_var ( "DEPEND", dep_and_use ['DEPEND'], False ) ) |
| 56 |
- ebuild_lines.append ( make_var ( "RDEPEND", dep_and_use ['RDEPEND'], False ) ) |
| 57 |
+ # see IUSE |
| 58 |
+ if len ( dep_and_use ['DEPEND'] ) > 1: |
| 59 |
+ ebuild_lines.append ( make_var ( "DEPEND", dep_and_use ['DEPEND'], False ) ) |
| 60 |
+ |
| 61 |
+ # see IUSE |
| 62 |
+ if len ( dep_and_use ['RDEPEND'] ) > 1: |
| 63 |
+ ebuild_lines.append ( make_var ( "RDEPEND", dep_and_use ['RDEPEND'], False ) ) |
| 64 |
|
| 65 |
del dep_and_use |
| 66 |
return remove_newlines ( ebuild_lines ) |
Archives