Port pylibmc to distutils-r1 (bug 451912).

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0x6B065BFB

3 files changed, 37 insertions, 20 deletions

diff --git a/dev-python/pylibmc/ChangeLog b/dev-python/pylibmc/ChangeLog
index 33d56f2e569e..df0b6b66750e 100644
--- a/dev-python/pylibmc/ChangeLog
+++ b/dev-python/pylibmc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pylibmc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/ChangeLog,v 1.4 2012/05/08 09:18:53 djc Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/ChangeLog,v 1.5 2013/01/24 12:17:24 djc Exp $
+
+  24 Jan 2013; Dirkjan Ochtman <djc@gentoo.org> pylibmc-1.2.3.ebuild:
+  Port pylibmc to distutils-r1 (bug 451912).
 
 *pylibmc-1.2.3 (08 May 2012)
 
@@ -20,4 +23,3 @@
   24 Oct 2011; Dirkjan Ochtman <djc@gentoo.org> +pylibmc-1.2.1.ebuild,
   +metadata.xml:
   Initial version (from sunrise, bug 267143).
-
diff --git a/dev-python/pylibmc/Manifest b/dev-python/pylibmc/Manifest
index 356abf572489..ad9e029b1c45 100644
--- a/dev-python/pylibmc/Manifest
+++ b/dev-python/pylibmc/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST pylibmc-1.2.2.tar.gz 47032 SHA256 040e9536d1722760bdb61b8a0a2780491176b73196603ec0b1de01381271aa54 SHA512 644591e297ddffce76b1f84b807008e492828dd1b00337029b2efd16cb65a62fd1767e00293f89b9c49b262765213e479f96fdf15544cce0a04b0bd1d8258fdb WHIRLPOOL 6e419e55d973619edc9a567ee1200b50368082a86f4572e20cea2f1de773dc05c858e6fa7cba082bef0f1e449dd0b38452a4e2ec569477799ffdfe9fc5abccdc
 DIST pylibmc-1.2.3.tar.gz 47355 SHA256 0157c72ce8b6aeefe52c77be5e1d059481b58127e0f9d2d6c216f6b1c68da6dc SHA512 9eaf0c5879e52d786b14b5939fa846082c095059439dfa23cac73b74a00cde14bd3497492bf6f5b3d1a6bad79b216fb869d2d10064c8182a67baf82c58622cea WHIRLPOOL eafa066f3a14e54575e6d7300fdd5376cd3fa2317fc632a53269417b397319f70002afbe99ece401af7f75e0888ab44ffbb1ddbe0ec94d8d2b42e9fb0f78810c
 EBUILD pylibmc-1.2.2.ebuild 913 SHA256 6190c2b6a62eb1318cf2a2237bb8f99b76e7eaecab03a7e8f112faee0bbc05c3 SHA512 3b63aae0be41afd5769af4678dbd9d60b15061d3a56dfc7ca407225c5f3cb53c72db7a95baa614e3e39fea69167cc434d3a127331fba1965264b13010ad809b4 WHIRLPOOL bfe00ebe31b5e58b865ab0748e926d3a91fd3e7ce895f3d08b858160e7399485a7aaeaf20075a4f909661028f2ab5ca2d55d5d0a654c95bca0c2467ec0d540f9
-EBUILD pylibmc-1.2.3.ebuild 923 SHA256 2d44a04de396290c6940dfb3715d84488cea44c9d1ce885cdc1a82ea06ef0c5f SHA512 e00b2355340f831d16049e340f0418d28ad8d0570629dce570d9a84332fb61ca0edcfa0bf6ee8f9193a5adc1f8a266dd55a71a64a587fe1e41eab11a35107388 WHIRLPOOL fd8e4882cea6600926687a23c432f41d690faa455c3059b3ae67b09e125869318f1675c1cb2f00acfc5dc39b44951d6cf3556d1b4414002bba4f7dcf9950774f
-MISC ChangeLog 755 SHA256 53d491f7178a8671442668d2da4d1ca353983e0a69129ce392036e5a1ed814c0 SHA512 2384ff13f0b7e7cb79945e8e3142376daef3bd4e514b5c5828478c055f4fd4de9376155b9bc82fc1c88b473664e7847cdb37f02056b05f12c48f2424021bb0a2 WHIRLPOOL 3669014958560e00d0bc5efaabdc70c57f1db0941659f306edd8b074c63faf097c73d110acc79b4d28a19079b1ab55104ff6bb1727c34b01292769bc6a1f19ae
+EBUILD pylibmc-1.2.3.ebuild 1095 SHA256 f767c25f6d0a9f4fa09619d57a6e6cc60529fec33a9afa14d2fe6140a4a2a61b SHA512 fb80c1f73a1c7a7c1fda29e3413f471e677146a8e8197bd19c88358a498ecf7c48a32148ad998166f1c65f28afabd09384095e336bea21259ecfa377da1e172d WHIRLPOOL 2470e4aa0a09776e84c82f6d16564449e3554ee7df0852ef00eef04014eb9d334d2dee392c0693f2bfd20e4331df92672ee4862237b96d66d82f03c8e3aa10ce
+MISC ChangeLog 870 SHA256 ed9136c186bbc20b9308e7833327331de18a7bd8bf067e28b5d4d11da5848dde SHA512 18bb08865f6c610317b7dc001b5ac3c2b6e854c56d285193e137c3d71ac3be3c9af1d81f192d92b37fc26e0a6b348a8f1579b5f725c85897f1105d3e26595b4c WHIRLPOOL fb4c923c17b83feadb64fa1a51f0e2c3191a43dd92676eb55889434e53cfee87967bae4c3104bb1f8d2b07978a0d4149cc322204e9553e6612bf1bdf11b8cf10
 MISC metadata.xml 478 SHA256 f864159217f766c8fa65994c1b3fcf7a4a736700fe72d672be12c548a8f9c6aa SHA512 9d8b4189816e83e6c5c12b11ebb0dac325f760c88d51bdf87c768d99cf750ebc8285026f00f597ca971ac070259143b40f3940964b3b8cbe7f77dd95be872a04 WHIRLPOOL c399825b5bc6f14e91594f998cb3cf1c6e8d73f3d22672f29461c5024202d731af754bde7b0beb0e653f995711aec658addf9bb2873cd0459a396aa875bba15d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEBJm8ACgkQxeMuLWsGW/uBbACdHLu8f2DwHUE0v5FW0BPoh7Qs
+WRIAn0I+CczttsTQQV9pGAzm3qvUhPAC
+=x9dJ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pylibmc/pylibmc-1.2.3.ebuild b/dev-python/pylibmc/pylibmc-1.2.3.ebuild
index 5583b779b562..c665e2e66de2 100644
--- a/dev-python/pylibmc/pylibmc-1.2.3.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.2.3.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.2.3.ebuild,v 1.1 2012/05/08 09:18:53 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibmc/pylibmc-1.2.3.ebuild,v 1.2 2013/01/24 12:17:24 djc Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Libmemcached wrapper written as a Python extension"
 HOMEPAGE="http://sendapatch.se/projects/pylibmc/ http://pypi.python.org/pypi/pylibmc"
@@ -17,18 +14,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 
 RDEPEND=">=dev-libs/libmemcached-0.32"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
 	sed -e "/with-info=1/d" -i setup.cfg
+	distutils-r1_python_prepare_all
 }
 
 src_test() {
-	memcached -d -u nobody -p 11219 -l localhost -P "${T}/memcached.pid"
-	MEMCACHED_PORT=11219 distutils_src_test
-	kill "$(<"${T}/memcached.pid")"
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+python_test() {
+	local PIDDIR="${T}/${EPYTHON}-pylibmc"
+	mkdir "${PIDDIR}" || die
+	chmod 0777 "${PIDDIR}" || die
+	memcached -d -p 11219 -u nobody -l localhost -P "${PIDDIR}/m.pid" || die
+	MEMCACHED_PORT=11219 nosetests || die
+	kill `cat "${PIDDIR}/m.pid"`
 }