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

[André Erdmann]

commit:     43760dfaaf7a140a0c941c1cbd89c481796f50cf
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Thu Aug  2 15:04:05 2012 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Thu Aug  2 15:04:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=43760dfa

ebuild: replace dep_allowed code

Should be more stable now (and doesn't raise an exception for deps
that cannot be filtered due to various reasons)

---
 roverlay/ebuild/depfilter.py |   68 ++++++++++++++++++++++++++++++++++++++++++
 roverlay/ebuild/depres.py    |   55 +++++++--------------------------
 2 files changed, 80 insertions(+), 43 deletions(-)

diff --git a/roverlay/ebuild/depfilter.py b/roverlay/ebuild/depfilter.py
new file mode 100644
index 0000000..8aaf18e
--- /dev/null
+++ b/roverlay/ebuild/depfilter.py
@@ -0,0 +1,68 @@
+def dep_allowed ( dep ):
+	"""Filters out redundant dependencies on dev-lang/R."""
+
+	if not dep:
+		return 0
+	elif dep[0] in '|(':
+		# compound dep statements "|| ( a b c )", "( a b c )"
+		return 1
+
+
+	# the oldest version of dev-lang/R in portage
+	OLDEST_R_VERSION = ( 2, 10, 1 )
+#	OLDEST_R_VERSION = config.get (
+#		"PORTAGE.lowest_r_version", "2.10.1"
+#	).split ( '.' )
+
+	cat, sep, remainder = dep.partition ( '/' )
+	# don't strip leading '!'
+	cat = cat.lstrip ( "<>=" )
+
+
+	if not sep:
+		# cannot parse this
+		return 2
+
+	elif cat != 'dev-lang':
+		# only filtering dev-lang/R
+		return 3
+
+	elif '[' in remainder:
+		# USE flag requirements, e.g. "dev-lang/R[lapack]"
+		return 4
+
+	# result is ${PN}-${PV} or ${PN}-${PV}-${PR}
+	pn_or_pnpv, sepa, ver_or_rev = remainder.rpartition ( '-' )
+
+	if not sepa or not pn_or_pnpv:
+		return 5 if ver_or_rev != 'R' else 0
+
+	elif pn_or_pnpv [0] != 'R' or (
+		len ( pn_or_pnpv ) > 1 and pn_or_pnpv [1] != '-'
+	):
+		# only filtering dev-lang/R
+		return 6
+
+	elif len ( ver_or_rev ) == 0:
+		return 7
+
+	elif ver_or_rev [0] == 'r':
+		try:
+			pr = int ( ver_or_rev [1:] )
+		except ValueError:
+			return 8
+
+		pn, sepa, ver_or_rev = pn_or_pnpv.rpartition ( '-' )
+
+	else:
+		pn = pn_or_pnpv
+		pr = 0
+
+	try:
+		pv = tuple ( int (x) for x in ver_or_rev.split ( '.' ) ) + ( pr, )
+	except ValueError:
+		raise
+		return 9
+
+	return 10 if pv > OLDEST_R_VERSION else 0
+# --- end of dep_allowed (...) ---

diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py
index 8b38e91..b08c913 100644
--- a/roverlay/ebuild/depres.py
+++ b/roverlay/ebuild/depres.py
@@ -2,10 +2,10 @@
 # Copyright 2006-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+from roverlay        import config
 from roverlay.depres import deptype
-from roverlay.ebuild import evars
+from roverlay.ebuild import evars, depfilter
 
-# TODO/FIXME/IGNORE move this to const / config
 FIELDS_TO_EVAR = {
 	'R_SUGGESTS' : ( 'Suggests', ),
 	'DEPENDS'    : ( 'Depends', 'Imports' ),
@@ -16,19 +16,24 @@ FIELDS_TO_EVAR = {
 # setting per-field dep types here, in accordance with
 #  http://cran.r-project.org/doc/manuals/R-exts.html#The-DESCRIPTION-file
 FIELDS = {
+
 	# "The Depends field gives a comma-separated
 	#  list of >>package names<< which this package depends on."
 	'Depends'            : deptype.PKG,
+
 	# "Other dependencies (>>external to the R system<<)
 	#  should be listed in the SystemRequirements field"
 	'SystemRequirements' : deptype.SYS,
+
 	# "The Imports field lists >>packages<< whose namespaces
 	#  are imported from (as specified in the NAMESPACE file)
 	#  but which do not need to be attached."
 	'Imports'            : deptype.PKG,
+
 	# "The Suggests field uses the same syntax as Depends
 	#  and lists >>packages<< that are >>not necessarily needed<<."
 	'Suggests'           : deptype.internal,
+
 	# "A package that wishes to make use of header files
 	#  in other >>packages<< needs to declare them as
 	#  a comma-separated list in the field LinkingTo in the DESCRIPTION file."
@@ -174,44 +179,6 @@ class EbuildDepRes ( object ):
 
 	def _make_result ( self ):
 		"""Make evars using the depres result."""
-		def dep_allowed ( dep ):
-			try:
-				#FIXME hardcoded
-				#FIXME fails for "qt-core" etc.
-
-				# the oldest version of dev-lang/R in portage
-				OLDEST_R_VERSION = ( 2, 20, 1 )
-
-				if	not dep:
-					return False
-
-				cat, sep, remainder = dep.partition ( '/' )
-
-				if not sep:
-					raise Exception ( "bad dependency string '%s'!" % dep )
-
-				dep_list = remainder.split ( '-', 2 )
-
-				if len ( dep_list ) < 2:
-					ver = ( 0, )
-				else:
-					ver = tuple ( int (x) for x in dep_list [1].split ( '.' ) )
-
-
-				if cat.endswith ( 'dev-lang' ) \
-					and dep_list [0] == 'R' \
-					and cat [0] != '!' \
-				:
-					if not ver:
-						# filters out 'dev-lang/R'
-						return False
-					else:
-						return ver > OLDEST_R_VERSION
-			except Exception as e:
-				self.logger.exception ( e )
-
-			return True
-		# --- end of dep_allowed (...) ---
 
 		# RDEPEND -> <deps>, DEPEND -> <deps>, ..
 		_depmap = dict()
@@ -219,15 +186,17 @@ class EbuildDepRes ( object ):
 		# (e.g. whether to include R_SUGGESTS in RDEPEND)
 		for dep_type, channel in self._channels.items():
 			deplist = tuple ( filter (
-				dep_allowed, channel.collect_dependencies() )
+				depfilter.dep_allowed, channel.collect_dependencies() )
 			)
 
 			if len ( deplist ) > 0:
-				self.logger.debug ( "adding %s to %s", deplist, dep_type )
+				self.logger.debug (
+					"adding {deps} to {depvar}".format (
+						deps=deplist, depvar=dep_type
+				) )
 				_depmap [dep_type] = deplist
 			# else: (effectively) no dependencies for dep_type
 
-
 		self._close_channels()
 
 		self.has_suggests = bool ( 'R_SUGGESTS' in _depmap )