[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     61f625081294e1948bfa23da71ace43f332cd4ce
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 14:53:28 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 14:53:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=61f62508

Portage: support '^^' in depstrings (using a hack).

---
 gentoopm/portagepm/depend.py |   22 ++++++++++++++++++----
 gentoopm/portagepm/pkg.py    |    5 +++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/gentoopm/portagepm/depend.py b/gentoopm/portagepm/depend.py
index d4f3c33..f33fd5c 100644
--- a/gentoopm/portagepm/depend.py
+++ b/gentoopm/portagepm/depend.py
@@ -6,7 +6,7 @@
 from portage.dep import paren_reduce, use_reduce
 
 from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \
-	PMAnyOfDep, PMAllOfDep, PMBaseDep
+	PMAnyOfDep, PMAllOfDep, PMExactlyOneOfDep, PMBaseDep
 from gentoopm.portagepm.atom import PortageAtom
 
 class PortageBaseDep(PMBaseDep):
@@ -21,6 +21,8 @@ class PortageBaseDep(PMBaseDep):
 				yield PortageAnyOfDep(next(it), self._puse)
 			elif d == '&&':
 				yield PortageAllOfDep(next(it), self._puse)
+			elif d == '__xor__?':
+				yield PortageExactlyOneOfDep(next(it), self._puse)
 			elif d.endswith('?'):
 				yield PortageConditionalUseDep(next(it),
 						self._puse, d.rstrip('?'))
@@ -33,6 +35,9 @@ class PortageAnyOfDep(PMAnyOfDep, PortageBaseDep):
 class PortageAllOfDep(PMAllOfDep, PortageBaseDep):
 	pass
 
+class PortageExactlyOneOfDep(PMExactlyOneOfDep, PortageBaseDep):
+	pass
+
 class PortageConditionalUseDep(PMConditionalDep, PortageBaseDep):
 	def __init__(self, deps, puse, flag):
 		PortageBaseDep.__init__(self, deps, puse)
@@ -44,7 +49,11 @@ class PortageConditionalUseDep(PMConditionalDep, PortageBaseDep):
 
 class PortagePackageDepSet(PMPackageDepSet, PortageBaseDep):
 	def __init__(self, s, puse):
-		self._depstr = s
+		self._use_reducable = not '^^' in s
+		if not self._use_reducable:
+			# ARGV, paren_reduce() doesn't handle ^^
+			# so we hack it to a __xor__?, UGLY!
+			self._depstr = s.replace('^^', '__xor__?')
 		PortageBaseDep.__init__(self, None, puse)
 
 	def __iter__(self):
@@ -54,8 +63,10 @@ class PortagePackageDepSet(PMPackageDepSet, PortageBaseDep):
 
 	@property
 	def without_conditionals(self):
-		return PortageUncondAllOfDep(
-				use_reduce(self._depstr, self._puse))
+		if self._use_reducable:
+			return PortageUncondAllOfDep(
+					use_reduce(self._depstr, self._puse))
+		return PMPackageDepSet.without_conditionals.fget(self)
 
 class PortageUncondDep(PortageBaseDep):
 	def __init__(self, deps):
@@ -80,3 +91,6 @@ class PortageUncondAnyOfDep(PMAnyOfDep, PortageUncondDep):
 
 class PortageUncondAllOfDep(PMAllOfDep, PortageUncondDep):
 	pass
+
+class PortageUncondExactlyOneOfDep(PMExactlyOneOfDep, PortageUncondDep):
+	pass

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index ed4c80c..221e728 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -183,6 +183,11 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 		return PortagePackageDepSet(self._aux_get('PDEPEND'),
 				self._applied_use)
 
+	@property
+	def required_use(self):
+		return PortagePackageDepSet(self._aux_get('REQUIRED_USE'),
+				self._applied_use)
+
 	def __str__(self):
 		return '=%s' % self._cpv