add fixes proposed by Arfrever

* RDEPEND and DEPEND on dev-python/setuptools
* drop dependence on dev-python/linecache2
* drop sed (suspect return value) and use patch

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x11A8217C!

4 files changed, 74 insertions, 15 deletions

diff --git a/dev-python/unittest2/ChangeLog b/dev-python/unittest2/ChangeLog
index 84e93a9ce9e4..4fc09d36ed11 100644
--- a/dev-python/unittest2/ChangeLog
+++ b/dev-python/unittest2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/unittest2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.58 2015/04/03 20:54:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.59 2015/04/06 15:19:42 alunduil Exp $
+
+*unittest2-1.0.1-r1 (06 Apr 2015)
+
+  06 Apr 2015; Alex Brandt <alunduil@gentoo.org>
+  +files/remove-argparse-dependence.patch, +unittest2-1.0.1-r1.ebuild:
+  add fixes proposed by Arfrever  * RDEPEND and DEPEND on dev-python/setuptools
+  * drop dependence on dev-python/linecache2 * drop sed (suspect return value)
+  and use patch
 
   03 Apr 2015; Mike Frysinger <vapier@gentoo.org> unittest2-0.5.1-r2.ebuild:
   Mark arm64/s390/sh stable.
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index a86edcbb8fdf..b37ef81c69ae 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remove-argparse-dependence.patch 424 SHA256 dc192f334569d47127a7a1f914c7a8f7d42dd6ac3816bee523cb3de6efab39e3 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7 WHIRLPOOL 0be02f628d34f1322d6271dff050f51d78d9af361b64234f607f5dac15ceb6472678b0f04b6c8e1c22d7e943cdbfbefdadfe5e3e64f22d9c02c74ca2e1eb5748
 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
@@ -9,23 +10,24 @@ DIST unittest2py3k-0.5.1.tar.gz 55493 SHA256 78249c5f1ac508a34d9d131d43a89d77bf1
 EBUILD unittest2-0.5.1-r1.ebuild 1634 SHA256 576d37bab203098648baa55e98da376f5d72e59a45bae9a58f5ea2282d92e769 SHA512 d6665bf9b018f400e55f4954209b822e109e4973803e18475c362724aa42477ca59992ffbb32055dd85db7786b771e5be833bd488dc35cfa45d247b926cf8a02 WHIRLPOOL 2d09a01f56c04e4940d9a9ecde328ad50d804e5070ba1cd02229ba1a234a3dc0058ef69ffcfef05c24673750fa6c2b7005597b4e914129311a05890f89762f06
 EBUILD unittest2-0.5.1-r2.ebuild 1812 SHA256 d886d9e6b3f57b2bf1b10f64892ad5b5584bf1b0375c5ea31560f2a3855ae86a SHA512 b8b0c6d6b4f0aee1f1c2f9be6d32e6d6eda6813fecbd95a468b0d03d2493a53bb0d1258b3e474f7e6a4a0616411139277116a12de907595c3592321bb32fd2f0 WHIRLPOOL 80a6ce4759bafdae5af2e80e82fd6311080ad43b4f8c5ed73e393722beb57cfefd6b39493ebf0806e8bd4a7b06342c1f56d468faa945aefac7b0e74f72a617b1
 EBUILD unittest2-0.8.0.ebuild 964 SHA256 d854dc04de636e79bd2e540822a869267f75960ad3284f74f8c0f4c3a2d115de SHA512 6039b87483ac88692f8e2cf049e292907ceeddcd4a49303b8afb19799cc7d6a1db593fe582362de7aa3398fb90c6f44082dc4ce2420ca7799544682131077fae WHIRLPOOL b635039610ecdd150d7ae212192b5a42e5687bd090efd7bb06fefdc3727b367921da56e55f6a4376c8e2c627685d23466d9f0c22096f4c5759a036fb9b16709d
+EBUILD unittest2-1.0.1-r1.ebuild 947 SHA256 ac50d9d4ac2870feddbb5308741393190ff672b3f5701333d77db3cf05f81eb7 SHA512 1fa7e2019885c22176163b82f3f0d2ae9b71038c32d42b5fa5185a928955df16efa3b5c6ae8a00b63d0e4caf10811bf23f84e63e04fd55e3959e753df5e2a5b0 WHIRLPOOL d1a83706212a3653af1d8941fcf12f8699f612b7d29f47506cca9d0a4404905e4cdc6f908789ecac7cae2605e27fb4e2b237c9cfa30c73cc63e798164c7497e9
 EBUILD unittest2-1.0.1.ebuild 1054 SHA256 f0cc945cb049a881c37cc543cc307a6a103e9a9d25f3cc0dba3fd27e60ddc495 SHA512 03d6a73da14d0555941df04f6c1beed4424439fdbb01bd10cfcd6ee20607dd248d6653d87f3d3bd339fe7e673bf94d7fe14ab14f5c5ce57c4c37f023d2b3b39d WHIRLPOOL 0573a8a675d30a21a0aa11dbcddef356c490e86308f3f0341c7155ec7b3cccd20b3fe303b827bb176dd9524533b1b12ad0ee49352291743bca7e36e48b48abe1
-MISC ChangeLog 7353 SHA256 ee60df7b2827a8e7e009e9e9967ae21ec41a4343bca4315055e28956d8afd9b9 SHA512 68e5201fd7b6c86360715f8e3dbfb484ffe45aa7947c0e2fe2cd93c5039716b33e57f1b54845cee2786465a9acfbb55b4f1baf5c0c0ce609300ca9fa1db0bfc3 WHIRLPOOL d5907fbadfa0836adddcd03984fe04b3098768308dcf3fa0d5dbf7a3ef261183b19be9423f97099b95e54ae363dab3acf733e98fb8577e5eb8dc05aef5effbf8
+MISC ChangeLog 7686 SHA256 3a362e2689545008cd44c2ae075497b8fbba6e0f85dd8d232118087e01589347 SHA512 8d82678f9e35d0428bd671377657cd8674ba72464f99739c7e3c3cf548c961929bfeb6459e68f545d0bcb6a3f10117cddc04edb30c2e2fb883424cf89b889fd9 WHIRLPOOL 7ec97c90a6b402f3516e28698f7f26df0efa3f87bd346fbda758c1afcff2805ccf925f155ace6a730d9a8d417ebb6055fbf235253786cb8e6a620a4325ef9ee2
 MISC metadata.xml 232 SHA256 4a79028f179736bb77b3a063b34361732f0b9c13ee8fe972ecef8904bc2119a0 SHA512 d676b7510152db66389f8ee2f36d05ad5957b7ddc74be65b25831dff1a38708b0a9e1b84e6710a83a3a6a7c69d2d2c1939e5f57da94fef6e900063ac04e69ebc WHIRLPOOL 584c77c8d653b036b4962cf263f9766c475b79a9c97aed42e7f78b7500dc08e05ea62beb29fac68103dff9175183eed65473a9df769e34afdc4b7a9499c0f879
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVHv34AAoJEPGu1DbS6WIAwpQP/0jUKf1sHfrFSjlBKrdLC5Kk
-LjDWf1bVfRlx28EcY3JXOp7eBZPhGvXIAOUuIra2cm+QDOJn06/0FnbX77owX+rA
-TWycW772BKa7lHzyV2anSxWkR8BHcbZnDRcr/ST23QHMSIRQh+85W83ynWaUcCwy
-tTlErxVLB/IjfiGdr5UDZebOhoLyMSojBGYZp2u38b8hWIsPJXe3mDCSzT1Mgh5e
-llsFoEbvCVnKssvfFw627iVQ4ijmbJGLhIYEeOOQ995dB52uomywdDo/NVsWy6Vw
-MPMoDL20mn16N7Nq1Nr+oaO9K7xOEh+I8EKBTQ54DBrfxxAHAHKPqnGgcMx8R6Dn
-WaAySPFjVe4MjSStKg/zuOH418LmXpL3UDdIzzCnJgLX60xAwKeQUOACCp9GAg/l
-ES9MNWW9qXh5KXTV8dWQJfH5X2Tww+gBtn5VtEnyo/MYkR7sxrH+VM+ovB2Ogc56
-sfoHPvwZOXzAw0ohEfLUvgN+WYhNT123IPSg8zeonK1vEPEXWvARwzpWAZfGVUyr
-BFzqDD5a0g6A0HR64qKmTUahhijykYMoeuT+2WlyqjPp9wd9ADbYrmuxCZRLUmNs
-meveCso7CMYxcN3guEinIERg9K7O7SCDPBT7MVvNPbob08tYwIsYHKFlPrMJuvpH
-yMnRBMLzc/rV/8PTofps
-=vk2f
+iQIcBAEBCAAGBQJVIqQPAAoJECZUyt4RqCF8C78P/iYjv7z3uB4ahFFLnVsj84h2
+F/2HiuVj55BKcDNjgz3PyZq2U9dQ3MeIUVA6RjvGcSk6P/qn8hgCRb7NqnLve5WQ
+n5uVGtHTKPKlKNqnRAlYqVW1RMYIpeUyaVtPvQ9XqlWnw3qEGHUORZdMISTmDave
+XWqU9ZNeTb6ZjHh+EATjV/TJQW4uEgMA25kd5usLpEoP64Puyq3ywPDvbKecJKSf
+uGxMbujzWkNj17rUZdz/GSh/za676+yaSrilxTCHG+Zho/y19sbCEn90zjbrPKTt
+J7ZG0daDdagdBOSiGzQq/bKwFBGdDZskzeIyUwMMUzYccuMSopP630zW58EpasgM
+vsRHm7sEbhXA7wNZMep/mju3mprETUdNro+0RvjsXGA6UcVlszpF/tbYCnRDlMGp
+7Y8nAYP0BV+ysS03eWL7++MjPctcl1qDwIOVgYZyjQopTCG7f3yyCpZUugdMFYuM
+gHgD0J2EqFd0CVvSCxxqnF/vQLaj9ZAprqFpmMm5Kt6otP3L9KJ1hlmXkYchSyio
+vr4pC1xFrNtM0RT5xOXx6RnW+o0IqauOe2aR/lG+NtpZ+uNZ1lMZVAFPFN6iktdK
+Rn/47pBlAKrbLsf89m6Blw3ATbrwviNfJlXD8hhIl+cronEC/dk3WM97mqd+av2u
++cLbjqjcFT7qoE/Sh7B/
+=G+7Z
 -----END PGP SIGNATURE-----
diff --git a/dev-python/unittest2/files/remove-argparse-dependence.patch b/dev-python/unittest2/files/remove-argparse-dependence.patch
new file mode 100644
index 000000000000..36f89fc5f8f6
--- /dev/null
+++ b/dev-python/unittest2/files/remove-argparse-dependence.patch
@@ -0,0 +1,12 @@
+diff -r 8928fb47c3a9 setup.py
+--- a/setup.py	Thu Mar 12 15:55:36 2015 +1300
++++ b/setup.py	Sun Apr 05 09:06:44 2015 -0500
+@@ -57,7 +57,7 @@
+ # 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>=1.4', 'traceback2'],
++REQUIRES = ['six>=1.4', 'traceback2'],
+ 
+ params = dict(
+     name=NAME,
diff --git a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..3adb52e53df9
--- /dev/null
+++ b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-1.0.1-r1.ebuild,v 1.1 2015/04/06 15:19:42 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
+HOMEPAGE="http://pypi.python.org/pypi/unittest2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa"
+IUSE=""
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/remove-argparse-dependence.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}