commit: 4379a4883d5a603d84d04edb14929a9342d21e45
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 17:00:28 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 20:40:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4379a488
dev-python/Kivy: Clean up old.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-python/Kivy/Kivy-1.8.0.ebuild | 47 -----------
dev-python/Kivy/Kivy-1.9.0.ebuild | 45 ----------
dev-python/Kivy/Manifest | 1 -
dev-python/Kivy/files/cython-0.22.patch | 139 -------------------------------
dev-python/Kivy/files/cython-fixes.patch | 42 ----------
5 files changed, 274 deletions(-)
diff --git a/dev-python/Kivy/Kivy-1.8.0.ebuild
b/dev-python/Kivy/Kivy-1.8.0.ebuild
deleted file mode 100644
index af6192a..0000000
--- a/dev-python/Kivy/Kivy-1.8.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer spell"
-
-RDEPEND="
- dev-python/pygame[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- camera? ( media-libs/opencv )
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
- "
-RDEPEND="${DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -e '/data_files=/d' -i "${S}/setup.py" || die
- epatch "${FILESDIR}/cython-fixes.patch"
- if has_version '>=dev-python/cython-0.22' ; then
- epatch "${FILESDIR}/cython-0.22.patch"
- fi
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- use doc && DOCS=( doc/sources/. )
- use examples && EXAMPLES=( examples )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Kivy-1.9.0.ebuild
b/dev-python/Kivy/Kivy-1.9.0.ebuild
deleted file mode 100644
index 9dbec84..0000000
--- a/dev-python/Kivy/Kivy-1.9.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils
-
-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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo camera doc examples garden gstreamer spell"
-
-RDEPEND="
- dev-python/pygame[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
- cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
- camera? ( media-libs/opencv )
- garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] )
- gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] )
- spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
- "
-DEPEND="${RDEPEND}
- <=dev-python/cython-0.22[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cython-0.22-backport.patch )
-
-python_prepare_all() {
- sed -e '/data_files=/d' -i "${S}/setup.py" || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- use doc && DOCS=( doc/sources/. )
- use examples && EXAMPLES=( examples )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/Kivy/Manifest b/dev-python/Kivy/Manifest
index f81ab10..7e5371c 100644
--- a/dev-python/Kivy/Manifest
+++ b/dev-python/Kivy/Manifest
@@ -1,2 +1 @@
-DIST Kivy-1.8.0.tar.gz 14655888 SHA256
1bb5add88132c902ed746e7624034ecaab49e61f3fbbfde231604e887e6fb324 SHA512
e7057b008cceec9513961ddc3d4aaef2aa1a10de9c2de09ad82bd90ca88300047374e5f8c982cb018712fb0465c03208108c3110887ef383c00a45ee9e5bc81d
WHIRLPOOL
a6530edebcae34aede981c2f0db37a26a9378e148a073dc1396096b4db04ebdef0f6d96de4222383a5e2d84858bdf10383611751f9bf5ae625eafc67d1cf702f
DIST Kivy-1.9.0.tar.gz 16178808 SHA256
b828617f858963f7873f5c81bb8824ca1dfa265e7811fce03599e2ba7200ffa0 SHA512
e0efc27f8ae070f5748570ee9224220791d32e931bbaf0bad5ddee894cf1d0f9ded5eebcc54d3b666491edaab0316923311f5e0cc7b1e46929d87ea3bec87f21
WHIRLPOOL
c57c696752c88d3c8643e126180aa00b864df45bad0de4e6456143fd0f1486085a258a787ec2e4017b982004dd5a1212b11dbcb352f1f72b77591fa5fd9c934e
diff --git a/dev-python/Kivy/files/cython-0.22.patch
b/dev-python/Kivy/files/cython-0.22.patch
deleted file mode 100644
index 9b125f9..0000000
--- a/dev-python/Kivy/files/cython-0.22.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- 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)
-
diff --git a/dev-python/Kivy/files/cython-fixes.patch
b/dev-python/Kivy/files/cython-fixes.patch
deleted file mode 100644
index b9eca4c..0000000
--- a/dev-python/Kivy/files/cython-fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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.
