From 6b583f0cadcf91fe8e1e44ec1361ceb562ecf857 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 25 Nov 2014 01:32:57 +0000 Subject: [PATCH] Do not require pypi argparse for python versions which have it in the standard library. Patch by Arfrever. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- dev-python/unittest2/ChangeLog | 7 ++++++- dev-python/unittest2/Manifest | 11 ++++++----- .../files/unittest2-0.8.0-argparse.patch | 15 +++++++++++++++ dev-python/unittest2/unittest2-0.8.0.ebuild | 9 ++++----- 4 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 dev-python/unittest2/files/unittest2-0.8.0-argparse.patch diff --git a/dev-python/unittest2/ChangeLog b/dev-python/unittest2/ChangeLog index 465e9da94462..ef9cf8ced9bb 100644 --- a/dev-python/unittest2/ChangeLog +++ b/dev-python/unittest2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/unittest2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.42 2014/11/25 01:14:30 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.43 2014/11/25 01:32:55 floppym Exp $ + + 25 Nov 2014; Mike Gilbert + +files/unittest2-0.8.0-argparse.patch, unittest2-0.8.0.ebuild: + Do not require pypi argparse for python versions which have it in the standard + library. Patch by Arfrever. *unittest2-0.8.0 (25 Nov 2014) diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest index ba38a63ac3ca..95a6bdf19604 100644 --- a/dev-python/unittest2/Manifest +++ b/dev-python/unittest2/Manifest @@ -1,18 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX unittest2-0.8.0-argparse.patch 511 SHA256 700a8e77139b1fe2edb73bed1e55a2bcb0c6472067248889a10feba1956cd82c SHA512 5b6d2a49b301df2269ffe14fc58b416ea47f4d78ff2706a8be59386ae75777283189e228c70a2fe399449a8e6b3ef23d7491f488af3632191568037ae6776a06 WHIRLPOOL 6ba0777ee0777d24fe696bd067fcb2b66764ba0fea717834dd335f4292bd78f684131d0003004061b85e97ce2ceb0d48130f334f3a608271625d225b59dc1c7e DIST unittest2-0.5.1.tar.gz 62470 SHA256 aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71 SHA512 3979d94fd4e1038ec134dd2342d614766383177eadd0cc3c38b964528157fbbe466800d1a7422cf647500784af8e0c2caa750a364a33c9f761dca37d7bbb598f WHIRLPOOL d66d0b37c1646280e81035fde287f14c042fb2820434b27490aca49b265340ec76636315bfc9aa413a4c1f2d3be90a9e86da54f1149425ef09f7366d295f50b4 DIST unittest2-0.8.0.tar.gz 78312 SHA256 bb00b9c261cf3fa6b84cc3e6c3a39edf74b3140345b3f677907635a2738a7e2a SHA512 f5e3083e236ff5ad2b3149a5d31e1a0ed20e0bd3283eacec0c5d12c143afb60a92163a27c25424348872db7fcfa11d4230af468a0e67a41cb32ed9dcd5566607 WHIRLPOOL c35b23f967b30864417be11b75c29a1cb93126eb09096cc3366b4a32970af2b09e97ddd15ee32f12f6773aa9bedc89e64491516dd1f759bb35d760a18db217ff DIST unittest2py3k-0.5.1.tar.gz 55493 SHA256 78249c5f1ac508a34d9d131d43a89d77bf154186f3ea5f7a6b993d3f3535d403 SHA512 d56a416355abd905f22f5bdceab8305f8f2e28b17dd1250d4c2ab637e20745836a8bc0c8ba1356122b355ba6ad43c9a7b4284699a8b54fe6d8612b9c4565be2b WHIRLPOOL 526ae793735aa5c5eaa490d3a5fbd2a11ffe9e83d22fd246dd165891c4f03733484e3bb38b68d07ec12379298f19b358181feb2ef584db9e421ed6dcbfc367cd EBUILD unittest2-0.5.1-r1.ebuild 1634 SHA256 576d37bab203098648baa55e98da376f5d72e59a45bae9a58f5ea2282d92e769 SHA512 d6665bf9b018f400e55f4954209b822e109e4973803e18475c362724aa42477ca59992ffbb32055dd85db7786b771e5be833bd488dc35cfa45d247b926cf8a02 WHIRLPOOL 2d09a01f56c04e4940d9a9ecde328ad50d804e5070ba1cd02229ba1a234a3dc0058ef69ffcfef05c24673750fa6c2b7005597b4e914129311a05890f89762f06 EBUILD unittest2-0.5.1-r2.ebuild 1833 SHA256 ce2203f5aa20c56645e0c6dcb5b35a86ef729a50bf6b7f964120366af104aa57 SHA512 59bf0835433f5280af797938a44cf49e70d44cf11853635f6354436d6c072e41f98bae3a1c25ba834189d4d4a00d301cc8064caa17e45a160063afae0f2ed8ff WHIRLPOOL 5abdbec86120eb754381ad9a415761b836740afc0e200f65b6474f62e420648c3e23089a3b1013540430b79af58b9bcb68653406e840640f99af10b7762fd886 -EBUILD unittest2-0.8.0.ebuild 1005 SHA256 1fccce27f8c1fe59f32ec5147c69e727756b3c7b14cae5b2e0d0475ba104001d SHA512 94069e5e48e82eb5ea8f4961d372526cbaf75e3fa8932c839f8e3f2e79be706c2757914b666aeccc943afd6070e8028c14b86be377dfcda906f82ec74ec1b20e WHIRLPOOL 2f2295b60f3137850aa00a30f1c82c7c0c2dc63e2841cf362e45cc11e94530cf4416ba8fea326dc069bf481e18cf7dda67146dbd66853cf65eec2f073fd6f9c5 -MISC ChangeLog 5489 SHA256 a9703fad4d53322a16b97580db5c3cffc7f1a09c5134d9ea6c5a689d086c8c11 SHA512 042deea21184bc4b97b43e7151d1938bce63b154327aacfffac9d0c09338217417d465c4f07e302f2d7bbe8b2374cbe583acb1e904a641da10e7e71e424f057b WHIRLPOOL caad925e81f8e38cb28fa1d93112ae5ae34827149bb7aa7f745354a1895cad00e6e4d0a8e9f1e130ed480ef47218533344f4cf1f5086cc900f8c26d5bb9ba340 +EBUILD unittest2-0.8.0.ebuild 960 SHA256 f607e974071b7315c8d7c236e5bac730ea01432dca21fb5b74fe75afb4685dad SHA512 79bdedd6857bb871f9acf13d71d3ee84586be8255e15a41526891326a07fdfb736bbf3a020da40f85a4092f9bd0fcab19ca87cc1fb1b30272f77cc82a85aa4e9 WHIRLPOOL 922702f63ae74583b9140afea241eb4ddedfe99bc987e99f4056792e66d04ec64f1eff7020956341402a664364b2ee31617373a46f5418928513e56e223c272f +MISC ChangeLog 5715 SHA256 b555929ba8fc72a6ce19d0786d1a9a08f6b626863d30c7694d2acbdca371eab4 SHA512 a34242c8e991b07773045db327ec0bbaeb3f2e2cdc3b93733f8e36879ecbbcaf2daeb23822a7e0e49745fbbf6bade7b59af3bf5b02a6dae435e26cd15a455eca WHIRLPOOL 99399573b8e2f95f22dd123a9c4ea5f03797b442f5c6b0b2cdbfe1c966c7284d25411837bdb38bc3c9e95d9d7c65abfbbe65dfe697e76127df12d68b219dfabc MISC metadata.xml 232 SHA256 4a79028f179736bb77b3a063b34361732f0b9c13ee8fe972ecef8904bc2119a0 SHA512 d676b7510152db66389f8ee2f36d05ad5957b7ddc74be65b25831dff1a38708b0a9e1b84e6710a83a3a6a7c69d2d2c1939e5f57da94fef6e900063ac04e69ebc WHIRLPOOL 584c77c8d653b036b4962cf263f9766c475b79a9c97aed42e7f78b7500dc08e05ea62beb29fac68103dff9175183eed65473a9df769e34afdc4b7a9499c0f879 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRz1/cACgkQC77qH+pIQ6RpYAD+Muiwo1MVKfKmNAXv4kMuQFXA -cVCPRgJoQe+yau7cDQcBAMLhDo9n6/jLterkd5LIrYkEU9wtbCnchksUshiCSv1w -=VKW1 +iF4EAREIAAYFAlRz3EkACgkQC77qH+pIQ6S1QwD/d+c2T9ogncSSmbnSiqWob0HN +JXtEC0W0Uff+GWBGrZwBAKXK4O9N5edhJSXjI6jvW3nqedgGoHhVKpg/FgNuoRUs +=U8qK -----END PGP SIGNATURE----- diff --git a/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch b/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch new file mode 100644 index 000000000000..4435511c22f7 --- /dev/null +++ b/dev-python/unittest2/files/unittest2-0.8.0-argparse.patch @@ -0,0 +1,15 @@ +argparse is in standard library in Python 2.7 and >=3.2 +https://code.google.com/p/unittest-ext/issues/detail?id=88 +--- a/setup.py ++++ b/setup.py +@@ -57,7 +57,9 @@ + # Both install and setup requires - because we read VERSION from within the + # package, and the package also exports all the APIs. + # six for compat helpers +-REQUIRES = ['argparse', 'six'], ++REQUIRES = ['six'] ++if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 2): ++ REQUIRES.append('argparse') + + params = dict( + name=NAME, diff --git a/dev-python/unittest2/unittest2-0.8.0.ebuild b/dev-python/unittest2/unittest2-0.8.0.ebuild index 5c88f3d88f26..64f8cb3e9606 100644 --- a/dev-python/unittest2/unittest2-0.8.0.ebuild +++ b/dev-python/unittest2/unittest2-0.8.0.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/unittest2/unittest2-0.8.0.ebuild,v 1.1 2014/11/25 01:14:30 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.8.0.ebuild,v 1.2 2014/11/25 01:32:55 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 ) @@ -21,10 +21,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -python_prepare_all() { - sed -i -e /setup_requires/d setup.py || die - distutils-r1_python_prepare_all -} +PATCHES=( + "${FILESDIR}/unittest2-0.8.0-argparse.patch" +) python_test() { "${PYTHON}" -m unittest2 discover || die -- 2.26.2