jlec 15/06/03 20:04:07 Modified: Kivy-1.8.0.ebuild Kivy-1.9.0.ebuild ChangeLog Log: Fix eclass usage (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.9 dev-python/Kivy/Kivy-1.8.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild?r1=1.8&r2=1.9 Index: Kivy-1.8.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Kivy-1.8.0.ebuild 3 Jun 2015 19:54:18 -0000 1.8 +++ Kivy-1.8.0.ebuild 3 Jun 2015 20:04:07 -0000 1.9 @@ -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.8 2015/06/03 19:54:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.8.0.ebuild,v 1.9 2015/06/03 20:04:07 jlec Exp $ EAPI="5" @@ -17,28 +17,31 @@ KEYWORDS="~amd64 ~x86" IUSE="cairo camera doc examples garden gstreamer spell" -DEPEND="dev-python/cython - garden? ( dev-python/kivy-garden ) - gstreamer? ( dev-python/gst-python:1.0 ) - cairo? ( dev-python/pycairo ) - spell? ( dev-python/pyenchant ) - dev-python/pygame - dev-python/setuptools +RDEPEND=" + dev-python/pygame[${PYTHON_USEDEP}] + virtual/python-imaging[${PYTHON_USEDEP}] + cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) camera? ( media-libs/opencv ) - virtual/python-imaging + garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] ) + gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" -src_prepare() { - sed -e '/data_files=/d' -i "${S}/setup.py" +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 } -src_install() { - distutils-r1_src_install - use doc && dodoc -r doc/sources/* - use examples && insinto "/usr/share/doc/${PF}/" && doins -r examples +python_install_all() { + use doc && DOCS=( doc/sources/. ) + use examples && EXAMPLES=( examples ) + distutils-r1_python_install_all } 1.3 dev-python/Kivy/Kivy-1.9.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild?r1=1.2&r2=1.3 Index: Kivy-1.9.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Kivy-1.9.0.ebuild 3 Jun 2015 19:54:18 -0000 1.2 +++ Kivy-1.9.0.ebuild 3 Jun 2015 20:04:07 -0000 1.3 @@ -1,10 +1,10 @@ # 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.9.0.ebuild,v 1.2 2015/06/03 19:54:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/Kivy-1.9.0.ebuild,v 1.3 2015/06/03 20:04:07 jlec Exp $ EAPI="5" -PYTHON_COMPAT=( python{2_7,3_1,3_3,3_4} ) +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit distutils-r1 eutils @@ -17,24 +17,27 @@ KEYWORDS="~amd64 ~x86" IUSE="cairo camera doc examples garden gstreamer spell" -DEPEND="<dev-python/cython-0.22 - garden? ( dev-python/kivy-garden ) - gstreamer? ( dev-python/gst-python:1.0 ) - cairo? ( dev-python/pycairo ) - spell? ( dev-python/pyenchant ) - dev-python/pygame - dev-python/setuptools +RDEPEND=" + dev-python/pygame[${PYTHON_USEDEP}] + virtual/python-imaging[${PYTHON_USEDEP}] + cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] ) camera? ( media-libs/opencv ) - virtual/python-imaging + garden? ( dev-python/kivy-garden[${PYTHON_USEDEP}] ) + gstreamer? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] ) " -RDEPEND="${DEPEND}" - -src_prepare() { - sed -e '/data_files=/d' -i "${S}/setup.py" +RDEPEND="${DEPEND} + <dev-python/cython-0.22[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" + +python_prepare_all() { + sed -e '/data_files=/d' -i "${S}/setup.py" || die + distutils-r1_python_prepare_all } -src_install() { - distutils-r1_src_install - use doc && dodoc -r doc/sources/* - use examples && insinto "/usr/share/doc/${PF}/" && doins -r examples +python_install_all() { + use doc && DOCS=( doc/sources/. ) + use examples && EXAMPLES=( examples ) + distutils-r1_python_install_all } 1.11 dev-python/Kivy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/ChangeLog?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/ChangeLog?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/Kivy/ChangeLog?r1=1.10&r2=1.11 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ChangeLog 3 Jun 2015 19:54:18 -0000 1.10 +++ ChangeLog 3 Jun 2015 20:04:07 -0000 1.11 @@ -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.10 2015/06/03 19:54:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/Kivy/ChangeLog,v 1.11 2015/06/03 20:04:07 jlec Exp $ + + 03 Jun 2015; Justin Lecher <[email protected]> Kivy-1.8.0.ebuild, + Kivy-1.9.0.ebuild: + Fix eclass usage 03 Jun 2015; Justin Lecher <[email protected]> Kivy-1.8.0.ebuild, Kivy-1.9.0.ebuild:
