From e874ef8ee7995924681af8e4da101947802f390c Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Sat, 13 Dec 2014 07:40:50 +0000 Subject: [PATCH] offending test seded out wrt Bug #530388 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/apipkg/ChangeLog | 5 ++++- dev-python/apipkg/Manifest | 10 +++++----- dev-python/apipkg/apipkg-1.2-r1.ebuild | 9 +++++++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dev-python/apipkg/ChangeLog b/dev-python/apipkg/ChangeLog index 4527a2f08266..afa87781391f 100644 --- a/dev-python/apipkg/ChangeLog +++ b/dev-python/apipkg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/apipkg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/ChangeLog,v 1.8 2014/12/13 07:13:13 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/ChangeLog,v 1.9 2014/12/13 07:40:25 idella4 Exp $ + + 13 Dec 2014; Ian Delaney apipkg-1.2-r1.ebuild: + offending test seded out wrt Bug #530388 13 Dec 2014; Ian Delaney -apipkg-1.0.ebuild, -apipkg-1.2.ebuild, apipkg-1.2-r1.ebuild: diff --git a/dev-python/apipkg/Manifest b/dev-python/apipkg/Manifest index 60b325120bd6..b2e457b11a6b 100644 --- a/dev-python/apipkg/Manifest +++ b/dev-python/apipkg/Manifest @@ -2,13 +2,13 @@ Hash: SHA256 DIST apipkg-1.2.zip 12842 SHA256 ea86c4660e83015b6a3faad106cdf5a8d640688a93b84b93e8b64c60815789d4 SHA512 abd00a7c36914b9f79d5a54e1d0facc89fd6673f86d774784cd9a3a0e8e913cf3ef575914bcbbe4d17464b09e8b57d94c761453b2b19466e7dc408f321d22603 WHIRLPOOL 5693c8f1422d96e702eb929c2b3fe3f1a33b7d731ba4f6dced2b42229b941ca87848a31d19c2e79b0ce6fc0db98e24e6c81775c68374ca7f7bed59cf9682d049 -EBUILD apipkg-1.2-r1.ebuild 792 SHA256 4eeefa0f4631c6f4f9064c1e073b244c7aba2c06c2349372db185b1d7be76d47 SHA512 f6723be8622e38843f2f8cee66bc92b10a5b57deafb66ee19051e54700f80a3064f4eb9006d5376da3f2f0e59754d74a72a8729c4ccd6e87900278c453eddc89 WHIRLPOOL 1de3a66facaf783e58bcab7731e4c2c3887f14f4366dcaeb92a6ddf1c70f46a69deb88415bab5dbee0cefac3f541f170ecc807d886b977ed8ced153ffd6a526c -MISC ChangeLog 1503 SHA256 ba6eba6ca664f8e37243686fb3b11749321acc0d008dc4b0e68ae2dff8bb0653 SHA512 ca5315bd5b1c003580425594f6d9c79f62474d92557c5828b3d089a937c1853b982166e3c958cc3689063e9ad785cc3bbb30ffa8812e5525656c41246c4d2d97 WHIRLPOOL a31fb7da3152ca2f1aaf1d9fadb1cb9282a685e673c2ed162e184edce99b5c9edb7590d864558a3d3e0c2dc8d9d70e39e5c1c4c60681c0079a07c21df227734f +EBUILD apipkg-1.2-r1.ebuild 938 SHA256 11b4e0c1dcc684d6f1ae4c9ac4cec92b7831513658b7096fc5ce317fb4935e7d SHA512 93248de78641f460034dd156aa3abcd88b17c63a1584d7207b0bf036e8b9ca04d00a7e8c398d1cc0feaa659019b044b8412e6865ec8062363fd0c80ae71f0daa WHIRLPOOL cca6967c4d0b3af728701a47ac4951333300163521ebeb34b2db4cc482fe15db16b47de6bf52fde3f9f885f56b78911855eed6c83698dcb18493205dcc52bd30 +MISC ChangeLog 1617 SHA256 2d4c88bf9c712f1c8d418b0d35ddd6d52fbc9122b174ea12dfe98b38d84216f9 SHA512 9c77314c463385310fdaeeb7ae09fe5c63486b6beab53d468c76c1fe3e50de1c6b62f388a206e5fbd416ca728aa8f6dd69610d9a57170c07bb820e67facb66af WHIRLPOOL ab7457b3801f2afb6d5ceaeaaed326cfea77a5c868f05e3754f7d7614c2c94bc350beba00bfaf94517ad82583b53ff5131e893b18054122c70a2f14b78a3eb82 MISC metadata.xml 229 SHA256 98f8dff15204a65bed3f529a9659ccc1e23f26613724f4fbc4614a8c4a769f8e SHA512 6545bd0b4283857fe59a3953ab05505b4401059f43be2307e70851c0f99853e40fccc1bc90cea919b01d9474715dea55c68ad94b14b0746ffe488843c1a8bbb8 WHIRLPOOL c8b8743cc8833fc1adb5c508f031e1b48b79b210a116c3758b8985bd99eb22b79196376c2a260908349eb82461c30b3542491ef6d5302c3f9d57b94504054704 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSL5xwACgkQso7CE7gHKw0XGACgkLcWDMLz+8DFPHtb2uATQERQ -nVsAoMZmuw2vi1opxDnzBh5FgMOXqKmU -=uuv+ +iEYEAREIAAYFAlSL7XkACgkQso7CE7gHKw2YhQCfZs9W/0cJr7ANe9QzSjkOWiEt +GyIAoKCe0OD/Mh1SwCIRVa61Qurlv/nY +=+1+5 -----END PGP SIGNATURE----- diff --git a/dev-python/apipkg/apipkg-1.2-r1.ebuild b/dev-python/apipkg/apipkg-1.2-r1.ebuild index 1588bdfc13ad..0a922a5fbd6b 100644 --- a/dev-python/apipkg/apipkg-1.2-r1.ebuild +++ b/dev-python/apipkg/apipkg-1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.4 2014/12/13 07:13:13 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/apipkg/apipkg-1.2-r1.ebuild,v 1.5 2014/12/13 07:40:25 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) @@ -20,8 +20,13 @@ RDEPEND="" DEPEND="app-arch/unzip dev-python/setuptools[${PYTHON_USEDEP}]" -python_test() { +python_prepare_all() { # https://bitbucket.org/hpk42/apipkg/issue/5/test-failure-with-python-34 + sed -e 's:test_initpkg_not_transfers_not_existing_attrs:_&:' -i test_apipkg.py || die + distutils-r1_python_prepare_all +} + +python_test() { # Bug 530388. The test requires patching to match py3.4; trivial. py.test || die "Tests fail under ${EPYTHON}" } -- 2.26.2