From 06479f69445be831c5282dd06d2145126515b50d Mon Sep 17 00:00:00 2001 From: Rafael Martins Date: Sun, 8 Jan 2012 13:50:14 +0000 Subject: Revision bump, fixed tests for python-2.6. Fixed live ebuild, using EHG_REVISION=default. Package-Manager: portage-2.2.0_alpha84_p5/cvs/Linux x86_64 --- www-apps/blohg/ChangeLog | 10 +++- www-apps/blohg/Manifest | 21 ++++---- www-apps/blohg/blohg-0.9.1-r1.ebuild | 65 ++++++++++++++++++++++++ www-apps/blohg/blohg-0.9.1.ebuild | 60 ---------------------- www-apps/blohg/blohg-9999.ebuild | 5 +- www-apps/blohg/files/blohg-0.9.1-fix_tests.patch | 32 ++++++++++++ 6 files changed, 120 insertions(+), 73 deletions(-) create mode 100644 www-apps/blohg/blohg-0.9.1-r1.ebuild delete mode 100644 www-apps/blohg/blohg-0.9.1.ebuild create mode 100644 www-apps/blohg/files/blohg-0.9.1-fix_tests.patch (limited to 'www-apps/blohg') 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 + -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/Manifest b/www-apps/blohg/Manifest index a10673ca38f5..7968b9f4eb25 100644 --- a/www-apps/blohg/Manifest +++ b/www-apps/blohg/Manifest @@ -1,21 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX blohg-0.9.1-fix_tests.patch 1299 RMD160 3f455b80e850c478f0bf34ae9b08ce035000de39 SHA1 79c51f4d69d0daabe2bb35b1186448f7fd43c682 SHA256 8c65249ae6c56d99d42c4b4b843e35ac08ad275d8db68cd82162c47dbe496f70 DIST blohg-0.8.tar.gz 46880 RMD160 74014ee82d0ece7b0f72ba0f986f27a0a19609be SHA1 4edea7ef3b5c053306405809c02e95b88ab70c0e SHA256 c13b03652b3480e9d9ed2b74a2cf30236b0bb9e42c578100f7dfa1e681d8b4c0 DIST blohg-0.9.1.tar.gz 51929 RMD160 ed933808b074ebe1d74663fa8f08d18ca03249c0 SHA1 6417da310721e633d3891c7bfd3eaf605f5eb4cc SHA256 0278f4be2f2289183dcf7ff07ad067f0376ecba67902fe6a255d4e8e6f1504a7 EBUILD blohg-0.8.ebuild 1273 RMD160 2c554092584bbb4f63d04d9889afb57b6b091a4e SHA1 30ab4d0ebeb7906b56bfb50af29bdf2fbd61ec6e SHA256 af669ac81db12fdc919c26426e0104cfda538b8e9df6555654798cf1b6d75770 -EBUILD blohg-0.9.1.ebuild 1341 RMD160 d49b051047aa3d3028ee91fbbf345ec63c72dfd9 SHA1 2b2e268a05a494aa8746ef7d49331eaa54eaf013 SHA256 e32477a9e64003f242780ec162cfb576863f1b34927b56afc23e2a8cfa9b4d7d -EBUILD blohg-9999.ebuild 1191 RMD160 1d733882a76716eae98c84b49889e48193bc6d01 SHA1 d6bfecbd02886a0aa106232e5e9a58d89928a866 SHA256 d806613eb7ade8777c46c3228e34b9591f52b862d083d4b02d43a7b69e64de6a -MISC ChangeLog 2302 RMD160 434b632b9c59f6f2c1ed9167f7b31a81f2276f9e SHA1 330c58d5d712d9f04bd82e1ed983dba8d71b5384 SHA256 a89bccb9df511fedb38b506cbc0bb0614f0e9abb5865f1a00f41d6b5a8dfa80a +EBUILD blohg-0.9.1-r1.ebuild 1436 RMD160 29d6fc6c78b9f55f7575f5edeb012432b0267de0 SHA1 404ab9892a5d7b5c91b02ad6aaf34a45f12cc7f6 SHA256 bf57c890cc4c01fb28d317885d87c27f61b6128c57d701587e8f7813ba9ae8b8 +EBUILD blohg-9999.ebuild 1214 RMD160 3d89fc10ccde33e36f318589b866dbaecd6f2a2c SHA1 3757af331000eb42077525fad5fbb2f9592ab7a4 SHA256 e222a90fb31a3a708813321d868eb4b5ccca955a357ec9b6c2d2e7a0fe998ca5 +MISC ChangeLog 2592 RMD160 3c93d8efa7d10ce6601e21ba2241e8c39d6ea596 SHA1 32336a98c2f111cf09774458657822d393ea8ae6 SHA256 154edb78385831b7dacb7fe5a0d2c97fbf3533899fb78762aea430d07a259666 MISC metadata.xml 831 RMD160 3839796787fdb81da8b792107eaa9eb08c50633c SHA1 e3044688e6c4c443b1382f4cbb003ab809b41b09 SHA256 8a7df4759ec982bc3fd1a4c8e2d28c90385b22508f2f33b69aad80acc116da22 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJPBkYAAAoJEMmH5mwCk1Nvp98IAI/IjOJg6WOhdlGNgsGujidW -5+rIhkSY5/etKCXLlu35ZcC8a0uRPh5XuBG9bXORstfNccsXnhBsAhHz1o5N6CQW -JObVlGwUNhp8lCOTqvZCj41jO9VlIJ5pCnXktEHOjBgi4QU/sx4byQaWSatbxOyl -qbHXjT8vvF7HpyXnq/+XY8r7mZl2pa1fHqNoGKQYiQy4IUnqcg8SA6raBEGLhGjb -VNPajHM1sq6oKnl5mhxfLvhuNGjFJMDuIdziGGifovk71agiSz07vJPeVfwMk4wD -EjloR3u3fmkZL9bTb2znC9FdKsiVpYO5ASGN0+0Lu0cMy/pAYjnqRfYUf2weAvA= -=CfjE +iQEcBAEBAgAGBQJPCZ8fAAoJEMmH5mwCk1NvUu4H/j1zmDCCsYrMrfJ1U2n+f0Bq +6qttjFOXtDuqlzyfS2j8njr/RFygOYpdg6xgS9W1XICjpzrw/StwGKVWQcsR1zAM +ASnzLhLXnvE3J41NA9Su1WH401rFYSFi2ITBKwcw2tfkPf/8jajMq2xN/hH7RdMQ +mNczZrcUL5xJF1DnjCLrH5Ot+TgjpycwTvCUtkaf1B+0KwAJaIdPsjm0v2RQF4r5 +hyeoDOie77VwhtMbbfmHC6djDgw70HHxZh0YJ7GBTfY1wSeIKrRs4gjSlahf7VcS +Azt76ITHx1rZW8t697sRzhGPUwAG0XbCP1oGPFbrMU3h2al9hGJCXxWOT5W7r4w= +=6+MK -----END PGP SIGNATURE----- diff --git a/www-apps/blohg/blohg-0.9.1-r1.ebuild b/www-apps/blohg/blohg-0.9.1-r1.ebuild new file mode 100644 index 000000000000..734e6713bef2 --- /dev/null +++ b/www-apps/blohg/blohg-0.9.1-r1.ebuild @@ -0,0 +1,65 @@ +# 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-r1.ebuild,v 1.1 2012/01/08 13:50:14 rafaelmartins Exp $ + +EAPI="3" + +PYTHON_DEPEND="2:2.6" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="2.4 2.5 3.*" +DISTUTILS_SRC_TEST="setup.py" + +inherit distutils eutils + +DESCRIPTION="A Mercurial-based blogging engine." +HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc test" + +DEPEND=">=dev-python/docutils-0.7 + >=dev-python/flask-0.7 + >=dev-python/flask-babel-0.6 + >=dev-python/flask-script-0.3 + >=dev-python/frozen-flask-0.7 + >=dev-python/jinja-2.5.2 + >=dev-vcs/mercurial-1.6 + dev-python/pyyaml + dev-python/setuptools + dev-python/pygments + doc? ( dev-python/sphinx )" + +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-fix_tests.patch" + distutils_src_prepare +} + +src_compile() { + distutils_src_compile + + if use doc; then + einfo 'building documentation' + emake -C docs html + fi +} + +src_install() { + distutils_src_install + + if use doc; then + einfo 'installing documentation' + dohtml -r docs/_build/html/* + fi +} + +pkg_postinst() { + distutils_pkg_postinst + + einfo "If you're upgrading from <=blohg-0.5.1, please read the upgrade notes:" + einfo "http://docs.blohg.org/upgrade/#from-0-5-1-to-0-6" +} diff --git a/www-apps/blohg/blohg-0.9.1.ebuild b/www-apps/blohg/blohg-0.9.1.ebuild deleted file mode 100644 index a6838ec7c559..000000000000 --- a/www-apps/blohg/blohg-0.9.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 $ - -EAPI="3" - -PYTHON_DEPEND="2:2.6" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 3.*" -DISTUTILS_SRC_TEST="setup.py" - -inherit distutils - -DESCRIPTION="A Mercurial-based blogging engine." -HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc test" - -DEPEND=">=dev-python/docutils-0.7 - >=dev-python/flask-0.7 - >=dev-python/flask-babel-0.6 - >=dev-python/flask-script-0.3 - >=dev-python/frozen-flask-0.7 - >=dev-python/jinja-2.5.2 - >=dev-vcs/mercurial-1.6 - dev-python/pyyaml - dev-python/setuptools - dev-python/pygments - doc? ( dev-python/sphinx )" - -RDEPEND="${DEPEND}" - -src_compile() { - distutils_src_compile - - if use doc; then - einfo 'building documentation' - emake -C docs html - fi -} - -src_install() { - distutils_src_install - - if use doc; then - einfo 'installing documentation' - dohtml -r docs/_build/html/* - fi -} - -pkg_postinst() { - distutils_pkg_postinst - - einfo "If you're upgrading from <=blohg-0.5.1, please read the upgrade notes:" - einfo "http://docs.blohg.org/upgrade/#from-0-5-1-to-0-6" -} 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 +# 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() -- cgit v1.2.3-65-gdbad