Bump, remove old, drop s390 keywords until py catches up

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64

10 files changed, 19 insertions, 404 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 1918494bf918..c65a1376891a 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pytest
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.62 2013/04/10 19:51:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.63 2013/05/10 03:31:17 patrick Exp $
+
+*pytest-2.3.5 (10 May 2013)
+
+  10 May 2013; Patrick Lauer <patrick@gentoo.org> +pytest-2.3.5.ebuild,
+  -pytest-2.0.2.ebuild, -pytest-2.0.3.ebuild, -pytest-2.1.1.ebuild,
+  -pytest-2.2.3.ebuild, -pytest-2.2.4.ebuild, -pytest-2.3.2-r1.ebuild,
+  -pytest-2.3.3-r1.ebuild, -pytest-2.3.3.ebuild:
+  Bump, remove old, drop s390 keywords until py catches up
 
   10 Apr 2013; Agostino Sarubbo <ago@gentoo.org> pytest-2.3.4.ebuild:
   Stable for s390, wrt bug #458992
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 30e399f587ee..6516a2a1ddee 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,40 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX pytest-2.3.4-unicode.patch 1589 SHA256 2ebca1e0b4c79d45c1d558938f04aa8a30166f90eb0d40ec0809679b95e6ad0a SHA512 d187d08608f8cc5c9f97a2cd58497262f37b0c8c08a88eca1ee2e9726196a97d56d1d510cfde1e7d74ce49086608164145525e37f23086efff7e457d71d8f980 WHIRLPOOL bfcf7099a8d516020f4914d8c6963f54b1e92e323ab939e214bff42cb556d76e64fe98bede7e566173dd09906407fcdab9786d11216bb92c209a9999cf421cbb
-DIST pytest-2.0.2.zip 256675 SHA256 9b29dc0f81c7fcba3ce5154408e948d783e35ace39b514f093f2b83bcf35c48f SHA512 c7ff534fc31bc13f297ed054a058e25ec9a7c1fd544af7599854ab4496a2470e51bb3f3261cda65868fa51543074b9e664e7ed54b037f6b69e38dd66d27b4f27 WHIRLPOOL 87421887fdb24b1c52e92b7da7b88da1d30868d4f655a0ab770c03f89e86602bc00cfe314328cf6f512a7709c64778ab2427d66e54a21b862acdd2c5bef31961
-DIST pytest-2.0.3.zip 259712 SHA256 b387aaae6df6be8a37f4e9ffcb2ca04836f5b130c11f1297f93f487a3261e692 SHA512 dbd2b82f18cb3c74cee82fd989ca8feb65ece60fd7087e084b61fcca2bda8bdadbcc06a72c592be9684878917937de96a742fb6b1bb1672c133bde11e3f7d815 WHIRLPOOL efe3eb0c3b3f7c2478ac24ec5d52ebaf93d071c07fdae466c1ca9e13e5c3620ca35aeece0e6a51c5343a8a17f36acc552b10b06f12be426f39c938c0dfebc72d
-DIST pytest-2.1.1.zip 288420 SHA256 80a3837db680adbafd23e0005d40d781153dd1e8ec62ee406d50911ed0874155 SHA512 6193fb3ee49ce69583d0a61e804919b65f827149750903e258e946a379511f5e88357e95e239b7ae7a774e4da9b9d336c90d511f52bee790c535c2a0cdb58c3f WHIRLPOOL 078b020454f3f7d9e2407eb6c11b1da8440e1e8bdc9edec148ac112cf1b83c7c40e2f250bf18395fcec28c69d7d60f2f6587fdc4980d7a8c4ea241a9ba17f57d
-DIST pytest-2.2.3.zip 307445 SHA256 a9f76ba1ea10ab4d40f4382df15ec2ce583052496547aa9e6bab059eafd9406e SHA512 a970ed7aafe73dd9c881e2ab8e7588e6fa75714ad45c7dd2e742d216d937f949592ca79946781c4b4e506a200e1e70723c8d0a54fe135f6c97b4b2c9f4e48128 WHIRLPOOL ce3eb27be16273795baa685690ce8621a3efe11ad655a4ab9cc74046b10a038ad072ef0039d1eae2f4233b831211ae26f2cd7b05aa5fcaec80541a90171f98d1
-DIST pytest-2.2.4.zip 309641 SHA256 dc03898d46d00bb5e6756f6bc2ea3fc6c35935e774a0682988c4b4fcdd624f5e SHA512 8f37ff01fdd1a75142036710bc105392437123c012ff0a908cb7afd11ca8f06097867c15dce23a6582ce4eccc3529fa2df69ae227273d0786df35ba0466d0bbe WHIRLPOOL 49097e22e4188b557b3b8411fa85929b8e9190b32dbd99ccb09ad6c1477e2e1c720bad3bbc30f6e61337253d314c1d37d0e40e5a4c2496ee1fa5e417a8ff6072
-DIST pytest-2.3.2.zip 515396 SHA256 ff1efd507224cdd768d3827272c87e0cf99571f242c8a5bb634b9d35469fd61d SHA512 b6fcfbf28f404a35f1a3e22b125510676b6a4de11f407329244d79b5e8a279be57b4707a0e34d1a10bf664d9cd117fc377cd29bcba6a4c38a4b3da955ef70a7e WHIRLPOOL 2eef8bb9181bff2650af3f346274d1ad3c9fe56e49138af8f76cc23c872c6f7eb714d0e5eaa2615d6c8b678ff4c3bcfb9dd9bbc1eb8c31c8125ab61beffa7479
-DIST pytest-2.3.3.zip 521423 SHA256 e269661e308a34ddc2fd31ae7e9a9383772363813bac79f3da81acbc13a09677 SHA512 2a748d768c982d325625f9100e7f9b586172a0cf1e1256440ed41405e51b3e8a39fb4d0ce361bc403cff1d9b46f9c83a578e0ba914d21f7ed17a14b97022be0b WHIRLPOOL 50fb3523650c59d5e88ffb1f60a1d310f457d7c066a6bd28b3684f733bc893e7efcef6ec98808acaa0b3f81c927b23c1b09a756887f76538371f3ad3b271d1f0
 DIST pytest-2.3.4.zip 527214 SHA256 5616f744a311c5f5fbb44943aaa41c32df70ba132159a0a9fb6c999060d7645c SHA512 390ceb05fc79eec14861ac23f74b4ca64cff54a10c8a7d61ac148fd101d418c1f286777c50f181148c60e0b02c6bdeacf224ad0b2a88104b3b29e7761ed1bea9 WHIRLPOOL 3afa5442d4900ee93a11614e50d67407a2fc6d2f55ffd700b7b64b1ed20be0895f6fe35adeb9926491eea1b2500f62d49f77afd17471c0a4f1be52cb971f4ab6
-EBUILD pytest-2.0.2.ebuild 1274 SHA256 1780c4ca8f02074d107034cdb85d88c311df79e5252250407e54571d483b2b0d SHA512 279d839266d7e312263c3ca6a2723cde2a33589c36ae482f7d21426d5f59240b9f0dcaba52a5775edff40ba876b7007f652605c27373be4dab0edd7a5e92bb2c WHIRLPOOL f1da64d0ea84a12eb0484bb12bc812a60ff39818e8d9495c9d705c7bc5742b75f0e57efa2cc35730274d95acc490c8eb8a6f8920194606dc638417cb5ca1590b
-EBUILD pytest-2.0.3.ebuild 1271 SHA256 1af7e84f040477514bea4fd8db182bc68c5526bea1ba65efdc2ffef543728a42 SHA512 67438720e18e1942c002f22f043f23ae375803706d54bfb6c041a563bd251caa836326ab681588db69c0b550745c331663ea7c69b8f854ef84fc2926dc1f2ad3 WHIRLPOOL fd3a054b842e9810d15e42d9b437a95cbaa43bbb60da6168c75792c33b6862a0122e8b9dd223947184f997c51af76f5a634fe0ec862a313020a2af62b57c6e38
-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 1904 SHA256 47d394c63b3cd2f9982f8816ee30d589a21fceaa523add1d7c6bc3e3aa0fd4ff SHA512 0d3221e6b17051eb14c037685735051637fdba8291173bf2703370632ea3ead242002b726a17314e4da72950e971f20ab376b9248b60c7211b2d83fe3ea7d834 WHIRLPOOL eab220df628d2a3cc6bc318cabcc0b3d95d4aae3b91fd05f1242b388ed1db23425d05e21781f410b21392489d09d55d288aff0280ebf7ce29b933a322c323c5c
-EBUILD pytest-2.3.3-r1.ebuild 1520 SHA256 f7a9efdd1a739e60bc0959fcfeb6916838b678444b8467be91b0adae2d6bd570 SHA512 b5c455c765fae388b856c76b73cb971bfb85613475459bef04e11dda25ea020995b7fb43e8fa43418b25cfa0a2ab3e6000d76acb89c96fd86cf82cdff81f4bd1 WHIRLPOOL d9ac85e754b9ca3ca6e70f96b7f0e8476c92799c4516a9ba3203b38c0daa066deb5f2652fce6ee356c52dc775b729d4b994d7a1f7d8ff5299e21958440ac094e
-EBUILD pytest-2.3.3.ebuild 1901 SHA256 fd7b9f428d53998cfbceae6384c3e251f2209859333fa0401b4cb9df22b2b68d SHA512 55a04ca4014d2814b79703d57084a6c897320a5856445476751b4fc4d97bd585f3f5996d1e8ed7ce13a23444f5e2938427bfaa5545d864034251ab0752c04e99 WHIRLPOOL 4bc8c9388544340eb5702212901a1e6e2f20c62bdc524bbf5fcd5eac30ecb8a151bdd074e8a4901e036c03ecc55eed688e91919e0a14b718a2c85cd4ebfbbd25
+DIST pytest-2.3.5.tar.gz 426328 SHA256 804c28bef415fc6a54de7934f05b2d67a9cc8a230de98685fca274d9fcbe8b1c SHA512 4cda3149ca4b69b88c2df65d7c474506e852ee1daa9e6b1ca3dbde8b7ffe0cce09f2fb4ef696f54df7f6ce807cd472dd8447cfc32686902b2b214b18e5719060 WHIRLPOOL a2dd7c319d73e6c32077685d65785c672dbb6faa01ac4ed116520128a1b03b3a10b88e65957b736132fbc3a667b43840c28081ef4a4a8ddd2cd73f8727c778cf
 EBUILD pytest-2.3.4.ebuild 1568 SHA256 d2bab602145e55702bcaec79114a9109f456b4a255b69a6037073267dd3a0eae SHA512 3b6d8ae0bc09a2f5b035c19558f841ccb219300eaab986808f436784717f5cc06f842e1ecd374d96404a478108074c6af7e681e1e1c5204aa6aa1b4251253c75 WHIRLPOOL 3cb9b7c5d268ffc33970cf44acf1d4cf08e91de2bb4130cbd6769b95a5df9b3e05d0d9d65f879ba6b59c0ab9dca86b43d0df32d166c2c4ee07a700ead4dff1a3
-MISC ChangeLog 7989 SHA256 23c790347633dfcf487a6ff9e1edcdacc31e5b21e27e3222eee840ce0c093c02 SHA512 ab7647954d1a20fd1f43d6a85b0d9f393bd2b1ba641b4ed57467793ddac7047138055db3a1e16ac6444a8c4528f7f457750df85487a1d3230c46d7a5f5f33c37 WHIRLPOOL 7b87318f206b090db8b2509d36e48ab61a8c0cbb00d572886dd007ef02974eb29fffb49ba6b279f49a12b4066bcfdb3e7788a886dcf6d78b2d9f5ed5e6327d5b
+EBUILD pytest-2.3.5.ebuild 1521 SHA256 1f49707a34778bbdc15a7b1b4602dc5cf01bf1f210e6898b601621b130cf0136 SHA512 c196bcc226b0dfc2597b13c7bc3a8957606a5b0679d0c481fde0a5322e7c2221fdc1795afa19880c23d02cdd27d151e6df6d7b390a3e55ef940aa5119f59f690 WHIRLPOOL 5becb68e152efd77df970b5febac1f89fc8b42fc70d291ac8da457ddbf6a918515d806bb6bbcb8a8185f737019a225a295b16fc742a81552c4bc6903c660ffdc
+MISC ChangeLog 8342 SHA256 9de48aceeae0546bb8c957e70b532badd7abdea4d55d7156e9c44946cb46cabf SHA512 d7663cdc1af3377deae5050241b9c1cdaf6fd821ab24685ec5ec60e41f105dc391788996d275f7d17657db7401e5a7919a21d396826051732614f679596b7eb9 WHIRLPOOL 16e398c95fc9dd24320f8be095d1e73d27ece5c9463fa816d744b46dcdddbbcdcde65f78995a986fddb765b0283a9b9b0aaee8ce5a6f026bffae3f0e2558bf59
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRZcIoAAoJELp701BxlEWf0wgP/RVla/McbDCLaJZE4aU2P7Xn
-wSYKLFehFj23AALdzJDW48UuVCMFFuf4i+clcYOvTevye0wNBp9JDU9LkIOJ/Bwe
-AhsWbXtsERC9t6u+LAEgS8xJ/3cSnTfD+mOtbpZdeuouk7xjsi6IuVq/lpBcr0hr
-E2VzxBf1rUjnEIoJJo3tx9ze2AMYktjSrO6XxFnTTGtN/8qyB6otYktziQxTZwyZ
-YJaqsH4radwRvZkSIjAnb6M9IpUP76IO3pL4ujt7ULPq0Lo8WgxsDpxn6KjNgje7
-a8V76zISAha8EAcfrPXzEgjc9Ie9aMpjFFwgDSD1EqJtB5pdlJ7QiUviI6/PTLBa
-9VF2Kq6PHrgkXzTzHGF2rvluYEh2cW5xem2g4KKf85LopjVRP/gbgFrgv/LSdXPq
-YDWd1rBBAN6BaNaaCSi4Yu6FMhTAAUOWVmxEGyHw4YoH1ryN5nxixmkqlhCHqkrx
-BSFy6pNr6lLmBUNCtoHwxMee2Kd9HyyouUARRVJyDgb8UrpiL59oX6/ygY54VXDs
-hScrsQVKaXdYVSmWPw+t71cqwpGOxYrvZ6wKyzskCRJxhk7bRRyBkL4jWcUBnfKD
-gaG+w1KJMB0PeUxSKM8/Riq2/13Y9NwIWvi/e4VkI7bLCjS5pi81QZjjFKtfxY1L
-Z468G22hSvB4ZNkNXWsX
-=2uxm
------END PGP SIGNATURE-----
diff --git a/dev-python/pytest/pytest-2.0.2.ebuild b/dev-python/pytest/pytest-2.0.2.ebuild
deleted file mode 100644
index a43a2164c06b..000000000000
--- a/dev-python/pytest/pytest-2.0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.0.2.ebuild,v 1.7 2011/06/27 15:20:20 ranger 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/py-1.4.1"
-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"
-}
diff --git a/dev-python/pytest/pytest-2.0.3.ebuild b/dev-python/pytest/pytest-2.0.3.ebuild
deleted file mode 100644
index 45622d3538e0..000000000000
--- a/dev-python/pytest/pytest-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.0.3.ebuild,v 1.7 2011/10/06 17:46:30 jer 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/py-1.4.3"
-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"
-}
diff --git a/dev-python/pytest/pytest-2.1.1.ebuild b/dev-python/pytest/pytest-2.1.1.ebuild
deleted file mode 100644
index 62f102fe0eeb..000000000000
--- a/dev-python/pytest/pytest-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.1.1.ebuild,v 1.1 2011/09/11 04:40:35 floppym 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/py-1.4.5"
-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.2.3.ebuild b/dev-python/pytest/pytest-2.2.3.ebuild
deleted file mode 100644
index b017cd43b00b..000000000000
--- a/dev-python/pytest/pytest-2.2.3.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.2.3.ebuild,v 1.2 2012/05/12 20:13:22 aballier 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.2.4.ebuild b/dev-python/pytest/pytest-2.2.4.ebuild
deleted file mode 100644
index 4d0ece3483de..000000000000
--- a/dev-python/pytest/pytest-2.2.4.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.2.4.ebuild,v 1.1 2012/06/28 07:12:18 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.2-r1.ebuild b/dev-python/pytest/pytest-2.3.2-r1.ebuild
deleted file mode 100644
index b4ce1ec5522b..000000000000
--- a/dev-python/pytest/pytest-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,65 +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-r1.ebuild,v 1.2 2012/11/23 01:19:57 floppym 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="doc"
-
-# 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"
-
-DOCS="CHANGELOG README.txt"
-PYTHON_MODNAME="pytest.py _pytest"
-
-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() {
-	distutils_src_compile
-
-	dodocs() {
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir doc/en/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C doc/en html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_test() {
-	testing() {
-		local exit_status=0
-		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" build-${PYTHON_ABI}/lib/pytest.py || exit_status=1
-		return $exit_status
-	}
-	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
-
-	use doc && dohtml -r doc/en/_build/html/
-}
diff --git a/dev-python/pytest/pytest-2.3.3.ebuild b/dev-python/pytest/pytest-2.3.3.ebuild
deleted file mode 100644
index 9180e6978cdc..000000000000
--- a/dev-python/pytest/pytest-2.3.3.ebuild
+++ /dev/null
@@ -1,65 +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.3.ebuild,v 1.2 2012/11/23 01:19:57 floppym Exp $
-
-EAPI="4"
-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="doc"
-
-# 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"
-
-DOCS="CHANGELOG README.txt"
-PYTHON_MODNAME="pytest.py _pytest"
-
-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() {
-	distutils_src_compile
-
-	dodocs() {
-		if [[ "${PYTHON_ABI}" == "2.7" ]]; then
-			mkdir doc/en/.build || die
-			PYTHONPATH="${S}/doc:${S}/build-${PYTHON_ABI}"/lib emake -C doc/en html
-		fi
-	}
-	use doc && python_execute_function dodocs
-}
-
-src_test() {
-	testing() {
-		local exit_status=0
-		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib" "$(PYTHON)" build-${PYTHON_ABI}/lib/pytest.py || exit_status=1
-		return $exit_status
-	}
-	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
-
-	use doc && dohtml -r doc/en/_build/html/
-}
diff --git a/dev-python/pytest/pytest-2.3.3-r1.ebuild b/dev-python/pytest/pytest-2.3.5.ebuild
index b9b5dc37c17c..8164755681a9 100644
--- a/dev-python/pytest/pytest-2.3.3-r1.ebuild
+++ b/dev-python/pytest/pytest-2.3.5.ebuild
@@ -1,26 +1,25 @@
-# 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/pytest/pytest-2.3.3-r1.ebuild,v 1.2 2012/12/17 20:02:20 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.5.ebuild,v 1.1 2013/05/10 03:31:17 patrick Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
-inherit distutils-r1
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
+inherit distutils-r1 eutils
 
 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"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 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="doc"
+IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
-PY_VER="1.4.12"
+PY_VER="1.4.13"
 RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS=( CHANGELOG README.txt )