Migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 62 insertions, 5 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 970a0f3dd15e..a1bbdf5aa9fd 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.41 2012/11/23 01:19:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.42 2012/12/07 22:31:27 mgorny Exp $
+
+*pytest-2.3.3-r1 (07 Dec 2012)
+
+  07 Dec 2012; Michał Górny <mgorny@gentoo.org> +pytest-2.3.3-r1.ebuild:
+  Migrate to distutils-r1.
 
   23 Nov 2012; Mike Gilbert <floppym@gentoo.org> -pytest-2.3.2.ebuild,
   pytest-2.3.2-r1.ebuild, pytest-2.3.3.ebuild:
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f0ba20313df1..eb328c2a8e7b 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -14,13 +14,16 @@ EBUILD pytest-2.1.1.ebuild 1369 SHA256 4e7110ba6d8aca642068ab8ae382b0cbd3b5660c7
 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 87c3b38db2829a7d62e2ae9dbd23635fe23790c178daf1c179378efcd5f1e437 SHA512 22116ea2404342214640f6933bcfa7073eea4840829bbb0d7868a31de0d5d276d8903a38df1a12d29b629f57df1bfed795dbfb586b23e5b5c0ae5955d1d93dee WHIRLPOOL b24637e22f93c7540e2071e9594d83be871531d9309b5fbbfcacbd501354c275ee319f23cabfa4b22636371d2cfbec37b9f44a2c58b246c55ea936bf7378bcb9
 EBUILD pytest-2.3.3.ebuild 1901 SHA256 fd7b9f428d53998cfbceae6384c3e251f2209859333fa0401b4cb9df22b2b68d SHA512 55a04ca4014d2814b79703d57084a6c897320a5856445476751b4fc4d97bd585f3f5996d1e8ed7ce13a23444f5e2938427bfaa5545d864034251ab0752c04e99 WHIRLPOOL 4bc8c9388544340eb5702212901a1e6e2f20c62bdc524bbf5fcd5eac30ecb8a151bdd074e8a4901e036c03ecc55eed688e91919e0a14b718a2c85cd4ebfbbd25
-MISC ChangeLog 5380 SHA256 653c64bf9842512c6052ca6b990a11c59366ab225c279cdd6dc1abf8b9350c83 SHA512 85db76b80374afb3cb406434eebbc927beae3899df91c8ddf4859c4c3d8d30fdb2dd19c3fad14c9f21ddc3034cfa3943ff0438b9c891ef0c9fc54afb59c1b3cf WHIRLPOOL a89a2bb3d0ca3927f9879f17c80a70d9498d46b91ecc454762972dbf04b29d2733f5c1c8242335883fa0378a9e5531962f7b1afa3952a2ef37481b0c3347ec04
+MISC ChangeLog 5514 SHA256 606c216ae8135d806cda6b8cdaaffb49d9ef89b665ff866f62550f9c1d15bcab SHA512 e17a97683545e4b9f5595ad777b64141d1c5167029b79c6979fc94637544daecd85d4fe74ed5b3e27a15ed4440ea6c940bf1c0194b5f4076e379ffd4f4af2afb WHIRLPOOL 662b77a4ea093a2f56a3eab35f1e9d73c0aeedb24a3eeb025f4c2beb747bcddb871134b32f5ab5afb46c2aed649745b06dadc55f80a7a64df26452e459847880
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCuzz4ACgkQC77qH+pIQ6RjxAD/asjD++arhfThemEhDSsxBQBy
-Wvd8GpZkqKhMA/JYM4QA/3suBU5BSkWHoyFkK9WvgJKLd+nUUXmbuB25qQYl5Y5K
-=YfeZ
+iJwEAQEIAAYFAlDCbkcACgkQfXuS5UK5QB1HigP/Z6/VGnGq60TDHCJVuYAjf0tJ
+KZtb8oOHR+v7UqqHF5hQoIcAbdxr2EaGzN12LdHrOK09MHz99djjrijPstEcBhz2
+7NgCPEM6S46XkJb+l+ZJWC3kifu2l5Ujzbdfl3KEDJHIGUvUwycXgBtEN+bnGMZO
+4/LabCwAls9S8F8kisE=
+=ZNzU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytest/pytest-2.3.3-r1.ebuild b/dev-python/pytest/pytest-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..3cbe50f9ad02
--- /dev/null
+++ b/dev-python/pytest/pytest-2.3.3-r1.ebuild
@@ -0,0 +1,49 @@
+# 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-r1.ebuild,v 1.1 2012/12/07 22:31:27 mgorny Exp $
+
+EAPI="4"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
+inherit distutils-r1
+
+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}[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( CHANGELOG README.txt )
+
+python_prepare_all() {
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	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-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/en/_build/html/
+}