From 6e7a4c2a0723edf5e51d64f3684783d319fe1679 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Fri, 12 Aug 2016 11:14:59 -0700
Subject: [PATCH] thumbor-9999.ebuild: Update to post v6.0

Bump from 97a5559 (5.2.0~3) to bc49cb3 (6.0.1-131-gbc49cb3).

Drop the Thumbor fork of pexif [1], the unused python-magic
dependency [2], gevent [3], pymongo [4], and pyvows [5,6] (but
not preggy [7]).

I have not included:

* The new argparse dependency [8] because Python 2.7 includes argparse
  [9].
* nose-focus, because the only current nose_focus use in in
  .coveragerc for a 'report' target, and we're only using the 'run'
  target.

Also bump from EAPI 5 to 6 and from git-2 to the newer git-r3 (there
were no changes impacting this ebuild [10]).

[1]: https://github.com/thumbor/thumbor/issues/294
     Subject: As pexif is now on pypi revert from thumbor fork
[2]: https://github.com/thumbor/thumbor/pull/734
     Subject: Remove unused python-magic dependency
     $ git describe --contains origin/pr/734
     6.0.2~10^2
[3]: https://github.com/thumbor/thumbor/pull/735
     Subject: Remove unused gevent dependency
     $ git describe --contains origin/pr/735
     6.0.2~11^2
[4]: https://github.com/thumbor/thumbor/commit/a733977c2d8da5fd6253535b8471c1afb3887a8a
     Subject: removing mongo from setup.py
     $ git describe --contains a733977c
     6.0.0b1~27
[5]: https://github.com/thumbor/thumbor/commit/f4c9e1fc7e77a4b8d5abc432e7afa60f77c816b2
     Subject: Setting tornado 4.1 version
     $ git describe --contains f4c9e1fc
     5.0.0-rc1~4
[6]: https://github.com/thumbor/thumbor/commit/1e985972b8c08d27b289bb306b075194cc960ee5
     Subject: Removed pyvows
     $ git describe --tags 1e985972
     6.0.1-91-g1e98597
[7]: https://github.com/thumbor/thumbor/pull/743
     Subject: Make dependency on preggy explicit
     $ git describe --contains origin/pr/743
     6.0.2~7^2
[8]: https://github.com/thumbor/thumbor/pull/588
     Subject: Feature/nosetests #
     $ git describe --contains origin/pr/588
     6.0.0b1~30^2
[9]: https://docs.python.org/2.7/library/argparse.html
[10]: https://devmanual.gentoo.org/ebuild-writing/eapi/#eapi=6
---
 thumbor-9999.ebuild | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/thumbor-9999.ebuild b/thumbor-9999.ebuild
index 71e3113..5dda4c0 100644
--- a/thumbor-9999.ebuild
+++ b/thumbor-9999.ebuild
@@ -1,14 +1,14 @@
-# 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 user
 
 if [[ "${PV}" == "9999" ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://github.com/thumbor/thumbor.git"
 	SRC_URI=""
 else
@@ -25,17 +25,20 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/derpconf-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pillow-2.1.0[${PYTHON_USEDEP}]
-	<dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+	dev-python/futures[${PYTHON_USEDEP}]
+	>=dev-python/libthumbor-1.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pexif-0.15[${PYTHON_USEDEP}]
+	<dev-python/pexif-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/pycurl-7.19.0[${PYTHON_USEDEP}]
-	<dev-python/pycurl-7.20.0[${PYTHON_USEDEP}]
-	>=dev-python/python-magic-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/thumbor-pexif-0.14[${PYTHON_USEDEP}]
-	<dev-python/thumbor-pexif-1.0[${PYTHON_USEDEP}]
+	<dev-python/pycurl-7.44.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.0.1[${PYTHON_USEDEP}]
 	media-libs/opencv[python_single_target_python2_7]
-	>=www-servers/tornado-2.3.0[${PYTHON_USEDEP}]
-	<www-servers/tornado-3.3.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.1.0[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0.0[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -43,16 +46,19 @@ DEPEND="
 		${RDEPEND}
 		dev-python/colorama[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/gevent[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-3.0.0[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		>=dev-python/preggy-0.6.2[${PYTHON_USEDEP}]
-		>=dev-python/pymongo-2.1.1[${PYTHON_USEDEP}]
-		>=dev-python/pyvows-2.0.4[${PYTHON_USEDEP}]
+		>=dev-python/preggy-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pyssim[${PYTHON_USEDEP}]
 		dev-python/raven[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-2.4.9[${PYTHON_USEDEP}]
-		>=dev-python/tornado-pyvows-0.5.2[${PYTHON_USEDEP}]
+		<dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-0.16.1[${PYTHON_USEDEP}]
+		<dev-python/scipy-1.0.0[${PYTHON_USEDEP}]
+		media-gfx/cairosvg[${PYTHON_USEDEP}]
 	)
 	"
 
-- 
2.26.2