From: W. Trevor King <wking@tremily.us>
Date: Fri, 12 Aug 2016 21:32:54 +0000 (-0700)
Subject: Merge branch 'dev-python/pyvows'
X-Git-Url: http://git.tremily.us/?p=wtk-overlay.git;a=commitdiff_plain;h=10968c5bae0f7fadc40cb4de94790ed05d32dc7d

Merge branch 'dev-python/pyvows'

* dev-python/pyvows:
  pyvows-9999.ebuild: Bump to EAPI 6 and git-r3

Conflicts:
	dev-python/pyvows/pyvows-2.0.3.ebuild

The conflicts are due to the file addition/removal and thte local
dev-python/pyvows namespacing, and were resolved by removing
pyvows-2.0.3.ebuild and adding pyvows-2.1.0.ebuild.
---

10968c5bae0f7fadc40cb4de94790ed05d32dc7d
diff --cc dev-python/pyvows/pyvows-2.1.0.ebuild
index 0000000,26c68e8..26c68e8
mode 000000,120000..120000
--- a/dev-python/pyvows/pyvows-2.1.0.ebuild
+++ b/dev-python/pyvows/pyvows-2.1.0.ebuild