Update dependency on dev-python/py and add a safety check. Thanks to Arfrever for pointing out the problem.

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

5 files changed, 24 insertions, 67 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 0e25306f23a2..970a0f3dd15e 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.40 2012/11/11 11:05:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.41 2012/11/23 01:19:57 floppym Exp $
+
+  23 Nov 2012; Mike Gilbert <floppym@gentoo.org> -pytest-2.3.2.ebuild,
+  pytest-2.3.2-r1.ebuild, pytest-2.3.3.ebuild:
+  Update dependency on dev-python/py and add a safety check. Thanks to Arfrever
+  for pointing out the problem.
 
 *pytest-2.3.3 (11 Nov 2012)
 
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index abeae1616ad2..f0ba20313df1 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -13,19 +13,14 @@ EBUILD pytest-2.0.3.ebuild 1271 SHA256 1af7e84f040477514bea4fd8db182bc68c5526bea
 EBUILD pytest-2.1.1.ebuild 1369 SHA256 4e7110ba6d8aca642068ab8ae382b0cbd3b5660c7201b8340652480f5c1d05df SHA512 27057e0837c3cb0e33845f297fa199cfe27ca8541920e9e503255d6b82288ad95ab777a42650f0cb6093191bbe2d0a31859193b05c631a6ef847dee115349c55 WHIRLPOOL 72ab04b01fbe4f27fdd6daed1105152a2bad1c0e6f1c77cc67c1316843ea20eea5a15bdf1cd8bcc217c2b12f192192c9930c4b0ac10ae6f08fa72a04605eb3d2
 EBUILD pytest-2.2.3.ebuild 1382 SHA256 81966f459aed8399e604253dcbe38886c758ec4d15d476309e126a8a0b310e12 SHA512 21857337e071b7b5d1fdd64e3d3cf253747498a8421081b1c24b60fc9f0acdec05e25b200113e75c2c881d0e78ade678b5aee95522f1b958a5055d328f480712 WHIRLPOOL 327bdcf514f4abb3c56253f65e7ef6e2c3c9b83024911f8f566e73beac1e7beb6a788ba7dd14a44eecaf67be5878aeed6d268475d65f718dcf98a7edc8657852
 EBUILD pytest-2.2.4.ebuild 1381 SHA256 876d12e0af87849db6c8cb5c6506343975f527cc42e485c279402080627b8e38 SHA512 3e847b505fcd3d84e44e17e74539fdca19d104f1929b71b3f1bf7437d2e1fb159aeaf62d36889b841f277bcc6f2bdab2644f7d9f917268a1bb360f84adfc7b3f WHIRLPOOL 1f78e66fe993fb346892b001df525a631c99b08e5a444c1189d113ce143241a5bae389d71747b3f664cae0c772365f43853fa24a725a0fbbd5666bb216cbc3d7
-EBUILD pytest-2.3.2-r1.ebuild 1742 SHA256 f2ce437b54564cd909942ad3fc88e2b7fc004fc8a03ff8e42ff6de76c2835c29 SHA512 ab6a1c5186ad09706b0524a3f50db5198d8bf170cdad59ed6acde52c15240f9be759ff8091c4d9736b166f6cb2aff958fdd35b23e9682d55d61c5a5b6505d832 WHIRLPOOL fff1481759e2ee1618ee12dc1fe3767c138407e56f73b2ade4cc13b58b563c1fb0698e943f1fde83a77cf97731ac805c40a05ceba5d5f3404ebe8400dc3a5309
-EBUILD pytest-2.3.2.ebuild 1381 SHA256 91a00cd515818d4087d6e2d6f43bbeaf47d9c3e5f36300983de6023e1c6cc4ef SHA512 4b9338e13b537a1f3b74897e85dca20d2ce0cbbc0361359a7e90bc6c2f9eb2635aabde86a8e8ed2063e73abe8573ac9b9a0ce2068ca922c1b4811b7977212717 WHIRLPOOL c2343feaadfa87bc16cb6fd4111862a0b16e85665d3c16b4eaf7100c198b3a64420cea90fa6d00775ef737e22426fde7d9b1ffb336ea7459e3a0ec35819caf54
-EBUILD pytest-2.3.3.ebuild 1741 SHA256 7fd73537d6e4e3d5bf1eb338a3f80fbef3d4741e9d3eba2cc9e345a1f16ef0c4 SHA512 9cf6352d4b8a973f8bc7927240fc2a7477e87bb66587f52c8821ac9253927b6795d820fb226fdd99dd32e21fa22d67480c8e96768703a538e48f333f3d441252 WHIRLPOOL 292407bd0567175e38978a73cac34d0672892c5c87444495beeb26f2f856566c19c49e90e929a65e05d69e2b7164bf1e02d2fdf9036e52542d610729e17b58b4
-MISC ChangeLog 5151 SHA256 8834cf22abdb65667b966e93f197538ce83d8afc8c71dcfaffde383a2de037bb SHA512 a30e9b8de501c2f837f4672d703d6641e23f74ba8377fe08980530ea0636208c475ce57975acd0a48237c112a57d4aada39104864b8712299a7ef4968257d57e WHIRLPOOL 6cec79db0d058d025cf21964f7e2e5edbf5ac9df0fa34668c8ce9d76d60333f08ca45d4d64dbb4df02e77f617d90c8c305d09caf84b21129a763cd59514846eb
+EBUILD pytest-2.3.2-r1.ebuild 1904 SHA256 47d394c63b3cd2f9982f8816ee30d589a21fceaa523add1d7c6bc3e3aa0fd4ff SHA512 0d3221e6b17051eb14c037685735051637fdba8291173bf2703370632ea3ead242002b726a17314e4da72950e971f20ab376b9248b60c7211b2d83fe3ea7d834 WHIRLPOOL eab220df628d2a3cc6bc318cabcc0b3d95d4aae3b91fd05f1242b388ed1db23425d05e21781f410b21392489d09d55d288aff0280ebf7ce29b933a322c323c5c
+EBUILD pytest-2.3.3.ebuild 1901 SHA256 fd7b9f428d53998cfbceae6384c3e251f2209859333fa0401b4cb9df22b2b68d SHA512 55a04ca4014d2814b79703d57084a6c897320a5856445476751b4fc4d97bd585f3f5996d1e8ed7ce13a23444f5e2938427bfaa5545d864034251ab0752c04e99 WHIRLPOOL 4bc8c9388544340eb5702212901a1e6e2f20c62bdc524bbf5fcd5eac30ecb8a151bdd074e8a4901e036c03ecc55eed688e91919e0a14b718a2c85cd4ebfbbd25
+MISC ChangeLog 5380 SHA256 653c64bf9842512c6052ca6b990a11c59366ab225c279cdd6dc1abf8b9350c83 SHA512 85db76b80374afb3cb406434eebbc927beae3899df91c8ddf4859c4c3d8d30fdb2dd19c3fad14c9f21ddc3034cfa3943ff0438b9c891ef0c9fc54afb59c1b3cf WHIRLPOOL a89a2bb3d0ca3927f9879f17c80a70d9498d46b91ecc454762972dbf04b29d2733f5c1c8242335883fa0378a9e5531962f7b1afa3952a2ef37481b0c3347ec04
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQn4ZiAAoJEEqz6FtPBkyjRpkH/Rk8fN8idLPF/VGqgZsJEGr2
-lwabxDmzHkrrXtYglepzo2vN/pgypANA/IzwpW8HCOtnplrWBC0PVHyxQnHywOx0
-k6C6eoMUuzZy9roHZacbGU/dKoZrMZy3WydLY2fSsTd8GsOEcVqKxnuBEZmC8QQC
-emDDeVSikIGeDNJpOhADKXh/oHt9GfwFPyNiWc3LRHGoHz15i6MdDm1MzlgGZqN0
-IUoLed5Khf2yGA1Khdat8ohi74xYzTPQKKgqJkzmX3/k8grnIcFnMhLB80fKWQ1C
-TJzTiWqoEHtM3DEkyjeabJILGjC+qjtE4uO+aEeDAWuoWm6hkpECsepp5v/A1hU=
-=cjil
+iF4EAREIAAYFAlCuzz4ACgkQC77qH+pIQ6RjxAD/asjD++arhfThemEhDSsxBQBy
+Wvd8GpZkqKhMA/JYM4QA/3suBU5BSkWHoyFkK9WvgJKLd+nUUXmbuB25qQYl5Y5K
+=YfeZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytest/pytest-2.3.2-r1.ebuild b/dev-python/pytest/pytest-2.3.2-r1.ebuild
index 65a9f8a3d106..b4ce1ec5522b 100644
--- a/dev-python/pytest/pytest-2.3.2-r1.ebuild
+++ b/dev-python/pytest/pytest-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild,v 1.1 2012/11/06 09:26:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2-r1.ebuild,v 1.2 2012/11/23 01:19:57 floppym Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
-RDEPEND=">=dev-python/py-1.4.7"
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.11"
+RDEPEND=">=dev-python/py-${PY_VER}"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools"
@@ -25,10 +27,10 @@ DOCS="CHANGELOG README.txt"
 PYTHON_MODNAME="pytest.py _pytest"
 
 src_prepare() {
-	distutils_src_prepare
-
 	# Disable versioning of py.test script to avoid collision with versioning performed by distutils_src_install().
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+	distutils_src_prepare
 }
 
 src_compile() {
diff --git a/dev-python/pytest/pytest-2.3.2.ebuild b/dev-python/pytest/pytest-2.3.2.ebuild
deleted file mode 100644
index 63766768f3ea..000000000000
--- a/dev-python/pytest/pytest-2.3.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.2.ebuild,v 1.1 2012/10/30 08:05:44 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="py.test: simple powerful testing with Python"
-HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/py-1.4.7"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools"
-
-DOCS="CHANGELOG README.txt"
-PYTHON_MODNAME="pytest.py _pytest"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable versioning of py.test script to avoid collision with versioning performed by distutils_src_install().
-	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" "build-${PYTHON_ABI}/lib/pytest.py"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/py.test"
-
-	# Bug 380275: Test suite pre-compiles modules
-	python_clean_installation_image -q
-}
diff --git a/dev-python/pytest/pytest-2.3.3.ebuild b/dev-python/pytest/pytest-2.3.3.ebuild
index c2a73415c061..9180e6978cdc 100644
--- a/dev-python/pytest/pytest-2.3.3.ebuild
+++ b/dev-python/pytest/pytest-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild,v 1.1 2012/11/11 11:05:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.3.ebuild,v 1.2 2012/11/23 01:19:57 floppym Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc"
 
-RDEPEND=">=dev-python/py-1.4.7"
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.12"
+RDEPEND=">=dev-python/py-${PY_VER}"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools"
@@ -25,10 +27,10 @@ DOCS="CHANGELOG README.txt"
 PYTHON_MODNAME="pytest.py _pytest"
 
 src_prepare() {
-	distutils_src_prepare
-
 	# Disable versioning of py.test script to avoid collision with versioning performed by distutils_src_install().
 	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+	distutils_src_prepare
 }
 
 src_compile() {