Version bump for bug 389161. Work around null stdin by redirecting in src_test.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 74 insertions, 7 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/Manifest b/dev-python/cherrypy/Manifest
index 1311e31da443..e9f758f831ff 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -5,16 +5,18 @@ DIST CherryPy-2.3.0.tar.gz 241999 RMD160 4c95735b17d58c431f1dbf685500d2a1ca8e38d
 DIST CherryPy-3.1.2.tar.gz 319196 RMD160 43a34bc7454da21b597c60124ff0fc61b8dc3e31 SHA1 a94aedfd0e675858dbcc32dd250c23d285ee9b88 SHA256 0dfd65507b047d54c09849e7a4b8bdd3616fa8776a5dbff7697cbf6ea1559bf6
 DIST CherryPy-3.2.0.tar.gz 921937 RMD160 8cb2fda2acfc2a9ae84025f541a8d2d8776474cd SHA1 fd05b4f975f848dc5f5116b8f504b9bd31e93969 SHA256 0a70d163ee33b892df064ab70d097d0fc125c74fc0c6da418b2964bb1d6d18fe
 DIST CherryPy-3.2.1.tar.gz 568070 RMD160 d7524c374424ef7992351708cb9f64e6546f21af SHA1 7389234be6e93612f3a57def1bb269fc8e6aa6b3 SHA256 e1d1f51dd51ebf11efb157c36a4b8df4f5d5cb62af073b3ca50a9284ce83128d
+DIST CherryPy-3.2.2.tar.gz 414099 RMD160 b391c6865d04797464a8d124fd812d1602e1fbb9 SHA1 ad47d2d9c2c68231f0ea1b09ffb2927f42a493b6 SHA256 dc5a88562795c2ee462dac5b37aba1cf4f34f3e27281ec11049227039308b691
 EBUILD cherrypy-2.3.0.ebuild 1326 RMD160 361f650d381de97ede5266a6595fc064e114e648 SHA1 2b3a76ee0943c47c617c793bddcf16d9cd4bd575 SHA256 0dcc334799ffd8cd418c115c08b1351cc3e76f8a4e258cbc1fdb3b644e1f72d4
 EBUILD cherrypy-3.1.2.ebuild 1106 RMD160 2833ab7a8e54a799644c6f27d2c02f1026bd05b7 SHA1 1ba673e0385ed5b06a26096202277d883f7ab67b SHA256 71021a809633d279034d3235c29e5f0c98e6f7de698fcd879f836abfc443e799
 EBUILD cherrypy-3.2.0.ebuild 1504 RMD160 f9bacdca87d333a185cec4f304354ef8d23cb538 SHA1 df075dad35b29c8401c7935487159d4a2ee26853 SHA256 b79ffc0ddf8b6d7f47bf615db1fee128241ccc4100d5c792674a7619072cadf5
-EBUILD cherrypy-3.2.1.ebuild 1228 RMD160 b5197f8b90efee028cf7549df62f7539a27ceae2 SHA1 2a1e70b9f5d11f8ae67ca80f7262056819cea107 SHA256 738c6eca44afede7a8903058c5c966252f6ce6d7ebcf028fe292034a7268f25f
-MISC ChangeLog 7621 RMD160 9017292bef504d680e72f98f7af5f59ac9b007d6 SHA1 6d056a54e94c3f366e342de9e7bf353f7c968f4a SHA256 9500bd7087b9d3f333a20fe70459bef4dc91838e84fb543f69ebc1cc2c8b5258
+EBUILD cherrypy-3.2.1.ebuild 1275 RMD160 3311cdb1d7a1117be277e39cdf53bad1b03d1654 SHA1 5dfd9b34a470966be1b91e5df69344d6e537e3d6 SHA256 e1571688f70795fbeb1180953523fd149f0334d528c6849dbbb93e6956d23247
+EBUILD cherrypy-3.2.2.ebuild 1229 RMD160 d95a08f71b4b36d176059a8abb8f96524ef74389 SHA1 e1428f27376d220364b871b32570f83a5698c3f6 SHA256 be15d7a649a107de4f62422a5eea910f96d8fb2f547fb4d812bf943a1aedef3b
+MISC ChangeLog 7835 RMD160 ae83c11882f8acf7052d190d76d6d1da00b73f4d SHA1 30c797f75193e140a349121142fb77c53d8e1669 SHA256 ab0cdf887ef7ee844d5d629cfa191e2788e8b7eb163c255a1a71ab41ab39d152
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5rtb4ACgkQC77qH+pIQ6RjiAD9HVlyIzThdh9X67B4o4VH9EIY
-d3b5aZp6j0XWv8ZB8bwBALhMwl/NuADAMzRTj9/94MU58YctjFI/GGZCTyyTNS5/
-=Kj8l
+iF4EAREIAAYFAk77m8AACgkQC77qH+pIQ6STSAD/QMpO9usNadWiAZ9sLqkdJf7q
+4sT8oC+HoYT7IeTKv44A/jNTraOLqnH2lVYRGV88T0Uz8qDNSxZiPIizAlyL4/QQ
+=554w
 -----END PGP SIGNATURE-----
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
+}