Add a quick hack to rewrite some historical python dependencies

I'm not sure why these didn't get flagged up as missing dependencies,
but using the now removed, obsoleted package name causes the solver to
want to uninstall anything which depends on these, whic isn't helpful
right now...

calm/package.py

@@ -245,7 +245,7 @@ def process_package_constraint_list(pcl):
                     deplist[item] = item + ' ' + r
             else:
                 item = r
-                deplist[item] = item
+                deplist[item] = past_mistakes.substitute_dependency.get(r, r)
 
     # return a sorted list of package names with an optional version constraint.
     return sorted(deplist.values())

calm/past_mistakes.py

@@ -209,6 +209,23 @@
     r'tl_basic_\d+',
 ]
 
+substitute_dependency = {
+    'python-gi': 'python27-gi',
+    'python2-avogadro': 'python27-avogadro',
+    'python2-dbus': 'python27-dbus',
+    'python2-gi': 'python27-gi',
+    'python2-ipaddr': 'python27-ipaddr',
+    'python2-libvirt': 'python27-libvirt',
+    'python2-libxml2': 'python27-libxml2',
+    'python2-magic': 'python27-magic',
+    'python2-nghttp2': 'python27-nghttp2',
+    'python2-numpy': 'python27-numpy',
+    'python2-pyqt5': 'python27-pyqt5',
+    'python2-request': 'python27-request',
+    'python2-six': 'python27-six',
+    'python2-xdg': 'python27-xdg',
+}
+
 # provides: which don't exist and packages which require them should be expired
 expired_provides = [
     'python2',