From a8656f2c7bd5bd67f12499782b184b49246bb0e6 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben.hutchings@codethink.co.uk>
Date: Tue, 8 Sep 2020 18:35:52 +0100
Subject: Disable various obsolete mirrors

All of these have changed version control system or otherwise become
obsolete.  Their descriptions have already been set to mark them as
such.
---
 open-source-lorries-disabled/argparse.lorry        |   7 +
 open-source-lorries-disabled/asciidoc.lorry        |   7 +
 open-source-lorries-disabled/cherrypy.lorry        |   7 +
 open-source-lorries-disabled/clang.lorry           |   7 +
 open-source-lorries-disabled/cloud-init.lorry      |   7 +
 open-source-lorries-disabled/compiler-rt.lorry     |   7 +
 open-source-lorries-disabled/configobj.lorry       |   7 +
 open-source-lorries-disabled/cryptopp.lorry        |  12 ++
 open-source-lorries-disabled/distcc.lorry          |   8 ++
 open-source-lorries-disabled/dtc.lorry             |   7 +
 open-source-lorries-disabled/eglibc2.lorry         |   8 ++
 open-source-lorries-disabled/flashrom.lorry        |   8 ++
 open-source-lorries-disabled/freertos.lorry        |   8 ++
 open-source-lorries-disabled/go.lorry              |   7 +
 open-source-lorries-disabled/googlemock.lorry      |   8 ++
 open-source-lorries-disabled/googletest.lorry      |   8 ++
 open-source-lorries-disabled/i2c-tools.lorry       |   8 ++
 .../layer_management.lorry                         |   7 +
 open-source-lorries-disabled/libproxy.lorry        |   8 ++
 open-source-lorries-disabled/libpwquality.lorry    |   7 +
 open-source-lorries-disabled/libusbx.lorry         |   7 +
 open-source-lorries-disabled/libyaml.lorry         |  13 ++
 open-source-lorries-disabled/lighttpd.lorry        |   8 ++
 open-source-lorries-disabled/lm-sensors.lorry      |   8 ++
 open-source-lorries-disabled/lua-scrypt.lorry      |   7 +
 open-source-lorries-disabled/micheles.lorry        |   7 +
 open-source-lorries-disabled/midori.lorry          |   7 +
 open-source-lorries-disabled/navit.lorry           |  12 ++
 open-source-lorries-disabled/neon.lorry            |   8 ++
 open-source-lorries-disabled/ogg.lorry             |   7 +
 open-source-lorries-disabled/openwrt.lorry         |   7 +
 open-source-lorries-disabled/pexpect.lorry         |   8 ++
 open-source-lorries-disabled/pyfilesystem.lorry    |   8 ++
 open-source-lorries-disabled/pyopenssl.lorry       |   7 +
 .../python-coveragepy.lorry                        |   7 +
 open-source-lorries-disabled/python-packages.lorry | 152 +++++++++++++++++++++
 .../python-prettytable.lorry                       |   8 ++
 .../python-setuptools.lorry                        |  17 +++
 open-source-lorries-disabled/pytz.lorry            |   7 +
 .../rabbitmq-codegen.lorry                         |   7 +
 open-source-lorries-disabled/rabbitmq-server.lorry |   7 +
 open-source-lorries-disabled/scons.lorry           |   7 +
 open-source-lorries-disabled/six.lorry             |   7 +
 open-source-lorries-disabled/sloccount.lorry       |   8 ++
 open-source-lorries-disabled/smartdevicelink.lorry |   7 +
 open-source-lorries-disabled/snappy.lorry          |   8 ++
 open-source-lorries-disabled/unionfs-fuse.lorry    |   7 +
 open-source-lorries-disabled/vim.lorry             |   7 +
 .../xstatic-packages.lorry                         |  12 ++
 open-source-lorries-disabled/xstatic.lorry         |   7 +
 open-source-lorries/argparse.lorry                 |   7 -
 open-source-lorries/asciidoc.lorry                 |   5 -
 open-source-lorries/cherrypy.lorry                 |   5 -
 open-source-lorries/clang.lorry                    |   7 -
 open-source-lorries/cloud-init.lorry               |   5 -
 open-source-lorries/compiler-rt.lorry              |   7 -
 open-source-lorries/configobj.lorry                |   5 -
 open-source-lorries/cryptopp.lorry                 |  10 --
 open-source-lorries/distcc.lorry                   |   8 --
 open-source-lorries/dtc.lorry                      |   7 -
 open-source-lorries/eglibc2.lorry                  |   8 --
 open-source-lorries/flashrom.lorry                 |   6 -
 open-source-lorries/freertos.lorry                 |  10 +-
 open-source-lorries/go.lorry                       |   7 -
 open-source-lorries/googlemock.lorry               |   8 --
 open-source-lorries/googletest.lorry               |   6 -
 open-source-lorries/i2c-tools.lorry                |   6 -
 open-source-lorries/layer_management.lorry         |   7 -
 open-source-lorries/libproxy.lorry                 |   6 -
 open-source-lorries/libpwquality.lorry             |   5 -
 open-source-lorries/libusbx.lorry                  |   7 -
 open-source-lorries/libyaml-hg.lorry               |   7 -
 open-source-lorries/libyaml.lorry                  |   6 -
 open-source-lorries/lighttpd.lorry                 |   6 -
 open-source-lorries/lm-sensors.lorry               |   6 -
 open-source-lorries/lua-scrypt.lorry               |   5 -
 open-source-lorries/micheles.lorry                 |   7 -
 open-source-lorries/midori.lorry                   |   5 -
 open-source-lorries/navit-svn.lorry                |  12 --
 open-source-lorries/neon.lorry                     |   6 -
 open-source-lorries/ogg.lorry                      |   7 -
 open-source-lorries/openwrt.lorry                  |   5 -
 open-source-lorries/pexpect.lorry                  |   6 -
 open-source-lorries/pyfilesystem.lorry             |   6 -
 open-source-lorries/pyopenssl.lorry                |   5 -
 open-source-lorries/python-coveragepy.lorry        |   5 -
 open-source-lorries/python-packages.lorry          | 152 ---------------------
 open-source-lorries/python-prettytable.lorry       |   6 -
 .../python-setuptools-bitbucket.lorry              |   7 -
 open-source-lorries/python-setuptools.lorry        |  10 --
 open-source-lorries/pytz.lorry                     |   5 -
 open-source-lorries/rabbitmq-codegen.lorry         |   5 -
 open-source-lorries/rabbitmq-server.lorry          |   5 -
 open-source-lorries/scons.lorry                    |   5 -
 open-source-lorries/six.lorry                      |   5 -
 open-source-lorries/sloccount.lorry                |   6 -
 open-source-lorries/smartdevicelink.lorry          |   7 -
 open-source-lorries/snappy.lorry                   |   8 --
 open-source-lorries/unionfs-fuse.lorry             |   5 -
 open-source-lorries/vim.lorry                      |   5 -
 open-source-lorries/xstatic-packages.lorry         |  10 --
 open-source-lorries/xstatic.lorry                  |   5 -
 102 files changed, 544 insertions(+), 480 deletions(-)
 create mode 100644 open-source-lorries-disabled/argparse.lorry
 create mode 100644 open-source-lorries-disabled/asciidoc.lorry
 create mode 100644 open-source-lorries-disabled/cherrypy.lorry
 create mode 100644 open-source-lorries-disabled/clang.lorry
 create mode 100644 open-source-lorries-disabled/cloud-init.lorry
 create mode 100644 open-source-lorries-disabled/compiler-rt.lorry
 create mode 100644 open-source-lorries-disabled/configobj.lorry
 create mode 100644 open-source-lorries-disabled/cryptopp.lorry
 create mode 100644 open-source-lorries-disabled/distcc.lorry
 create mode 100644 open-source-lorries-disabled/dtc.lorry
 create mode 100644 open-source-lorries-disabled/eglibc2.lorry
 create mode 100644 open-source-lorries-disabled/flashrom.lorry
 create mode 100644 open-source-lorries-disabled/freertos.lorry
 create mode 100644 open-source-lorries-disabled/go.lorry
 create mode 100644 open-source-lorries-disabled/googlemock.lorry
 create mode 100644 open-source-lorries-disabled/googletest.lorry
 create mode 100644 open-source-lorries-disabled/i2c-tools.lorry
 create mode 100644 open-source-lorries-disabled/layer_management.lorry
 create mode 100644 open-source-lorries-disabled/libproxy.lorry
 create mode 100644 open-source-lorries-disabled/libpwquality.lorry
 create mode 100644 open-source-lorries-disabled/libusbx.lorry
 create mode 100644 open-source-lorries-disabled/libyaml.lorry
 create mode 100644 open-source-lorries-disabled/lighttpd.lorry
 create mode 100644 open-source-lorries-disabled/lm-sensors.lorry
 create mode 100644 open-source-lorries-disabled/lua-scrypt.lorry
 create mode 100644 open-source-lorries-disabled/micheles.lorry
 create mode 100644 open-source-lorries-disabled/midori.lorry
 create mode 100644 open-source-lorries-disabled/navit.lorry
 create mode 100644 open-source-lorries-disabled/neon.lorry
 create mode 100644 open-source-lorries-disabled/ogg.lorry
 create mode 100644 open-source-lorries-disabled/openwrt.lorry
 create mode 100644 open-source-lorries-disabled/pexpect.lorry
 create mode 100644 open-source-lorries-disabled/pyfilesystem.lorry
 create mode 100644 open-source-lorries-disabled/pyopenssl.lorry
 create mode 100644 open-source-lorries-disabled/python-coveragepy.lorry
 create mode 100644 open-source-lorries-disabled/python-prettytable.lorry
 create mode 100644 open-source-lorries-disabled/python-setuptools.lorry
 create mode 100644 open-source-lorries-disabled/pytz.lorry
 create mode 100644 open-source-lorries-disabled/rabbitmq-codegen.lorry
 create mode 100644 open-source-lorries-disabled/rabbitmq-server.lorry
 create mode 100644 open-source-lorries-disabled/scons.lorry
 create mode 100644 open-source-lorries-disabled/six.lorry
 create mode 100644 open-source-lorries-disabled/sloccount.lorry
 create mode 100644 open-source-lorries-disabled/smartdevicelink.lorry
 create mode 100644 open-source-lorries-disabled/snappy.lorry
 create mode 100644 open-source-lorries-disabled/unionfs-fuse.lorry
 create mode 100644 open-source-lorries-disabled/vim.lorry
 create mode 100644 open-source-lorries-disabled/xstatic-packages.lorry
 create mode 100644 open-source-lorries-disabled/xstatic.lorry
 delete mode 100644 open-source-lorries/argparse.lorry
 delete mode 100644 open-source-lorries/clang.lorry
 delete mode 100644 open-source-lorries/compiler-rt.lorry
 delete mode 100644 open-source-lorries/distcc.lorry
 delete mode 100644 open-source-lorries/dtc.lorry
 delete mode 100644 open-source-lorries/eglibc2.lorry
 delete mode 100644 open-source-lorries/go.lorry
 delete mode 100644 open-source-lorries/googlemock.lorry
 delete mode 100644 open-source-lorries/layer_management.lorry
 delete mode 100644 open-source-lorries/libusbx.lorry
 delete mode 100644 open-source-lorries/libyaml-hg.lorry
 delete mode 100644 open-source-lorries/micheles.lorry
 delete mode 100644 open-source-lorries/navit-svn.lorry
 delete mode 100644 open-source-lorries/ogg.lorry
 delete mode 100644 open-source-lorries/python-setuptools-bitbucket.lorry
 delete mode 100644 open-source-lorries/smartdevicelink.lorry
 delete mode 100644 open-source-lorries/snappy.lorry

diff --git a/open-source-lorries-disabled/argparse.lorry b/open-source-lorries-disabled/argparse.lorry
new file mode 100644
index 0000000..04df5e1
--- /dev/null
+++ b/open-source-lorries-disabled/argparse.lorry
@@ -0,0 +1,7 @@
+{
+    "argparse": {
+        "type": "hg",
+        "url": "http://code.google.com/p/argparse/",
+        "description": "Obsolete (included in Python standard library)"
+    }
+}
diff --git a/open-source-lorries-disabled/asciidoc.lorry b/open-source-lorries-disabled/asciidoc.lorry
new file mode 100644
index 0000000..c64c825
--- /dev/null
+++ b/open-source-lorries-disabled/asciidoc.lorry
@@ -0,0 +1,7 @@
+{
+    "asciidoc": {
+        "type": "hg",
+        "url": "https://code.google.com/p/asciidoc",
+        "description": "Obsolete (use asciidoc-git or asciidoc-py3)"
+    }
+}
diff --git a/open-source-lorries-disabled/cherrypy.lorry b/open-source-lorries-disabled/cherrypy.lorry
new file mode 100644
index 0000000..f805996
--- /dev/null
+++ b/open-source-lorries-disabled/cherrypy.lorry
@@ -0,0 +1,7 @@
+{
+    "cherrypy": {
+        "type": "hg",
+        "url": "http://bitbucket.org/cherrypy/cherrypy",
+        "description": "Obsolete (use cherrypy-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/clang.lorry b/open-source-lorries-disabled/clang.lorry
new file mode 100644
index 0000000..c5efa99
--- /dev/null
+++ b/open-source-lorries-disabled/clang.lorry
@@ -0,0 +1,7 @@
+{
+    "clang": {
+        "type": "git",
+        "url": "http://llvm.org/git/clang.git",
+        "description": "Obsolete (use llvm)"
+    }
+}
diff --git a/open-source-lorries-disabled/cloud-init.lorry b/open-source-lorries-disabled/cloud-init.lorry
new file mode 100644
index 0000000..3798353
--- /dev/null
+++ b/open-source-lorries-disabled/cloud-init.lorry
@@ -0,0 +1,7 @@
+{
+    "cloud-init": {
+        "type": "bzr",
+        "url": "lp:cloud-init",
+        "description": "Obsolete (use cloud-init-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/compiler-rt.lorry b/open-source-lorries-disabled/compiler-rt.lorry
new file mode 100644
index 0000000..6a8d419
--- /dev/null
+++ b/open-source-lorries-disabled/compiler-rt.lorry
@@ -0,0 +1,7 @@
+{
+    "compiler-rt": {
+        "type": "git",
+        "url": "http://llvm.org/git/compiler-rt.git",
+        "description": "Obsolete (use llvm)"
+    }
+}
diff --git a/open-source-lorries-disabled/configobj.lorry b/open-source-lorries-disabled/configobj.lorry
new file mode 100644
index 0000000..3e89a36
--- /dev/null
+++ b/open-source-lorries-disabled/configobj.lorry
@@ -0,0 +1,7 @@
+{
+    "configobj": {
+        "type": "hg",
+        "url": "http://code.google.com/p/configobj/",
+        "description": "Obsolete (use configobj-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/cryptopp.lorry b/open-source-lorries-disabled/cryptopp.lorry
new file mode 100644
index 0000000..024a154
--- /dev/null
+++ b/open-source-lorries-disabled/cryptopp.lorry
@@ -0,0 +1,12 @@
+{
+    "cryptopp": {
+        "type": "svn",
+        "url": "svn://svn.code.sf.net/p/cryptopp/code",
+        "layout": {
+            "trunk": "trunk/c5",
+            "branches": "branches/*/c5",
+            "tags": "tags/*"
+        },
+        "description": "Obsolete (use cryptopp-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/distcc.lorry b/open-source-lorries-disabled/distcc.lorry
new file mode 100644
index 0000000..9fa00af
--- /dev/null
+++ b/open-source-lorries-disabled/distcc.lorry
@@ -0,0 +1,8 @@
+{
+    "distcc": {
+        "type": "svn",
+        "url": "http://distcc.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use distcc-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/dtc.lorry b/open-source-lorries-disabled/dtc.lorry
new file mode 100644
index 0000000..c8033d1
--- /dev/null
+++ b/open-source-lorries-disabled/dtc.lorry
@@ -0,0 +1,7 @@
+{
+    "dtc": {
+        "type": "git",
+        "url": "git://git.jdl.com/software/dtc.git",
+        "description": "Obsolete (use device-tree-compiler)"
+    }
+}
diff --git a/open-source-lorries-disabled/eglibc2.lorry b/open-source-lorries-disabled/eglibc2.lorry
new file mode 100644
index 0000000..6cdeace
--- /dev/null
+++ b/open-source-lorries-disabled/eglibc2.lorry
@@ -0,0 +1,8 @@
+{
+    "eglibc2": {
+        "type": "svn",
+        "url": "svn://svn.eglibc.org",
+        "layout": "standard",
+        "description": "Obsolete (use glibc)"
+    }
+}
diff --git a/open-source-lorries-disabled/flashrom.lorry b/open-source-lorries-disabled/flashrom.lorry
new file mode 100644
index 0000000..769e444
--- /dev/null
+++ b/open-source-lorries-disabled/flashrom.lorry
@@ -0,0 +1,8 @@
+{
+    "flashrom": {
+        "type": "svn",
+        "url": "https://code.coreboot.org/svn/flashrom/",
+        "layout": "standard",
+        "description": "Obsolete (use flashrom-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/freertos.lorry b/open-source-lorries-disabled/freertos.lorry
new file mode 100644
index 0000000..a8f413b
--- /dev/null
+++ b/open-source-lorries-disabled/freertos.lorry
@@ -0,0 +1,8 @@
+{
+    "freertos": {
+        "type": "svn",
+        "url": "http://svn.code.sf.net/p/freertos/code/",
+        "layout": "standard",
+        "description": "Obsolete (use freertos-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/go.lorry b/open-source-lorries-disabled/go.lorry
new file mode 100644
index 0000000..eb64126
--- /dev/null
+++ b/open-source-lorries-disabled/go.lorry
@@ -0,0 +1,7 @@
+{
+    "go": {
+        "type": "hg",
+        "url": "https://code.google.com/p/go",
+        "description": "Obsolete (use go-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/googlemock.lorry b/open-source-lorries-disabled/googlemock.lorry
new file mode 100644
index 0000000..972fd51
--- /dev/null
+++ b/open-source-lorries-disabled/googlemock.lorry
@@ -0,0 +1,8 @@
+{
+    "googlemock": {
+        "type": "svn",
+        "url": "http://googlemock.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use googletest-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/googletest.lorry b/open-source-lorries-disabled/googletest.lorry
new file mode 100644
index 0000000..a21d19d
--- /dev/null
+++ b/open-source-lorries-disabled/googletest.lorry
@@ -0,0 +1,8 @@
+{
+    "googletest": {
+        "type": "svn",
+        "url": "http://googletest.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use googletest-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/i2c-tools.lorry b/open-source-lorries-disabled/i2c-tools.lorry
new file mode 100644
index 0000000..c27bfd3
--- /dev/null
+++ b/open-source-lorries-disabled/i2c-tools.lorry
@@ -0,0 +1,8 @@
+{
+    "i2c-tools": {
+        "type": "svn",
+        "url": "http://lm-sensors.org/svn/i2c-tools",
+        "layout": "standard",
+        "description": "Obsolete (use i2c-tools-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/layer_management.lorry b/open-source-lorries-disabled/layer_management.lorry
new file mode 100644
index 0000000..6a6789b
--- /dev/null
+++ b/open-source-lorries-disabled/layer_management.lorry
@@ -0,0 +1,7 @@
+{
+    "layer_management": {
+        "type": "git",
+        "url": "git://git.projects.genivi.org/layer_management.git",
+        "description": "Obsolete"
+    }
+}
diff --git a/open-source-lorries-disabled/libproxy.lorry b/open-source-lorries-disabled/libproxy.lorry
new file mode 100644
index 0000000..b3ee325
--- /dev/null
+++ b/open-source-lorries-disabled/libproxy.lorry
@@ -0,0 +1,8 @@
+{
+    "libproxy": {
+        "type": "svn",
+        "url": "http://libproxy.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use libproxy-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/libpwquality.lorry b/open-source-lorries-disabled/libpwquality.lorry
new file mode 100644
index 0000000..2e5b4b6
--- /dev/null
+++ b/open-source-lorries-disabled/libpwquality.lorry
@@ -0,0 +1,7 @@
+{
+    "libpwquality": {
+        "type": "hg",
+        "url": "http://hg.fedorahosted.org/hg/libpwquality",
+        "description": "Obsolete (use libpwquality-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/libusbx.lorry b/open-source-lorries-disabled/libusbx.lorry
new file mode 100644
index 0000000..08ae041
--- /dev/null
+++ b/open-source-lorries-disabled/libusbx.lorry
@@ -0,0 +1,7 @@
+{
+    "libusbx": {
+        "type": "git",
+        "url": "git://libusbx.git.sourceforge.net/gitroot/libusbx/libusbx",
+        "description": "Obsolete (use libusb)"
+    }
+}
diff --git a/open-source-lorries-disabled/libyaml.lorry b/open-source-lorries-disabled/libyaml.lorry
new file mode 100644
index 0000000..d590d29
--- /dev/null
+++ b/open-source-lorries-disabled/libyaml.lorry
@@ -0,0 +1,13 @@
+{
+    "libyaml": {
+        "type": "svn",
+        "url": "http://svn.pyyaml.org/libyaml",
+        "layout": "standard",
+        "description": "Obsolete (use libyaml-git)"
+    },
+    "libyaml-hg": {
+        "type": "hg",
+        "url": "http://bitbucket.org/xi/libyaml",
+        "description": "Obsolete (use libyaml-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/lighttpd.lorry b/open-source-lorries-disabled/lighttpd.lorry
new file mode 100644
index 0000000..9fd8f83
--- /dev/null
+++ b/open-source-lorries-disabled/lighttpd.lorry
@@ -0,0 +1,8 @@
+{
+    "lighttpd": {
+        "type": "svn",
+        "url": "svn://svn.lighttpd.net/lighttpd",
+        "layout": "standard",
+        "description": "Obsolete (use lighttpd-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/lm-sensors.lorry b/open-source-lorries-disabled/lm-sensors.lorry
new file mode 100644
index 0000000..bba0a19
--- /dev/null
+++ b/open-source-lorries-disabled/lm-sensors.lorry
@@ -0,0 +1,8 @@
+{
+    "lm-sensors": {
+        "type": "svn",
+        "url": "http://lm-sensors.org/svn/lm-sensors/",
+        "layout": "standard",
+        "description": "Obsolete (use lm-sensors-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/lua-scrypt.lorry b/open-source-lorries-disabled/lua-scrypt.lorry
new file mode 100644
index 0000000..d46a2e0
--- /dev/null
+++ b/open-source-lorries-disabled/lua-scrypt.lorry
@@ -0,0 +1,7 @@
+{
+    "lua-scrypt": {
+        "type": "bzr",
+        "url": "http://bzr.rjek.com/public/lua-scrypt/",
+        "description": "Obsolete (use lua-scrypt-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/micheles.lorry b/open-source-lorries-disabled/micheles.lorry
new file mode 100644
index 0000000..7a44bcb
--- /dev/null
+++ b/open-source-lorries-disabled/micheles.lorry
@@ -0,0 +1,7 @@
+{
+    "micheles": {
+        "type": "hg",
+        "url": "https://code.google.com/p/micheles/",
+        "description": "Obsolete (use python-packages/python-decorator-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/midori.lorry b/open-source-lorries-disabled/midori.lorry
new file mode 100644
index 0000000..e1d9422
--- /dev/null
+++ b/open-source-lorries-disabled/midori.lorry
@@ -0,0 +1,7 @@
+{
+    "midori": {
+        "type": "bzr",
+        "url": "https://code.launchpad.net/~midori/midori/trunk",
+        "description": "Obsolete (use midori-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/navit.lorry b/open-source-lorries-disabled/navit.lorry
new file mode 100644
index 0000000..dad186b
--- /dev/null
+++ b/open-source-lorries-disabled/navit.lorry
@@ -0,0 +1,12 @@
+{
+    "navit-svn": {
+        "type": "svn",
+        "url": "http://svn.code.sf.net/p/navit/code",
+        "layout": {
+            "trunk": "trunk/navit",
+            "branches": "branches/*/navit",
+            "tags": "tags/*/navit"
+        },
+        "description": "Obsolete (use navit)"
+    }
+}
diff --git a/open-source-lorries-disabled/neon.lorry b/open-source-lorries-disabled/neon.lorry
new file mode 100644
index 0000000..247e6c0
--- /dev/null
+++ b/open-source-lorries-disabled/neon.lorry
@@ -0,0 +1,8 @@
+{
+    "neon": {
+        "type": "svn",
+        "url": "http://svn.webdav.org/repos/projects/neon/",
+        "layout": "standard",
+        "description": "Obsolete (use neon-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/ogg.lorry b/open-source-lorries-disabled/ogg.lorry
new file mode 100644
index 0000000..c917619
--- /dev/null
+++ b/open-source-lorries-disabled/ogg.lorry
@@ -0,0 +1,7 @@
+{
+    "ogg": {
+        "type": "git",
+        "url": "git://git.xiph.org/mirrors/ogg.git",
+        "description": "Obsolete (use ogg-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/openwrt.lorry b/open-source-lorries-disabled/openwrt.lorry
new file mode 100644
index 0000000..3d47f33
--- /dev/null
+++ b/open-source-lorries-disabled/openwrt.lorry
@@ -0,0 +1,7 @@
+{
+    "openwrt/uhttpd": {
+        "type": "git",
+        "url": "git://nbd.name/uhttpd.git",
+        "description": "Obsolete (use openwrt/uhttpd2)"
+    }
+}
diff --git a/open-source-lorries-disabled/pexpect.lorry b/open-source-lorries-disabled/pexpect.lorry
new file mode 100644
index 0000000..f008207
--- /dev/null
+++ b/open-source-lorries-disabled/pexpect.lorry
@@ -0,0 +1,8 @@
+{
+    "pexpect": {
+        "type": "svn",
+        "url": "https://svn.code.sf.net/p/pexpect/code/",
+        "layout": "standard",
+        "description": "Obsolete (use pexpect-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/pyfilesystem.lorry b/open-source-lorries-disabled/pyfilesystem.lorry
new file mode 100644
index 0000000..b72d242
--- /dev/null
+++ b/open-source-lorries-disabled/pyfilesystem.lorry
@@ -0,0 +1,8 @@
+{
+    "pyfilesystem": {
+        "type": "svn",
+        "url": "http://pyfilesystem.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use pyfilesystem-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/pyopenssl.lorry b/open-source-lorries-disabled/pyopenssl.lorry
new file mode 100644
index 0000000..40d07da
--- /dev/null
+++ b/open-source-lorries-disabled/pyopenssl.lorry
@@ -0,0 +1,7 @@
+{
+    "pyopenssl": {
+        "type": "bzr",
+        "url": "lp:pyopenssl",
+        "description": "Obsolete (use pyopenssl-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/python-coveragepy.lorry b/open-source-lorries-disabled/python-coveragepy.lorry
new file mode 100644
index 0000000..a109d1e
--- /dev/null
+++ b/open-source-lorries-disabled/python-coveragepy.lorry
@@ -0,0 +1,7 @@
+{
+    "python-coveragepy": {
+        "type": "hg",
+        "url": "https://bitbucket.org/ned/coveragepy",
+        "description": "Obsolete (use python-coveragepy-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/python-packages.lorry b/open-source-lorries-disabled/python-packages.lorry
index 8afd764..28d3653 100644
--- a/open-source-lorries-disabled/python-packages.lorry
+++ b/open-source-lorries-disabled/python-packages.lorry
@@ -3,20 +3,142 @@
         "type": "hg",
         "url": "https://bitbucket.org/runeh/anyjson"
     },
+    "python-packages/astroid": {
+        "type": "hg",
+        "url": "https://bitbucket.org/logilab/astroid",
+        "description": "Obsolete (use python-packages/astroid-git"
+    },
+    "python-packages/cmd2-hg": {
+        "type": "hg",
+        "url": "http://bitbucket.org/catherinedevlin/cmd2",
+        "description": "Obsolete (use python-packages/cmd2-git)"
+    },
+    "python-packages/dateutil": {
+        "type": "bzr",
+        "url": "lp:dateutil",
+        "description": "Obsolete (use python-packages/dateutil-git)"
+    },
     "python-packages/decorator": {
         "type": "hg",
         "url": "https://bitbucket.org/pypa/pypi"
     },
+    "python-packages/defusedxml": {
+        "type": "hg",
+        "url": "https://bitbucket.org/tiran/defusedxml",
+        "description": "Obsolete (use python-packages/defusedxml-git)"
+    },
+    "python-packages/disutils2": {
+        "type": "hg",
+        "url": "http://hg.python.org/distutils2",
+        "description": "Obsolete (use python-setuptools-git)"
+    },
+    "python-packages/fixtures": {
+        "type": "bzr",
+        "url": "lp:python-fixtures",
+        "description": "Obsolete (use python-packages/fixtures-git)"
+    },
+    "python-packages/futures": {
+        "type": "hg",
+        "url": "https://code.google.com/p/pythonfutures/",
+        "description": "Obsolete (included in Python standard library)"
+    },
+    "python-packages/logutils": {
+        "type": "hg",
+        "url": "https://bitbucket.org/vinay.sajip/logutils",
+        "description": "Obsolete (use python-packages/logutils-git)"
+    },
+    "python-packages/mock": {
+        "type": "hg",
+        "url": "https://code.google.com/p/mock/",
+        "description": "Obsolete (included in Python standard library)"
+    },
+    "python-packages/mox": {
+        "layout": "standard",
+        "type": "svn",
+        "url": "http://pymox.googlecode.com/svn/",
+        "description": "Obsolete (use python-packages/pymox)"
+    },
+    "python-packages/netifaces": {
+        "type": "hg",
+        "url": "https://bitbucket.org/al45tair/netifaces",
+        "description": "Obsolete (use python-packages/netifaces-git)"
+    },
+    "python-packages/paste": {
+        "type": "hg",
+        "url": "http://bitbucket.org/ianb/paste",
+        "description": "Obsolete (use python-packages/paste-git)"
+    },
+    "python-packages/pastedeploy": {
+        "type": "hg",
+        "url": "http://bitbucket.org/ianb/pastedeploy",
+        "description": "Obsolete (use python-packages/pastedeploy-git)"
+    },
+    "python-packages/py-bcrypt": {
+        "type": "hg",
+        "url": "https://code.google.com/p/py-bcrypt/",
+        "description": "Obsolete (use py-bcrypt-git)"
+    },
     "python-packages/pyasn1": {
         "module": "pyasn1",
         "type": "cvs",
         "url": ":pserver:anonymous@pyasn1.cvs.sourceforge.net:/cvsroot/pyasn1"
     },
+    "python-packages/pygments": {
+        "type": "hg",
+        "url": "https://bitbucket.org/birkenfeld/pygments-main",
+        "description": "Obsolete (use python-packages/pygments-git)"
+    },
+    "python-packages/pylint": {
+        "type": "hg",
+        "url": "https://bitbucket.org/logilab/pylint/",
+        "description": "Obsolete (use python-packages/pylint-git)"
+    },
+    "python-packages/pyparsing": {
+        "type": "svn",
+        "url": "svn://svn.code.sf.net/p/pyparsing/code",
+        "layout": "standard",
+        "description": "Obsolete (use python-packages/pyparsing-git)"
+    },
+    "python-packages/pyserial": {
+        "layout": {
+            "trunk": "trunk/pyserial",
+            "branches": "branches/*",
+            "tags": "tags/*"
+        },
+        "type": "svn",
+        "url": "http://svn.code.sf.net/p/pyserial/code/",
+        "description": "Obsolete (use python-packages/pyserial-git)"
+    },
     "python-packages/pysnmp": {
         "module": "pysnmp",
         "type": "cvs",
         "url": ":pserver:anonymous@pysnmp.cvs.sourceforge.net:/cvsroot/pysnmp"
     },
+    "python-packages/rsa": {
+        "type": "hg",
+        "url": "https://bitbucket.org/sybren/python-rsa",
+        "description": "Obsolete (use python-packages/rsa-git)"
+    },
+    "python-packages/singledispatch" : {
+        "type": "hg",
+        "url": "https://bitbucket.org/ambv/singledispatch",
+        "description": "Obsolete (included in Python standard library)"
+    },
+    "python-packages/smartypants": {
+        "type": "hg",
+        "url": "https://bitbucket.org/livibetter/smartypants.py",
+        "description": "Obsolete (use python-packages/smartypants-git)"
+    },
+    "python-packages/sphinx": {
+        "type": "hg",
+        "url": "https://bitbucket.org/birkenfeld/sphinx",
+        "description": "Obsolete (use python-packages/sphinx-git)"
+    },
+    "python-packages/subunit": {
+        "type": "bzr",
+        "url": "lp:subunit",
+        "description": "Obsolete (use python-packages/subunit-git)"
+    },
     "python-packages/suds": {
         "type": "hg",
         "url": "https://bitbucket.org/mirror/suds"
@@ -24,5 +146,35 @@
     "python-packages/tempita": {
         "type": "hg",
         "url": "https://bitbucket.org/ianb/tempita"
+    },
+    "python-packages/testrepository": {
+        "type": "bzr",
+        "url": "lp:testrepository",
+        "description": "Obsolete (use python-packages/testrepository-git)"
+    },
+    "python-packages/testresources": {
+        "type": "bzr",
+        "url": "lp:testresources",
+        "description": "Obsolete (use python-packages/testresources-git)"
+    },
+    "python-packages/testscenarios": {
+        "type": "bzr",
+        "url": "lp:testscenarios",
+        "description": "Obsolete (use python-packages/testscenarios-git)"
+    },
+    "python-packages/tox": {
+        "type": "hg",
+        "url": "https://bitbucket.org/hpk42/tox",
+        "description": "Obsolete (use python-packages/tox-git)"
+    },
+    "python-packages/trollius": {
+        "type": "hg",
+        "url": "http://bitbucket.org/enovance/trollius",
+        "description": "Obsolete (use python-packages/trollius-git)"
+    },
+    "python-packages/wheel": {
+        "type": "hg",
+        "url": "https://bitbucket.org/pypa/wheel",
+        "description": "Obsolete (use python-packages/wheel-git)"
     }
 }
diff --git a/open-source-lorries-disabled/python-prettytable.lorry b/open-source-lorries-disabled/python-prettytable.lorry
new file mode 100644
index 0000000..d2714c0
--- /dev/null
+++ b/open-source-lorries-disabled/python-prettytable.lorry
@@ -0,0 +1,8 @@
+{
+    "python-prettytable": {
+        "type": "svn",
+        "url": "http://prettytable.googlecode.com/svn",
+        "layout": "standard",
+        "description": "Obsolete (use python-prettytable-ptable)"
+    }
+}
diff --git a/open-source-lorries-disabled/python-setuptools.lorry b/open-source-lorries-disabled/python-setuptools.lorry
new file mode 100644
index 0000000..eceb2e6
--- /dev/null
+++ b/open-source-lorries-disabled/python-setuptools.lorry
@@ -0,0 +1,17 @@
+{
+    "python-setuptools": {
+        "type": "svn",
+        "url": "http://svn.python.org/projects/sandbox/",
+        "layout": {
+            "trunk": "trunk/setuptools",
+            "branches": "branches/setuptools/*",
+            "tags": "tags/setuptools/*"
+        },
+        "description": "Obsolete (use python-setuptools-git)"
+    },
+    "python-setuptools-bitbucket": {
+        "type": "hg",
+        "url": "https://bitbucket.org/pypa/setuptools",
+        "description": "Obsolete (use python-setuptools-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/pytz.lorry b/open-source-lorries-disabled/pytz.lorry
new file mode 100644
index 0000000..4ec45b6
--- /dev/null
+++ b/open-source-lorries-disabled/pytz.lorry
@@ -0,0 +1,7 @@
+{
+    "pytz": {
+        "type": "bzr",
+        "url": "lp:pytz",
+        "description": "Obsolete (use pytz-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/rabbitmq-codegen.lorry b/open-source-lorries-disabled/rabbitmq-codegen.lorry
new file mode 100644
index 0000000..d54e9e4
--- /dev/null
+++ b/open-source-lorries-disabled/rabbitmq-codegen.lorry
@@ -0,0 +1,7 @@
+{
+    "rabbitmq-codegen": {
+        "type": "hg",
+        "url": "http://hg.rabbitmq.com/rabbitmq-codegen",
+        "description": "Obsolete (use rabbitmq-codegen-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/rabbitmq-server.lorry b/open-source-lorries-disabled/rabbitmq-server.lorry
new file mode 100644
index 0000000..981694b
--- /dev/null
+++ b/open-source-lorries-disabled/rabbitmq-server.lorry
@@ -0,0 +1,7 @@
+{
+    "rabbitmq-server": {
+        "type": "hg",
+        "url": "http://hg.rabbitmq.com/rabbitmq-server",
+        "description": "Obsolete (use rabbitmq-server-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/scons.lorry b/open-source-lorries-disabled/scons.lorry
new file mode 100644
index 0000000..6c9e49d
--- /dev/null
+++ b/open-source-lorries-disabled/scons.lorry
@@ -0,0 +1,7 @@
+{
+    "scons": {
+        "type": "hg",
+        "url": "https://bitbucket.org/scons/scons",
+        "description": "Obsolete (use scons-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/six.lorry b/open-source-lorries-disabled/six.lorry
new file mode 100644
index 0000000..9c94516
--- /dev/null
+++ b/open-source-lorries-disabled/six.lorry
@@ -0,0 +1,7 @@
+{
+    "six": {
+        "type": "hg",
+        "url": "http://bitbucket.org/gutworth/six",
+        "description": "Obsolete (use six-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/sloccount.lorry b/open-source-lorries-disabled/sloccount.lorry
new file mode 100644
index 0000000..8c90a84
--- /dev/null
+++ b/open-source-lorries-disabled/sloccount.lorry
@@ -0,0 +1,8 @@
+{
+    "sloccount": {
+        "type": "svn",
+        "url": "svn://svn.code.sf.net/p/sloccount/code/",
+        "layout": "standard",
+        "description": "Obsolete (use sloccount-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/smartdevicelink.lorry b/open-source-lorries-disabled/smartdevicelink.lorry
new file mode 100644
index 0000000..a7a6505
--- /dev/null
+++ b/open-source-lorries-disabled/smartdevicelink.lorry
@@ -0,0 +1,7 @@
+{
+    "smartdevicelink": {
+        "type": "git",
+        "url": "git://git.projects.genivi.org/smartdevicelink.git",
+        "description": "Obsolete (use smartdevicelink/sdl_core)"
+    }
+}
diff --git a/open-source-lorries-disabled/snappy.lorry b/open-source-lorries-disabled/snappy.lorry
new file mode 100644
index 0000000..b723bb3
--- /dev/null
+++ b/open-source-lorries-disabled/snappy.lorry
@@ -0,0 +1,8 @@
+{
+    "snappy": {
+        "type": "svn",
+        "url": "http://snappy.googlecode.com/svn/",
+        "layout": "standard",
+        "description": "Obsolete (use snappy-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/unionfs-fuse.lorry b/open-source-lorries-disabled/unionfs-fuse.lorry
new file mode 100644
index 0000000..6be027d
--- /dev/null
+++ b/open-source-lorries-disabled/unionfs-fuse.lorry
@@ -0,0 +1,7 @@
+{
+    "unionfs-fuse": {
+        "type": "hg",
+        "url": "http://hg.podgorny.cz/unionfs-fuse",
+        "description": "Obsolete (use unionfs-fuse-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/vim.lorry b/open-source-lorries-disabled/vim.lorry
new file mode 100644
index 0000000..6f6f474
--- /dev/null
+++ b/open-source-lorries-disabled/vim.lorry
@@ -0,0 +1,7 @@
+{
+    "vim": {
+        "type": "hg",
+        "url": "https://vim.googlecode.com/hg/",
+        "description": "Obsolete (use vim-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/xstatic-packages.lorry b/open-source-lorries-disabled/xstatic-packages.lorry
new file mode 100644
index 0000000..0fc2aa0
--- /dev/null
+++ b/open-source-lorries-disabled/xstatic-packages.lorry
@@ -0,0 +1,12 @@
+{
+    "xstatic-packages/xstatic-jquery": {
+        "type": "hg",
+        "url": "https://bitbucket.org/thomaswaldmann/xstatic-jquery",
+        "description": "Obsolete (use xstatic-packages/xstatic-jquery-git)"
+    },
+    "xstatic-packages/xstatic-jquery-ui": {
+        "type": "hg",
+        "url": "https://bitbucket.org/thomaswaldmann/xstatic-jquery_ui",
+        "description": "Obsolete (use xstatic-packages/xstatic-jquery-ui-git)"
+    }
+}
diff --git a/open-source-lorries-disabled/xstatic.lorry b/open-source-lorries-disabled/xstatic.lorry
new file mode 100644
index 0000000..b411e87
--- /dev/null
+++ b/open-source-lorries-disabled/xstatic.lorry
@@ -0,0 +1,7 @@
+{
+    "xstatic": {
+        "type": "hg",
+        "url": "https://bitbucket.org/thomaswaldmann/xstatic",
+        "description": "Obsolete (use xstatic-git)"
+    }
+}
diff --git a/open-source-lorries/argparse.lorry b/open-source-lorries/argparse.lorry
deleted file mode 100644
index 04df5e1..0000000
--- a/open-source-lorries/argparse.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "argparse": {
-        "type": "hg",
-        "url": "http://code.google.com/p/argparse/",
-        "description": "Obsolete (included in Python standard library)"
-    }
-}
diff --git a/open-source-lorries/asciidoc.lorry b/open-source-lorries/asciidoc.lorry
index ce9808a..53edc17 100644
--- a/open-source-lorries/asciidoc.lorry
+++ b/open-source-lorries/asciidoc.lorry
@@ -1,9 +1,4 @@
 {
-    "asciidoc": {
-        "type": "hg",
-        "url": "https://code.google.com/p/asciidoc",
-        "description": "Obsolete (use asciidoc-git or asciidoc-py3)"
-    },
     "asciidoc-git": {
         "type": "git",
         "url": "https://github.com/asciidoc/asciidoc.git"
diff --git a/open-source-lorries/cherrypy.lorry b/open-source-lorries/cherrypy.lorry
index 8f7d426..c5c8254 100644
--- a/open-source-lorries/cherrypy.lorry
+++ b/open-source-lorries/cherrypy.lorry
@@ -1,9 +1,4 @@
 {
-    "cherrypy": {
-        "type": "hg",
-        "url": "http://bitbucket.org/cherrypy/cherrypy",
-        "description": "Obsolete (use cherrypy-git)"
-    },
     "cherrypy-git": {
         "type": "git",
         "url": "https://github.com/cherrypy/cherrypy.git"
diff --git a/open-source-lorries/clang.lorry b/open-source-lorries/clang.lorry
deleted file mode 100644
index c5efa99..0000000
--- a/open-source-lorries/clang.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "clang": {
-        "type": "git",
-        "url": "http://llvm.org/git/clang.git",
-        "description": "Obsolete (use llvm)"
-    }
-}
diff --git a/open-source-lorries/cloud-init.lorry b/open-source-lorries/cloud-init.lorry
index 15e2b56..58d9b55 100644
--- a/open-source-lorries/cloud-init.lorry
+++ b/open-source-lorries/cloud-init.lorry
@@ -1,9 +1,4 @@
 {
-    "cloud-init": {
-        "type": "bzr",
-        "url": "lp:cloud-init",
-        "description": "Obsolete (use cloud-init-git)"
-    },
     "cloud-init-git": {
         "type": "git",
         "url": "https://github.com/canonical/cloud-init.git"
diff --git a/open-source-lorries/compiler-rt.lorry b/open-source-lorries/compiler-rt.lorry
deleted file mode 100644
index 6a8d419..0000000
--- a/open-source-lorries/compiler-rt.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "compiler-rt": {
-        "type": "git",
-        "url": "http://llvm.org/git/compiler-rt.git",
-        "description": "Obsolete (use llvm)"
-    }
-}
diff --git a/open-source-lorries/configobj.lorry b/open-source-lorries/configobj.lorry
index 4226236..30d69ce 100644
--- a/open-source-lorries/configobj.lorry
+++ b/open-source-lorries/configobj.lorry
@@ -1,9 +1,4 @@
 {
-    "configobj": {
-        "type": "hg",
-        "url": "http://code.google.com/p/configobj/",
-        "description": "Obsolete (use configobj-git)"
-    },
     "configobj-git": {
         "type": "git",
         "url": "https://github.com/DiffSK/configobj.git"
diff --git a/open-source-lorries/cryptopp.lorry b/open-source-lorries/cryptopp.lorry
index 9f3d3d2..c9a5f99 100644
--- a/open-source-lorries/cryptopp.lorry
+++ b/open-source-lorries/cryptopp.lorry
@@ -1,14 +1,4 @@
 {
-    "cryptopp": {
-        "type": "svn",
-        "url": "svn://svn.code.sf.net/p/cryptopp/code",
-        "layout": {
-            "trunk": "trunk/c5",
-            "branches": "branches/*/c5",
-            "tags": "tags/*"
-        },
-        "description": "Obsolete (use cryptopp-git)"
-    },
     "cryptopp-git": {
         "type": "git",
         "url": "https://github.com/weidai11/cryptopp.git"
diff --git a/open-source-lorries/distcc.lorry b/open-source-lorries/distcc.lorry
deleted file mode 100644
index 9fa00af..0000000
--- a/open-source-lorries/distcc.lorry
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "distcc": {
-        "type": "svn",
-        "url": "http://distcc.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use distcc-git)"
-    }
-}
diff --git a/open-source-lorries/dtc.lorry b/open-source-lorries/dtc.lorry
deleted file mode 100644
index c8033d1..0000000
--- a/open-source-lorries/dtc.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "dtc": {
-        "type": "git",
-        "url": "git://git.jdl.com/software/dtc.git",
-        "description": "Obsolete (use device-tree-compiler)"
-    }
-}
diff --git a/open-source-lorries/eglibc2.lorry b/open-source-lorries/eglibc2.lorry
deleted file mode 100644
index 6cdeace..0000000
--- a/open-source-lorries/eglibc2.lorry
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "eglibc2": {
-        "type": "svn",
-        "url": "svn://svn.eglibc.org",
-        "layout": "standard",
-        "description": "Obsolete (use glibc)"
-    }
-}
diff --git a/open-source-lorries/flashrom.lorry b/open-source-lorries/flashrom.lorry
index 0091dcd..e646db9 100644
--- a/open-source-lorries/flashrom.lorry
+++ b/open-source-lorries/flashrom.lorry
@@ -1,10 +1,4 @@
 {
-    "flashrom": {
-        "type": "svn",
-        "url": "https://code.coreboot.org/svn/flashrom/",
-        "layout": "standard",
-        "description": "Obsolete (use flashrom-git)"
-    },
     "flashrom-git": {
         "type": "git",
         "url": "https://review.coreboot.org/flashrom.git"
diff --git a/open-source-lorries/freertos.lorry b/open-source-lorries/freertos.lorry
index b611cb3..ce48276 100644
--- a/open-source-lorries/freertos.lorry
+++ b/open-source-lorries/freertos.lorry
@@ -1,12 +1,6 @@
 {
-     "freertos": {
-        "type": "svn",
-        "url": "http://svn.code.sf.net/p/freertos/code/",
-        "layout": "standard",
-        "description": "Obsolete (use freertos-git)"
-     },
-     "freertos-git": {
+    "freertos-git": {
         "type": "git",
         "url": "https://github.com/FreeRTOS/FreeRTOS.git"
-     }
+    }
 }
diff --git a/open-source-lorries/go.lorry b/open-source-lorries/go.lorry
deleted file mode 100644
index eb64126..0000000
--- a/open-source-lorries/go.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "go": {
-        "type": "hg",
-        "url": "https://code.google.com/p/go",
-        "description": "Obsolete (use go-git)"
-    }
-}
diff --git a/open-source-lorries/googlemock.lorry b/open-source-lorries/googlemock.lorry
deleted file mode 100644
index 972fd51..0000000
--- a/open-source-lorries/googlemock.lorry
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "googlemock": {
-        "type": "svn",
-        "url": "http://googlemock.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use googletest-git)"
-    }
-}
diff --git a/open-source-lorries/googletest.lorry b/open-source-lorries/googletest.lorry
index 4b9b0ba..1d9243e 100644
--- a/open-source-lorries/googletest.lorry
+++ b/open-source-lorries/googletest.lorry
@@ -1,10 +1,4 @@
 {
-    "googletest": {
-        "type": "svn",
-        "url": "http://googletest.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use googletest-git)"
-    },
     "googletest-git": {
         "type": "git",
         "url": "https://github.com/google/googletest.git"
diff --git a/open-source-lorries/i2c-tools.lorry b/open-source-lorries/i2c-tools.lorry
index 260989d..92e62c8 100644
--- a/open-source-lorries/i2c-tools.lorry
+++ b/open-source-lorries/i2c-tools.lorry
@@ -1,10 +1,4 @@
 {
-    "i2c-tools": {
-        "type": "svn",
-        "url": "http://lm-sensors.org/svn/i2c-tools",
-        "layout": "standard",
-        "description": "Obsolete (use i2c-tools-git)"
-    },
     "i2c-tools-git": {
         "type": "git",
         "url": "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git"
diff --git a/open-source-lorries/layer_management.lorry b/open-source-lorries/layer_management.lorry
deleted file mode 100644
index 6a6789b..0000000
--- a/open-source-lorries/layer_management.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "layer_management": {
-        "type": "git",
-        "url": "git://git.projects.genivi.org/layer_management.git",
-        "description": "Obsolete"
-    }
-}
diff --git a/open-source-lorries/libproxy.lorry b/open-source-lorries/libproxy.lorry
index 9301e7a..a9f8077 100644
--- a/open-source-lorries/libproxy.lorry
+++ b/open-source-lorries/libproxy.lorry
@@ -1,10 +1,4 @@
 {
-    "libproxy": {
-        "type": "svn",
-        "url": "http://libproxy.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use libproxy-git)"
-    },
     "libproxy-git": {
         "type": "git",
         "url": "https://github.com/libproxy/libproxy.git"
diff --git a/open-source-lorries/libpwquality.lorry b/open-source-lorries/libpwquality.lorry
index ed2244b..2ed9ddf 100644
--- a/open-source-lorries/libpwquality.lorry
+++ b/open-source-lorries/libpwquality.lorry
@@ -1,9 +1,4 @@
 {
-    "libpwquality": {
-        "type": "hg",
-        "url": "http://hg.fedorahosted.org/hg/libpwquality",
-        "description": "Obsolete (use libpwquality-git)"
-    },
     "libpwquality-git": {
         "type": "git",
         "url": "https://github.com/libpwquality/libpwquality.git"
diff --git a/open-source-lorries/libusbx.lorry b/open-source-lorries/libusbx.lorry
deleted file mode 100644
index 08ae041..0000000
--- a/open-source-lorries/libusbx.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "libusbx": {
-        "type": "git",
-        "url": "git://libusbx.git.sourceforge.net/gitroot/libusbx/libusbx",
-        "description": "Obsolete (use libusb)"
-    }
-}
diff --git a/open-source-lorries/libyaml-hg.lorry b/open-source-lorries/libyaml-hg.lorry
deleted file mode 100644
index 00bdd29..0000000
--- a/open-source-lorries/libyaml-hg.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "libyaml-hg": {
-        "type": "hg",
-        "url": "http://bitbucket.org/xi/libyaml",
-        "description": "Obsolete (use libyaml-git)"
-    }
-}
diff --git a/open-source-lorries/libyaml.lorry b/open-source-lorries/libyaml.lorry
index 2bfb4a9..b545d1f 100644
--- a/open-source-lorries/libyaml.lorry
+++ b/open-source-lorries/libyaml.lorry
@@ -1,10 +1,4 @@
 {
-    "libyaml": {
-        "type": "svn",
-        "url": "http://svn.pyyaml.org/libyaml",
-        "layout": "standard",
-        "description": "Obsolete (use libyaml-git)"
-    },
     "libyaml-git": {
 	"type": "git",
 	"url": "https://github.com/yaml/libyaml.git"
diff --git a/open-source-lorries/lighttpd.lorry b/open-source-lorries/lighttpd.lorry
index 609bf65..f53c174 100644
--- a/open-source-lorries/lighttpd.lorry
+++ b/open-source-lorries/lighttpd.lorry
@@ -1,10 +1,4 @@
 {
-    "lighttpd": {
-        "type": "svn",
-        "url": "svn://svn.lighttpd.net/lighttpd",
-        "layout": "standard",
-        "description": "Obsolete (use lighttpd-git)"
-    },
     "lighttpd-git": {
         "type": "git",
         "url": "https://git.lighttpd.net/lighttpd/lighttpd1.4.git"
diff --git a/open-source-lorries/lm-sensors.lorry b/open-source-lorries/lm-sensors.lorry
index 75d2077..05ca650 100644
--- a/open-source-lorries/lm-sensors.lorry
+++ b/open-source-lorries/lm-sensors.lorry
@@ -1,10 +1,4 @@
 {
-    "lm-sensors": {
-        "type": "svn",
-        "url": "http://lm-sensors.org/svn/lm-sensors/",
-        "layout": "standard",
-        "description": "Obsolete (use lm-sensors-git)"
-    },
     "lm-sensors-git": {
         "type": "git",
         "url": "https://github.com/lm-sensors/lm-sensors.git"
diff --git a/open-source-lorries/lua-scrypt.lorry b/open-source-lorries/lua-scrypt.lorry
index 8f2d0b2..01e4db1 100644
--- a/open-source-lorries/lua-scrypt.lorry
+++ b/open-source-lorries/lua-scrypt.lorry
@@ -1,9 +1,4 @@
 {
-    "lua-scrypt": {
-        "type": "bzr",
-        "url": "http://bzr.rjek.com/public/lua-scrypt/",
-        "description": "Obsolete (use lua-scrypt-git)"
-    },
     "lua-scrypt-git": {
         "type": "git",
         "url": "https://git.gitano.org.uk/lua-scrypt.git"
diff --git a/open-source-lorries/micheles.lorry b/open-source-lorries/micheles.lorry
deleted file mode 100644
index 7a44bcb..0000000
--- a/open-source-lorries/micheles.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "micheles": {
-        "type": "hg",
-        "url": "https://code.google.com/p/micheles/",
-        "description": "Obsolete (use python-packages/python-decorator-git)"
-    }
-}
diff --git a/open-source-lorries/midori.lorry b/open-source-lorries/midori.lorry
index 45ffd53..6893b5d 100644
--- a/open-source-lorries/midori.lorry
+++ b/open-source-lorries/midori.lorry
@@ -1,9 +1,4 @@
 {
-    "midori": {
-        "type": "bzr",
-        "url": "https://code.launchpad.net/~midori/midori/trunk",
-        "description": "Obsolete (use midori-git)"
-    },
     "midori-git": {
         "type": "git",
         "url": "https://github.com/midori-browser/core.git"
diff --git a/open-source-lorries/navit-svn.lorry b/open-source-lorries/navit-svn.lorry
deleted file mode 100644
index dad186b..0000000
--- a/open-source-lorries/navit-svn.lorry
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "navit-svn": {
-        "type": "svn",
-        "url": "http://svn.code.sf.net/p/navit/code",
-        "layout": {
-            "trunk": "trunk/navit",
-            "branches": "branches/*/navit",
-            "tags": "tags/*/navit"
-        },
-        "description": "Obsolete (use navit)"
-    }
-}
diff --git a/open-source-lorries/neon.lorry b/open-source-lorries/neon.lorry
index d5c9763..5e0e738 100644
--- a/open-source-lorries/neon.lorry
+++ b/open-source-lorries/neon.lorry
@@ -1,10 +1,4 @@
 {
-    "neon": {
-        "type": "svn",
-        "url": "http://svn.webdav.org/repos/projects/neon/",
-        "layout": "standard",
-        "description": "Obsolete (use neon-git)"
-    },
     "neon-git": {
         "type": "git",
         "url": "https://github.com/notroj/neon.git"
diff --git a/open-source-lorries/ogg.lorry b/open-source-lorries/ogg.lorry
deleted file mode 100644
index c917619..0000000
--- a/open-source-lorries/ogg.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "ogg": {
-        "type": "git",
-        "url": "git://git.xiph.org/mirrors/ogg.git",
-        "description": "Obsolete (use ogg-git)"
-    }
-}
diff --git a/open-source-lorries/openwrt.lorry b/open-source-lorries/openwrt.lorry
index eccf45f..1895351 100644
--- a/open-source-lorries/openwrt.lorry
+++ b/open-source-lorries/openwrt.lorry
@@ -63,11 +63,6 @@
         "type": "git",
         "url": "https://git.openwrt.org/project/uclient.git"
     },
-    "openwrt/uhttpd": {
-        "type": "git",
-        "url": "git://nbd.name/uhttpd.git",
-        "description": "Obsolete (use openwrt/uhttpd2)"
-    },
     "openwrt/uhttpd2": {
         "type": "git",
         "url": "https://git.openwrt.org/project/uhttpd.git"
diff --git a/open-source-lorries/pexpect.lorry b/open-source-lorries/pexpect.lorry
index bc13aef..428da4e 100644
--- a/open-source-lorries/pexpect.lorry
+++ b/open-source-lorries/pexpect.lorry
@@ -1,10 +1,4 @@
 {
-    "pexpect": {
-        "type": "svn",
-        "url": "https://svn.code.sf.net/p/pexpect/code/",
-        "layout": "standard",
-        "description": "Obsolete (use pexpect-git)"
-    },
     "pexpect-git": {
         "type": "git",
         "url": "https://github.com/pexpect/pexpect.git"
diff --git a/open-source-lorries/pyfilesystem.lorry b/open-source-lorries/pyfilesystem.lorry
index a58e40c..aca2661 100644
--- a/open-source-lorries/pyfilesystem.lorry
+++ b/open-source-lorries/pyfilesystem.lorry
@@ -1,10 +1,4 @@
 {
-    "pyfilesystem": {
-        "type": "svn",
-        "url": "http://pyfilesystem.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use pyfilesystem-git)"
-    },
     "pyfilesystem-git": {
         "type": "git",
         "url": "https://github.com/PyFilesystem/pyfilesystem.git"
diff --git a/open-source-lorries/pyopenssl.lorry b/open-source-lorries/pyopenssl.lorry
index 698ddbf..3c6625f 100644
--- a/open-source-lorries/pyopenssl.lorry
+++ b/open-source-lorries/pyopenssl.lorry
@@ -1,9 +1,4 @@
 {
-    "pyopenssl": {
-        "type": "bzr",
-        "url": "lp:pyopenssl",
-        "description": "Obsolete (use pyopenssl-git)"
-    },
     "pyopenssl-git": {
         "type": "git",
         "url": "https://github.com/pyca/pyopenssl.git"
diff --git a/open-source-lorries/python-coveragepy.lorry b/open-source-lorries/python-coveragepy.lorry
index f28b361..640b2ac 100644
--- a/open-source-lorries/python-coveragepy.lorry
+++ b/open-source-lorries/python-coveragepy.lorry
@@ -1,9 +1,4 @@
 {
-    "python-coveragepy": {
-        "type": "hg",
-        "url": "https://bitbucket.org/ned/coveragepy",
-        "description": "Obsolete (use python-coveragepy-git)"
-    },
     "python-coveragepy-git": {
         "type": "git",
         "url": "https://github.com/nedbat/coveragepy.git"
diff --git a/open-source-lorries/python-packages.lorry b/open-source-lorries/python-packages.lorry
index 31c15e7..c60c8a1 100644
--- a/open-source-lorries/python-packages.lorry
+++ b/open-source-lorries/python-packages.lorry
@@ -15,11 +15,6 @@
         "type": "git",
         "url": "https://github.com/agronholm/apscheduler.git"
     },
-    "python-packages/astroid": {
-        "type": "hg",
-        "url": "https://bitbucket.org/logilab/astroid",
-        "description": "Obsolete (use python-packages/astroid-git"
-    },
     "python-packages/astroid-git": {
         "type": "git",
         "url": "https://github.com/PyCQA/astroid.git"
@@ -52,11 +47,6 @@
         "type": "git",
         "url": "https://github.com/python-cmd2/cmd2.git"
     },
-    "python-packages/cmd2-hg": {
-        "type": "hg",
-        "url": "http://bitbucket.org/catherinedevlin/cmd2",
-        "description": "Obsolete (use python-packages/cmd2-git)"
-    },
     "python-packages/configshell-fb": {
         "type": "git",
         "url": "https://github.com/agrover/configshell-fb.git"
@@ -73,29 +63,14 @@
         "type": "git",
         "url": "https://github.com/pyca/cryptography.git"
     },
-    "python-packages/dateutil": {
-        "type": "bzr",
-        "url": "lp:dateutil",
-        "description": "Obsolete (use python-packages/dateutil-git)"
-    },
     "python-packages/dateutil-git": {
         "type": "git",
         "url": "https://github.com/dateutil/dateutil.git"
     },
-    "python-packages/defusedxml": {
-        "type": "hg",
-        "url": "https://bitbucket.org/tiran/defusedxml",
-        "description": "Obsolete (use python-packages/defusedxml-git)"
-    },
     "python-packages/defusedxml-git": {
         "type": "git",
         "url": "https://github.com/tiran/defusedxml.git"
     },
-    "python-packages/disutils2": {
-        "type": "hg",
-        "url": "http://hg.python.org/distutils2",
-        "description": "Obsolete (use python-setuptools-git)"
-    },
     "python-packages/django": {
         "type": "git",
         "url": "https://github.com/django/django.git"
@@ -141,11 +116,6 @@
         "type": "git",
         "url": "https://github.com/eventlet/eventlet.git"
     },
-    "python-packages/fixtures": {
-        "type": "bzr",
-        "url": "lp:python-fixtures",
-        "description": "Obsolete (use python-packages/fixtures-git)"
-    },
     "python-packages/fixtures-git": {
         "type": "git",
         "url": "https://github.com/testing-cabal/fixtures.git"
@@ -158,11 +128,6 @@
         "type": "git",
         "url": "https://github.com/terencehonles/fusepy.git"
     },
-    "python-packages/futures": {
-        "type": "hg",
-        "url": "https://code.google.com/p/pythonfutures/",
-        "description": "Obsolete (included in Python standard library)"
-    },
     "python-packages/gear": {
         "type": "git",
         "url": "https://opendev.org/opendev/gear"
@@ -239,11 +204,6 @@
         "type": "hg",
         "url": "https://hg.logilab.org/review/logilab/common/"
     },
-    "python-packages/logutils": {
-        "type": "hg",
-        "url": "https://bitbucket.org/vinay.sajip/logutils",
-        "description": "Obsolete (use python-packages/logutils-git)"
-    },
     "python-packages/logutils-git": {
         "type": "git",
         "url": "https://bitbucket.org/vinay.sajip/logutils"
@@ -264,17 +224,6 @@
         "type": "git",
         "url": "https://github.com/GrahamDumpleton/mod_wsgi-metrics.git"
     },
-    "python-packages/mock": {
-        "type": "hg",
-        "url": "https://code.google.com/p/mock/",
-        "description": "Obsolete (included in Python standard library)"
-    },
-    "python-packages/mox": {
-        "layout": "standard",
-        "type": "svn",
-        "url": "http://pymox.googlecode.com/svn/",
-        "description": "Obsolete (use python-packages/pymox)"
-    },
     "python-packages/msgpack-python": {
         "type": "git",
         "url": "https://github.com/msgpack/msgpack-python.git"
@@ -287,11 +236,6 @@
         "type": "git",
         "url": "https://github.com/SethMMorton/natsort.git"
     },
-    "python-packages/netifaces": {
-        "type": "hg",
-        "url": "https://bitbucket.org/al45tair/netifaces",
-        "description": "Obsolete (use python-packages/netifaces-git)"
-    },
     "python-packages/netifaces-git": {
         "type": "git",
         "url": "https://github.com/al45tair/netifaces.git"
@@ -328,20 +272,10 @@
         "type": "hg",
         "url": "https://foss.heptapod.net/python-libs/passlib"
     },
-    "python-packages/paste": {
-        "type": "hg",
-        "url": "http://bitbucket.org/ianb/paste",
-        "description": "Obsolete (use python-packages/paste-git)"
-    },
     "python-packages/paste-git": {
         "type": "git",
         "url": "https://github.com/cdent/paste.git"
     },
-    "python-packages/pastedeploy": {
-        "type": "hg",
-        "url": "http://bitbucket.org/ianb/pastedeploy",
-        "description": "Obsolete (use python-packages/pastedeploy-git)"
-    },
     "python-packages/pastedeploy-git": {
         "type": "git",
         "url": "https://github.com/Pylons/pastedeploy.git"
@@ -390,11 +324,6 @@
         "type": "git",
         "url": "https://github.com/celery/py-amqp.git"
     },
-    "python-packages/py-bcrypt": {
-        "type": "hg",
-        "url": "https://code.google.com/p/py-bcrypt/",
-        "description": "Obsolete (use py-bcrypt-git)"
-    },
     "python-packages/py-bcrypt-git": {
         "type": "git",
         "url": "https://github.com/pyca/bcrypt.git"
@@ -447,11 +376,6 @@
         "type": "hg",
         "url": "https://hg.sr.ht/~olly/yoyo"
     },
-    "python-packages/pygments": {
-        "type": "hg",
-        "url": "https://bitbucket.org/birkenfeld/pygments-main",
-        "description": "Obsolete (use python-packages/pygments-git)"
-    },
     "python-packages/pygments-git": {
         "type": "git",
         "url": "https://github.com/pygments/pygments.git"
@@ -460,11 +384,6 @@
         "type": "git",
         "url": "https://github.com/progrium/pyjwt.git"
     },
-    "python-packages/pylint": {
-        "type": "hg",
-        "url": "https://bitbucket.org/logilab/pylint/",
-        "description": "Obsolete (use python-packages/pylint-git)"
-    },
     "python-packages/pylint-git": {
         "type": "git",
         "url": "https://github.com/PyCQA/pylint.git"
@@ -477,12 +396,6 @@
         "type": "git",
         "url": "https://github.com/pyca/pyopenssl.git"
     },
-    "python-packages/pyparsing": {
-        "type": "svn",
-        "url": "svn://svn.code.sf.net/p/pyparsing/code",
-        "layout": "standard",
-        "description": "Obsolete (use python-packages/pyparsing-git)"
-    },
     "python-packages/pyparsing-git": {
         "type": "git",
         "url": "https://github.com/pyparsing/pyparsing.git"
@@ -587,11 +500,6 @@
         "type": "git",
         "url": "https://github.com/nvie/rq.git"
     },
-    "python-packages/rsa": {
-        "type": "hg",
-        "url": "https://bitbucket.org/sybren/python-rsa",
-        "description": "Obsolete (use python-packages/rsa-git)"
-    },
     "python-packages/rsa-git": {
         "type": "git",
         "url": "https://github.com/sybrenstuvel/python-rsa.git"
@@ -624,11 +532,6 @@
         "type": "tarball",
         "url": "https://deb.debian.org/debian/pool/main/s/simplegeneric/simplegeneric_0.8.1.orig.tar.bz2"
     },
-    "python-packages/smartypants": {
-        "type": "hg",
-        "url": "https://bitbucket.org/livibetter/smartypants.py",
-        "description": "Obsolete (use python-packages/smartypants-git)"
-    },
     "python-packages/smartypants-git": {
         "type": "git",
         "url": "https://github.com/leohemsted/smartypants.py.git"
@@ -641,11 +544,6 @@
         "type": "git",
         "url": "https://github.com/shibukawa/snowball_py.git"
     },
-    "python-packages/sphinx": {
-        "type": "hg",
-        "url": "https://bitbucket.org/birkenfeld/sphinx",
-        "description": "Obsolete (use python-packages/sphinx-git)"
-    },
     "python-packages/sphinx-git": {
         "type": "git",
         "url": "https://github.com/sphinx-doc/sphinx.git"
@@ -662,11 +560,6 @@
         "type": "git",
         "url": "https://github.com/andialbrecht/sqlparse.git"
     },
-    "python-packages/subunit": {
-        "type": "bzr",
-        "url": "lp:subunit",
-        "description": "Obsolete (use python-packages/subunit-git)"
-    },
     "python-packages/subunit-git": {
         "type": "git",
         "url": "https://github.com/testing-cabal/subunit"
@@ -683,20 +576,10 @@
         "type": "git",
         "url": "https://github.com/agrover/targetcli-fb.git"
     },
-    "python-packages/testrepository": {
-        "type": "bzr",
-        "url": "lp:testrepository",
-        "description": "Obsolete (use python-packages/testrepository-git)"
-    },
     "python-packages/testrepository-git": {
         "type": "git",
         "url": "https://github.com/testing-cabal/testrepository.git"
     },
-    "python-packages/testscenarios": {
-        "type": "bzr",
-        "url": "lp:testscenarios",
-        "description": "Obsolete (use python-packages/testscenarios-git)"
-    },
     "python-packages/testscenarios-git": {
         "type": "git",
         "url": "https://github.com/testing-cabal/testscenarios.git"
@@ -713,20 +596,10 @@
         "type": "git",
         "url": "https://opendev.org/openstack/tooz.git"
     },
-    "python-packages/tox": {
-        "type": "hg",
-        "url": "https://bitbucket.org/hpk42/tox",
-        "description": "Obsolete (use python-packages/tox-git)"
-    },
     "python-packages/tox-git": {
         "type": "git",
         "url": "https://github.com/tox-dev/tox.git"
     },
-    "python-packages/trollius": {
-        "type": "hg",
-        "url": "http://bitbucket.org/enovance/trollius",
-        "description": "Obsolete (use python-packages/trollius-git)"
-    },
     "python-packages/trollius-git": {
         "type": "git",
         "url": "https://github.com/jamadden/trollius.git"
@@ -771,11 +644,6 @@
         "type": "git",
         "url": "https://github.com/mitsuhiko/werkzeug.git"
     },
-    "python-packages/wheel": {
-        "type": "hg",
-        "url": "https://bitbucket.org/pypa/wheel",
-        "description": "Obsolete (use python-packages/wheel-git)"
-    },
     "python-packages/wheel-git": {
         "type": "git",
         "url": "https://github.com/pypa/wheel.git"
@@ -872,11 +740,6 @@
         "type": "git",
         "url": "https://github.com/pypa/virtualenv.git"
     },
-    "python-packages/singledispatch" : {
-        "type": "hg",
-        "url": "https://bitbucket.org/ambv/singledispatch",
-        "description": "Obsolete (included in Python standard library)"
-    },
     "python-packages/pymox":{
         "type": "git",
         "url": "https://github.com/emonty/pymox.git"
@@ -889,25 +752,10 @@
         "type": "git",
         "url": "https://github.com/giampaolo/pysendfile.git"
     },
-    "python-packages/pyserial": {
-        "layout": {
-            "trunk": "trunk/pyserial",
-            "branches": "branches/*",
-            "tags": "tags/*"
-        },
-        "type": "svn",
-        "url": "http://svn.code.sf.net/p/pyserial/code/",
-        "description": "Obsolete (use python-packages/pyserial-git)"
-    },
     "python-packages/pyserial-git": {
         "type": "git",
         "url": "https://github.com/pyserial/pyserial.git"
     },
-    "python-packages/testresources": {
-        "type": "bzr",
-        "url": "lp:testresources",
-        "description": "Obsolete (use python-packages/testresources-git)"
-    },
     "python-packages/testresources-git": {
         "type": "git",
         "url": "https://github.com/testing-cabal/testresources.git"
diff --git a/open-source-lorries/python-prettytable.lorry b/open-source-lorries/python-prettytable.lorry
index 5fbd3d2..e23db84 100644
--- a/open-source-lorries/python-prettytable.lorry
+++ b/open-source-lorries/python-prettytable.lorry
@@ -1,10 +1,4 @@
 {
-    "python-prettytable": {
-        "type": "svn",
-        "url": "http://prettytable.googlecode.com/svn",
-        "layout": "standard",
-        "description": "Obsolete (use python-prettytable-ptable)"
-    },
     "python-prettytable-ptable": {
         "type": "git",
         "url": "https://github.com/kxxoling/PTable.git"
diff --git a/open-source-lorries/python-setuptools-bitbucket.lorry b/open-source-lorries/python-setuptools-bitbucket.lorry
deleted file mode 100644
index 21a6f1f..0000000
--- a/open-source-lorries/python-setuptools-bitbucket.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "python-setuptools-bitbucket": {
-        "type": "hg",
-        "url": "https://bitbucket.org/pypa/setuptools",
-        "description": "Obsolete (use python-setuptools-git)"
-    }
-}
diff --git a/open-source-lorries/python-setuptools.lorry b/open-source-lorries/python-setuptools.lorry
index 592fcdf..a8fbd50 100644
--- a/open-source-lorries/python-setuptools.lorry
+++ b/open-source-lorries/python-setuptools.lorry
@@ -1,14 +1,4 @@
 {
-    "python-setuptools": {
-        "type": "svn",
-        "url": "http://svn.python.org/projects/sandbox/",
-        "layout": {
-            "trunk": "trunk/setuptools",
-            "branches": "branches/setuptools/*",
-            "tags": "tags/setuptools/*"
-        },
-        "description": "Obsolete (use python-setuptools-git)"
-    },
     "python-setuptools-git": {
         "type": "git",
         "url": "https://github.com/pypa/setuptools.git"
diff --git a/open-source-lorries/pytz.lorry b/open-source-lorries/pytz.lorry
index c777289..d38b5a4 100644
--- a/open-source-lorries/pytz.lorry
+++ b/open-source-lorries/pytz.lorry
@@ -1,9 +1,4 @@
 {
-    "pytz": {
-        "type": "bzr",
-        "url": "lp:pytz",
-        "description": "Obsolete (use pytz-git)"
-    },
     "pytz-git": {
         "type": "git",
         "url": "https://git.launchpad.net/pytz"
diff --git a/open-source-lorries/rabbitmq-codegen.lorry b/open-source-lorries/rabbitmq-codegen.lorry
index 2b1fa9e..29e58d3 100644
--- a/open-source-lorries/rabbitmq-codegen.lorry
+++ b/open-source-lorries/rabbitmq-codegen.lorry
@@ -1,9 +1,4 @@
 {
-    "rabbitmq-codegen": {
-        "type": "hg",
-        "url": "http://hg.rabbitmq.com/rabbitmq-codegen",
-        "description": "Obsolete (use rabbitmq-codegen-git)"
-    },
     "rabbitmq-codegen-git": {
         "type": "git",
         "url": "https://github.com/rabbitmq/rabbitmq-codegen.git"
diff --git a/open-source-lorries/rabbitmq-server.lorry b/open-source-lorries/rabbitmq-server.lorry
index 25155bf..f751b0b 100644
--- a/open-source-lorries/rabbitmq-server.lorry
+++ b/open-source-lorries/rabbitmq-server.lorry
@@ -1,9 +1,4 @@
 {
-    "rabbitmq-server": {
-        "type": "hg",
-        "url": "http://hg.rabbitmq.com/rabbitmq-server",
-        "description": "Obsolete (use rabbitmq-server-git)"
-    },
     "rabbitmq-server-git": {
         "type": "git",
         "url": "https://github.com/rabbitmq/rabbitmq-server.git"
diff --git a/open-source-lorries/scons.lorry b/open-source-lorries/scons.lorry
index 841737e..db97f08 100644
--- a/open-source-lorries/scons.lorry
+++ b/open-source-lorries/scons.lorry
@@ -1,9 +1,4 @@
 {
-    "scons": {
-        "type": "hg",
-        "url": "https://bitbucket.org/scons/scons",
-        "description": "Obsolete (use scons-git)"
-    },
     "scons-git": {
         "type": "git",
         "url": "https://github.com/SCons/scons.git"
diff --git a/open-source-lorries/six.lorry b/open-source-lorries/six.lorry
index 252c9d6..54a5e4e 100644
--- a/open-source-lorries/six.lorry
+++ b/open-source-lorries/six.lorry
@@ -1,9 +1,4 @@
 {
-    "six": {
-        "type": "hg",
-        "url": "http://bitbucket.org/gutworth/six",
-        "description": "Obsolete (use six-git)"
-    },
     "six-git": {
         "type": "git",
         "url": "https://github.com/benjaminp/six.git"
diff --git a/open-source-lorries/sloccount.lorry b/open-source-lorries/sloccount.lorry
index 01285f5..58bb18a 100644
--- a/open-source-lorries/sloccount.lorry
+++ b/open-source-lorries/sloccount.lorry
@@ -1,10 +1,4 @@
 {
-    "sloccount": {
-        "type": "svn",
-        "url": "svn://svn.code.sf.net/p/sloccount/code/",
-        "layout": "standard",
-        "description": "Obsolete (use sloccount-git)"
-    },
     "sloccount-git": {
         "type": "git",
         "url": "https://git.code.sf.net/p/sloccount/code"
diff --git a/open-source-lorries/smartdevicelink.lorry b/open-source-lorries/smartdevicelink.lorry
deleted file mode 100644
index a7a6505..0000000
--- a/open-source-lorries/smartdevicelink.lorry
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "smartdevicelink": {
-        "type": "git",
-        "url": "git://git.projects.genivi.org/smartdevicelink.git",
-        "description": "Obsolete (use smartdevicelink/sdl_core)"
-    }
-}
diff --git a/open-source-lorries/snappy.lorry b/open-source-lorries/snappy.lorry
deleted file mode 100644
index b723bb3..0000000
--- a/open-source-lorries/snappy.lorry
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "snappy": {
-        "type": "svn",
-        "url": "http://snappy.googlecode.com/svn/",
-        "layout": "standard",
-        "description": "Obsolete (use snappy-git)"
-    }
-}
diff --git a/open-source-lorries/unionfs-fuse.lorry b/open-source-lorries/unionfs-fuse.lorry
index 8891e2d..eeef1ab 100644
--- a/open-source-lorries/unionfs-fuse.lorry
+++ b/open-source-lorries/unionfs-fuse.lorry
@@ -1,9 +1,4 @@
 {
-    "unionfs-fuse": {
-        "type": "hg",
-        "url": "http://hg.podgorny.cz/unionfs-fuse",
-        "description": "Obsolete (use unionfs-fuse-git)"
-    },
     "unionfs-fuse-git": {
         "type": "git",
         "url": "https://github.com/rpodgorny/unionfs-fuse.git"
diff --git a/open-source-lorries/vim.lorry b/open-source-lorries/vim.lorry
index 9f5b32c..f43c816 100644
--- a/open-source-lorries/vim.lorry
+++ b/open-source-lorries/vim.lorry
@@ -1,9 +1,4 @@
 {
-    "vim": {
-        "type": "hg",
-        "url": "https://vim.googlecode.com/hg/",
-        "description": "Obsolete (use vim-git)"
-    },
     "vim-git": {
         "type": "git",
         "url": "https://github.com/vim/vim.git"
diff --git a/open-source-lorries/xstatic-packages.lorry b/open-source-lorries/xstatic-packages.lorry
index d9c8a5f..ec10eb6 100644
--- a/open-source-lorries/xstatic-packages.lorry
+++ b/open-source-lorries/xstatic-packages.lorry
@@ -63,11 +63,6 @@
         "type": "git",
         "url": "https://opendev.org/openstack/xstatic-jasmine"
     },
-    "xstatic-packages/xstatic-jquery": {
-        "type": "hg",
-        "url": "https://bitbucket.org/thomaswaldmann/xstatic-jquery",
-        "description": "Obsolete (use xstatic-packages/xstatic-jquery-git)"
-    },
     "xstatic-packages/xstatic-jquery-git": {
         "type": "git",
         "url": "https://github.com/xstatic-py/xstatic-jquery.git"
@@ -88,11 +83,6 @@
         "type": "git",
         "url": "https://opendev.org/openstack/xstatic-jquery.tablesorter"
     },
-    "xstatic-packages/xstatic-jquery-ui": {
-        "type": "hg",
-        "url": "https://bitbucket.org/thomaswaldmann/xstatic-jquery_ui",
-        "description": "Obsolete (use xstatic-packages/xstatic-jquery-ui-git)"
-    },
     "xstatic-packages/xstatic-jquery-ui-git": {
         "type": "git",
         "url": "https://github.com/xstatic-py/xstatic-jquery_ui.git"
diff --git a/open-source-lorries/xstatic.lorry b/open-source-lorries/xstatic.lorry
index 6d923e5..8cb109a 100644
--- a/open-source-lorries/xstatic.lorry
+++ b/open-source-lorries/xstatic.lorry
@@ -1,9 +1,4 @@
 {
-    "xstatic": {
-        "type": "hg",
-        "url": "https://bitbucket.org/thomaswaldmann/xstatic",
-        "description": "Obsolete (use xstatic-git)"
-    },
     "xstatic-git": {
         "type": "git",
         "url": "https://github.com/xstatic-py/xstatic.git"
-- 
cgit v1.2.1