Fix not applying anti-versioning patch for py3 & py3.3 test failure (bug #450762). Drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 92 insertions, 65 deletions

diff --git a/dev-python/unittest2/ChangeLog b/dev-python/unittest2/ChangeLog
index b0f34406dd9f..c2a605c024b5 100644
--- a/dev-python/unittest2/ChangeLog
+++ b/dev-python/unittest2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/unittest2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.36 2013/09/05 18:45:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/ChangeLog,v 1.37 2013/10/05 14:51:33 mgorny Exp $
+
+*unittest2-0.5.1-r2 (05 Oct 2013)
+
+  05 Oct 2013; Michał Górny <mgorny@gentoo.org> +unittest2-0.5.1-r2.ebuild,
+  -unittest2-0.5.1.ebuild:
+  Fix not applying anti-versioning patch for py3 & py3.3 test failure (bug
+  #450762). Drop old.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> unittest2-0.5.1-r1.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index 51033439acef..095431acc317 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 DIST unittest2-0.5.1.tar.gz 62470 SHA256 aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71 SHA512 3979d94fd4e1038ec134dd2342d614766383177eadd0cc3c38b964528157fbbe466800d1a7422cf647500784af8e0c2caa750a364a33c9f761dca37d7bbb598f WHIRLPOOL d66d0b37c1646280e81035fde287f14c042fb2820434b27490aca49b265340ec76636315bfc9aa413a4c1f2d3be90a9e86da54f1149425ef09f7366d295f50b4
 DIST unittest2py3k-0.5.1.tar.gz 55493 SHA256 78249c5f1ac508a34d9d131d43a89d77bf154186f3ea5f7a6b993d3f3535d403 SHA512 d56a416355abd905f22f5bdceab8305f8f2e28b17dd1250d4c2ab637e20745836a8bc0c8ba1356122b355ba6ad43c9a7b4284699a8b54fe6d8612b9c4565be2b WHIRLPOOL 526ae793735aa5c5eaa490d3a5fbd2a11ffe9e83d22fd246dd165891c4f03733484e3bb38b68d07ec12379298f19b358181feb2ef584db9e421ed6dcbfc367cd
 EBUILD unittest2-0.5.1-r1.ebuild 1629 SHA256 adab1a0853dada4ee099e7f232fa6c766e661f3070e897b0bb73df810f4203fa SHA512 dd4cfbbab5883e2fd783df456a1f7f8c0b207e76b5eae081d31548fb2ce7cc881a82d99ca55205b97582b2613276a944f1bcc21d76e506e5b80af55aa0ae9014 WHIRLPOOL 24c3fc4c57c81683856505cc5fea46110a530628304ca32d96f34b8f9f6f5d5683666f626576c0fa4ae2080ccd0e2bac6d82ff011a7f81125fcf8b3e34d116d5
-EBUILD unittest2-0.5.1.ebuild 1523 SHA256 9a408ac145edf55e127b7bdb4bfbec21063b80aee8578f90af50968670f0b526 SHA512 02a84be01a982f98d5e1595a5c5f23942eb9cd79b261d65126fed3ac97e10dceec249d516e915a59b8cb5f24129ffbdc20b4a4e51c141da144e0f42bab738ce0 WHIRLPOOL 3afa6b1a6cc8fbb807e4c56112ca2c34777e3ad917fa867dddf17d6b19af6f62ffec2c883bfb81ff0cd895e1291debef610fae0255fa7e03cfb9b40558b3929c
-MISC ChangeLog 4685 SHA256 b96b07e5680dd758bec84fa5c6e3e22514ec9ff8aa062e6ace2c32a8fbcd605c SHA512 8b7f0595ce8d95449296bf9118ccf52effecfc0733cd4b8c84ced529390207903d20030e331858847f105f0271146909b1337a1e13f2a8ffa0e9c0565d733910 WHIRLPOOL e4acf71b993e93727c1dc192c64db3a1e67f28974f6a1caf0243baec40e2f5986a8b5be60b7af74d5e069f114d2a8b3a07da31c71c2b1f3a0c3edd2253a193d6
+EBUILD unittest2-0.5.1-r2.ebuild 1807 SHA256 9d96c5760836a2c5f8e9f936f0bb3632b221e0de44e15491a7e116542740c2c9 SHA512 32a6adfa78d8bc793e5ec2aa6c411321fab698515d1ebaa55732c1dc84bf2e01e290a860f23753953214178884b9de6d64d8237335d864ea0d7eb39000cb441e WHIRLPOOL ac9a012dfa0610ce15a0cb3618f6199dd2fae7c806260c8ea4e1c076f195ee6b39b3d274faa9d0d92e9a0187958d2365d224b55b14166c99c78ec7806fdeb260
+MISC ChangeLog 4923 SHA256 838b62fcc5dd44751f0bfba90bd0ab2a3753cf9b029d5473b0e96d68ed63f930 SHA512 4016bb1a5511fc1781bda3b098b7daae259bc29bf711df063e37c301d2648cbbefc2b446ed24e5e5957ddce95aead4c5fdd5480ae91bc8371c9b85aeb33f3667 WHIRLPOOL e3fe7da19cad273f7a5f87f06ac6b6e0867ff0e291e55df86c476762955acfaff99a13674181e1a38b5d04ebc006258c4d65e11ca175c6e5de3fbda47244cdc3
 MISC metadata.xml 232 SHA256 4a79028f179736bb77b3a063b34361732f0b9c13ee8fe972ecef8904bc2119a0 SHA512 d676b7510152db66389f8ee2f36d05ad5957b7ddc74be65b25831dff1a38708b0a9e1b84e6710a83a3a6a7c69d2d2c1939e5f57da94fef6e900063ac04e69ebc WHIRLPOOL 584c77c8d653b036b4962cf263f9766c475b79a9c97aed42e7f78b7500dc08e05ea62beb29fac68103dff9175183eed65473a9df769e34afdc4b7a9499c0f879
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNKuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSUCd8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOMo4QANrMZsZDcn6SHEz3sneKykMb
-YziU75FtRWDBybbzBatBN1JrecWvQJATi7xWczdUdvz7DR6JQU4K4KqwO1uSh3MR
-MbAHQQJc9vQ/EgZzXPWWaXySEuEQjrTlwu53tYuOppi+PoP+VPPdVDS9kAF9w5/t
-skFd4ToJ6hBgGNXQxbi1jBqBisLlPFp95+gINWRkAI8Z4Wi7AMqF/L4acF0dXWKo
-lfECMpEFKRapW9mPOTmNvbov0dJWAV/7GqSwht+wR4rHZ/XDE4MqNFVWvXGmw/VV
-FuSEE42rbak6q0jrPUqBIakM8nUu42px9DF9oF7OX6tScvEfKcNMEMMtSYOy9tIc
-ohz2m2YLPw9+xAbzDKHPLQInHG6fsM9mpA4gG5ER3o1XnUKQkXMK4sc4u7z4ODg3
-wT3DsJy/ExeUQH0Z02C7fKZrKSsE7252iNASGT7wK0iIr6BgRyxvrurgrt1ZUjNd
-LpiTDpgeM4FcKSDQ6QNPi4nUwY1MgWJ9/A3gzyBHji/p/0rIBDwQZE72IInq4jG9
-PeKym8eEXfjSfvEbgst+Us1TU1Jlg+Mpm4ooNXAQqWHynuKTebVJ8FRgJ3Tv0MK6
-4M8eWp+9m5TIaARxm1btk9ma3j3FvOHz7Sme7ElS/C0wcwGFPWMUwu9SjabHr6QM
-P6CG2uCBztZ9V5PUWJkX
-=7FNm
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOHx0QAJmx9DbK6ZrdNjACOuCizCqf
+4B9vTAviMXQYHRyk7jcxERbNZsuWilANDY89AxYnWYCpyz0aRQXX4tcdndUvrQag
+G+3Ar0Unc/axwZ+GGYxPukmv2yGU9RbY6QPBOaN6TQTy1q9bZjLD6uSEX6xEeJxs
+tv61YRCgTfagNGHYb61t0NK5nM4IiWzv89r4CNhJYBLYuLRIMjDihwBjG5fMWsbg
+n5tKQoY/wAvisCSGzOxyEyfixtiEbWozHRqAiOXldBJPruxfL4qySisdL1minb0r
+QjN2cdqRbP9AJNV9+wTgVjTWaXQR3tiL5cun/WDAshGOMklTrE3ieZecpFsG+78h
+xbj0jtMyjLPmyCsZtGOdmnzId1Z+WaJpL7NKpKKK4e4wpBGNWXHZY8fIh19X3xF2
+9B8JYxE99qyxzIQ2+YfVXht0EnziD7BvhEFyMs/Lp94x2FcaNra02aP3QniK+FSS
+9+mxK+o6gyHJquSxEJemnlDg3zyQ6GRpOa30wsHc6k+MbnIKCcg6Ze/7uGEUHLjz
+aq7YeGFZIkewQin83SWnsTeMKzbI2Ef0oAnvpjpiSWLop9AyZEU6a/rXQAExL0sD
+XHHd1Gb8UZuX0bl5i0OEtOCo2OO6eJJlRlAetrCk1HaCURcOuDOtMGOCwJ1b/cg/
+BuvWd+hQWvqWXkPqcUWS
+=trJ+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/unittest2/unittest2-0.5.1-r2.ebuild b/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
new file mode 100644
index 000000000000..d1fd171ba3f0
--- /dev/null
+++ b/dev-python/unittest2/unittest2-0.5.1-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1-r2.ebuild,v 1.1 2013/10/05 14:51:33 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+PY3_P=${PN}py3k-${PV}
+
+DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+"
+HOMEPAGE="http://pypi.python.org/pypi/unittest2
+	http://pypi.python.org/pypi/unittest2py3k http://code.google.com/p/unittest-ext/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${PY3_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	local d
+	for d in "${S}" "${WORKDIR}"/${PY3_P}; do
+		# Disable versioning of unit2 script to avoid collision with versioning performed by distutils_src_install().
+		sed -i -e "/'%s = unittest2:main_' % SCRIPT2,/d" \
+			"${d}"/setup.py || die
+
+		sed -i -e '/No module named/s/self.*$/pass/' \
+			"${d}"/unittest2/test/test_loader.py || die
+	done
+
+	distutils-r1_python_prepare_all
+}
+
+select_source() {
+	if [[ ${EPYTHON} == python3* ]]; then
+		cd "${WORKDIR}"/${PY3_P} || die
+	else
+		cd "${S}" || die
+	fi
+}
+
+python_compile() {
+	select_source
+	distutils-r1_python_compile
+}
+
+src_test() {
+	# multiprocessing causes test failure with signals
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	scripts/unit2 discover -s lib || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	select_source
+	distutils-r1_python_install
+}
diff --git a/dev-python/unittest2/unittest2-0.5.1.ebuild b/dev-python/unittest2/unittest2-0.5.1.ebuild
deleted file mode 100644
index 60651063effb..000000000000
--- a/dev-python/unittest2/unittest2-0.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/unittest2/unittest2-0.5.1.ebuild,v 1.18 2011/07/26 16:26:56 neurogeek Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-# http://hg.python.org/unittest2/rev/d2be68aedc8e
-PYTHON_TESTS_RESTRICTED_ABIS="2.4"
-
-inherit distutils
-
-DESCRIPTION="The new features in unittest for Python 2.7 backported to Python 2.4+."
-HOMEPAGE="http://pypi.python.org/pypi/unittest2 http://pypi.python.org/pypi/unittest2py3k http://code.google.com/p/unittest-ext/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	mirror://pypi/${PN:0:1}/${PN}py3k/${PN}py3k-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-DOCS="README.txt"
-
-src_prepare() {
-	preparation() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			cp -pr "${WORKDIR}/${PN}py3k-${PV}" "${S}-${PYTHON_ABI}" || return 1
-		else
-			cp -pr "${S}" "${S}-${PYTHON_ABI}" || return 1
-		fi
-
-		# Disable versioning of unit2 script to avoid collision with versioning performed by distutils_src_install().
-		sed -e "/'%s = unittest2:main_' % SCRIPT2,/d" -i "${S}-${PYTHON_ABI}/setup.py" || return 1
-	}
-	python_execute_function -q preparation
-}
-
-src_test() {
-	testing() {
-		./unit2 discover
-	}
-	python_execute_function -s testing
-}