various dependency updates for pkgcraft changes

Author: radhermit

benches/dep_memory_usage.py

@@ -11,7 +11,7 @@
 from pkgcore.ebuild.atom import atom as pkgcore_dep
 from portage.dep import Atom as portage_dep
 
-from pkgcraft.dep import PkgDep as pkgcraft_dep
+from pkgcraft.dep import Dep as pkgcraft_dep
 
 eprint = lambda x: print(x, file=sys.stderr)
 

benches/test_dep.py

@@ -2,7 +2,7 @@
 from pkgcore.ebuild.atom import atom as pkgcore_dep
 from portage.dep import Atom as portage_dep
 
-from pkgcraft.dep import PkgDep as pkgcraft_dep
+from pkgcraft.dep import Dep as pkgcraft_dep
 
 pytest_plugins = ("benchmark", "pkgcraft")
 

benches/test_repo.py

@@ -1,7 +1,7 @@
 import pytest
 from pkgcore.ebuild.atom import atom as pkgcore_dep
 
-from pkgcraft.dep import PkgDep as pkgcraft_dep
+from pkgcraft.dep import Dep as pkgcraft_dep
 from pkgcraft.repo import RepoSet
 
 pytest_plugins = ("benchmark", "pkgcraft")

src/pkgcraft/dep/__init__.pxd

@@ -1,7 +1,7 @@
 # TODO: use proper relative imports when fixed upstream
 # https://github.com/cython/cython/pull/4552
-from .dep.base cimport (AllOf, AnyOf, AtMostOneOf, Dep, Disabled, Enabled, ExactlyOneOf,
-                        UseDisabled, UseEnabled)
-from .dep.pkg cimport Cpv, PkgDep
+from .dep.pkg cimport Cpv, Dep
 from .dep.set cimport Dependencies, DepSet, License, Properties, RequiredUse, Restrict, SrcUri, Uri
+from .dep.spec cimport (AllOf, AnyOf, AtMostOneOf, DepSpec, Disabled, Enabled, ExactlyOneOf,
+                        UseDisabled, UseEnabled)
 from .dep.version cimport Version, VersionWithOp

src/pkgcraft/dep/__init__.py

@@ -1,5 +1,5 @@
-from .base import (AllOf, AnyOf, AtMostOneOf, Dep, Disabled, Enabled, ExactlyOneOf, UseDisabled,
-                   UseEnabled)
-from .pkg import Blocker, Cpv, PkgDep, SlotOperator
+from .pkg import Blocker, Cpv, Dep, SlotOperator
 from .set import Dependencies, DepSet, License, Properties, RequiredUse, Restrict, SrcUri, Uri
+from .spec import (AllOf, AnyOf, AtMostOneOf, DepSpec, Disabled, Enabled, ExactlyOneOf, UseDisabled,
+                   UseEnabled)
 from .version import Operator, Version, VersionWithOp

src/pkgcraft/dep/base.pxd

@@ -2,20 +2,20 @@ from .. cimport pkgcraft_c as C
 
 
 cdef class Cpv:
-    cdef C.PkgDep *ptr
+    cdef C.Dep *ptr
     # cached fields
     cdef str _category
     cdef str _package
     cdef object _version
     cdef int _hash
 
     @staticmethod
-    cdef Cpv from_ptr(C.PkgDep *)
+    cdef Cpv from_ptr(C.Dep *)
 
 
-cdef class PkgDep(Cpv):
+cdef class Dep(Cpv):
     # cached fields
     cdef object _use
 
     @staticmethod
-    cdef PkgDep from_ptr(C.PkgDep *)
+    cdef Dep from_ptr(C.Dep *)