gentoo resync : 14.07.2018

2 files changed, 54 insertions, 0 deletions

diff --git a/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
new file mode 100644
index 000000000000..19d4bd8598ff
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-0.2.0-r1-system-libs.patch
@@ -0,0 +1,26 @@
+diff -ur hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
+--- hiredis-0.2.0.orig/setup.py	2015-04-03 16:08:45.000000000 +0200
++++ hiredis-0.2.0/setup.py	2018-04-22 16:57:15.966520939 +0200
+@@ -40,12 +40,11 @@
+ # supported Python versions is worse...
+ #
+ # Also see: https://github.com/pietern/hiredis-py/issues/15
+-lib = ("hiredis_for_hiredis_py", {
+-  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
+ 
+ ext = Extension("hiredis.hiredis",
+   sources=glob.glob("src/*.c"),
+-  include_dirs=["vendor"])
++  libraries=["hiredis"],
++)
+ 
+ setup(
+   name="hiredis",
+@@ -57,7 +56,6 @@
+   keywords=["Redis"],
+   license="BSD",
+   packages=["hiredis"],
+-  libraries=[lib],
+   ext_modules=[ext],
+ 
+   # Override "install_lib" command
diff --git a/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch b/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
new file mode 100644
index 000000000000..6cd22292deb9
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-0.2.0-system-libs.patch
@@ -0,0 +1,28 @@
+Remove vendor and var 'lib' from setup.py
+diff -u hiredis-0.2.0.orig/setup.py hiredis-0.2.0/setup.py
+--- setup.py	2015-06-21 11:47:28.796472027 +0800
++++ setup.py	2015-06-21 11:49:53.047949803 +0800
+@@ -40,12 +40,9 @@
+ # supported Python versions is worse...
+ #
+ # Also see: https://github.com/pietern/hiredis-py/issues/15
+-lib = ("hiredis_for_hiredis_py", {
+-  "sources": ["vendor/hiredis/%s.c" % src for src in ("read", "sds")]})
+ 
+ ext = Extension("hiredis.hiredis",
+-  sources=glob.glob("src/*.c"),
+-  include_dirs=["vendor"])
++  sources=glob.glob("src/*.c"))
+ 
+ setup(
+   name="hiredis",
+@@ -57,7 +54,6 @@
+   keywords=["Redis"],
+   license="BSD",
+   packages=["hiredis"],
+-  libraries=[lib],
+   ext_modules=[ext],
+ 
+   # Override "install_lib" command
+Common subdirectories: hiredis-0.2.0.orig/src and hiredis-0.2.0/src
+Common subdirectories: hiredis-0.2.0.orig/vendor and hiredis-0.2.0/vendor