3 files changed, 96 insertions, 1 deletions
diff --git a/dev-python/logbook/ChangeLog b/dev-python/logbook/ChangeLog
index 3bf3fc0a478f..fcff15bd6736 100644
--- a/dev-python/logbook/ChangeLog
+++ b/dev-python/logbook/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/logbook
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/ChangeLog,v 1.9 2013/06/30 14:50:46 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logbook/ChangeLog,v 1.10 2013/08/18 08:46:32 idella4 Exp $
+
+*logbook-0.5.0 (18 Aug 2013)
+
+  18 Aug 2013; Ian Delaney <idella4@gentoo.org>
+  +files/logbook-0.5-pypy-test-fix.patch, +logbook-0.5.0.ebuild:
+  bump; Drop py2.5, add pypy2_0 support, updated deps, test phase
 
 *logbook-0.4.2 (30 Jun 2013)
 
diff --git a/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch b/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch
new file mode 100644
index 000000000000..9f691a1811f0
--- /dev/null
+++ b/dev-python/logbook/files/logbook-0.5-pypy-test-fix.patch
@@ -0,0 +1,50 @@
+From 41dc7b9af1841b0005051ad81ab36ed2e062d663 Mon Sep 17 00:00:00 2001
+From: Rotem Yaari <vmalloc@gmail.com>
+Date: Sat, 17 Aug 2013 22:43:39 +0300
+Subject: [PATCH] #91: Fix broken tests on pypy
+
+---
+ .travis.yml           | 1 +
+ tests/test_logbook.py | 2 +-
+ tox.ini               | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index ee3f457..b0aaea6 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -3,6 +3,7 @@ python:
+   - "2.6"
+   - "2.7"
+   - "3.3"
++  - "pypy"
+ 
+ install:
+   # this fixes SemLock issues on travis
+diff --git a/tests/test_logbook.py b/tests/test_logbook.py
+index 6d1a301..a1da11c 100644
+--- a/tests/test_logbook.py
++++ b/tests/test_logbook.py
+@@ -99,7 +99,7 @@ def make_record():
+ 
+         errormsg = str(caught.exception)
+         self.assertRegexpMatches(errormsg,
+-                "Could not format message with provided arguments: Invalid (?:format specifier)|(?:conversion specification)")
++                "Could not format message with provided arguments: Invalid (?:format specifier)|(?:conversion specification)|(?:format spec)")
+         self.assertIn("msg='Hello {foo:invalid}'", errormsg)
+         self.assertIn('args=()', errormsg)
+         self.assertIn("kwargs={'foo': 42}", errormsg)
+diff --git a/tox.ini b/tox.ini
+index 694cd51..2b52a28 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -1,5 +1,5 @@
+ [tox]
+-envlist=py26,py27,py33,docs
++envlist=py26,py27,py33,pypy,docs
+ 
+ [testenv]
+ commands=
+-- 
+1.8.1.6
+
diff --git a/dev-python/logbook/logbook-0.5.0.ebuild b/dev-python/logbook/logbook-0.5.0.ebuild
new file mode 100644
index 000000000000..e4b407b5bfef
--- /dev/null
+++ b/dev-python/logbook/logbook-0.5.0.ebuild
@@ -0,0 +1,39 @@
+# 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.5.0.ebuild,v 1.1 2013/08/18 08:46:31 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A logging replacement for Python"
+HOMEPAGE="http://packages.python.org/Logbook/ http://pypi.python.org/pypi/Logbook"
+SRC_URI="https://github.com/mitsuhiko/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( virtual/python-json[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.3-r3[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.2-objectsinv.patch \
+		"${FILESDIR}"/${PN}-0.5-pypy-test-fix.patch )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -w tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}