Exclude tests the right way.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 45 insertions, 78 deletions

diff --git a/dev-python/restkit/ChangeLog b/dev-python/restkit/ChangeLog
index 710a38a51078..84f3fd5cf763 100644
--- a/dev-python/restkit/ChangeLog
+++ b/dev-python/restkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/restkit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.9 2013/02/10 09:02:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/ChangeLog,v 1.10 2013/02/26 05:55:08 floppym Exp $
+
+*restkit-4.2.1-r1 (26 Feb 2013)
+
+  26 Feb 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/restkit-exclude-tests.patch, +restkit-4.2.1-r1.ebuild,
+  -restkit-4.2.0.ebuild, -restkit-4.2.1.ebuild:
+  Exclude tests the right way.
 
 *restkit-4.2.1 (10 Feb 2013)
 
diff --git a/dev-python/restkit/Manifest b/dev-python/restkit/Manifest
index 21e1955f459f..44772c5dfb70 100644
--- a/dev-python/restkit/Manifest
+++ b/dev-python/restkit/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX restkit-exclude-tests.patch 720 SHA256 97a529b149b6c00e7cdec755e911870703c70d7017561947fbf0cb32c81236bb SHA512 41e411225b27f0506f62f89d8ebc535ab5d9007ee3e8b9f809b1e277a2d3cfb6155b930bdf779c5447958aa2b34d03b6ccdb4cd856ee8b2ed3aadb1e2d23dc3f WHIRLPOOL 4193bf34efd010477ad364c5637d8dbee0a6a6dfef5e3c9c68a5e51825422bf482a64e209853443d560e1b539585b0e5fa3b4f1fe452ed3abcdaa9a0e6e1018f
 DIST restkit-2.1.4.tgz 1287958 SHA256 24c2820c7dcfc1452609c6e56fa36cc2550b308d6c2093c59c2e6ad7af0c312a SHA512 b6c223d3943423b1cbcb2dd9264c5e22342140ef1db6e005ffea90148d1d7f89ef69605bbdcbfeb3826f71131f5c2f061bb660b01ece5d73585a34528d80f485 WHIRLPOOL 3ae70c6a9a7dd53b085205d8874bee05efd169c085a77b73f7067cae8cff795a4be8966bb8adf237df6bce7bdaf1c965bb95729a077a0aa08c60c6ee32fdf767
 DIST restkit-2.2.3.tar.gz 1299330 SHA256 ff3434e5fba4193b4a620b7f15df50575fa2352b50f55ae7b1f0ab8a38a14172 SHA512 78fe0969557eef5a7d3eab0787c3d9bfab5d52e53fc98d564696309320b76f544b004aa245fed88c932719cdf1c1098cf3c214069618f83f14f039e06c23c77b WHIRLPOOL 6fadaf538c0b3ac2e20ffe7884ca2f02ec7f4ae3e1a5574d543f5bd8dd4b88c3f69a6ebc4e13e0682b0442cfa8e000c01fd14866e1a2f7334f232d9202ad2a39
 DIST restkit-2.3.3.tar.gz 1302376 SHA256 c6d65d2c1df48a271af233630fd3f5f3dc7bd46108e88008fbfb8364479e7a0f SHA512 8a832f5d377e4624cf5ea02df91d501b31f895a0361262bb90a452a3cafd80fb911aba86e7a072e5a02da022781fa332467e7b4c8b546c8f02a2bd68d6b7f337 WHIRLPOOL 62a9b48a0195c92133819632639389462714899d438d343c56e17ee7673e6d25f0a0dbffaef337e58d5cb701cb39f70b42c9df75ae1e8b290215e721cad21ac3
 DIST restkit-3.0.2.tar.gz 1952695 SHA256 9d90a74e904bf1ff8b6cbf920c7835faa4b5c477eef4f0dc67444ec4dcc476db SHA512 f20473cda0961600cd28e9e82367e3e23c8a0103d029d6dc355601252294fb1b9332b5018380302fed35a08190add236b6de281c8a8dfe0ac778b4e17f3e43db WHIRLPOOL 5acbb5075314137bc84b519fde53eb79acf5ae571a90cd5221e2c4eb69a1e6e0a0520a07e4b45627e878a329ddb1095f873bc7fbb3dd13a70652318858e7621a
-DIST restkit-4.2.0.tar.gz 1275675 SHA256 5a8d8128a7469aae33f6443069ac7b82c4223c1148fdaf51d37a9dec3a055471 SHA512 00bb5e879d353320fc49f752f6cab0ed6d99943f07dffd534f0f4f0ece6819022dc6277cc63905077baf23eb38d8f85d8392c4864bc821ab0c60329e2342b1ec WHIRLPOOL 103ec6bf558539f4124ba7bc0ee9acb0d1b503e7b0ae05e49e9198b11c7e05b94c022d64a2f926eabea4262d5ddb3d873be641da79d68290e3f1ba59a76f4fc9
 DIST restkit-4.2.1.tar.gz 1863612 SHA256 0d5e025a0ae1c00eea8f17df5258679964d95f6e35f3c150764d5b9a4cfb8f79 SHA512 9b65b2c2013babf173d6ab094e5dabd754b42426aa894110a51d0a6784e90995296f7862b991590a3ea3061c7cf4b98ec96c4ca9f4d55819f500b5cd9bae51fd WHIRLPOOL 053e3dd43ac0bd25f3b09d17b8b8a253d37a3a1cae235428a99599b3da1c02646c94fc071656726a4ec54bdddd93b0e7330c223549acfeaf2c44c16ff1c81de3
 EBUILD restkit-2.1.4.ebuild 1290 SHA256 1cf31ec091a19fd80c38b215eaf13bc6c4a930e62e864c425de954c538f7f5c0 SHA512 f75c295a265e41cc326d9ff978ed4b0d5cc7ca979dfd92d9623969a7d5aeba7dbda11e72f01274196b67554b03429f2aa48053ad9fe70394ae7c337db18c31f4 WHIRLPOOL 1f42ce3a8ab87aad0b5af1a5d029bf228438389da06c393162a2a87b55619c3bf9f509c65cffb783aa1451abd356bdacd51bd569b728cd4be1c845710b0d3ec2
 EBUILD restkit-2.2.3.ebuild 1266 SHA256 56543df78afe1406aa4894b7ef1c793a6fdb92181418898f7aa3b4ea8cbc9cce SHA512 9a8eadb9fe930ea67244da31253044664d57de7dc3c5e8d934452e55e81cee5550ff483de12a9404501d57f1c7d0a48b1e8399651bbf344df932bb7c6159ab7a WHIRLPOOL cb5efd36711fb81986fccb4f7c4ab798ac6d375fbadf2a14029971c035808f89b206f125e0221a2183d87611c12045b149fb7a93d59cfa4bd69dc44e3f351e9e
 EBUILD restkit-2.3.3.ebuild 1397 SHA256 adb17f2c96c37dd31e867685a901ea3bc9533fc56d1574b95464455a0e626c25 SHA512 ec6bfc78bd1208015068e5c48fe2a497d1dddb4eb0e10f2f5c580fc215b309140530e8da850237358a99e676af4dbd84406ccf256fad656022ea27e2e84b0222 WHIRLPOOL 9ceb982fa98445da03526596f4a2f3ce940c3aeef14607c777a6ca0fa5ebdd17b2947e63f5a4ec255b37b5ad47be8223e6447ad9aa44a49d41fd2a34be602ef1
 EBUILD restkit-3.0.2.ebuild 1249 SHA256 2aabe60fd01ac933f2a5c56b2b4d6015e83fd17c4d66f2db55b5b21c9259f6fb SHA512 1eb7e679b52f7a68d1a2145070a2e73206b3ea09f9591fa3b24a1d50b333965d90d186035cd609011e758b1d20d3c29da5e1ad69e5cb9a0145d74434952d4870 WHIRLPOOL 486107300e14a098b9987ca48875a7b0d8cd4a8b8ddb63b01feeca076d516ac9d717ca12067b57d8c8e1a2108496fd885b0cf81e35b32db1fb8e45ff87862616
-EBUILD restkit-4.2.0.ebuild 1417 SHA256 9d5fcc36810a6676d9b86634c425e31057efcd2ea6566b8b3130eb709c157823 SHA512 8ce36a6ea5e7c13593e4d82051f0eaa3c32b2945d9ea948188f5ae41bc3266b69bf7efc1863995f1c8fc95215b9e8cb021ef1cefedf9dd543df7b068629a9072 WHIRLPOOL 8e104f86e77d36b5bfb98b034d15d79bc0cb7318447d7cf30bf359f73912723cc020901a9fdecbaa67b14e5785ced2bfc96df5d8ee45e3ef28af1e6039d88e57
-EBUILD restkit-4.2.1.ebuild 1423 SHA256 db6139e8e1d036031f61da52dad5fff66476a12f3e8c84b698a2fc94430ad60b SHA512 76adf7002a1330f433a6d74b872d85df0b25e7d11c8a6bfe8bf7ff0292666d642dd4018cf7fc3a770d05cad5a9e48589044c100870210a254ec4f28815e01579 WHIRLPOOL 46bbc43f72fa9a35a55f03350cf334ed3ecd7aa931021ed00fdfb6e00bc8a28bd5da26f28c7ad7f55d27a7df344b776c34735564d99b9d311708d4a105ba1f57
-MISC ChangeLog 1497 SHA256 11e230909795c7236601c708996ef195fb0936525eac2b6fcab5399688f51412 SHA512 fcdfb01d6972f719883e0093238f33fd3f3815df6750a140bf865d6ed18d9d74b8309c231835da4189bab4a8414c06e431d1a6c9a2ff2f261b7cf4b502ce2c11 WHIRLPOOL 4499c2753239e9139496f6ea616350be7db892119e9b33437ece3504288624cda60047f2653261e80838aa6980297e9edca65abe7ba3e468247b713355c3a166
+EBUILD restkit-4.2.1-r1.ebuild 1379 SHA256 13f1b9fce626766c9025e1d6f16bfbc68635a79bd528dbfb5c9f998c52e40e2c SHA512 b11de03ee836d4029ca9ac9b7f911853a6b79893daaed0a2b1a3d7682ebff9049c9b76475cf9f7316fcc9a6763bdfe480837d34d2d2ad90e4aea968dcf1490e6 WHIRLPOOL beb033b219828cfede1234a4b966edd6fc0e1c871781c9c00f2c21cae8cc7d7a74658904fd5c3b3a0377ce5c99686f9883d8e20bbbb4c5def6b786ebbe95d67f
+MISC ChangeLog 1724 SHA256 fec33cd1999bf831c55d5dd6d1a139c8fbcf003946f4d26533b157776c6326a9 SHA512 2d58258e0eb84b9f0d5134c668668b516cbbcb4dd7b340d6935b54b8cdc3be42dc2a3f94e5e2bc1e82b7c80d0e1953c0fab6a45a6e6d3e58780e760d3e87ba3e WHIRLPOOL 25d4f2a3d56d672cad0a2267398e391e2d23d377e92bc8fc2e4509ee1cd32555943cc97ae9eca513c9c698d0e18fbd8b3cb3e65fda1a09357aea9df7a107f8e6
 MISC metadata.xml 365 SHA256 d3b55f5084a9a6cf238a3b538d292fdb8677def37df1daaf0982287a48009fb8 SHA512 dbdd590df6540d14ad6f17553a6a6619a0bb9bfd2a1d6d6e199f682b92ea584bb9efa27620b373de05a2b43af144cc031820e8d0a1d2bd579938dbcf90740e5e WHIRLPOOL 12c4582f8af92574ee88bd63c9de7ffcaa34eea47c86006c82b61c46b2308b009a1c549038e010673f4cd07a505a72d0ebc82fad7879948dd92c35a741c71566
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEXYjwACgkQso7CE7gHKw3kfgCgtwk2t67mp9/0ChT2CsiZ6xX7
-hwoAn0QuTr3Mq3/tr9abAop9GxHEYANX
-=kLzT
+iF4EAREIAAYFAlEsTkAACgkQC77qH+pIQ6TwCwD/XDt2ikZEtzCiKkbsin2MBIiP
+md1U1yoLe2CYkcCrJ2wBAMFDh4nSY+6D0aq3t+0ZMdSmt2b7fUBcMLaxZM0KNqTZ
+=AzxN
 -----END PGP SIGNATURE-----
diff --git a/dev-python/restkit/files/restkit-exclude-tests.patch b/dev-python/restkit/files/restkit-exclude-tests.patch
new file mode 100644
index 000000000000..5347967f5d28
--- /dev/null
+++ b/dev-python/restkit/files/restkit-exclude-tests.patch
@@ -0,0 +1,25 @@
+From 62a02a962f8b6460a379156108bde09f003821af Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 26 Feb 2013 00:43:01 -0500
+Subject: [PATCH] Don't install tests.
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e6613c0..a6a5505 100755
+--- a/setup.py
++++ b/setup.py
+@@ -53,7 +53,7 @@ def main():
+             license = 'MIT',
+             url = 'http://benoitc.github.com/restkit',
+             classifiers = CLASSIFIERS,
+-            packages = find_packages(),
++            packages = find_packages(exclude=['tests']),
+             data_files = DATA_FILES,
+             scripts = SCRIPTS,
+             zip_safe =  False,
+-- 
+1.8.1.4
+
diff --git a/dev-python/restkit/restkit-4.2.0.ebuild b/dev-python/restkit/restkit-4.2.1-r1.ebuild
index 7f8564a9284e..66d02609ae02 100644
--- a/dev-python/restkit/restkit-4.2.0.ebuild
+++ b/dev-python/restkit/restkit-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.0.ebuild,v 1.3 2013/01/15 14:07:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.1-r1.ebuild,v 1.1 2013/02/26 05:55:08 floppym Exp $
 
 EAPI=5
 
@@ -29,9 +29,9 @@ RDEPEND="cli? ( dev-python/ipython
 	>=dev-python/socketpool-0.5.0
 	>=dev-python/http-parser-0.7.7"
 
-src_compile() {
-	distutils-r1_src_compile
+PATCHES=( "${FILESDIR}/${PN}-exclude-tests.patch" )
 
+python_compile_all() {
 	if use doc ; then
 		pushd doc > /dev/null
 		PYTHONPATH="${S}" emake html
@@ -40,20 +40,15 @@ src_compile() {
 }
 
 python_test() {
-	nosetests -v tests
+	nosetests -v tests || die "Tests fail with ${EPYTHON}"
 }
 
-src_install() {
-	distutils-r1_src_install
-
-	use cli || rm "${D}"/usr/bin/restcli*
+python_install_all() {
+	use cli || rm "${ED}"/usr/bin/restcli*
 
 	use doc && dohtml -r doc/_build/html/
 	if use examples ; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
-
-	einfo "Remove tests to avoid file collisions"
-	rm -rf $(find "${ED}" -name tests) || die
 }
diff --git a/dev-python/restkit/restkit-4.2.1.ebuild b/dev-python/restkit/restkit-4.2.1.ebuild
deleted file mode 100644
index 0ffff73fbf19..000000000000
--- a/dev-python/restkit/restkit-4.2.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/restkit/restkit-4.2.1.ebuild,v 1.1 2013/02/10 09:02:37 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} pypy{1_9,2_0} )
-
-inherit distutils-r1
-
-DESCRIPTION="A HTTP ressource kit for Python."
-HOMEPAGE="http://github.com/benoitc/restkit http://benoitc.github.com/restkit/ http://pypi.python.org/pypi/restkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+cli doc examples test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx
-		dev-python/epydoc )
-	test? ( dev-python/webob
-		>=dev-python/socketpool-0.5.0
-		>=dev-python/http-parser-0.7.7 )"
-RDEPEND="cli? ( dev-python/ipython
-	dev-python/setuptools[${PYTHON_USEDEP}] )
-	dev-python/webob
-	>=dev-python/socketpool-0.5.0
-	>=dev-python/http-parser-0.7.7"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc ; then
-		pushd doc > /dev/null
-		PYTHONPATH="${S}" emake html
-		popd > /dev/null
-	fi
-}
-
-python_test() {
-	nosetests -v tests || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	use cli || rm "${D}"/usr/bin/restcli*
-
-	use doc && dohtml -r doc/_build/html/
-	if use examples ; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-
-	einfo "Remove tests to avoid file collisions"
-	rm -rf $(find "${D}" -name tests) || die
-}