Fix installing tests in setup.py. Add missing PYTHON_USEDEPs. Use proper phase functions. Limit Python implementations to match current django.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 38 insertions, 15 deletions

diff --git a/dev-python/django-evolution/ChangeLog b/dev-python/django-evolution/ChangeLog
index 8abb8a7020d7..7139386898f1 100644
--- a/dev-python/django-evolution/ChangeLog
+++ b/dev-python/django-evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django-evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/ChangeLog,v 1.9 2013/04/05 04:33:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/ChangeLog,v 1.10 2013/04/05 11:38:49 mgorny Exp $
+
+  05 Apr 2013; Michał Górny <mgorny@gentoo.org>
+  django-evolution-0.6.7-r1.ebuild:
+  Fix installing tests in setup.py. Add missing PYTHON_USEDEPs. Use proper phase
+  functions. Limit Python implementations to match current django.
 
   05 Apr 2013; Ian Delaney <idella4@gentoo.org>
   django-evolution-0.6.7-r1.ebuild:
diff --git a/dev-python/django-evolution/Manifest b/dev-python/django-evolution/Manifest
index c4eb9bf3299e..ccc349928aff 100644
--- a/dev-python/django-evolution/Manifest
+++ b/dev-python/django-evolution/Manifest
@@ -2,14 +2,26 @@
 Hash: SHA256
 
 DIST django_evolution-0.6.7.tar.gz 64124 SHA256 fa3c60861d6b5ee0aaa85a5970b51bbe3ef5bb91e2e2d5f8f60d42b03a664df1 SHA512 575d74cc232b0d0f3bf3bfda929714ba0f57283a704b6045dfea4ebf5a184c0499f35c1253410dff5c8724ab0d841a843f8d27fc1ebe93a509d01da5c709b7e7 WHIRLPOOL a1fffd615c1598967e58a8069548e6e810bd515c707a9e010a31f930f87234c4a38bdba27ba563cbd92f1719c5c711c5eabb3a625abf1a6d9aa6c7ceeeaf0be6
-EBUILD django-evolution-0.6.7-r1.ebuild 1108 SHA256 988d6f2c55d2f6e12d5643934b378407c44c3b72c6ec14c56658c8a171f151b8 SHA512 cffdd680d96075b68c48549a823074864e7d05c37794c044580f7b794429e1b6d8e1166858aa02ca40bd5094f4cf4bd5e0570fd985f4fcd0587881b6b2cf71b5 WHIRLPOOL 485f9214fd2dbabcd72352a39d3375b4b2dd3e8af5937aa371c189fcac95d5681c0cfbbdb54249f78a5a556d9b05a61677187ab45ab90abd5a8fc182a801ca5e
+EBUILD django-evolution-0.6.7-r1.ebuild 1294 SHA256 19002f21d2890a39a2b74d3674e4419bf34f9b5d368c2a4b2602b0fe9740e973 SHA512 b6d2e647e40bd6f64dec721130202e02420710fa8298a57f1839c39d51e621014e456bbaa8a837aff8def516ef5df2b58b6189c431edf2c35a9c03c140f21ec3 WHIRLPOOL 7a6edb7783efd6f1885e114bf113b7df0b7c23b30c3ce2269669a879892994160139739d01077681ceee78fde9c4f1a273b16df6af5134ec057f8612daf51a53
 EBUILD django-evolution-0.6.7.ebuild 1198 SHA256 ddbefea809a12ecd3ce48ca5ed72fe3c793fb859bd45a9fac9b04f71aa54ca0e SHA512 eb647e70a404a97997f9163c092a0f8464f530cea529f026557359886aed5c48530f6c4f4913d91858b95df4fc0af161d89c2f5a17f3b5fd384dfe41f5903d2f WHIRLPOOL 8bb2296f09671d01418e0c6e60f277ab96f33cbc2556a99f7d611580c8d733491949851f5581a93dd6a8a1dd57b8089c52c7d3afafc7c7b1fd31bee6ae320b98
-MISC ChangeLog 1539 SHA256 04bf215920aa2d179c890b5863cf346d472f83036fdff7df8b3bb4ff31fa1019 SHA512 f06a81944856ef5bc2c79bca28363787e5ba8a06d0aa8e5e51f1f30def30a74c660fd70d887a17d37a22bfd1dae28474b0cd3edbc09b05e2a728b44b3768076c WHIRLPOOL c6354cc7ae157ddd1ff392c1132609b60eaf7f2272fe880159273fc11913087ffd15146aa188d41b4d6131a94653c23be8c96a0bfaedc282fb6cec535ce78660
+MISC ChangeLog 1774 SHA256 0ef8f9be4f2f4bfd63f73dc7fb30106d1cde38db7e6d677c65d2019f2aa6eb5f SHA512 36ca512cb4c2a62f00167ced5e9babab95e9c6a84c40a23420bd0357bb1f9d2f7ab5f9b5580d1190a6ed7535fac098962699b136a1d7c53f52ea15d544057e2e WHIRLPOOL 07afe58b2c1237a715589edc233653cc7a86f6b4b685517735fb2e50c6f3766ecc093ce5c085bc3176138ee940e408a48998fe21ff38e8b8404131af00441201
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFeVCoACgkQso7CE7gHKw2iYwCfQNzFP6ehs2B1/byD+KXAg8eb
-eSwAoL6/tcvcItN1+DRvCgrHOIq8KXp3
-=qzXL
+iQJ8BAEBCABmBQJRXrgNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDwu4P/RmSQJNJ9QOS++29uCEF0ene
+AHFwLayDDYL3JZwWp7NOXHtroatzwY0kkhoXbQnuh4WxVmjrdhTar0hD3cpWt5Zy
+ToekgdJP7tqZPQwcx2TSV43ZGwqj9GBWn2WTZoOZD7iVIgXJHlNd3oqbWWfC8CiF
+IS1xSdeslCT1ZdCQQZg75vrb0RoSMCEDiRcld/c2+QQffdgtCWgWgUQ13Kyvtyfy
+yQ0xxqvaypR1ticeaWf2xs93MkyYKlEIagI+wJlbEvxqe4Lx6BxxVllluTLpR77s
+zeBo+T66jTOLSqRBi+Rjwezyb0Ep1y7PsnC4OR+7SjJiyvMR2qxPh2F0Ek988Ipy
+FSM8QISj6k/9/WG/4kjpfQIOJYYIozHp0c0udRhxDc97dMsPEpTTLHvinnnLsrP3
+Xt4s16xNLUSdUJTJM/ba+TU06/oTf5xMVpfeYvg3syIuV2xLlhN0bnXQMXqLXgD/
+AFsuiRaCAuLB8Vd+kb/xFSNf80AbxAMBCQjsQuJBodG6F7RcsNTeDUCb51rnyElb
+DyCILmGj5BL5uWskp8cMEq2iPa+URGLNhdAAl3BUA5XvAonkT08ZjWL+tu+o/6Jv
+e0NlCm4K4eJfriXS7I1piYDhXEjVOEz4jnrUhKrZeBCtizKcBcmUmk6kqYyfhSP8
+QWqdv+JDHuHJ4v7WCA8w
+=a7+Q
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild b/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
index 1ff8107150fc..9b4f0882174e 100644
--- a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
+++ b/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.5 2013/04/05 04:33:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.6 2013/04/05 11:38:49 mgorny Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}-${PV}
@@ -22,19 +22,25 @@ IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/django
-	test? ( dev-python/nose )"
+	dev-python/django[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
+python_prepare_all() {
+	# Fix installing 'tests' package in the global scope.
+	# http://code.google.com/p/django-evolution/issues/detail?id=134
+	sed -i -e 's:find_packages(:&exclude=("tests",):' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	# This is tested, any delay in die subsequent to (implicitly inherited) multiprocessing eclass
 	"${PYTHON}" tests/runtests.py || die
 }
 
-src_install() {
-	einfo "Remove tests to avoid file collisions"
-	rm -rf $(find ../ -name tests) || die
-	distutils-r1_src_install
+python_install_all() {
+	distutils-r1_python_install_all
 	dodoc -r docs/
 }