From: W. Trevor King <wking@tremily.us>
Date: Wed, 8 Oct 2014 16:35:20 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/dev-python/raven'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7480d1bd76902277d3b92a4a24fd8c8cc98c0c7f;p=wtk-overlay.git

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

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

  $ git merge -s ours --no-commit origin/dev-python/raven
  $ git read-tree --prefix=dev-python/dev-python/raven/ -u origin/dev-python/raven
  $ 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
---

7480d1bd76902277d3b92a4a24fd8c8cc98c0c7f
diff --cc dev-python/raven/Manifest
index 0000000,2f602f0..2f602f0
mode 000000,100644..100644
--- a/dev-python/raven/Manifest
+++ b/dev-python/raven/Manifest
diff --cc dev-python/raven/metadata.xml
index 0000000,440c5f4..440c5f4
mode 000000,100644..100644
--- a/dev-python/raven/metadata.xml
+++ b/dev-python/raven/metadata.xml
diff --cc dev-python/raven/raven-5.0.0.ebuild
index 0000000,4d91556..4d91556
mode 000000,120000..120000
--- a/dev-python/raven/raven-5.0.0.ebuild
+++ b/dev-python/raven/raven-5.0.0.ebuild
diff --cc dev-python/raven/raven-9999.ebuild
index 0000000,2d3e10c..2d3e10c
mode 000000,100644..100644
--- a/dev-python/raven/raven-9999.ebuild
+++ b/dev-python/raven/raven-9999.ebuild