Fixed #534114

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x55265D89)

3 files changed, 53 insertions, 6 deletions

diff --git a/dev-python/Kivy/ChangeLog b/dev-python/Kivy/ChangeLog
index 467a86998b00..1b44fe2c23a1 100644
--- a/dev-python/Kivy/ChangeLog
+++ b/dev-python/Kivy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/Kivy
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.4 2014/08/10 21:06:30 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.5 2015/01/01 21:23:06 slis Exp $
+
+  01 Jan 2015; Sławek Lis <slis@gentoo.org> +files/cython-fixes.patch,
+  Kivy-1.8.0.ebuild:
+  Fixed #534114
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> Kivy-1.8.0.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild
index ee6e00421c33..685b514733d0 100644
--- a/dev-python/Kivy/Kivy-1.8.0.ebuild
+++ b/dev-python/Kivy/Kivy-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.4 2014/08/10 21:06:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.5 2015/01/01 21:23:06 slis Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} )
 
 inherit distutils-r1
 
-DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications"
+DESCRIPTION="A software library for rapid development of hardware-accelerated multitouch applications."
 HOMEPAGE="http://kivy.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -19,7 +19,7 @@ IUSE="cairo camera doc examples garden gstreamer spell"
 
 DEPEND="dev-python/cython
 	garden? ( dev-python/kivy-garden )
-	gstreamer? ( dev-python/gst-python:0.10 )
+	gstreamer? ( dev-python/gst-python )
 	cairo? ( dev-python/pycairo )
 	spell? ( dev-python/pyenchant )
 	dev-python/pygame
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	sed -e '/data_files=/d' -i "${S}/setup.py"
+	epatch "${FILESDIR}/cython-fixes.patch"
 }
 
 src_install() {
diff --git a/dev-python/Kivy/files/cython-fixes.patch b/dev-python/Kivy/files/cython-fixes.patch
new file mode 100644
index 000000000000..b9eca4c5d5da
--- /dev/null
+++ b/dev-python/Kivy/files/cython-fixes.patch
@@ -0,0 +1,42 @@
+--- kivy/lib/gstplayer/_gstplayer.pyx.orig	2014-01-29 17:45:32.000000000 +0100
++++ kivy/lib/gstplayer/_gstplayer.pyx	2015-01-01 21:24:55.480191418 +0100
+@@ -207,7 +207,7 @@
+             self.eos_cb()
+ 
+     def load(self):
+-        cdef char *c_uri
++        cdef bytes py_uri
+ 
+         # if already loaded before, clean everything.
+         if self.pipeline != NULL:
+@@ -256,8 +256,8 @@
+ 
+         # configure playbin
+         g_object_set_int(self.pipeline, 'async-handling', 1)
+-        c_uri = <bytes>self.uri.encode('utf-8')
+-        g_object_set_void(self.playbin, 'uri', c_uri)
++        py_uri = <bytes>self.uri.encode('utf-8')
++        g_object_set_void(self.playbin, 'uri', <char *>py_uri)
+ 
+         # attach the callback
+         # NOTE no need to create a weakref here, as we manage to grab/release
+--- kivy/graphics/shader.pyx.orig	2014-01-20 03:49:50.000000000 +0100
++++ kivy/graphics/shader.pyx	2015-01-01 21:25:01.446858150 +0100
+@@ -421,6 +421,7 @@
+     cdef void bind_vertex_format(self, VertexFormat vertex_format):
+         cdef unsigned int i
+         cdef vertex_attr_t *attr
++        cdef bytes name
+ 
+         # if the current vertex format used in the shader is the current one, do
+         # nothing.
+@@ -445,7 +446,8 @@
+                 attr = &vertex_format.vattr[i]
+                 if attr.per_vertex == 0:
+                     continue
+-                attr.index = glGetAttribLocation(self.program, <char *><bytes>attr.name)
++                name = <bytes>attr.name
++                attr.index = glGetAttribLocation(self.program, <char *>name)
+                 glEnableVertexAttribArray(attr.index)
+ 
+         # save for the next run.