summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-04-04 18:31:00 +0000
committerMike Gilbert <floppym@gentoo.org>2013-04-04 18:31:00 +0000
commit22d7cbd2aab86683df06cf797a4181139528af95 (patch)
tree9a8316fed781286d45f8e42a70fc4c12fcd501d5 /dev-python/pytest
parentRe-order patch so the source files get patched first. (diff)
downloadhistorical-22d7cbd2aab86683df06cf797a4181139528af95.tar.gz
historical-22d7cbd2aab86683df06cf797a4181139528af95.tar.bz2
historical-22d7cbd2aab86683df06cf797a4181139528af95.zip
Drop unnecessary revbump.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-python/pytest')
-rw-r--r--dev-python/pytest/ChangeLog5
-rw-r--r--dev-python/pytest/Manifest9
-rw-r--r--dev-python/pytest/pytest-2.3.4-r1.ebuild51
3 files changed, 8 insertions, 57 deletions
diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index a685579b3349..5cdb58142bd7 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,9 @@
# 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.60 2013/04/04 18:24:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.61 2013/04/04 18:30:58 floppym Exp $
+
+ 04 Apr 2013; Mike Gilbert <floppym@gentoo.org> -pytest-2.3.4-r1.ebuild:
+ Drop unnecessary revbump.
04 Apr 2013; Mike Gilbert <floppym@gentoo.org>
files/pytest-2.3.4-unicode.patch, pytest-2.3.4-r1.ebuild:
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 35c6d3ab03f3..c675bbc0f83e 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -18,14 +18,13 @@ 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-r1.ebuild 1552 SHA256 158917724d0b4b2ddfc914b99fb8ecb2ab8e9101a6aff55e4a45a541e52e59c7 SHA512 e6bd99d6520462a98ba6a23d258ea633506d3c5241176076c9d0db06847ec2a6dc5afb3639cd630eadf196b3c9d2c0e1f391504e5450da4a21921c08a93a65b1 WHIRLPOOL 07c7a832a5335a2a40e498876fb8c40a009b522efa2b9dba38a1305e0944eb5c39942fa83a7507c7a133c2f7c244787974305b2fadaee24b451dc799ff0dbcbd
EBUILD pytest-2.3.4.ebuild 1567 SHA256 a93d6e3b82b8852ae4bbd6ebe9584549cfea851885e63fd91644cd3a4dddb3aa SHA512 f3352fc0b8d503ecb02fe8dcb4d0113e54ebc43c5312136d601527d7e9ec26c0f765dd69d91b08100e140c5c684cf8c247231f3580bfdfe57cf3d4bec19b094a WHIRLPOOL 247a34d28504ddf49a4b37714d1e427c16d1009c70357f8a523f9201da4aa171cca8b4ca810d8026d4e0383c1dc4db8a5399b1b8fbfc2ecba33535669e30c2dc
-MISC ChangeLog 7784 SHA256 d928e80d373f192923fdf02ba716ad58ea28462a5c1015ce05d8988195bba482 SHA512 08ce906548140fb0e6445b4f301a0bdd22cd2efb199cfc6af1d10f92f43ab89bf4a04b9bdff5fc1b19863be5ed4a67fa48397f68033364eb81dd1313026933d4 WHIRLPOOL fa6db6ea168a0981c04292098e7950681e00d11d2dba3dc14e7cad00f569f45ad213b4d645d0ba49e8a8eb8cb02835b5c638f1d3fe20460e1f4b44e9daa76871
+MISC ChangeLog 7887 SHA256 ca5d5eb0aaea5f30e068fdb53ade7f77f806a412fcb7cbcf71dae6a465a660a0 SHA512 bda40ad316ed41d8d54c552f27c2c9dca919613d643b2de2978ce942db77ed9c13a3c33a1128ea3deb235129fa3a501dab50bf3ceea42af82eb6a45c1c1f9fdd WHIRLPOOL 3ee3aa39bbc76066719ff357e1df2f87e8823943469ca358700a178cfd1356a75b5d5223de2b1c9d526c778c2924065e6ff6dfba00ff7a7e4c9e83d4eefa47cd
MISC metadata.xml 229 SHA256 d84d28d5adf361bcc2b76c4b2c47920c5b06472add64c47c790522f180f93dce SHA512 9ad7198911f7c6318bcca718f8ab1d436ea14df3edefab5d5b20e36f9ab2c06f3d7d1d3a89ace9b6485b36a93bae88db28d443f51a375c8c2b8f4fe750657139 WHIRLPOOL 0aa5c9b1a9e5f07dfff7cd90a8ecb9ba54820d13261b822a8978492ff3a22369d27cafae2f772f76aac0f55f42e4b636b7c5190677eb6404be6002782ee79925
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlFdxWMACgkQC77qH+pIQ6QfgwD/S+Du7f5RzaWyNLn4lLaYsEjb
-/2dQwxPMfb2PlUCxuy4A/31AvdryZ6XChSiDTHXLiCX+S9ta3w4Xj98TjAoeeN5p
-=HADK
+iF4EAREIAAYFAlFdxuMACgkQC77qH+pIQ6Q03QD8CDBzLFrzg8ruQ4NVQIfMAWX1
+z2XWjekC2xrNq+UHxoYA/1rNizEkm8l0Y07KFZgIotP9+i1OCIsQ+ComTQoLgGjy
+=glje
-----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
deleted file mode 100644
index 28fc05b2fc21..000000000000
--- a/dev-python/pytest/pytest-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.2 2013/04/04 18:24:34 floppym 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}[${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
-
- 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() {
- "${PYTHON}" pytest.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && dohtml -r doc/en/_build/html/
-}