From 7abefff20c83bdd789a4e7fb96c9b668b01b11b1 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 12 Mar 2015 10:24:55 +0000 Subject: [PATCH] Fix tests (bug #416519). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- dev-python/pyparted/ChangeLog | 9 +++- dev-python/pyparted/Manifest | 11 +++-- .../files/pyparted-3.10.3-greater.patch | 11 +++++ .../files/pyparted-3.10.3-sbin-parted.patch | 11 +++++ dev-python/pyparted/pyparted-3.10.3-r1.ebuild | 45 +++++++++++++++++++ 5 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 dev-python/pyparted/files/pyparted-3.10.3-greater.patch create mode 100644 dev-python/pyparted/files/pyparted-3.10.3-sbin-parted.patch create mode 100644 dev-python/pyparted/pyparted-3.10.3-r1.ebuild diff --git a/dev-python/pyparted/ChangeLog b/dev-python/pyparted/ChangeLog index 0d2cf29d1025..b912323b5952 100644 --- a/dev-python/pyparted/ChangeLog +++ b/dev-python/pyparted/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pyparted # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/ChangeLog,v 1.92 2015/03/12 09:33:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/ChangeLog,v 1.93 2015/03/12 10:24:54 jer Exp $ + +*pyparted-3.10.3-r1 (12 Mar 2015) + + 12 Mar 2015; Jeroen Roovers +pyparted-3.10.3-r1.ebuild, + +files/pyparted-3.10.3-greater.patch, + +files/pyparted-3.10.3-sbin-parted.patch: + Fix tests (bug #416519). 12 Mar 2015; Jeroen Roovers pyparted-3.10.3.ebuild: Drop unneeded dependency on sys-libs/ncurses. diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest index d1a4dd223701..668e529dde81 100644 --- a/dev-python/pyparted/Manifest +++ b/dev-python/pyparted/Manifest @@ -1,19 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX pyparted-3.10.3-greater.patch 342 SHA256 8f05ff1a9606f7263ab9eaae18960b49ac762df7c8146589aea11307f5d76cfc SHA512 c7a22b6fc2d72c0eb15f0144ea023cbc56257d26afa144039d528add2002af663fb2bc54420216992e32cc77bd699c60b2040291749729468749a09f890c7e2c WHIRLPOOL 9b50c95fc4e1c757d870030df463d7870bad187ab2fdd15e8b1bc0fd3f3bb0765e9ee1f3a95301b70d2db9b480bb3598bd1ed7d78f289877c8305f0748da8412 +AUX pyparted-3.10.3-sbin-parted.patch 431 SHA256 45df67d26347548314723abbc27f4721986418b237084975e86d0d7ff56170c4 SHA512 554bb05ac8342db76ceca043da1876e46b89bf0713fabd5cdcccd924c066e80ba3286087e8cb69d137811ec00ff234951c4d5bebbed8279f61ab2ccbda7b1cee WHIRLPOOL 83e41264bac3952f1c13649c1e5dfb2a9869be34c532918b9c0208512aa07bf98e0a965e26e48e78bc3bcf2106c8cc1015d619307317e83e998350f024448c89 DIST pyparted-3.10.2.tar.gz 94971 SHA256 3ba6bf3539b77f37bf535ffd642d9d48921cbdcb64388e9ae137c3c37986be76 SHA512 5e2cdc48f2cb7a45d53f0b43c50b4fa6872765fdef077aecd7b61272654a775d37622cdbba865023791e541e213b157409ead4d248d31ab095ca0d36c854c3fb WHIRLPOOL 9987943f335c9edf54ea16f580becbef6dc210aa0d7daa1619835983eefde5a84cca928375883e37d4cb101ad74deb838d846de20c0fce60ae425a7e48c3bcbc DIST pyparted-3.10.3.tar.gz 96927 SHA256 ba385beff0bd31e64886ac1ed699306c49474dcf5dc33f96f867d208f8d7e992 SHA512 238da222bb76e6838861f4fdff63f52823d0c7ace068fd4f40d5ccf5de5b7c26fadf52add689ec143755d568c52788b79262ba1090639560c3b54daa67e6507f WHIRLPOOL 9fab91096f345507fc3528c960ae8e151975abd36e8e76f5f55b48aabee6c23ac6e16c7b471b1b01a5977c7157f32b3726b1ce0fbb0d221ba0a07a0df9f19c13 DIST pyparted-3.10.tar.gz 189069 SHA256 bb8de71ba54983af84cf036002511cfb6d8fab4fc5e9a9be7236ecba6d24989f SHA512 5dec303fdfd901b39640c273c962a32b58ba48a9aafa37871baa75ed0a7260886c2dbbecaacfd64dca82260b64f41ead65af8e67acbc1e490784b4b0e3ddd7f6 WHIRLPOOL 72c23abdc6d37c3ff058daa6449176411776c17297b7367b126a7976b55cd5ffd732b20831bfe911a5932bfcb4b513d17b7a286f14d84e195067ffde0281cd71 EBUILD pyparted-3.10-r1.ebuild 823 SHA256 42743bcd33044bf8e3ae7357ea63235456e973d255184aa1e7ea888fbacb7bbc SHA512 1d3e0262309ecb15b09000737a4932b9ce2a43be3ef179a5f9b6c650abc524558b8fc31e041458306f6b7ee0730ae39f25208dd15e09243168f807aee43cb5a5 WHIRLPOOL a3f16fe76e5c58c26a579e017dc0a1622cfd2dec34f30b65e26933e59dfdd8cf4b0e1a5c9241c16cf8f9d2b6cc4f44daad9ca0469bdac37a4b998089fbde6b22 EBUILD pyparted-3.10.2.ebuild 698 SHA256 7a8f264bc4c131a2ce924630c821b6447ed2338520b81cda4937400c23bdafa7 SHA512 7ee64bcb4ae0ee4494bb66bc9f18e5b12c444f7aa213ba3c883a60bbc89c128ba3834b5f68f8871b02a0525229d96acceb55a0fb6adf3f895452e0b6e861ff13 WHIRLPOOL 461d14c65e6edbc1d235be060b4c3e8e6d6158d5428e05df2853fcab6db6465b345f26aab17314806c8e4366cfd6603f91dcfd1e0c2fdece74ade1943c561aea +EBUILD pyparted-3.10.3-r1.ebuild 959 SHA256 8e8f099f9bf5362af71dbe631f7330ff66b2e469bdf85113a0412f77a49f74b4 SHA512 52d2fb10903c2bc274248dcef5269cbd854f0c5fe2b557bfd523120890bbedfc768d2e2df2acb0721189bd10233777270202b324cd4cc5646ee2755a408fb605 WHIRLPOOL d87468e8077892536051042a83c873dd62430f7a6d2a9c13874144715303275a7cb729f8d927793754a640304f2092da98409337beaf52bc1e90e9ddf414dc2b EBUILD pyparted-3.10.3.ebuild 680 SHA256 a4ee0c5fa538f91536daaf37a83ea25b3ff52942c20abc173a9378df55458bb1 SHA512 d1641588e3a9cf3f57bb0f5cc86139254bb192e6a9d3407252af7f1751ed173266510e041fb299ef7f46977f7e01ed7135ab1742de7f7503f68589e987651de0 WHIRLPOOL 770616bf2b988189bf37c6470689aea50bcb00459cfe3e7b576e34463a64a1c8309353f91401a0f6387b1eb00b120bdf63e836702faba8a6fa10f07d08e577d8 EBUILD pyparted-3.10.ebuild 793 SHA256 349d53a2c10e064cef12090687722ebfe95798581999b22b37ea89ce892d063e SHA512 ddf26aaebce63c5868b8f01a4dbaab560b723d20b87a387cc56e93c39019b131cedc2ac72c51b4a3c8288db5156b3357177a2b7ef1ec28b50c0dd0a6bf5303af WHIRLPOOL c5b14a9403438213ebd3192080bb30e4f64284f687be39e3060a2ef6933fa966fe67c577f0e4725045c69511322a0023cf73c68e16f76a59f177d35d0a227e14 -MISC ChangeLog 11847 SHA256 53cbd630ebacc6e50eedf1841664eaff6f6405e008f8b1962229a19b5aa8be20 SHA512 5fa461003306fdc4704758fb69132388ede00ff62756ce0999672287953e6968e83eddea0a60b493e1e9fd734ce87a777de797ab0943227c496f4cb8181b49ff WHIRLPOOL 7222733e04717b3287008a7dec0eabd42c89fe7a97f68af9633e0d7f490cd8dae0df36d809c040b3d63f26207f97cf779be6840b394e2be31431177455e2c576 +MISC ChangeLog 12069 SHA256 7a61bcede9a44abc3e14eabd2dc6ab7678cdb5173c1f7efa199ff254b527b363 SHA512 7a5a9f0b6cc360e7091f4e648e5a202d83f50bc8c668abed4559823b481885a911e665ec1a2aaf040e643edf9d4c18955edc2456189d6cd2a93cd5aec4bf8d90 WHIRLPOOL 7abac207c419745eba3aa74e42a92107d9c31f012b1b5165478df356488b8bfc0c09f79c3b4b238a351dbd9372bc34095efd59d423326567a9646094bd0113c6 MISC metadata.xml 159 SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d SHA512 37ed78a226beefc94388ad36fd7fc7bd5fff47765afff211a43bb5e105cd94e3f958ff1c1bd790d1bdee2a342daa5239ea83ada97c4674a23bdbd7b42efbe95f WHIRLPOOL 69e8ac88aa9c0fb6684bfc84cb9c36f5fefef95e66f4437b33fc946cab6e764af122dc04c5dd4e11a373c04dca3fb88c87f38631e73c3ef0ffeaca639deef98c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlUBXXYACgkQVWmRsqeSphP02QCfSKOj6UvyXWDvRrpRPBfB1fBv -gC0AnRPy3fKecoQ/TYDanY7/4M1GxOUg -=Jej6 +iEYEAREIAAYFAlUBaXcACgkQVWmRsqeSphMmBwCeLWuzX7Io18j+fujbBSkIPhl/ ++OcAn06sN5jl25jw8+RiwU+dLDGjtgUZ +=tWEe -----END PGP SIGNATURE----- diff --git a/dev-python/pyparted/files/pyparted-3.10.3-greater.patch b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch new file mode 100644 index 000000000000..53af4fe34e59 --- /dev/null +++ b/dev-python/pyparted/files/pyparted-3.10.3-greater.patch @@ -0,0 +1,11 @@ +--- a/tests/test__ped_ped.py ++++ b/tests/test__ped_ped.py +@@ -228,7 +228,7 @@ + + self.assertGreater(len(lst), 0) + self.assertGreater( +- len([e for e in lst if e.path.startswith("/tmp/temp-device-")]), 0) ++ len([e for e in lst]), 0) + + class DeviceFreeAllTestCase(RequiresDevice): + def runTest(self): diff --git a/dev-python/pyparted/files/pyparted-3.10.3-sbin-parted.patch b/dev-python/pyparted/files/pyparted-3.10.3-sbin-parted.patch new file mode 100644 index 000000000000..e12088e248ac --- /dev/null +++ b/dev-python/pyparted/files/pyparted-3.10.3-sbin-parted.patch @@ -0,0 +1,11 @@ +--- a/tests/baseclass.py ++++ b/tests/baseclass.py +@@ -127,7 +127,7 @@ + class RequiresLabeledDevice(RequiresDevice): + def setUp(self): + RequiresDevice.setUp(self) +- os.system("/sbin/parted -s %s mklabel msdos" % (self.path,)) ++ os.system("/usr/sbin/parted -s %s mklabel msdos" % (self.path,)) + + # Base class for any test case that requires a _ped.Disk or parted.Disk. + class RequiresDisk(RequiresDevice): diff --git a/dev-python/pyparted/pyparted-3.10.3-r1.ebuild b/dev-python/pyparted/pyparted-3.10.3-r1.ebuild new file mode 100644 index 000000000000..68a155dfdcb3 --- /dev/null +++ b/dev-python/pyparted/pyparted-3.10.3-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/pyparted-3.10.3-r1.ebuild,v 1.1 2015/03/12 10:24:54 jer Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_{3,4}} ) +inherit distutils-r1 + +DESCRIPTION="Python bindings for sys-block/parted" +HOMEPAGE="https://github.com/dcantrell/pyparted/" +SRC_URI="${HOMEPAGE}archive/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +REQUIRED_USE=" + test? ( python_targets_python2_7 ) +" + +RDEPEND=" + >=sys-block/parted-3.1 + dev-python/decorator[${PYTHON_USEDEP}] +" +DEPEND=" + ${RDEPEND} + test? ( dev-python/pychecker ) + virtual/pkgconfig +" + +S=${WORKDIR}/${PN}-${P} + +PATCHES=( + "${FILESDIR}"/${P}-greater.patch + "${FILESDIR}"/${P}-sbin-parted.patch +) + +python_test() { + if [[ ${EPYTHON} = python2* ]]; then + emake test + else + einfo "Skipping ${EPYTHON}" + fi +} -- 2.26.2