Migrate to distutils-r1. Disallow the test server from using TCP sockets. Disable the tests which require TCP sockets.

Package-Manager: portage-2.2.0_alpha151/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 94 insertions, 3 deletions

diff --git a/dev-python/redis-py/ChangeLog b/dev-python/redis-py/ChangeLog
index 522572373e98..e046e44805a2 100644
--- a/dev-python/redis-py/ChangeLog
+++ b/dev-python/redis-py/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/redis-py
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.30 2012/12/31 22:45:41 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/ChangeLog,v 1.31 2013/01/13 12:28:50 mgorny Exp $
+
+*redis-py-2.7.2-r1 (13 Jan 2013)
+
+  13 Jan 2013; Michał Górny <mgorny@gentoo.org> +redis-py-2.7.2-r1.ebuild:
+  Migrate to distutils-r1. Disallow the test server from using TCP sockets.
+  Disable the tests which require TCP sockets.
 
   31 Dec 2012; Agostino Sarubbo <ago@gentoo.org> redis-py-2.7.1.ebuild:
   Stable for x86, wrt bug #449414
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index 8dce6a739a9b..9c5a6cba645d 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST redis-py-2.4.12.tar.gz 28944 SHA256 98cadb4481671a54b7de867280dc11f11ba16ce007d1e078746ba768d2655486 SHA512 ee2f78552a4e88938eba04c2e5705c11dee1d5808fb272db086b74f491529f06fdc523bcadc5c6e0a27a6ee0e74bbed3cd35801c57b2102f60d32f3bf7e0be2a WHIRLPOOL 55a4275c5a9c3e559e63ee830e409371f7e47e4baba2fed6bbc13f440396c48450b6b829e5dcc66eed3862537d5bddab84ff2151106019a45e3fdb8c9c2f2951
 DIST redis-py-2.4.13.tar.gz 29329 SHA256 365285e161395344edc629a2e108f6bb0983e96d9b5012dab1f76cec2379a09a SHA512 3bec824f05207eaa4502e79274e3ecb62936a2b1f74ec01ffde5c973fdef1b23c90a331664631f91497ec5b2dc8fa79cb904a1fb38ef26da80ea2682c169b567 WHIRLPOOL 4e324b004e4bb640cfee3340dca03924682f8f4101c7e83ea2145fbfa9b729535c9a2fcaee4614473ae69e23da343ab732cd9e64743c3d21aff28d7a334c14a6
 DIST redis-py-2.7.1.tar.gz 50723 SHA256 e59c0258d3a831299915ba47640f388107943f3e510a0e89d5ca51e56d2d0474 SHA512 98b22d8870f968535b66475234dcaf2d2eb2b90ba1ae10ba2d25c55c0059bcc34dd4c4494be6fc9b3e59a75e62ef9d4cf66ad6baf5945d68cbed19554d3609ef WHIRLPOOL a1857366f2204201b0e249d9f413a66fd02ac9cc0c9dd23ea36005e5ece6348c325b84d0c2d7f101439c17872302d2bbc9a1b1c444ee8b73547074188cd5b0e3
@@ -5,6 +8,16 @@ DIST redis-py-2.7.2.tar.gz 50888 SHA256 c22e7129f21b8bd1690c2cefc07b2caf1088c66a
 EBUILD redis-py-2.4.12.ebuild 796 SHA256 3b0d9ac3c0d45182514832bb1ca7f62d16a2219eb7e174105561ba20771c3799 SHA512 bf6a7b35f375749e057029fa5def8fc149fad8bbda1590cb142b18c8d6913518576b5fa09066262db71ac93a71b6168c94fd382e19093cbd4f2b339a030d7e05 WHIRLPOOL 4f4f98b4bb4135809205c879ab96094909ffe541814a438dd8555300edf83316b06cfb9c68a577c514fce651cc30510ed3f6a6f065b8a584ae958949061ba942
 EBUILD redis-py-2.4.13.ebuild 799 SHA256 32c2bff32f590c83da515e8d2ae0d8da9e6fd889841ac2c08e1ddcb1cc575488 SHA512 364248f4d89d00f019b1429363b3741b5f6a258d5565bff09f66d617a411bdc3b48add905ac4d1a0c0ea317cbbdc87398e0c531c9e6020196ebad9ee67ea4543 WHIRLPOOL 410d1ec3cce9df78c74cbfd1564e4e66911e2b5dd327f4e5cab674624f06a40a21dbf7d30da87cd2ebc22f9a8d6bf05c10dc0c7b1623985e53f4cd6787c4fc38
 EBUILD redis-py-2.7.1.ebuild 1073 SHA256 992e99673f8b98e08285828d5b88c08c8cd930c3c3d1d72dacc02eefff81373d SHA512 60fd0c436de38854e51514b9e895f7373ce904cdfb095664420e1f0c446d41ef181c5bd5cae9861c63addef950db9e17e3e4b4445b1327a6cd70833f164e27fc WHIRLPOOL eec33f5e78d14c1a15fc95b147bf8dbf0fb644bc8f521d3b892af7ecab3523c4d7010fb9ff65406f21f1e55284a08257bb9ed2db9d062140cf179f9646861e23
+EBUILD redis-py-2.7.2-r1.ebuild 1741 SHA256 fb7e68c839ac890199665a4dc62702b263ebeb4c8adfeb7f1fbd2edd0af5cf80 SHA512 955ee6414c4db2a8cd2652e5d7a43e42476aaf3c8c527d4979bad46dad680297b120f20c5269ba9af1b0d4b3d628763e6abd92660e25315025601dc01cfa0e57 WHIRLPOOL 9603f66da991538c039ecd5dbf48a436b9bdfce40d066ef4696fdf28ab7c479bc1adfa81bb58d680aeea32b051686550b728e44524fb70af6dcb8e2b107aff68
 EBUILD redis-py-2.7.2.ebuild 1075 SHA256 77ff4b255958fdf93f9e30da98596159b39b05fece1b30c5f1b4ec3ead8a6615 SHA512 61df4b23da9c5d3e39a06a9061f361e780e6e367f121309f2c020fe6bbdd6f0665abecb89d01d8116f77cf134c6a0cacc0ada7d8ab26f492ac387e44270e1ab3 WHIRLPOOL 147677e0d415adac8b5533f27b47e5b63eb0c5ba2c3ac4175490f8132627e51a0c1659e6191e466a9ab55f8341f316c18501da8c485e075e611c0876204ba28d
-MISC ChangeLog 4010 SHA256 2e8fe036a7f22be5d8722f897419151f6a1971d2df95ad76cb9d3beddbb90284 SHA512 7e3f43c14753ff2e27c1b0242896e0984dcc1fda58ae94c2d1cb6d12de1e6a035a79115c71122a02d307100208a90a8f92aecd63ef94ddffcdae7b555e2a8b65 WHIRLPOOL 92403fbcf6b1213f68ef059f249024bfd7e6d4b163fa743664fc8038dd30e3ebf615b72b3510a6a1ba46f4d83d958f8071e87c4ea7918bef50ce760a1d0c2bc9
+MISC ChangeLog 4248 SHA256 8e7f24284517c8f54bc0450472bccc926e783292f02aeb23c8412e3670da4b48 SHA512 b873386f3d8bc674c1fba7171e690c48a9b67e767e5a4021061dec1b2c90f5b740f34db57c50127e46c2987d24a31deb35db6ce7bb2735281b02e45a677229e9 WHIRLPOOL 424114a5c71ab2f000d80d7bf6c5cee3ad4a1c12d84ceb4a31ba7d6efbe4b37cecddb97df69a2792183a2ddc66e666d5e6ca727e2a03928a0bd9293bdeab03e8
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlDyqKMACgkQfXuS5UK5QB1rVgP+INlJgDcHuz+NwNAZONzT9rfh
+H+CwKJB9qjcrGXSw5P3skM9hb/LyYffWNh/1FFRm+IikFjAC0CPOvC68MEdVO05S
+p5jwTLKfbU6yPGzPtHcMBxXm+htFX+Gf4OBeKnxZPiZEeX4c0e0kwJlqaX8qbZDl
+WxLgo5KsEv2uO7BgIZ8=
+=wfUH
+-----END PGP SIGNATURE-----
diff --git a/dev-python/redis-py/redis-py-2.7.2-r1.ebuild b/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
new file mode 100644
index 000000000000..4a2c62b5be47
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.7.2-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/redis-py/redis-py-2.7.2-r1.ebuild,v 1.1 2013/01/13 12:28:50 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="http://github.com/andymccurdy/redis-py http://pypi.python.org/pypi/redis"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-db/redis )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable pubsub and encoding tests, they do not seem to support
+	# UNIX socket connectivity.
+	sed -i -e '/PubSub/d' -e '/Encoding/d' \
+		-e '/use_hiredis:/d' tests/__init__.py || die
+
+	# Make sure that tests will be used from BUILD_DIR rather than cwd.
+	mv tests tests-hidden || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if use test; then
+		cp -r tests-hidden "${BUILD_DIR}"/lib/tests || die
+	fi
+}
+
+src_test() {
+#	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	# moved to BUILD_DIR
+	rm -rf tests
+	distutils-r1_src_test
+}
+
+python_test() {
+	local pidfile=${T}/redis-${EPYTHON}.pid
+	local sock=${T}/redis-${EPYTHON}.sock
+
+	sed -i -e "s:port=6379:unix_socket_path=\"${sock}\":" \
+		"${BUILD_DIR}"/lib/tests/*.py || die
+
+	# XXX: find a way to make sure it is killed
+
+	"${EPREFIX}"/usr/sbin/redis-server \
+		--pidfile "${pidfile}" \
+		--port 0 \
+		--unixsocket "${sock}" \
+		--daemonize yes || die
+	esetup.py test
+	kill "$(<"${pidfile}")"
+}