Version bump. Add python3.4.

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

5 files changed, 146 insertions, 20 deletions

diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog
index e81532f13979..002e0e9d1eed 100644
--- a/dev-python/nose/ChangeLog
+++ b/dev-python/nose/ChangeLog
@@ -1,6 +1,12 @@
 # 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.122 2014/03/31 21:19:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.123 2014/04/01 01:18:40 floppym Exp $
+
+*nose-1.3.1 (01 Apr 2014)
+
+  01 Apr 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/nose-1.3.1-python3.4.patch, +nose-1.3.1.ebuild, nose-9999.ebuild:
+  Version bump. Add python3.4.
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> nose-1.1.2-r1.ebuild,
   nose-1.2.1.ebuild, nose-1.2.1_p2012.ebuild, nose-1.3.0.ebuild,
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index aedd0d0d6958..937bcc652e2b 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,34 +3,25 @@ Hash: SHA256
 
 AUX nose-0.11.0-disable_intersphinx.patch 733 SHA256 b5b941ab4dbe8d70706a55de9f50dbbaa4bf1db6196a4ef5cc966723c6f2a625 SHA512 6169e600bcf720d49adaa76297d9029b89cdc9b808b2618d61312b935cd399680d48384ecd57985398bae76a50850be2bc5eb8f9625e33d2c822f5bda897b559 WHIRLPOOL 8256a55dc1dbb82e1b29f3fd8aeb675c3ec001eff65ee83215043c727f7560f23fb48e66c45a65348afbb646bd572396b4aabd3986add90a070201dde79274cb
 AUX nose-1.2.1-skiptest.patch 860 SHA256 0d99dde3d6ee82cf7268748461ac52f571036e6376ce5df00a2949655a97079f SHA512 f73715ccf64379664590eb04f0408c5ddff837b6fbf39f288d915a267efac41d1cf70fb846383e16a9ec256bc3fb4b06bd76ff2c97e82e08d1817dcdc53bcc2d WHIRLPOOL fd9ab9f1dde91405a079b03c6c3eb385893dbfbabce6b142d3f0fe013d39d7ad148025a42fbd2fcfeaff8193d99ddaee03e8ce23425802c1cf75fda44e9b6821
+AUX nose-1.3.1-python3.4.patch 1526 SHA256 383f32e3eaa6d94926330364780a3164ed5676ff97fe0e27845116b4b7951e7c SHA512 c9972cc0e76e8b6ad41dabfb859cdad0aadf93a4f9d03ac8c9706e5cc1719fa857d48cf2e18b411afc75bebcf7e2a7015fb1cf4645b03f5c52a51598e65b9616 WHIRLPOOL 83b9571303b3f395ddf464474042176352a790da0a84db9fdac8228f28b4e98053b5948662286c50edbdd1b2ca458e2ac911adc9259eceb726e93214ba1e32c6
 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
 DIST nose-1.3.0.tar.gz 404909 SHA256 4e63cc3325de75cf98ffad40be72fa69753de824695173178f74c034fe4f5260 SHA512 a3b8060e415560a868599224449a3af636d24a060f1381990b175dcd12f30249edd181179d23aea06b0c755ff3dc821b7a15ed8840f7855530479587d4d814f4 WHIRLPOOL 1a25fcdbaa163bcad6a03610880edb7351a63fa1f3aeb8417316c4502d57a28a479b088ad6027d6f87aa490f885139b57382d024f1cd4cc847521d5fce4abba3
+DIST nose-1.3.1.tar.gz 274469 SHA256 85273b87ab3db9307e3b1452b071e25c1db1cc812bc337d2a97ea0b0cf2ab6ba SHA512 1168202e144c089bf52a3b1fb5b514d1adac3b0c89cf490ff239613d749140fe1da159f047415a254f96aa36aa71aa32ea8b902707dcf02ef5a433e55c16765d WHIRLPOOL 924d2a73d96bcf427a3853dc4983aa03cc145ef0a9e8ad7c6c38197869c4e50c3adb027931f99a9fb4d75dceb53c1e2557108f5366d2a17c135d382c78112dfd
 EBUILD nose-1.1.2-r1.ebuild 2400 SHA256 e6a43c62df4491289f4d4c50a2788157b09483783c35bdd684629d5659ab0c99 SHA512 d4a7c53d87d78c2b53c29b4c94bb374aaa35b806a589d44dd8d9c20a5a1bbad5bc1d2ac590a5844d70d61687655ffe44419d981999339039a6a5b2284b9bb96e WHIRLPOOL 5c49c1631245d22d320a593f231c627cc457fa2b5605f30ff2254bbee953105dbb3cbcb3dcd36e9846463de575fcdf1ad396cad76cb6239ccecdbca565c34f7b
 EBUILD nose-1.1.2.ebuild 2309 SHA256 fbcb87a80ddc02cb980b4b0d2cf225723547852866d4c82c18f694acebb527bf SHA512 529241cb0b96d279be04f9a2a0c89ce8c617ff5895e4770c22dec2cbb8cb133712ea84beb7bd41d57c799431c4ab60bd9fd750b9fd3b1bf8d1cc621b5e10c066 WHIRLPOOL 9b9b0db595bae01e590f50557dccc98d32baf3ea7d7088504d2fe55c25c617a7fefc5ce1a3d967efe9e8b2cd11d1fde2892ce44ff7164b243440f9d0779730af
 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-9999.ebuild 2629 SHA256 dcc0b0df3e3637de2f1b422c3b8461097ee1889448c7d70d3b051d60165bb0b5 SHA512 ec1084f9956b8fd776977d0ba915c299d399695859e1f0a76c454219bffe1e1dd007a104debd196479a64f3ab92d017a3bb485da68a8a585d27667163f5892a5 WHIRLPOOL 0e80ca836ecdb1d5811b3529d93450583290f5c0e178ec72844d00cdc3d978ef4ae13420eb270a278fa3ff1bb6afda273da6ac2e5b6acf24ab0a718d0b47233f
-MISC ChangeLog 15801 SHA256 616cc9cf10763bed42c1ff808f73402d6a108d3cc57a5a1b15ecd6e67ea26f6d SHA512 830606d1ddafd43963a947b634dbf32f32f7cf8bde058bfc3390ccaf991c58febc886b8f90471cf20546686fce7a1e2d89c41315c8ecb54f1355b82e139a9d32 WHIRLPOOL 6bcbb6799e8ac3e5756a57370a2ebf6df2ca3873a33806ae3da66dcfe44a16078920a57f9541d2de4723fd31e0df61901e8a364de002fbd9699865d62722ae44
+EBUILD nose-1.3.1.ebuild 2474 SHA256 d4dee098c8db2ec979bdf977451080796087a733916e8a1ff266bc451e7b6328 SHA512 7d00cb06a80a816918167a0a80ceb653f19a87cdb835258539330bcd44490c12dd7b4e893699eb1de20b4d64d885667b78ac5156e5973b80bc23722e8b16edf6 WHIRLPOOL fe4bb059e1483b28fe3e894ef489c70d00a9bb9ecfaa3c7de9d9f4dc0acc84fe9c128f8d1c1390f46e5dfe7e6835ee66faedd17c9f8af6121cec063a0ca9b5fe
+EBUILD nose-9999.ebuild 2634 SHA256 f7ba08b158006344b209bd00de0051e54e6d17c9d25ffc86333b36422a7fa0ae SHA512 62ac9cdb6cc4e231100528d086754cd8e92cb24f58c86c95b186e143c983fb69a1e220bb0660c1735f0b0fdfaa96604bba173efa82d45e5cd99e782d3ac2462f WHIRLPOOL 521f87038c24dfee550cf1f6eecbf9ef62e9fe205ff68eabb696e35b728fb6b21958a197cd3285aec1d68e4fb107096e1bb6e4bd4d03f9f7bac395a4c54d3476
+MISC ChangeLog 15985 SHA256 6f51e66766061ea204e97d41f014316dd013b54141cbd3353897391c1598685a SHA512 af299a49353812df98e43de0f31ceed2d8518fb2b20f488be2af972cb03d9e8fb61d9fb6bc08e28fbe124761861c77b66eda6bae372054d49a0915e419543a5d WHIRLPOOL 6efda5bc3c005a19fd66993d10b4ac453a7d1abef76fa9013dd32035c4d84c2072c346f657aa924a66d822a9adbce15a9b3712530abbedbd44aa34df2257e7cb
 MISC metadata.xml 312 SHA256 9c3ef94669e362a0bf2390147afae7a7857d4779016763294c26efeb13d983cd SHA512 39a4a0cf4bf47d0325a171cc5c4bc7d20079b8fcaa93a8b41d4b50280c39e742be9774f2952983d30a0b3eb4e759f95e65ea6f86fc3ed217155dfa20379389f1 WHIRLPOOL 3343d2ebabe1e5738175be205bcad0d7bf7014f42ce2901c0b7338bf2ee20c5e69758e37e5b0738bb95d8bb96e033b1ef19a93e0928bf15f1f27c55f6cb1b9dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTOdvaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWE8P/1qOvOXSeNisF+H1uvTemBCH
-eQUkc+ErUIupQmilgRrYsbGa5rxYAWqgha2pyNG5oE+TAMMPB8IPQkwYdqXy0YhA
-NwVKs+Xq2akUOXds0LwRdyOD6ddfZUFDQvu2OxtKBAVcgMd+x5C41imEZnSJbBNw
-V00FNh+B+i+lshSUcx1g4z3fv+zb9b9KYMjy+E1/KCZoIr5y8/X+hBcb0yHc6Q8S
-XbKdN3obdJfz1fvmkfHUGu7OrL/O6nH0MfbZj7pWc0c1O71kNAyEpyR5hgzmD2O5
-n9Htk4ivJy6j688u7zZtTl/UGx0nT9Nhpr3hEBnHKjBvJfoQvRF3S9S//ycZYQTv
-l1I4yH2lzLsRBhCxm9yx+tRIaU91lnuTx35UaOj4cWEWUbLF42JFU287suRBHRn/
-EB00avEfiKtHcSNnNbg9+cdL5fvFbizzvkbNYv+xipILfD/iklzbjycxfLh38Jfk
-db7JVBIG8f/UMKHQ15LkP0A3frQuenQBj5UNfr8vuxioKAyJEWIBM/DWjfq3utJY
-gQiGQWWAJhZj6iimZ3cWsjEuKq8iq3aYp+r+EhhQQ+HMcX32iXJ2Zz5BW6W1d5W/
-6W9ITnzmgRHB+jQcJv6OVRF8NgQ11D+ihfXXRS4XxKUgcOTLSf4J0Z4bw93e/2Em
-sCsUjcj+PLqAKNluOZ08
-=nDlX
+iF4EAREIAAYFAlM6E/EACgkQC77qH+pIQ6R2+wD/dP1EBDc1slBIbRFiPh9wspnd
+cRTAjOzuEzzsGQsEnDIA/A0ARygJp64JmLtTe6j8ryXMZZQE8yNfA3YWLOr7+Za+
+=kjgK
 -----END PGP SIGNATURE-----
diff --git a/dev-python/nose/files/nose-1.3.1-python3.4.patch b/dev-python/nose/files/nose-1.3.1-python3.4.patch
new file mode 100644
index 000000000000..2269f755c3f0
--- /dev/null
+++ b/dev-python/nose/files/nose-1.3.1-python3.4.patch
@@ -0,0 +1,41 @@
+From 192694ed9f70447317bd54e427a17208bddf03be Mon Sep 17 00:00:00 2001
+From: John Szakmeister <john@szakmeister.net>
+Date: Sat, 15 Mar 2014 06:15:42 -0400
+Subject: [PATCH] Fix #783: try_run is broken with Python 3.4
+
+It turns out that we expected inspect.getargspec() to only work on
+functions (versus classes that are callable).  Python 3.4 has changed
+this behavior and now happily returns the arg spec.  Let's try to detect
+this situation by checking the __call__() method to if it's actually the
+method of a class.  If so, pop the 'self' argument off of args--similar
+to what's done in the exceptional case below.
+---
+ CHANGELOG    | 1 +
+ nose/util.py | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/nose/util.py b/nose/util.py
+index 7995700..dcb5fef 100644
+--- a/nose/util.py
++++ b/nose/util.py
+@@ -8,7 +8,7 @@
+ import sys
+ import types
+ import unittest
+-from nose.pyversion import ClassType, TypeType, isgenerator
++from nose.pyversion import ClassType, TypeType, isgenerator, ismethod
+ 
+ 
+ log = logging.getLogger('nose')
+@@ -449,6 +449,8 @@ def try_run(obj, names):
+                 # py.test compatibility
+                 try:
+                     args, varargs, varkw, defaults = inspect.getargspec(func)
++                    if hasattr(func, '__call__') and ismethod(func.__call__):
++                        args.pop(0)
+                 except TypeError:
+                     # Not a function. If it's callable, call it anyway
+                     if hasattr(func, '__call__'):
+-- 
+1.8.5.5
+
diff --git a/dev-python/nose/nose-1.3.1.ebuild b/dev-python/nose/nose-1.3.1.ebuild
new file mode 100644
index 000000000000..c692ef253cf9
--- /dev/null
+++ b/dev-python/nose/nose-1.3.1.ebuild
@@ -0,0 +1,88 @@
+# 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.ebuild,v 1.1 2014/04/01 01:18:40 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
+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
+)
+
+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
+}
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index b40f73bf8d06..8b57e9e63c02 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.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/nose/nose-9999.ebuild,v 1.8 2014/03/31 21:19:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-9999.ebuild,v 1.9 2014/04/01 01:18:40 floppym Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://github.com/nose-devs/${PN}.git
 inherit git-2
 #endif
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
 inherit distutils-r1 eutils
 
 DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"