bump with required patch to pass testsuite; closes Bug 451248

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

4 files changed, 94 insertions, 11 deletions

diff --git a/dev-python/logbook/ChangeLog b/dev-python/logbook/ChangeLog
index f8998fbca624..d90b212ea1fd 100644
--- a/dev-python/logbook/ChangeLog
+++ b/dev-python/logbook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/logbook
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/ChangeLog,v 1.3 2012/11/03 06:00:24 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/ChangeLog,v 1.4 2013/02/21 15:05:03 idella4 Exp $
+
+*logbook-0.4.1 (21 Feb 2013)
+
+  21 Feb 2013; Ian Delaney <idella4@gentoo.org>
+  +files/logbook-0.4.1-testspy3.patch, +files/logbook-0.4.1.patch,
+  +logbook-0.4.1.ebuild:
+  bump with required patch to pass testsuite; closes Bug 451248
 
   03 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -logbook-0.3.ebuild:
   old
@@ -18,4 +25,3 @@
 
   11 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +logbook-0.3.ebuild:
   Initial commit.
-
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index b3dab42a539f..5d466b5f4992 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX logbook-0.4.1-testspy3.patch 1696 SHA256 ebc8a81faaa6e3681ab9064c7a70d6c8a37763295f3f5cfa4d9fc3c8ec26db78 SHA512 27b8d1a409d02ffa2ecefdc36491b02a40165ff54f49f886cdb6122b0dfd621242013b4b5ec58afc950bc7bb11ea49d4a22bd0252c09a1d052eb5bc1002d073f WHIRLPOOL fe9fb019d455c84aaf4bdb285415e67e72c6e3a9a0872e16ce56ef13fbceb5958e96a68e04859f0e86096abefaf968485abf72ba34f3b7de4ad10920a7afd3b8
+DIST Logbook-0.4.1.tar.gz 96055 SHA256 5aef26127b55187c8109492c10f71f67c2706e940681f7e374cbeacfc90ed3ab SHA512 7eb92b6ed01a0b88bafa5057cd22e42129f3d7c8e52a994287ad5e0680562fd565e2029bb685a0db1f09a9d325321c385bf607ab04a5dd94a536ea37d1903970 WHIRLPOOL 2997c1de17e677492e014196517e91a6980506828cdbab06a4a8057dcd8582d15c1e5f830116306cd7d27b75c9d528973dd6203cda9c0b7dd197acb34f44d696
 DIST Logbook-0.4.tar.gz 65470 SHA256 3f5942e841c3b77e1b0b00a4cca4197db76bd0fe0356851f30f0a58a9494ba66 SHA512 dd066bc7332cac975cc655918a0e09b6cbe310fdf97d8b8a2d4246be435c06d16d48085a771adf2a12206b2ea5248506d34727b7b3783c07a4d37cdd859652dd WHIRLPOOL 22d501be6eea0733e9ed9634663bca73b7e1c7d2154d98660fe501cebba7820f3f602b18f04ef5c0db70b99cc63ad2d3a3b1e630d7df64d0505abafb1d68ffcd
+EBUILD logbook-0.4.1.ebuild 756 SHA256 25ebacd495564dd796e7db673c7ee01829f429fbde05e6ada1941009c326f8e8 SHA512 787c1de8d679d14957fd2e884699fe601ca79cc3dea0c188fb1637c0ecf8944093088b4ce157fbe1210799b5fe6f750902408d0a39e2f5ac5bdd78158ce1a1d5 WHIRLPOOL b166c585c030c62f3b44d18c4e87e9ef24800c50b722f90bb4bdf436d48e060cf376f1a37f3768352e6246bfe50a8dd5cedc18bec2a89bb1c0d5b401a78a6050
 EBUILD logbook-0.4.ebuild 602 SHA256 4aaad1338a792ea8b5d6e9521d726855e159749729e74196e4060c9e1693fb00 SHA512 3d723a6ed59e5393bd47e5fd7948f98ea0295b26e251a120012dffdafcd5818cd5f5be7deda7c9c5969ad3841a7b1c6f048288247921dd1c55fa89958949384d WHIRLPOOL bcb305ac21cbb4fe917ae58d99d0611f871267feb29d13a70dde5c3a7dfb21c19c57f4342e1e43e162bf35307849557b95da9f6375d24fb8baba7b62d97855a6
-MISC ChangeLog 698 SHA256 a956ed6c471520d27546cb394a5b4f7be88dc8fb9b88a7028961d14b6bb6f861 SHA512 d61e9ff3daadf241686ce982a3ebd41184ae782553f909b001aadbb6b1e186738ca28814100bcc5f9175bdf2cb289a7d7faac287a32897a53c89658a3758eca2 WHIRLPOOL fdf4d7f1fc144758f735f0324404d9f091d5576e24953d33fbfca1bb20e6ef79a7570a5d618438ebeb3c5e00fb3a3d589021f8de1d110aa63d6b5dd822022b24
+MISC ChangeLog 930 SHA256 04813e472622fdb394b1db977a02f88946a5fb1a9f76a9fc15f75db7148aa45a SHA512 5e88db7d0487c13049d9f0bea9e36d605bc117776cb004546729af5acfc837be0c67fe3a40a4bd03e2d75e699946c0f5b39ccceab31aedc4b31aa6c1e0d69c70 WHIRLPOOL ef0ad959598457c59b7aca59afefbaa3c6a9dc30d758beafc1ccff9527cf97988ad5d7dff16b9d3f21d911a4201c0d6550418a0029ae782f891e47267302d726
 MISC metadata.xml 230 SHA256 2208fc56448b06b9cf1a8ad7446694dfb34501a8641dff690f9d1016b622314f SHA512 08da57ca75ba7f4541167a61a84dbfa62011fb52cf352df41b4eec91e48b00e61859b769a02fb8cde95b238c21b68da5669266cb00ef9fbadafa3e1c2bd9e136 WHIRLPOOL 708e0fd588fd39d4c5cbabba54c976605e0bff4bcf2c817a3d25eb03517e5ae04e3d86addf673494dd19047e9b44d7b72c97d5c101f5a1a2489d8728e4bcd5a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQlLHRAAoJEEdUh39IaPFNWxcH/Ry3vi78mYYbG76jXvYIyv8v
-6PsPhd9j10JvbDy0yw3wFkWGXXdFRufJftvd7saNq7QYfNOdZzztFT9LFbt3qX3M
-rGsTTnrQQLyMQe+QxJDqwbvNG9w77XH6j3RtzP754rQFlAWcYTe4YhP/LgQEYHmr
-TQoxmK0eCfNHSS9/OvhCgQZawKsIUrOOIPwdzUN8jt9d4Zv0gUF0f1uR7vRF7Fyb
-0SxatOuwh0nA1UuhpyD6u2CyTQ8qmsnR6jAujHaedfyFy4eoIWOYxGoni7cMvPun
-3pRoilyoun1SxnkBAdyfc6Yd3NCmgrmwrqizcj5lu/FhUMicMw47Q1xxqk93KEY=
-=x5yb
+iEYEAREIAAYFAlEmN68ACgkQso7CE7gHKw2ELACffWGvc25Aq2Mpiyfm3I1EAlH1
+JWwAoMH1PTl7Pxeera8h94mDTfaaDbvX
+=5J9n
 -----END PGP SIGNATURE-----
diff --git a/dev-python/logbook/files/logbook-0.4.1-testspy3.patch b/dev-python/logbook/files/logbook-0.4.1-testspy3.patch
new file mode 100644
index 000000000000..0a0361cb4e54
--- /dev/null
+++ b/dev-python/logbook/files/logbook-0.4.1-testspy3.patch
@@ -0,0 +1,45 @@
+See https://github.com/Sapphire64/logbook/commit/384f79006a17098817f6402765bbec273759da58
+diff -ur Logbook-0.4.1.orig/logbook/base.py Logbook-0.4.1/logbook/base.py
+--- logbook/base.py	2012-12-12 00:00:36.000000000 +0800
++++ logbook/base.py	2013-02-21 18:46:19.955740703 +0800
+@@ -22,7 +22,7 @@
+ try:
+     from logbook._speedups import group_reflected_property, \
+          ContextStackManager, StackedObject
+-except ImportError:
++except (ImportError, NameError):
+     from logbook._fallback import group_reflected_property, \
+          ContextStackManager, StackedObject
+ 
+# Skip until hopefully a fiz for pyzmq down the track
+diff -ur Logbook-0.4.1.orig/logbook/testsuite/test_regular.py Logbook-0.4.1/logbook/testsuite/test_regular.py
+--- logbook/testsuite/test_regular.py	2012-12-12 00:00:36.000000000 +0800
++++ logbook/testsuite/test_regular.py	2013-02-21 21:48:45.616679871 +0800
+@@ -17,7 +17,10 @@
+ import thread
+ import pickle
+ import shutil
+-import unittest
++if sys.version_info[:2] == (2, 7) or sys.version_info[:2] >= (3, 2):
++    import unittest
++else:
++    import unittest2 as unittest
+ import tempfile
+ import socket
+ from datetime import datetime, timedelta
+@@ -1299,6 +1302,7 @@
+         time.sleep(0.1)
+         return handler, subscriber
+ 
++    @unittest.skipIf(sys.version_info[:2] >= (3, 1), "tests fail due to pyzmq")
+     @require('zmq')
+     def test_zeromq_handler(self):
+         tests = [
+@@ -1317,6 +1321,7 @@
+             finally:
+                 handler.pop_thread()
+ 
++    @unittest.skipIf(sys.version_info[:2] >= (3, 1), "tests fail due to pyzmq")
+     @require('zmq')
+     def test_zeromq_background_thread(self):
+         handler, subscriber = self._get_zeromq()
diff --git a/dev-python/logbook/logbook-0.4.1.ebuild b/dev-python/logbook/logbook-0.4.1.ebuild
new file mode 100644
index 000000000000..5809a3534ea7
--- /dev/null
+++ b/dev-python/logbook/logbook-0.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/logbook-0.4.1.ebuild,v 1.1 2013/02/21 15:05:03 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} )
+
+inherit distutils-r1 eutils
+
+MY_PN=${PN/l/L}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ http://pypi.python.org/pypi/Logbook"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="CHANGES README"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-testspy3.patch
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	esetup.py test
+}