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

Merge branch 'dev-python/pexif'

Replacing the obsolete thumbor-pexif.

* dev-python/pexif:
  pexif-9999.ebuild: Convert from thumbor-pexif to pexif

Conflicts:
	dev-python/thumbor-pexif/thumbor-pexif-0.14.1.ebuild
	dev-python/thumbor-pexif/thumbor-pexif-9999.ebuild
	pexif-9999.ebuild
	thumbor-pexif-9999.ebuild

The conflicts are due to the change in dev-python/* namespacing, and
were resolved by creating dev-python/pexif to exactly match the branch
and removing dev-python/thumbor-pexif.
---

d7e32a9f5161c0774f8b49221860c6a7e16a55a5
diff --cc dev-python/pexif/Manifest
index 0000000,639baa5..639baa5
mode 000000,100644..100644
--- a/dev-python/pexif/Manifest
+++ b/dev-python/pexif/Manifest
diff --cc dev-python/pexif/pexif-0.15.ebuild
index 0000000,6881e13..6881e13
mode 000000,120000..120000
--- a/dev-python/pexif/pexif-0.15.ebuild
+++ b/dev-python/pexif/pexif-0.15.ebuild