[gentoo-commits] proj/gentoopm:master commit in: gentoopm/pkgcorepm/, gentoopm/paludispm/

[Michał Górny]

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

Paludis/pkgcore: introduce initial support for REQUIRED_USE.

---
 gentoopm/paludispm/depend.py |   10 +++++++++-
 gentoopm/paludispm/pkg.py    |    7 +++++++
 gentoopm/pkgcorepm/depend.py |   19 +++++++++++++++++--
 gentoopm/pkgcorepm/pkg.py    |   10 ++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/gentoopm/paludispm/depend.py b/gentoopm/paludispm/depend.py
index 976fa55..91a2e3c 100644
--- a/gentoopm/paludispm/depend.py
+++ b/gentoopm/paludispm/depend.py
@@ -6,7 +6,7 @@
 import paludis
 
 from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \
-	PMAnyOfDep, PMAllOfDep, PMBaseDep
+	PMAnyOfDep, PMAllOfDep, PMExactlyOneOfDep, PMBaseDep
 from gentoopm.paludispm.atom import PaludisAtom
 
 class PaludisBaseDep(PMBaseDep):
@@ -22,8 +22,13 @@ class PaludisBaseDep(PMBaseDep):
 				yield PaludisAnyOfDep(d, self._pkg)
 			elif isinstance(d, paludis.AllDepSpec):
 				yield PaludisAllOfDep(d, self._pkg)
+			elif isinstance(d, paludis.ExactlyOneDepSpec):
+				yield PaludisExactlyOneOfDep(d, self._pkg)
 			elif isinstance(d, paludis.ConditionalDepSpec):
 				yield PaludisConditionalDep(d, self._pkg)
+			elif isinstance(d, paludis.PlainTextDepSpec):
+				# XXX: this is in REQUIRED_USE as well
+				yield str(d)
 			else:
 				raise NotImplementedError('Unable to parse %s' % repr(d))
 
@@ -33,6 +38,9 @@ class PaludisAnyOfDep(PMAnyOfDep, PaludisBaseDep):
 class PaludisAllOfDep(PMAllOfDep, PaludisBaseDep):
 	pass
 
+class PaludisExactlyOneOfDep(PMExactlyOneOfDep, PaludisBaseDep):
+	pass
+
 class PaludisConditionalDep(PMConditionalDep, PaludisBaseDep):
 	@property
 	def enabled(self):

diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index 288bc2b..c29c0d7 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -137,6 +137,13 @@ class PaludisID(PMPackage, PaludisAtom):
 				self)
 
 	@property
+	def required_use(self):
+		k = self._pkg.find_metadata('REQUIRED_USE')
+		if k is None:
+			return None
+		return PaludisPackageDepSet(k.parse_value(), self)
+
+	@property
 	def use(self):
 		iuse = self._pkg.find_metadata('IUSE').parse_value()
 		return SpaceSepFrozenSet([PaludisUseFlag(x) for x in iuse])

diff --git a/gentoopm/pkgcorepm/depend.py b/gentoopm/pkgcorepm/depend.py
index 8ebe6cf..fd3dcce 100644
--- a/gentoopm/pkgcorepm/depend.py
+++ b/gentoopm/pkgcorepm/depend.py
@@ -4,11 +4,13 @@
 # Released under the terms of the 2-clause BSD license.
 
 from pkgcore.ebuild.atom import atom
-from pkgcore.restrictions.boolean import OrRestriction, AndRestriction
+from pkgcore.restrictions.boolean import OrRestriction, AndRestriction, \
+		JustOneRestriction
 from pkgcore.restrictions.packages import Conditional
+from pkgcore.restrictions.values import ContainmentMatch
 
 from gentoopm.basepm.depend import PMPackageDepSet, PMConditionalDep, \
-	PMAnyOfDep, PMAllOfDep, PMBaseDep
+	PMAnyOfDep, PMAllOfDep, PMExactlyOneOfDep, PMBaseDep
 from gentoopm.pkgcorepm.atom import PkgCoreAtom
 
 class PkgCoreBaseDep(PMBaseDep):
@@ -20,10 +22,15 @@ class PkgCoreBaseDep(PMBaseDep):
 		for d in self._deps:
 			if isinstance(d, atom):
 				yield PkgCoreAtom(d)
+			elif isinstance(d, ContainmentMatch): # REQUIRED_USE
+				assert(len(d.vals) == 1)
+				yield next(iter(d.vals))
 			elif isinstance(d, OrRestriction):
 				yield PkgCoreAnyOfDep(d, self._pkg)
 			elif isinstance(d, AndRestriction):
 				yield PkgCoreAllOfDep(d, self._pkg)
+			elif isinstance(d, JustOneRestriction):
+				yield PkgCoreExactlyOneOfDep(d, self._pkg)
 			elif isinstance(d, Conditional) and d.attr == 'use':
 				yield PkgCoreConditionalUseDep(d, self._pkg)
 			else:
@@ -36,6 +43,9 @@ class PkgCoreAnyOfDep(PMAnyOfDep, PkgCoreBaseDep):
 class PkgCoreAllOfDep(PMAllOfDep, PkgCoreBaseDep):
 	pass
 
+class PkgCoreExactlyOneOfDep(PMExactlyOneOfDep, PkgCoreBaseDep):
+	pass
+
 class PkgCoreConditionalUseDep(PMConditionalDep, PkgCoreBaseDep):
 	@property
 	def enabled(self):
@@ -63,6 +73,8 @@ class PkgCoreUncondDep(PkgCoreBaseDep):
 				yield PkgCoreUncondAnyOfDep(d)
 			elif isinstance(d, AndRestriction):
 				yield PkgCoreUncondAllOfDep(d, self._pkg)
+			elif isinstance(d, JustOneRestriction):
+				yield PkgCoreUncondExactlyOneOfDep(d, self._pkg)
 			else:
 				raise NotImplementedError('Parsing %s not implemented' \
 						% repr(d))
@@ -72,3 +84,6 @@ class PkgCoreUncondAnyOfDep(PMAnyOfDep, PkgCoreUncondDep):
 
 class PkgCoreUncondAllOfDep(PMAllOfDep, PkgCoreUncondDep):
 	pass
+
+class PkgCoreUncondAllOfDep(PMExactlyOneOfDep, PkgCoreUncondDep):
+	pass

diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py
index c21a17a..da81888 100644
--- a/gentoopm/pkgcorepm/pkg.py
+++ b/gentoopm/pkgcorepm/pkg.py
@@ -137,6 +137,11 @@ class PkgCoreInstallablePackage(PkgCorePackage, PMInstallablePackage):
 		return PkgCorePackageDepSet(self._pkg._raw_pkg.post_rdepends,
 				self._pkg)
 
+	@property
+	def required_use(self):
+		return PkgCorePackageDepSet(self._pkg._raw_pkg.required_use,
+				self._pkg)
+
 	def __lt__(self, other):
 		if not isinstance(other, PkgCorePackage):
 			raise TypeError('Unable to compare %s against %s' % \
@@ -170,6 +175,11 @@ class PkgCoreInstalledPackage(PkgCorePackage, PMInstalledPackage):
 				self._pkg)
 
 	@property
+	def required_use(self):
+		return PkgCorePackageDepSet(self._pkg.required_use,
+				self._pkg)
+
+	@property
 	def contents(self):
 		return PkgCorePackageContents(self._pkg.contents)