Attempt to fix problem with cython-0.22 (#540402)

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89

4 files changed, 159 insertions, 12 deletions

diff --git a/dev-python/Kivy/ChangeLog b/dev-python/Kivy/ChangeLog
index 1b44fe2c23a1..af2910cc97dd 100644
--- a/dev-python/Kivy/ChangeLog
+++ b/dev-python/Kivy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/Kivy
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.6 2015/02/19 07:30:03 slis Exp $
+
+  19 Feb 2015; Sławek Lis <slis@gentoo.org> +files/cython-0.22.patch,
+  Kivy-1.8.0.ebuild:
+  Attempt to fix problem with cython-0.22 (#540402)
 
   01 Jan 2015; Sławek Lis <slis@gentoo.org> +files/cython-fixes.patch,
   Kivy-1.8.0.ebuild:
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild b/dev-python/Kivy/Kivy-1.8.0.ebuild
index 685b514733d0..579137b1ffa4 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-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.5 2015/01/01 21:23:06 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.6 2015/02/19 07:30:03 slis Exp $
 
 EAPI="5"
 
@@ -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 )
+	gstreamer? ( dev-python/gst-python:1.0 )
 	cairo? ( dev-python/pycairo )
 	spell? ( dev-python/pyenchant )
 	dev-python/pygame
@@ -32,6 +32,9 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	sed -e '/data_files=/d' -i "${S}/setup.py"
 	epatch "${FILESDIR}/cython-fixes.patch"
+	if has_version '>=dev-python/cython-0.22' ; then
+	    epatch "${FILESDIR}/cython-0.22.patch"
+	fi
 }
 
 src_install() {
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index 361772ddb64d..fa7c9956a674 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cython-0.22.patch 4804 SHA256 e7490987c956b1e312090951568dee53e3ed28070a21da2d5a8278e3250c706d SHA512 cd218b0db01cd424f8e5b26cd326dc186ba1328833858b607ffcd26add2e718761eaff012c7f0e051fd8dbad900529e672ed8ca05a6ac92a7113cf34d694d4dd WHIRLPOOL c2154a2bd673ce03a1addd22285ca3e6be7c29d310df3d2bb03263f431cfdaf8d4ec1e8fe36c6535a908af9e39b3796450613f206d93277c4b037921f6bf5431
 AUX cython-fixes.patch 1667 SHA256 f22281bbda72fd21daa80f9669c7105225a2dafb940d51f21138cd91a3582dbc SHA512 630ca8349da7ad2fd8c980e1ceca30a448f4895068aa05d58310893f6139314929d56433f54dc8aca8fa12fa2c6b95f84076c492cd6637dacd1af4be2816775c WHIRLPOOL 31e7a7947d4b81fdd0a2dd77a7bc4631621e2997761766f6387064e58bd30a2a73e8025a7ffbd72110ca364140120fc743de3ce901c93d437ea3561731084258
 DIST Kivy-1.8.0.tar.gz 14655888 SHA256 1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512 e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d WHIRLPOOL a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f
-EBUILD Kivy-1.8.0.ebuild 1115 SHA256 9c56df2b9a3b6274c5684c36fad14855a2b2dd1a6090579d74ac0170596203c5 SHA512 b105d41e8e56670c209ed8dd20efe9298a47b00d8578f104405d4bbb6eb3090f3ee3eb039fb9249f22d7e2f43f5aed2db43341fe5e13a56bc813b7ea5cf5b939 WHIRLPOOL 93c891b497f34f487ac5f1c89f7279ffb42d12c0b8152878628d95e03a0db2e75e51335a85b2b9010892ba8e662bbe21929d94481123dddcec2139464321aac5
-MISC ChangeLog 779 SHA256 968628d7e84b7e7eadc3f7eda6b83b51d4300c3225b9d4b2a16e1b57b4d619cf SHA512 5f64f4bdb5bd1bbeafb66a0198d787ea539941751752eea39d38a69f5f1d97dc80ba77d55c9acf160eb9bfdb7c67879bd114c1ee5bb4bd101a2094c84bdceedf WHIRLPOOL 1c2f5963e912dc1723c316543792ae500f40fc87f76f972152db9434dd607b51e26927383120f75a95bbb2f0a3d36d533fba9e80d5c319dfae8e126ee43fb044
+EBUILD Kivy-1.8.0.ebuild 1217 SHA256 d6a31a0fc0ecbfe83d52824960cb0c0e0054489e5266c67b8c397223bd4af177 SHA512 4ef62502838862e6dec701ee50c8754d7c4528f4a0d086153b7dc4270a34cf96def6f69938c6f2dddab0982984a09189f9a123ec071ca0148b39777c6ff8f8f3 WHIRLPOOL 704fd80c18919dbcceecafc6dca59c56bdb1a5e054ef3be5097844a6ed163846ac0959583c039a11a1b7ece8c2924072a62b8cc2f232808e51910ca326fa57f9
+MISC ChangeLog 924 SHA256 5fc5bc2a8d57eaa544b45a44156a4e0562cc9e85e513c649171014905c32d579 SHA512 91bb5a9b7a8904977154ccffd01e3e09cd477960bbc0c9dd63607f0f0f6dfe9caa40b28da89c69e0c14ac65545719c4c4856b3092b2aad87cec4c3cfae65fed5 WHIRLPOOL de6368cd6a72665ef7997d105be105b5c1038301d4d33652a72de11d97d7846d6de37f9ad5a2764580d839cc94249952fb43f6d9a065a73cbe809f9ed265fc24
 MISC metadata.xml 405 SHA256 f7bc0de1629637f683bc13a5716633fd891b94b99110272fa9a8325c7a4e15af SHA512 85b396edb91f819561f3b6a67baf37ff7593ff1f9947b1d93b32e80004c4d3689a279b40f60c60b1641ef64d659ae9929932a0753456185ff835140cdcc13d60 WHIRLPOOL 49f41ebe8dad13c6a74b1433657768f22dd74e6804ed35cd8ada9e0bb285d72606a1162322a02f6ee834b78de73eb3d7e8b57d08328a3de7fa5b4d93d4bb6197
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUpbokAAoJEO1RxJ84ipLkPscH/ReeRz/qyVCnf4h1Ey2asCFR
-Zv8Iqrc1KJvE+fBW2Qf7DEwuuGkYBkyFGFPUk7V5cR+jTMHqr2leryUjkD6rCkfC
-OWznfgTK7tj374Tr/rG/Bdkar/I5XzrA7/1GoKdDfQ06E60kc63mUMTYAwxtUjQR
-CdUNjdOpjbVica+n9myNHW1Jo2BUm8wHteIed0HNONLtNYjC8FpH1ZZohIdZ3ejh
-PBqc4bt/l6kEpOpjIxIwi9oTwtOt1XjrRD3G0Ho83c3Qft+Ea90EaNVemtmaYiRW
-ipezR91rz1CXMckrYDFkvpTJ4Dc9dnd51lXdEZ1qcCkjrrSxhh5a1IU6IKemiWA=
-=i8DR
+iQEcBAEBCAAGBQJU5ZBLAAoJEO1RxJ84ipLkya4IAJ9NEkRb6CQ0696Xyi3om3G4
+dgYlsLO9soQSuaowc/JjQz2IURlqCkHCUsl6BlKaJIXtZFK4bxG4cXnTHTnmjpGt
+HQIeDS+DF/nMpBVNFIWgAAKH0r4UurhDV9m835R/57MWn0QSQNMj+6Qjf5G/XVY2
+hW2Ij6+PZRXsBX2UyMqw0segX1EB+zSxDSfFNecfLTVf/OaxSHQjXlqyNcqln27d
+vOLCCIz7mxt1WxX2Bd58T7r1tQ5khA4yR91nwprZ3Ou9BeLdVjhHEmuO3gReI37I
+46z40+Ca9m9nxBc+7V1vBY2UhcuFMP/UP1kZRZ3HcIOzRIcs4/zJQ1sjY2uQLuU=
+=7duV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/Kivy/files/cython-0.22.patch b/dev-python/Kivy/files/cython-0.22.patch
new file mode 100644
index 000000000000..9b125f9ad648
--- /dev/null
+++ b/dev-python/Kivy/files/cython-0.22.patch
@@ -0,0 +1,139 @@
+--- kivy/graphics.orig/shader.pyx	2015-02-19 07:27:13.062070969 +0100
++++ kivy/graphics/shader.pyx	2015-02-19 07:27:22.838737743 +0100
+@@ -221,13 +221,13 @@
+         '''
+         glUseProgram(0)
+ 
+-    cdef void set_uniform(self, str name, value):
++    cdef void set_uniform(self, str name, value) except *:
+         if name in self.uniform_values and self.uniform_values[name] == value:
+             return
+         self.uniform_values[name] = value
+         self.upload_uniform(name, value)
+ 
+-    cdef void upload_uniform(self, str name, value):
++    cdef void upload_uniform(self, str name, value) except *:
+         '''Pass a uniform variable to the shader.
+         '''
+         cdef long vec_size, index, x, y
+@@ -412,7 +412,7 @@
+             mat[x] = <GLfloat>value.mat[x]
+         glUniformMatrix4fv(loc, 1, False, mat)
+ 
+-    cdef int get_uniform_loc(self, str name):
++    cdef int get_uniform_loc(self, str name) except *:
+         cdef bytes c_name = name.encode('utf-8')
+         cdef int loc = glGetUniformLocation(self.program, c_name)
+         self.uniform_locations[name] = loc
+@@ -453,11 +453,11 @@
+         # save for the next run.
+         self._current_vertex_format = vertex_format
+ 
+-    cdef void build(self):
++    cdef void build(self) except *:
+         self.build_vertex()
+         self.build_fragment()
+ 
+-    cdef void build_vertex(self, int link=1):
++    cdef void build_vertex(self, int link=1) except *:
+         if self.vertex_shader is not None:
+             glDetachShader(self.program, self.vertex_shader.shader)
+             self.vertex_shader = None
+@@ -467,7 +467,7 @@
+         if link:
+             self.link_program()
+ 
+-    cdef void build_fragment(self, int link=1):
++    cdef void build_fragment(self, int link=1) except *:
+         if self.fragment_shader is not None:
+             glDetachShader(self.program, self.fragment_shader.shader)
+             self.fragment_shader = None
+@@ -477,7 +477,7 @@
+         if link:
+             self.link_program()
+ 
+-    cdef void link_program(self):
++    cdef void link_program(self) except *:
+         if self.vertex_shader is None or self.fragment_shader is None:
+             return
+ 
+--- kivy/graphics.orig/instructions.pyx	2015-02-19 07:27:13.062070969 +0100
++++ kivy/graphics/instructions.pyx	2014-01-20 03:49:50.000000000 +0100
+@@ -233,15 +233,15 @@
+         if self.context_pop:
+             context.pop_states(self.context_pop)
+ 
+-    cdef void set_state(self, str name, value):
++    cdef void set_state(self, str name, value) except *:
+         self.context_state[name] = value
+         self.flag_update()
+ 
+-    cdef void push_state(self, str name):
++    cdef void push_state(self, str name) except *:
+         self.context_push.append(name)
+         self.flag_update()
+ 
+-    cdef void pop_state(self, str name):
++    cdef void pop_state(self, str name) except *:
+         self.context_pop.append(name)
+         self.flag_update()
+ 
+@@ -764,29 +764,29 @@
+     cdef get_state(self, str name):
+         return self.state_stacks[name][-1]
+ 
+-    cdef void set_states(self, dict states):
++    cdef void set_states(self, dict states) except *:
+         cdef str name
+         for name, value in states.iteritems():
+             self.set_state(name, value)
+ 
+-    cdef void push_state(self, str name):
++    cdef void push_state(self, str name) except *:
+         stack = self.state_stacks[name]
+         stack.append(stack[-1])
+         self.flag_update()
+ 
+-    cdef void push_states(self, list names):
++    cdef void push_states(self, list names) except *:
+         cdef str name
+         for name in names:
+             self.push_state(name)
+ 
+-    cdef void pop_state(self, str name):
++    cdef void pop_state(self, str name) except *:
+         stack = self.state_stacks[name]
+         oldvalue = stack.pop()
+         if oldvalue != stack[-1]:
+             self.set_state(name, stack[-1])
+             self.flag_update()
+ 
+-    cdef void pop_states(self, list names):
++    cdef void pop_states(self, list names) except *:
+         cdef str name
+         for name in names:
+             self.pop_state(name)
+@@ -806,10 +806,10 @@
+         texture.bind()
+         self.flag_update()
+ 
+-    cdef void enter(self):
++    cdef void enter(self) except *:
+         self._shader.use()
+ 
+-    cdef void leave(self):
++    cdef void leave(self) except *:
+         self._shader.stop()
+ 
+     cdef void apply(self):
+--- kivy/graphics.orig/instructions.pxd	2015-02-19 07:44:16.315415541 +0100
++++ kivy/graphics/instructions.pxd  2014-01-20 03:49:50.000000000 +0100
+@@ -115,7 +115,7 @@
+     cdef void pop_states(self, list names) except *
+     cdef void enter(self) except *
+     cdef void leave(self) except *
+-    cdef void apply(self) except *
++    cdef void apply(self)
+     cpdef draw(self)
+     cdef void reload(self)
+