From: W. Trevor King <wking@tremily.us>
Date: Tue, 7 Oct 2014 18:46:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/south'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b2fd225c3d3320c80e865744a522326d23ba0e1;p=wtk-overlay.git

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
---

6b2fd225c3d3320c80e865744a522326d23ba0e1
diff --cc dev-python/south/ChangeLog
index 0000000,7ff16fd..7ff16fd
mode 000000,100644..100644
--- a/dev-python/south/ChangeLog
+++ b/dev-python/south/ChangeLog
diff --cc dev-python/south/Manifest
index 0000000,36f091d..36f091d
mode 000000,100644..100644
--- a/dev-python/south/Manifest
+++ b/dev-python/south/Manifest
diff --cc dev-python/south/files/south-0.7.5-tests.patch
index 0000000,2e4da84..2e4da84
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,07c50ed..07c50ed
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,5b2a5c5..5b2a5c5
mode 000000,100644..100644
--- a/dev-python/south/metadata.xml
+++ b/dev-python/south/metadata.xml
diff --cc dev-python/south/south-0.7.2.ebuild
index 0000000,e75824d..e75824d
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,e75824d..e75824d
mode 000000,100644..100644
--- a/dev-python/south/south-0.7.3.ebuild
+++ b/dev-python/south/south-0.7.3.ebuild
diff --cc dev-python/south/south-0.7.4.ebuild
index 0000000,dadbcc4..dadbcc4
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,47ef425..47ef425
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,3a9254a..3a9254a
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,0e7a7db..0e7a7db
mode 000000,100644..100644
--- a/dev-python/south/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 0000000,b20ffe5..b20ffe5
mode 000000,100644..100644
--- a/dev-python/south/south-0.8.1.ebuild
+++ b/dev-python/south/south-0.8.1.ebuild
diff --cc dev-python/south/south-1.0.ebuild
index 0000000,e3d248b..e3d248b
mode 000000,100644..100644
--- a/dev-python/south/south-1.0.ebuild
+++ b/dev-python/south/south-1.0.ebuild