[gentoo-commits] proj/R_overlay:master commit in: roverlay/

["André Erdmann" <dywi@mailerd.de>]

commit:     925f11b49cd410c164c822c29ef36884e6c22b99
Author:     Andre Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed May 30 19:35:47 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed May 30 19:35:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=925f11b4

roverlay, ebuild: reduce lines of code by not writing unchanged vars (IUSE="${IUSE:-}" etc.)
	modified:   roverlay/ebuild.py

---
 roverlay/ebuild.py |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/roverlay/ebuild.py b/roverlay/ebuild.py
index df2d028..8c960a2 100644
--- a/roverlay/ebuild.py
+++ b/roverlay/ebuild.py
@@ -163,9 +163,11 @@ class Ebuild:
 			have_suggests = bool ( 'RSUGGESTS' in self._data and self._data ['RSUGGESTS'] )
 
 			# set defaults: inherit eclass + include depend in rdepend
+			# TODO: is ${DEPEND:-},... necessary?
 			ret = dict (
 				DEPEND  = [ '${DEPEND:-}' ],
-				RDEPEND = [ '${DEPEND:-}',  '${RDEPEND:-}' ],
+				# RDEPEND: assuming that the eclass includes it's DEPEND in RDEPEND
+				RDEPEND = [ '${RDEPEND:-}' ],
 				IUSE    = [ '${IUSE:-}' ],
 			)
 
@@ -305,7 +307,9 @@ class Ebuild:
 
 			add_easyvar ( ebuild_lines, "PKG_FILE" )
 			if 'PKG_ORIGIN' in self._data:
-				add_easyvar ( ebuild_lines, "PKG_ORIGIN", None, True )
+				add_easyvar ( ebuild_lines, "PKG_ORIGIN", None, False )
+
+			ebuild_lines.append ( "" )
 
 			add_easyvar ( ebuild_lines, "DESCRIPTION" )
 
@@ -323,13 +327,20 @@ class Ebuild:
 
 			dep_and_use = get_dep_and_use ()
 
-			ebuild_lines.append ( make_var ( "IUSE", dep_and_use ['IUSE'], True ) )
+			# check that IUSE has more than one element, don't write IUSE="${IUSE:-}" etc.
+			if len ( dep_and_use ['IUSE'] ) > 1:
+				ebuild_lines.append ( make_var ( "IUSE", dep_and_use ['IUSE'], True ) )
 
 			if 'R_SUGGESTS' in dep_and_use:
 				ebuild_lines.append ( make_var ( "R_SUGGESTS", dep_and_use ['R_SUGGESTS'], False ) )
 
-			ebuild_lines.append ( make_var ( "DEPEND", dep_and_use ['DEPEND'], False ) )
-			ebuild_lines.append ( make_var ( "RDEPEND", dep_and_use ['RDEPEND'], False ) )
+			# see IUSE
+			if len ( dep_and_use ['DEPEND'] ) > 1:
+				ebuild_lines.append ( make_var ( "DEPEND", dep_and_use ['DEPEND'], False ) )
+
+			# see IUSE
+			if len ( dep_and_use ['RDEPEND'] ) > 1:
+				ebuild_lines.append ( make_var ( "RDEPEND", dep_and_use ['RDEPEND'], False ) )
 
 			del dep_and_use
 			return remove_newlines ( ebuild_lines )