revbump; drop masked pypy2_0, patch sourced from upstream to fix version issue in py3

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 120 insertions, 5 deletions

diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog
index 99032ae47c66..6055782656c4 100644
--- a/dev-python/nose/ChangeLog
+++ b/dev-python/nose/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/nose
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.125 2014/04/11 13:48:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.126 2014/04/22 08:30:33 idella4 Exp $
+
+*nose-1.3.1-r1 (22 Apr 2014)
+
+  22 Apr 2014; Ian Delaney <idella4@gentoo.org> +files/nose-1.3.1-version.patch,
+  +nose-1.3.1-r1.ebuild, nose-1.3.1.ebuild:
+  revbump; drop masked pypy2_0, patch sourced from upstream to fix version issue
+  in py3
 
   11 Apr 2014; Ian Delaney <idella4@gentoo.org>
   +files/nose-1.3.1-pypy-test.patch, nose-1.3.1.ebuild, nose-9999.ebuild:
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 66e19ba12974..1191fef05f9d 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -6,6 +6,7 @@ AUX nose-1.2.1-skiptest.patch 860 SHA256 0d99dde3d6ee82cf7268748461ac52f571036e6
 AUX nose-1.3.1-doctest.patch 1653 SHA256 39737b6bdeed24262647020b47f0f24ab4997eed7c198896bef6a6ffcf5c056a SHA512 eee4dff3c2b496841076eba00a134169d5ae86b68d611fd332f4682cecf5ece28172a16c4f6989defa34d9d5bb903a2587432426d9e163b05244de86d89bb257 WHIRLPOOL 1c84d7a3724c2df99222486f5a42190adb24fa7073810ad38a64f1854f7ef67c73731c14e667200a9dec082cd741933224aab95a62a8f7de386c974bb60119ad
 AUX nose-1.3.1-pypy-test.patch 1441 SHA256 c2fa088a7f5caa61b957e3ef1f899dc028f984c662375223712c30d982c5af48 SHA512 73d884ab87695555353970c9a2493fb95432e79dd7b97dd5e4603ac6c39c6cdd956373a91f57ef3f353c087903b27e0b38f0c7c116435800e6c91120e04b3cc0 WHIRLPOOL 3f4706fd2e8708f6e8fb96f84531b61a9a9eeb7f649410a441d78528b819568734cffe342e0b9bf9396aa365f7993ac8e6e459d3c0b69ad35d5a2029608a2f7e
 AUX nose-1.3.1-python3.4.patch 1526 SHA256 383f32e3eaa6d94926330364780a3164ed5676ff97fe0e27845116b4b7951e7c SHA512 c9972cc0e76e8b6ad41dabfb859cdad0aadf93a4f9d03ac8c9706e5cc1719fa857d48cf2e18b411afc75bebcf7e2a7015fb1cf4645b03f5c52a51598e65b9616 WHIRLPOOL 83b9571303b3f395ddf464474042176352a790da0a84db9fdac8228f28b4e98053b5948662286c50edbdd1b2ca458e2ac911adc9259eceb726e93214ba1e32c6
+AUX nose-1.3.1-version.patch 541 SHA256 b61c12e30ec77b0da520beffc4da0188f7228cc898d8a76d77fc7e3ee028926e SHA512 446887677183a4fd6d998d3eecc8ab7a41f69cf96ec5decd26fbb3250d90f6fbe12d7d1c82f1d13a57d3b078013ff9f9f56027ed47ab7e2d8ba05a8d8d8434f2 WHIRLPOOL b5e308042fd4574b21c2f4a0c73768b9de721a09142092e107d67ccaf434d3aa88adfc7797467ebdc5ea8397020bcc31fc26506743e684dc6801c7f7e387ed13
 DIST nose-1.1.2.tar.gz 729206 SHA256 b1ba12c1c45323fd8695be68ce7228456b86e51234f167027ebbc4ccda852c61 SHA512 6eb6061f31143c411fd8943552f15dc5af67e455434f55956f54fe6eb3b2d84311d474d2f195ed39858b69f7622f38cea4ae55d35bcbf3c92365a9fd4ef2c743 WHIRLPOOL bec8210ee9a64b473bf62f4a955e2395806a7c803c9b3106a8fa308a48e23f818d5596175977013992d40306a17164a417d9bdee4ba8b7e2770d2ba46d7da3cf
 DIST nose-1.2.1.tar.gz 400377 SHA256 2171e9202d118d302d5db1decb52dd862b79e2a626ca19653a6914574a6ca7d9 SHA512 c13116c1f0547000cc565e15774687b9e884f8b74fb62a84e578408a868a84961704839065ae4f21b662e87f2aaedf6ea424ea58dfa9d3d73c06281f806d15dd WHIRLPOOL 5628fd0d874d254bb2c051c9626e49f91468d911df81870559b493ee420bcd36cf2476c26fb32189828d379ce691ba8db60a9489baa9eda8897eac743d5f98f5
 DIST nose-1.2.1_p2012.tar.gz 323479 SHA256 be1c94cd6d6521787d17c35c3161acb65c449a95f300006811b495978c7a4bad SHA512 15bb73b9d97d9c47a739e99194e5c3689bc1815db235bbf3cc0dbe270c343df58294cad2aa8b3ef73c2129dbd47894f95fbb43c7cb66e20e610aebe8eb6c73ed WHIRLPOOL 4beee1458b6ef8b95f14bc497609599582f88f153cad197e945d35bb30227fa8664dd231cadc045f3accb9b720a0945cd13ab9b82c29bd685d24a7f08b9e43fd
@@ -16,14 +17,15 @@ EBUILD nose-1.1.2.ebuild 2309 SHA256 fbcb87a80ddc02cb980b4b0d2cf225723547852866d
 EBUILD nose-1.2.1.ebuild 2526 SHA256 96f3bd82e7d928b78ec15022f34f560dad32e88c2308ad5856d0a438ff3cf08b SHA512 f010b4c2454a6b6e295e9cbde3c16e4c6ddf6d00acc0328208325f3bea112f31ab769f675d0e70a4f111220b55fa0237f47f990fd22883c670dc49160dc3bd1d WHIRLPOOL 7ebd344e0cec95f9e8ea8111ba12f8ebdcff38cefc45375ff124fa4f5672efcc45fe89c8786510844f65721cdbdf72d0f95ae568243eea0b213b678630a2e7d9
 EBUILD nose-1.2.1_p2012.ebuild 2592 SHA256 c5b4b344663d1219d171a78a6ce37f20c8fb022263ea8c0faef56ddd8c236758 SHA512 dac134ce3927618665646e956d7cb08f283f77ad61aa1db193a0de8f87e112d786e38fb057851a8ddd22970661107268387bde461a62ceaf1fe7c4bdbbb4380a WHIRLPOOL ce649fee437f6b34cde746013eef48b7f3da7279c7cb7ede14c0463293c924ee578bdcf880202bda14f2da349eae02c87fc9fc6d085f3a9f13d809078d2f464e
 EBUILD nose-1.3.0.ebuild 2486 SHA256 c9839db4d2ab5cec353338f4d1c76dafe3ef4b4fe763f2311e1a8d56dacaa762 SHA512 188b50c8b8006eadd988f34b20215aafb55bbe4c9fe307c0050ecdba54b18aebcb34d3e63bf3aa13c8d6687f669434d0c0bac92bfa705e89f7db9198faad3f7b WHIRLPOOL 33d01fefe9fa38e17407df9a6348dc575e6a0c31da73a7b0218e64984a5e81dc53788306fe3937024dce9aa27d11bc9e2f5e4894a0523f01ad2e9b20b779807c
+EBUILD nose-1.3.1-r1.ebuild 2573 SHA256 5af91bb6f50ed85d4dd59bf8c9208ec9273924ae52f7891616711aafb19e1d07 SHA512 6298b8971332b745dd9b0af4949dfffe5231b393b01b12c92a0c9dfed4b5bab66acc61abe538062bf6fdda77d315d0988bc1a37e8043e00773bd9cba9fb504ca WHIRLPOOL 6879985050575f3555b57983d6131de4ebac6837209fdecd0ce0bdb3acb746e2d0749f6855279142fae488e3ffd8a29640ad72d3106e40fbbf68d850b73d2e56
 EBUILD nose-1.3.1.ebuild 2544 SHA256 39fe7179f7b7ca57a391a963e080de1dd7d8cbfaeaf351ec76af954133d42a7b SHA512 12dd604d0af0e59d2980e8a723560e9c9dad5c8683a2d3bd97052c0723b89a7b46efb5c1942635a7f678be0b8d13287ac1060a2e9d820e1ff0e689c820cb27c3 WHIRLPOOL b1afcbd06b1469742daf83e1ab56bac28d7bb5d0d0e12f25cc01bec77a58441bac2421834531caafb34c8aeb41a57b90a6364250ae180f367473a7a2a29d5a53
 EBUILD nose-9999.ebuild 2634 SHA256 f7ba08b158006344b209bd00de0051e54e6d17c9d25ffc86333b36422a7fa0ae SHA512 62ac9cdb6cc4e231100528d086754cd8e92cb24f58c86c95b186e143c983fb69a1e220bb0660c1735f0b0fdfaa96604bba173efa82d45e5cd99e782d3ac2462f WHIRLPOOL 521f87038c24dfee550cf1f6eecbf9ef62e9fe205ff68eabb696e35b728fb6b21958a197cd3285aec1d68e4fb107096e1bb6e4bd4d03f9f7bac395a4c54d3476
-MISC ChangeLog 16352 SHA256 3a7198f862baa648701f38bae3fbbdfb94df9afa9388040fcdff4142a39d7186 SHA512 429a771d75859b6644b0c52fedd13d00aeb034cd6a152719fa4938bfa844300148ca1c3fd15aafc5c615a45074dc65ce20e8a324786f0cfc0f1594b916495b66 WHIRLPOOL 8f2224954494b8b906d023ab648baf92d3090da2fa92fc4f55aec94452ce37c491c3aa5d64ff64d6199e83ecf133945b1c0875a3908310a15b80494d03cf496d
+MISC ChangeLog 16598 SHA256 bed619cff2785ba3c85b600eeec2856aef92d9de9f63393d3a483d4a28dc744c SHA512 7bdc897936a39937787f39df69cb2c9df0cc5c56b814b2902b8a87d2389bd30ec6b9cedac0d7244f5703180d6cb6661b2c6079f2b2c55bd74b46134a5d7e8fd5 WHIRLPOOL 3811d4ad625ccec6c38dcd597503a74a4a32fa766b648bbe7f6e700a77caadd2ee17f1a9e9293286a5d3eef6279b94a76b390a3be80d10ba6651e5f72f28f883
 MISC metadata.xml 312 SHA256 9c3ef94669e362a0bf2390147afae7a7857d4779016763294c26efeb13d983cd SHA512 39a4a0cf4bf47d0325a171cc5c4bc7d20079b8fcaa93a8b41d4b50280c39e742be9774f2952983d30a0b3eb4e759f95e65ea6f86fc3ed217155dfa20379389f1 WHIRLPOOL 3343d2ebabe1e5738175be205bcad0d7bf7014f42ce2901c0b7338bf2ee20c5e69758e37e5b0738bb95d8bb96e033b1ef19a93e0928bf15f1f27c55f6cb1b9dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNH8PMACgkQso7CE7gHKw1TBgCgu4NqeSo4+IHlX2ki9O9MAc3n
-AZ0Aniej9cFBfTsqk182k9B+DrqvZ2yN
-=r8SV
+iEYEAREIAAYFAlNWJvEACgkQso7CE7gHKw3OLQCeI8pT6iBuiHfiMe4J+cT7BLu7
+jiwAmwddoxhnPkx0JKCEAAmxFyd+QCXG
+=h2Kx
 -----END PGP SIGNATURE-----
diff --git a/dev-python/nose/files/nose-1.3.1-version.patch b/dev-python/nose/files/nose-1.3.1-version.patch
new file mode 100644
index 000000000000..8f6edb5be2ef
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-version.patch
@@ -0,0 +1,16 @@
+https://github.com/nose-devs/nose/commit/43c35e49106916f51f676455888fe7a39d030113.diff
+diff --git a/nose/pyversion.py b/nose/pyversion.py
+index fba5ada..8b56614 100644
+--- a/nose/pyversion.py
++++ b/nose/pyversion.py
+@@ -89,7 +89,8 @@ def __init__(self, cls, func):
+         self.__dict__ = func.__dict__.copy()
+         self._func = func
+         self.__self__ = UnboundSelf(cls)
+-        self.im_class = cls
++        if sys.version_info < (3, 0):
++            self.im_class = cls
+ 
+     def address(self):
+         cls = self.__self__.cls
+
diff --git a/dev-python/nose/nose-1.3.1-r1.ebuild b/dev-python/nose/nose-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..9cf4be26eb7b
--- /dev/null
+++ b/dev-python/nose/nose-1.3.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.1-r1.ebuild,v 1.1 2014/04/22 08:30:33 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
+inherit distutils-r1 eutils
+
+DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
+HOMEPAGE="http://pypi.python.org/pypi/nose http://readthedocs.org/docs/nose/ https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.6 )
+	test? ( dev-python/twisted-core
+		dev-python/unittest2 )"
+
+DOCS=( AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-skiptest.patch
+	"${FILESDIR}"/${PN}-1.3.1-python3.4.patch
+	"${FILESDIR}"/${P}-doctest.patch
+	"${FILESDIR}"/${P}-pypy-test.patch
+	"${FILESDIR}"/${P}-version.patch )
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# nosetests use heavy multiprocessing during the tests.
+	# this shall make them less likely to kill your system or timeout.
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+	local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dohtml -r -A txt doc/.build/html/.
+	fi
+}