Switch to new pythonegg deps

1 files changed, 3 insertions, 10 deletions

diff --git a/pythoneggs.py b/pythoneggs.py
index f4beedc..178610f 100755
--- a/pythoneggs.py
+++ b/pythoneggs.py
@@ -85,6 +85,8 @@ for f in files:
             path_item = f
             metadata = FileMetadata(f)
         dist = Distribution.from_location(path_item, dist_name, metadata)
+        if not dist.py_version:
+            continue
         py_major = dist.py_version[:1]
         if Provides:
             # If egg metadata says package name is python, we provide python(abi)
@@ -100,15 +102,6 @@ for f in files:
                 spec = ('==', dist.version)
                 if not spec in py_deps[name]:
                     py_deps[name].append(spec)
-            # Temporary: Keep old style provides until all packages have new style ones and requires can be switched
-            name = 'pythonegg(%s)' % dist.key
-            if not name in py_deps:
-                py_deps[name] = []
-            if dist.version:
-                spec = ('==', dist.version)
-                if not spec in py_deps[name]:
-                    py_deps[name].append(spec)
-            # /Temporary
         if Requires or (Suggests and dist.extras):
             name = 'python(abi)'
             # If egg metadata says package name is python, we don't add dependency on python(abi)
@@ -132,7 +125,7 @@ for f in files:
                 deps = depsextras
             # add requires/suggests based on egg metadata
             for dep in deps:
-                name = 'pythonegg(%s)' % dep.key
+                name = 'pythonegg(%s)(%s)' % (py_major, dep.key)
                 for spec in dep.specs:
                     if spec[0] != '!=':
                         if not name in py_deps: