Restore stable keywords

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 73 insertions, 25 deletions

diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index e3aee9fb3a92..044a4cddafa4 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,12 @@
 # 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.58 2013/04/04 09:14:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.59 2013/04/04 12:38:16 patrick Exp $
+
+*pytest-2.3.4-r1 (04 Apr 2013)
+
+  04 Apr 2013; Patrick Lauer <patrick@gentoo.org> +pytest-2.3.4-r1.ebuild,
+  pytest-2.3.4.ebuild:
+  Restore stable keywords
 
   04 Apr 2013; Ian Delaney <idella4@gentoo.org> pytest-2.3.4.ebuild:
   Test suite fixed for py3, fixes Bug #462552, by patrick
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index c7867fb0b4da..71a666548f01 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX pytest-2.3.4-unicode.patch 1570 SHA256 2d1074c720dfc0c2a29c5321153b344f43a8ed9184bfc567afdcc5c4dfa9d812 SHA512 94b8505022c180382c38b142b7a561ec44822c5c3cab71d9b81629898da49029c71995e59787aa486296b8090cc4322d87245cc41896a0370ee745ce7c979396 WHIRLPOOL e820f4dbc6cba63e9d7d40ac74ad79636209b4c3d713bcfef59134d693e6073fb2f225e3f008f71cfab24ba117fc144b3c50f7dafccc9ad1e5cb1400b936691a
 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
@@ -18,13 +15,7 @@ EBUILD pytest-2.2.4.ebuild 1381 SHA256 876d12e0af87849db6c8cb5c6506343975f527cc4
 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
-EBUILD pytest-2.3.4.ebuild 1811 SHA256 6220f977636fd7d7f7f9991a40c11690c58fd720aa0009d5dfa3d0c82cde2f11 SHA512 d606bce9f50c1ad6c96f3672c76e01fdf84e2ca1fffb7718bf6a47428302d2798e87257d2cc9e912bb2c8826ba98a6a654ca159025f2825ecb7af436c88d2d61 WHIRLPOOL c085b26a8772ddb2b6f163408f811436236c888bc4672ccdc530332917bac4beda611fccc810c18100e1fb9551b85214729fd11ec8815f278b39e3f6f599b450
-MISC ChangeLog 7446 SHA256 8ae45de20279ef8db6ada7c87593ed95644d105b36e6132cb3e26c856fbda9d7 SHA512 ad82848f631996564a4c463a254c7e43f644ada35a6782442ab3e37efac3297b831748a53b7a678e4a810e935b0ec22efe968965ea605ece5bb123020674cb39 WHIRLPOOL 152da25f672eed1060fe4c691e3aac5bc1687d3c7cf971b8d3becb8d21825655ea1c0b6e1ba1d7df1ae97605caebe58bcf314c121e7ee1faf38df821bc3f48c4
+EBUILD pytest-2.3.4-r1.ebuild 1813 SHA256 cf5778bfd97b63ce175cad488384952924dd9d13db276d9e04565ea12b7b1892 SHA512 15987b6c6846e54173c24966dea0172f89bf19acc54f4ff49b9ba654ab05aa89594667d3c8b28b06a4e5b9bf196ae35b6f0fce5a21065c6beb7dc7af76bd5057 WHIRLPOOL 9cff56a901ca44fbfd488b2a5cb14448e388cc2ca44e080a10c81334d779851ec837423cf234c6f6f7be8ebbdaba0e787a2afb705f5e14e2e85d1e30845bca68
+EBUILD pytest-2.3.4.ebuild 1567 SHA256 a93d6e3b82b8852ae4bbd6ebe9584549cfea851885e63fd91644cd3a4dddb3aa SHA512 f3352fc0b8d503ecb02fe8dcb4d0113e54ebc43c5312136d601527d7e9ec26c0f765dd69d91b08100e140c5c684cf8c247231f3580bfdfe57cf3d4bec19b094a WHIRLPOOL 247a34d28504ddf49a4b37714d1e427c16d1009c70357f8a523f9201da4aa171cca8b4ca810d8026d4e0383c1dc4db8a5399b1b8fbfc2ecba33535669e30c2dc
+MISC ChangeLog 7603 SHA256 d751acb694094bac0a7a81298c22a8bcde723756e4b2566adf0d78c449378b34 SHA512 bce30efd23f48f0c4dcbe4556be96f4d3a8408cebed941274b654e4b2b190c367516017d30ee77ae5aa5ed78bc0a16efa241bbd7ef4f669705c10b653ff23ce2 WHIRLPOOL 5cdbf1ca2deed2a75f72927ab9b1d60917041ae2424c490f6a28258d74ec20c4d9f577a07b420178550430a25ce9a0a1a5a070430dc02c13fb3075b35d7e2a8c
 MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlFdRIYACgkQso7CE7gHKw01sgCePI58SYe7Fl1SJDUeX+lDFO/P
-6roAoNhynwMYYF7GeLmJCHUFd2XpGwdY
-=Z/e0
------END PGP SIGNATURE-----
diff --git a/dev-python/pytest/pytest-2.3.4-r1.ebuild b/dev-python/pytest/pytest-2.3.4-r1.ebuild
new file mode 100644
index 000000000000..af2b05f401a1
--- /dev/null
+++ b/dev-python/pytest/pytest-2.3.4-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.4-r1.ebuild,v 1.1 2013/04/04 12:38:16 patrick Exp $
+
+EAPI="5"
+
+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"
+
+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 test"
+
+# 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[${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
+
+	epatch "${FILESDIR}"/${P}-unicode.patch
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib/ || die
+	# pytest.py draws from "${S}" if / when absent of a local testing folder; Bug 462552
+	if [[ "${EPYTHON:6:1}" == 3 ]]; then
+		cp -a "${S}"/testing/ . || die
+		"${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}"
+		rm -rf testing/
+	else
+		"${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/en/_build/html/
+}
diff --git a/dev-python/pytest/pytest-2.3.4.ebuild b/dev-python/pytest/pytest-2.3.4.ebuild
index 41e0365148d5..dcd51a7feadf 100644
--- a/dev-python/pytest/pytest-2.3.4.ebuild
+++ b/dev-python/pytest/pytest-2.3.4.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/pytest/pytest-2.3.4.ebuild,v 1.15 2013/04/04 09:14:30 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.3.4.ebuild,v 1.16 2013/04/04 12:38:16 patrick Exp $
 
 EAPI="5"
 
@@ -13,12 +13,12 @@ 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"
+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 test"
 
 # When bumping, please check setup.py for the proper py version
 PY_VER="1.4.12"
-RDEPEND=">=dev-python/py-${PY_VER}"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -43,15 +43,7 @@ python_compile_all() {
 }
 
 python_test() {
-	cd "${BUILD_DIR}"/lib/ || die
-	# pytest.py draws from "${S}" if / when absent of a local testing folder; Bug 462552
-	if [[ "${EPYTHON:6:1}" == 3 ]]; then
-		cp -a "${S}"/testing/ . || die
-		"${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}"
-		rm -rf testing/
-	else
-		"${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}"
-	fi
+	"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py || die "tests failed with ${EPYTHON}"
 }
 
 python_install_all() {