Merge remote-tracking branch 'origin/dev-python/south'

Pull in this per-package branch with a subtree merge [1]:

  $ git merge -s ours --no-commit origin/dev-python/south
  $ git read-tree --prefix=dev-python/dev-python/south/ -u origin/dev-python/south
  $ git commit -v

so folks who aren't using a version of Layman that supports submodules
(currently everybody) can use this modular package.

[1]: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

diff --cc dev-python/south/ChangeLog
index 0000000000000000000000000000000000000000,7ff16fd78f72b993feac4fd99499b17959847e9b..7ff16fd78f72b993feac4fd99499b17959847e9b
mode 000000,100644..100644
--- /dev/null
--- 2/ChangeLog
+++ b/dev-python/south/ChangeLog

diff --cc dev-python/south/Manifest
index 0000000000000000000000000000000000000000,36f091d037f487f8ef58b5c74a9f2cd0e08f886a..36f091d037f487f8ef58b5c74a9f2cd0e08f886a
mode 000000,100644..100644
--- /dev/null
--- 2/Manifest
+++ b/dev-python/south/Manifest

diff --cc dev-python/south/files/south-0.7.5-tests.patch
index 0000000000000000000000000000000000000000,2e4da84d975d49b5b1b96beb40248e942d9064cf..2e4da84d975d49b5b1b96beb40248e942d9064cf
mode 000000,100644..100644
--- /dev/null
--- 2/files/south-0.7.5-tests.patch
+++ b/dev-python/south/files/south-0.7.5-tests.patch

diff --cc dev-python/south/files/south-1.0-3753b49c-Replace-dict.iteritems-with-six.patch
index 0000000000000000000000000000000000000000,07c50edabce357a4c652f5f1767fe7eb75c94f49..07c50edabce357a4c652f5f1767fe7eb75c94f49
mode 000000,100644..100644
--- /dev/null
--- 2/files/south-1.0-3753b49c-Replace-dict.iteritems-with-six.patch
+++ b/dev-python/south/files/south-1.0-3753b49c-Replace-dict.iteritems-with-six.patch

diff --cc dev-python/south/metadata.xml
index 0000000000000000000000000000000000000000,5b2a5c55470bcbe074c775e9e464fb19970eb083..5b2a5c55470bcbe074c775e9e464fb19970eb083
mode 000000,100644..100644
--- /dev/null
--- 2/metadata.xml
+++ b/dev-python/south/metadata.xml

diff --cc dev-python/south/south-0.7.2.ebuild
index 0000000000000000000000000000000000000000,e75824dbc3a77e6143269947e6cad6807663ce32..e75824dbc3a77e6143269947e6cad6807663ce32
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.2.ebuild
+++ b/dev-python/south/south-0.7.2.ebuild

diff --cc dev-python/south/south-0.7.3.ebuild
index 0000000000000000000000000000000000000000,e75824dbc3a77e6143269947e6cad6807663ce32..e75824dbc3a77e6143269947e6cad6807663ce32
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.2.ebuild
+++ b/dev-python/south/south-0.7.3.ebuild

diff --cc dev-python/south/south-0.7.4.ebuild
index 0000000000000000000000000000000000000000,dadbcc4af47d74313f0fdcccbfe4416c68105ac5..dadbcc4af47d74313f0fdcccbfe4416c68105ac5
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.4.ebuild
+++ b/dev-python/south/south-0.7.4.ebuild

diff --cc dev-python/south/south-0.7.5-r1.ebuild
index 0000000000000000000000000000000000000000,47ef4258a0c5c3f143f88e604546da57993b3582..47ef4258a0c5c3f143f88e604546da57993b3582
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.5-r1.ebuild
+++ b/dev-python/south/south-0.7.5-r1.ebuild

diff --cc dev-python/south/south-0.7.5.ebuild
index 0000000000000000000000000000000000000000,3a9254ad80c39621f9dd88decfc3e59be238eb6b..3a9254ad80c39621f9dd88decfc3e59be238eb6b
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.5.ebuild
+++ b/dev-python/south/south-0.7.5.ebuild

diff --cc dev-python/south/south-0.7.6.ebuild
index 0000000000000000000000000000000000000000,0e7a7db3bf6bf49c98759f1c8bbe982e0aa223b6..0e7a7db3bf6bf49c98759f1c8bbe982e0aa223b6
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.7.6.ebuild
+++ b/dev-python/south/south-0.7.6.ebuild

diff --cc dev-python/south/south-0.8.1.ebuild
index 0000000000000000000000000000000000000000,b20ffe54db14a5eabe2fad1eb9f1694f351b5acf..b20ffe54db14a5eabe2fad1eb9f1694f351b5acf
mode 000000,100644..100644
--- /dev/null
--- 2/south-0.8.1.ebuild
+++ b/dev-python/south/south-0.8.1.ebuild

diff --cc dev-python/south/south-1.0.ebuild
index 0000000000000000000000000000000000000000,e3d248b93296905482cc378b80f19d2d7348a830..e3d248b93296905482cc378b80f19d2d7348a830
mode 000000,100644..100644
--- /dev/null
--- 2/south-1.0.ebuild
+++ b/dev-python/south/south-1.0.ebuild