diff options
author | Mike Gilbert <floppym@gentoo.org> | 2011-12-28 22:44:07 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2011-12-28 22:44:07 +0000 |
commit | 11d16cf636d106b3566020546d613594c2bd7625 (patch) | |
tree | 5ed2a147d86903ce0e824fd254dcc382e73b7aa4 /dev-python/cherrypy | |
parent | Version Bump (diff) | |
download | gentoo-2-11d16cf636d106b3566020546d613594c2bd7625.tar.gz gentoo-2-11d16cf636d106b3566020546d613594c2bd7625.tar.bz2 gentoo-2-11d16cf636d106b3566020546d613594c2bd7625.zip |
Version bump for bug 389161. Work around null stdin by redirecting in src_test.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/cherrypy')
-rw-r--r-- | dev-python/cherrypy/ChangeLog | 9 | ||||
-rw-r--r-- | dev-python/cherrypy/cherrypy-3.2.1.ebuild | 6 | ||||
-rw-r--r-- | dev-python/cherrypy/cherrypy-3.2.2.ebuild | 54 |
3 files changed, 67 insertions, 2 deletions
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog index 42feaf6cd0f4..1db2a8d46421 100644 --- a/dev-python/cherrypy/ChangeLog +++ b/dev-python/cherrypy/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/cherrypy # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.46 2011/09/10 19:08:36 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.47 2011/12/28 22:44:07 floppym Exp $ + +*cherrypy-3.2.2 (28 Dec 2011) + + 28 Dec 2011; Mike Gilbert <floppym@gentoo.org> +cherrypy-3.2.2.ebuild, + cherrypy-3.2.1.ebuild: + Version bump for bug 389161. Work around null stdin by redirecting in + src_test. *cherrypy-3.2.1 (10 Sep 2011) diff --git a/dev-python/cherrypy/cherrypy-3.2.1.ebuild b/dev-python/cherrypy/cherrypy-3.2.1.ebuild index 6fdda888c4f7..a7a2a1c1c300 100644 --- a/dev-python/cherrypy/cherrypy-3.2.1.ebuild +++ b/dev-python/cherrypy/cherrypy-3.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.1.ebuild,v 1.1 2011/09/10 19:08:36 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.1.ebuild,v 1.2 2011/12/28 22:44:07 floppym Exp $ EAPI="3" PYTHON_DEPEND="*:2.5" @@ -35,6 +35,10 @@ src_prepare() { setup.py || die "sed failed" } +src_test() { + distutils_src_test < /dev/tty +} + src_install() { distutils_src_install diff --git a/dev-python/cherrypy/cherrypy-3.2.2.ebuild b/dev-python/cherrypy/cherrypy-3.2.2.ebuild new file mode 100644 index 000000000000..a5c619cb21e9 --- /dev/null +++ b/dev-python/cherrypy/cherrypy-3.2.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-3.2.2.ebuild,v 1.1 2011/12/28 22:44:07 floppym Exp $ + +EAPI="4" +PYTHON_DEPEND="*:2.5" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.4" +DISTUTILS_SRC_TEST="nosetests" + +inherit distutils + +MY_P="CherryPy-${PV}" + +DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework" +HOMEPAGE="http://www.cherrypy.org/ http://pypi.python.org/pypi/CherryPy" +SRC_URI="http://download.cherrypy.org/${PN}/${PV}/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc" + +DEPEND="dev-python/setuptools" +RDEPEND="" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + distutils_src_prepare + sed -i \ + -e 's/"cherrypy.tutorial", //' \ + -e "/('cherrypy\/tutorial',/,/),/d" \ + -e "/LICENSE.txt/d" \ + setup.py || die "sed failed" +} + +src_test() { + distutils_src_test < /dev/tty +} + +src_install() { + distutils_src_install + + delete_tests() { + rm -fr "${ED}$(python_get_sitedir)/cherrypy/test" + } + python_execute_function -q delete_tests + + if use doc; then + insinto /usr/share/doc/${PF} + doins -r cherrypy/tutorial + fi +} |