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.

diff --combined dev-python/pyvows/Manifest
index 7f473a695bf1b15f1775322d71348c8de64506f4,e145188076d427edb7ee9e353114ae2f9ac89188..e145188076d427edb7ee9e353114ae2f9ac89188
--- 1/dev-python/pyvows/Manifest
--- 2/Manifest
+++ b/dev-python/pyvows/Manifest
@@@ -1,1 -1,1 +1,1 @@@
- DIST pyvows-2.0.3.tar.gz 19463 SHA256 83c818d41c24d80f4551181c5e27737ea2e16eb28bfea01cec0638444685d74e SHA512 215b9f6444a1beb3e56b18e1fdffaee86594f4e450f2a2af27219b19d18d6346c7f5ef3c69d85974f55d22fee174b3e4ea0b91c39bf1e99266bd17153db8e1a0 WHIRLPOOL aad7f9d47b05ccaa23b46ca9a2a294cd52e0dbb4718f55dd78816ca948343de06812138344828b4b93af3b234e5c53079a0033dc7755c7074638ca9a8740b09e
+ DIST pyvows-2.1.0.tar.gz 36661 SHA256 cf5c866e3478defe52270efbaf399cb11b5602d63f0b4502eccce7dfb002b138 SHA512 ca64d4eb4c02bf9b03c93c1958d5a2da7d231fd7f9682ac47f702d5d75aa1ae2bd95ec4fc55b9970fdf4e9aab0236fe8829bae07f3e0aee24a0d8230424eaaa4 WHIRLPOOL e5ae058de1751496809f968e51d4ca13b7e5d124058d33e53c39aa431a4f781275659856aed8a2342df8ce712334ac851e26cf66ad2ea15f536484874301ddf3

diff --combined dev-python/pyvows/pyvows-2.1.0.ebuild
index 0000000000000000000000000000000000000000,26c68e8d08360126863370f963aaf5e57c2d9075..26c68e8d08360126863370f963aaf5e57c2d9075
mode 000000,120000..120000
--- /dev/null
--- 2/pyvows-2.1.0.ebuild
+++ b/dev-python/pyvows/pyvows-2.1.0.ebuild
@@@ -1,0 -1,1 +1,1 @@@
+ pyvows-2.1.0.ebuild

diff --combined dev-python/pyvows/pyvows-9999.ebuild
index a949b132faba8361c548d0cd8e3dd6227c31f85c,1cba33049c5b9c33ae8c0e69fea3c595c88a0e76..1cba33049c5b9c33ae8c0e69fea3c595c88a0e76
--- 1/dev-python/pyvows/pyvows-9999.ebuild
--- 2/pyvows-9999.ebuild
+++ b/dev-python/pyvows/pyvows-9999.ebuild
@@@ -1,8 -1,8 +1,8 @@@
- # Copyright 1999-2014 Gentoo Foundation
+ # Copyright 1999-2016 Gentoo Foundation
  # Distributed under the terms of the GNU General Public License v2
  # $Header: $
  
- EAPI=5
+ EAPI=6
  PYTHON_COMPAT=( python2_7 )
  
  inherit distutils-r1
@@@ -11,7 -11,7 +11,7 @@@ MY_PN="pyVows
  MY_P="${MY_PN}-${PV}"
  
  if [[ "${PV}" == "9999" ]]; then
-       inherit git-2
+       inherit git-r3
        EGIT_REPO_URI="git://github.com/heynemann/${PN}.git"
        SRC_URI=""
  else