From d4610beae1e0e8b250567ba3200c009ad102edbd Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 3 Jan 2017 19:38:11 -0500
Subject: [PATCH] dev-python/requests: drop unused patch #595974 and restore
 used one #604560

---
 .../requests-2.11.1-system-packages.patch     | 20 ------------------
 .../files/requests-2.2.0-system-chardet.patch | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 dev-python/requests/files/requests-2.11.1-system-packages.patch
 create mode 100644 dev-python/requests/files/requests-2.2.0-system-chardet.patch

diff --git a/dev-python/requests/files/requests-2.11.1-system-packages.patch b/dev-python/requests/files/requests-2.11.1-system-packages.patch
deleted file mode 100644
index f511d0d6524dc..0000000000000
--- a/dev-python/requests/files/requests-2.11.1-system-packages.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- setup.py | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index b7ed12b..1d5abe4 100755
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish':
- packages = [
-     'requests',
-     'requests.packages',
--    'requests.packages.chardet',
--    'requests.packages.urllib3',
--    'requests.packages.urllib3.packages',
--    'requests.packages.urllib3.contrib',
--    'requests.packages.urllib3.util',
--    'requests.packages.urllib3.packages.ssl_match_hostname',
- ]
- 
- requires = []
diff --git a/dev-python/requests/files/requests-2.2.0-system-chardet.patch b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
new file mode 100644
index 0000000000000..18fc7a992bf5a
--- /dev/null
+++ b/dev-python/requests/files/requests-2.2.0-system-chardet.patch
@@ -0,0 +1,21 @@
+--- requests-2.2.0/requests/compat.py
++++ requests-2.2.0/requests/compat.py
+@@ -4,7 +4,7 @@
+ pythoncompat
+ """
+ 
+-from .packages import chardet
++import chardet
+ 
+ import sys
+ 
+--- requests-2.2.0/setup.py
++++ requests-2.2.0/setup.py
+@@ -17,7 +17,6 @@
+ packages = [
+     'requests',
+     'requests.packages',
+-    'requests.packages.chardet',
+     'requests.packages.urllib3',
+     'requests.packages.urllib3.packages',
+     'requests.packages.urllib3.contrib',