| 1 |
commit: d4610beae1e0e8b250567ba3200c009ad102edbd |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 4 00:38:11 2017 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 4 00:38:47 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4610bea |
| 7 |
|
| 8 |
dev-python/requests: drop unused patch #595974 and restore used one #604560 |
| 9 |
|
| 10 |
.../files/requests-2.11.1-system-packages.patch | 20 -------------------- |
| 11 |
.../files/requests-2.2.0-system-chardet.patch | 21 +++++++++++++++++++++ |
| 12 |
2 files changed, 21 insertions(+), 20 deletions(-) |
| 13 |
|
| 14 |
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 |
| 15 |
deleted file mode 100644 |
| 16 |
index f511d0d..00000000 |
| 17 |
--- a/dev-python/requests/files/requests-2.11.1-system-packages.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,20 +0,0 @@ |
| 20 |
- setup.py | 6 ------ |
| 21 |
- 1 file changed, 6 deletions(-) |
| 22 |
- |
| 23 |
-diff --git a/setup.py b/setup.py |
| 24 |
-index b7ed12b..1d5abe4 100755 |
| 25 |
---- a/setup.py |
| 26 |
-+++ b/setup.py |
| 27 |
-@@ -18,12 +18,6 @@ if sys.argv[-1] == 'publish': |
| 28 |
- packages = [ |
| 29 |
- 'requests', |
| 30 |
- 'requests.packages', |
| 31 |
-- 'requests.packages.chardet', |
| 32 |
-- 'requests.packages.urllib3', |
| 33 |
-- 'requests.packages.urllib3.packages', |
| 34 |
-- 'requests.packages.urllib3.contrib', |
| 35 |
-- 'requests.packages.urllib3.util', |
| 36 |
-- 'requests.packages.urllib3.packages.ssl_match_hostname', |
| 37 |
- ] |
| 38 |
- |
| 39 |
- requires = [] |
| 40 |
|
| 41 |
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 |
| 42 |
new file mode 100644 |
| 43 |
index 00000000..18fc7a9 |
| 44 |
--- /dev/null |
| 45 |
+++ b/dev-python/requests/files/requests-2.2.0-system-chardet.patch |
| 46 |
@@ -0,0 +1,21 @@ |
| 47 |
+--- requests-2.2.0/requests/compat.py |
| 48 |
++++ requests-2.2.0/requests/compat.py |
| 49 |
+@@ -4,7 +4,7 @@ |
| 50 |
+ pythoncompat |
| 51 |
+ """ |
| 52 |
+ |
| 53 |
+-from .packages import chardet |
| 54 |
++import chardet |
| 55 |
+ |
| 56 |
+ import sys |
| 57 |
+ |
| 58 |
+--- requests-2.2.0/setup.py |
| 59 |
++++ requests-2.2.0/setup.py |
| 60 |
+@@ -17,7 +17,6 @@ |
| 61 |
+ packages = [ |
| 62 |
+ 'requests', |
| 63 |
+ 'requests.packages', |
| 64 |
+- 'requests.packages.chardet', |
| 65 |
+ 'requests.packages.urllib3', |
| 66 |
+ 'requests.packages.urllib3.packages', |
| 67 |
+ 'requests.packages.urllib3.contrib', |
Archives