diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-08-24 20:46:24 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-08-24 20:46:24 +0000 |
| commit | bc453d6763354285a0ad7689bf1e815ca4f5237f (patch) | |
| tree | 4558410e57f5df55d321d0f76e45c826aea7739e /dev-python/docutils | |
| parent | 0.8.66 version bump. (diff) | |
| download | historical-bc453d6763354285a0ad7689bf1e815ca4f5237f.tar.gz historical-bc453d6763354285a0ad7689bf1e815ca4f5237f.tar.bz2 historical-bc453d6763354285a0ad7689bf1e815ca4f5237f.zip | |
Fix tests when run with python 3. Bug 432546.
Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64
Diffstat (limited to 'dev-python/docutils')
| -rw-r--r-- | dev-python/docutils/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/docutils/Manifest | 10 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.9.1.ebuild | 12 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog index 2ec84ca79e30..b974c187e80b 100644 --- a/dev-python/docutils/ChangeLog +++ b/dev-python/docutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/docutils # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.156 2012/08/24 18:35:06 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.157 2012/08/24 20:46:24 floppym Exp $ + + 24 Aug 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.1.ebuild: + Fix tests when run with python 3. Bug 432546. 24 Aug 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.1.ebuild: Call die if pkg_preinst is not removed on the next bump. diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest index ae88447acb84..023440235ab9 100644 --- a/dev-python/docutils/Manifest +++ b/dev-python/docutils/Manifest @@ -10,14 +10,14 @@ DIST docutils-0.9.1.tar.gz 1541437 SHA256 e89f187dbbc6674f839239c89fec44af9f1880 DIST docutils-0.9.tar.gz 1534138 SHA256 ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245 SHA512 ce015d79093e8fa0e14851c5f122a2c2d38981c82358bb1a9219271af2d12bf3219abbeed362114342ebd5a7173e0bf4a3686987c70bb950c72c2ffa3fed2440 WHIRLPOOL b33d34a5de0adb7e77a3c053b3cd800152e1bcdac1006aac5b7450465844d176a2a7e9b6e41507343bcfc747aba9316f01df661f84555d5a9bc28a42db202320 DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19 EBUILD docutils-0.8.1.ebuild 4480 SHA256 8d1e170b9f201bad7e1e7095a49e0217175cdc296f73a31f0b4783f7fa6a20e8 SHA512 f8a4f0b65dc12fadfeb1ee64ccd126f9b85d847e0e89750fd98d20b28dec1a2de5b185b18f32d0de6842d4d12648b2448723546e606ee37fa6f35c78226f4107 WHIRLPOOL 43e1df34b66f35523edb88cf0f8c9969967621a816ed412e8cb53d0e1dc2896ea0a5c1b11d60be63c9bd5c23cd086890e047c0af4cde98674e8c9f96a20f691a -EBUILD docutils-0.9.1.ebuild 4373 SHA256 48a888f164b50e1c1b9ebc65d03347848d146e1da5e3f8d0e0b1b989797d7a20 SHA512 cf65c65bb72e6aa8e33fafb9f27111f69d088e7ce36f02c3afa9e4aef7aa16c81d9ae3b31d59d9524e7e35296ac077518a9d7f19826ddb160b79f0de4c76826a WHIRLPOOL 7cd7a4ac3627b8642d1b0a8126ade36048213a7d47867567cf45aed488fdc788aa112b27bd2d09102d57f9ad2f9d8c284bba304e324a13a609cf0a8b7488f92a +EBUILD docutils-0.9.1.ebuild 4298 SHA256 0d9444e4f4c1a7b5e0632ca5dcf05f32657d0b83a5db1bde734f705844e51f5b SHA512 60200efa262e56f64306576418492741910e4597f2f291b85f165ff735d0c7d4d4187c9687c3a063f039588a21b69c803607f268c9196fc924650b8380d1890b WHIRLPOOL 3f7037b55d38745a61906a5dc8753e44fa32b4fb16429b382cb1ebf3bc83da3918ba567e00c352cfe2891527753260f6436e37675ed506b7c04a99e9666275d3 EBUILD docutils-0.9.ebuild 4102 SHA256 5d4d5ff38686ed796e7bc467c977ad50875fcf4cc8c5ef37ad0a80e3694652fc SHA512 82980bdf296a45e7237eb306ecf6b31507142d139b5735804b6e2d4185e110589de9f9ea67a6354f21482d7cebbe5f5497d48243483256525ab7b58d084f2308 WHIRLPOOL c7bc98e16c14c33343b4f4fe3e93769d923c86c9d7cb3d86b1072c09617a212558050f40d5251859512451724ed478ba561b5befafd3d3751d7bd45fa1534812 -MISC ChangeLog 22316 SHA256 86e2c74a7feb40a4d77252db3fe04ab7a2de14d9a372cf6fc6cc8f74b82bb2e5 SHA512 70c39e926f5a406e9818b1bbddc828de3f9e8a353a33c81a0156d7de432c07e83afd21c75f248c464a4515fec8bde963dfcb51d4c8980300b8ce51a8cf7a50c1 WHIRLPOOL b093ee27895048445f819191c9efd430d9fc9c70e5d88a39c94e3965204d34378f242ea6af1e67680d626077d39e38ceb1184cce4994126219e5afacfff523e6 +MISC ChangeLog 22437 SHA256 72418e97ca55a733d48ecf68df903a78910a9cbcb54d7260346fa7ad5b192a2f SHA512 399779216b3c35f0a9c170810a83de10a155f071ddcabd96357cddad74808e978a2c8fd61828b6812a39738acb2903dd2a8dfe9eaa95af861922c5f7238daf47 WHIRLPOOL 42a84c4088d0c2da3103afb94c9388d991951569b9939906a71ea12b905ebb29aac94ffc10fcfe0c4a837b6275d12f69a0b91ca4a2eb2b4a463e7591e20e90d1 MISC metadata.xml 224 SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755 SHA512 84a00eb058c5f923404a2ede0df0a2ef9a1b4143a2f7d7b8ddfd5b68c8342dc68e89b5042e603a93b756e8e69cb92a5a32e6aa9ced869d30de1e41c874e080f3 WHIRLPOOL 9392f13e54a9fa3df0396729edecc43709acb478f2d67add1f0b3aeeb16c902fac3d970dcacab9be6ae1094f8700848d790acb260e288440ca80f9be8d0ae0b6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlA3yWAACgkQC77qH+pIQ6T2JwD+MV34HLbIGRUB+ip/uK5be96g -mbVtui6pwq710lLY3vYBAJgGdEcp5mOrHfRtbobKd9DwvXyFnxhK5JaHAuyeIzI5 -=+XV0 +iF4EAREIAAYFAlA36CYACgkQC77qH+pIQ6T3XAD/YMzx8GSM6YH+N0opomezw/Uo +lLQuBDXrOTzXFGIMA2IA/2nSOtIDr/5Dq0AUPsO6KY0t0dozQgr0IMLzuLQFQedI +=TRRb -----END PGP SIGNATURE----- diff --git a/dev-python/docutils/docutils-0.9.1.ebuild b/dev-python/docutils/docutils-0.9.1.ebuild index 6eebdb6114f0..338d6d393917 100644 --- a/dev-python/docutils/docutils-0.9.1.ebuild +++ b/dev-python/docutils/docutils-0.9.1.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/docutils/docutils-0.9.1.ebuild,v 1.3 2012/08/24 18:35:06 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.4 2012/08/24 20:46:24 floppym Exp $ EAPI="4" SUPPORT_PYTHON_ABIS="1" @@ -46,8 +46,14 @@ src_compile() { src_test() { testing() { - echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) - PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) + local testfile + if [[ $(python_get_version --language --major) == 3 ]]; then + testfile=test3/alltests.py + else + testfile=test/alltests.py + fi + echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" } python_execute_function testing } |