summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Martins <rafaelmartins@gentoo.org>2012-01-08 13:50:14 +0000
committerRafael Martins <rafaelmartins@gentoo.org>2012-01-08 13:50:14 +0000
commit259989b57c3beccb044f0bec660085813cf02ea4 (patch)
treeb658e5038d2934637e1813802778af2e007a69a5 /www-apps
parentRestructure patching, #398139 (diff)
downloadgentoo-2-259989b57c3beccb044f0bec660085813cf02ea4.tar.gz
gentoo-2-259989b57c3beccb044f0bec660085813cf02ea4.tar.bz2
gentoo-2-259989b57c3beccb044f0bec660085813cf02ea4.zip
Revision bump, fixed tests for python-2.6. Fixed live ebuild, using EHG_REVISION=default.
(Portage version: 2.2.0_alpha84_p5/cvs/Linux x86_64)
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/blohg/ChangeLog10
-rw-r--r--www-apps/blohg/blohg-0.9.1-r1.ebuild (renamed from www-apps/blohg/blohg-0.9.1.ebuild)9
-rw-r--r--www-apps/blohg/blohg-9999.ebuild5
-rw-r--r--www-apps/blohg/files/blohg-0.9.1-fix_tests.patch32
4 files changed, 51 insertions, 5 deletions
diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index e2f52f2f3251..b46e2fd5fe75 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for www-apps/blohg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.14 2012/01/06 00:53:09 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.15 2012/01/08 13:50:14 rafaelmartins Exp $
+
+*blohg-0.9.1-r1 (08 Jan 2012)
+
+ 08 Jan 2012; Rafael G. Martins <rafaelmartins@gentoo.org>
+ -blohg-0.9.1.ebuild, +blohg-0.9.1-r1.ebuild,
+ +files/blohg-0.9.1-fix_tests.patch, blohg-9999.ebuild:
+ Revision bump, fixed tests for python-2.6. Fixed live ebuild, using
+ EHG_REVISION=default.
*blohg-0.9.1 (06 Jan 2012)
diff --git a/www-apps/blohg/blohg-0.9.1.ebuild b/www-apps/blohg/blohg-0.9.1-r1.ebuild
index a6838ec7c559..734e6713bef2 100644
--- a/www-apps/blohg/blohg-0.9.1.ebuild
+++ b/www-apps/blohg/blohg-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.9.1.ebuild,v 1.1 2012/01/06 00:53:09 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.9.1-r1.ebuild,v 1.1 2012/01/08 13:50:14 rafaelmartins Exp $
EAPI="3"
@@ -9,7 +9,7 @@ SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
DISTUTILS_SRC_TEST="setup.py"
-inherit distutils
+inherit distutils eutils
DESCRIPTION="A Mercurial-based blogging engine."
HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
@@ -34,6 +34,11 @@ DEPEND=">=dev-python/docutils-0.7
RDEPEND="${DEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_tests.patch"
+ distutils_src_prepare
+}
+
src_compile() {
distutils_src_compile
diff --git a/www-apps/blohg/blohg-9999.ebuild b/www-apps/blohg/blohg-9999.ebuild
index e6b77eb7a5c8..0e160ac78951 100644
--- a/www-apps/blohg/blohg-9999.ebuild
+++ b/www-apps/blohg/blohg-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.6 2011/12/17 03:46:20 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-9999.ebuild,v 1.7 2012/01/08 13:50:14 rafaelmartins Exp $
EAPI="3"
@@ -10,6 +10,7 @@ RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
DISTUTILS_SRC_TEST="setup.py"
EHG_REPO_URI="http://hg.rafaelmartins.eng.br/blohg/"
+EHG_REVISION="default"
inherit mercurial distutils
diff --git a/www-apps/blohg/files/blohg-0.9.1-fix_tests.patch b/www-apps/blohg/files/blohg-0.9.1-fix_tests.patch
new file mode 100644
index 000000000000..59bc85ee2e02
--- /dev/null
+++ b/www-apps/blohg/files/blohg-0.9.1-fix_tests.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Rafael G. Martins <rafael@rafaelmartins.eng.br>
+# Date 1326030133 7200
+# Node ID bb6ae530f3475d08a1bbe04dd4b23fe29597a26c
+# Parent 2133cc744722cf0bbe061c2958dd00a831c7b0e2
+fix tests for python 2.6
+
+diff -r 2133cc744722 -r bb6ae530f347 blohg/testsuite.py
+--- a/blohg/testsuite.py Thu Jan 05 22:39:04 2012 -0200
++++ b/blohg/testsuite.py Sun Jan 08 11:42:13 2012 -0200
+@@ -146,8 +146,8 @@
+ app = create_app(self.repo_path)
+
+ with app.test_request_context():
+- with self.assertRaises(TemplateNotFound):
+- app.jinja_loader.get_source(app.jinja_env, 'test.html')
++ self.assertRaises(TemplateNotFound, app.jinja_loader.get_source,
++ app.jinja_env, 'test.html')
+
+ new_file = os.path.join(self.repo_path, app.config['TEMPLATES_DIR'],
+ 'test.html')
+@@ -158,8 +158,8 @@
+
+ app.hg.reload()
+ with app.test_request_context():
+- with self.assertRaises(TemplateNotFound):
+- app.jinja_loader.get_source(app.jinja_env, 'test.html')
++ self.assertRaises(TemplateNotFound, app.jinja_loader.get_source,
++ app.jinja_env, 'test.html')
+
+ app.debug = True
+ app.hg.reload()