Add dev-python/mako and dependencies to portage-stable, needed by new piglit

Current upstream versions of the piglit testsuite require the mako
template engine.  Add dev-python/mako and its dependencies
dev-python/beaker and dev-python/markupsafe to portage-stable.

Upgraded dev-python/beaker to versions 1.5.4-r1 on arm AND 1.6.4 on amd64 AND 1.6.4 on x86
Upgraded dev-python/mako to version 0.7.0 on amd64, arm, x86
Upgraded dev-python/markupsafe to version 0.15 on amd64, arm, x86

BUG=None
TEST=emerged on amd64 and x86 and arm
TEST=Also tested as part of subsequent upgrade of piglit.

Change-Id: Id74659d762a9114082a917fb086c8f43c71e35a3
Reviewed-on: https://gerrit.chromium.org/gerrit/32289
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Josh Triplett <josh@joshtriplett.org>
Tested-by: Josh Triplett <josh@joshtriplett.org>
This commit is contained in:
Josh Triplett 2012-09-05 14:44:31 -07:00 committed by Gerrit
parent 153eeb98e8
commit d4aed6aaa2
10 changed files with 195 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST Beaker-1.5.4.tar.gz 46238 RMD160 a60e052a362a6fbf0d3564caaff625879fdef37f SHA1 72a696854e36e2ea92f4535209e4538baf06caa0 SHA256 a13dc6ae0e9490c85fc2c1ba035ea5b21cd684ee3b4b70b6a9e473f0550a716b

View File

@ -0,0 +1,36 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.5.4-r1.ebuild,v 1.3 2012/08/05 07:06:24 blueness Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_TESTS_RESTRICTED_ABIS="3.*"
PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils
MY_PN="Beaker"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A Session and Caching library with WSGI Middleware"
HOMEPAGE="http://beaker.groovie.org/ http://pypi.python.org/pypi/Beaker"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
DEPEND="dev-python/setuptools
test? ( dev-python/webtest )"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
src_prepare() {
distutils_src_prepare
# Workaround for http://bugs.python.org/issue11276.
sed -e "s/import anydbm/& as anydbm/;/import anydbm/a dbm = anydbm" -i beaker/container.py
}

View File

@ -0,0 +1 @@
DIST Mako-0.7.0.tar.gz 398315 RMD160 1428904d236726decd1f9e95205c29d4428977f1 SHA1 9743c8d90048151c234625219c2ddcd6b201a14c SHA256 2a0acef46ab00d355c668addac08b51712e26741c21f7329de6ce8e8fc229f8e

View File

@ -0,0 +1,11 @@
diff -ur Mako-0.7.0.orig/test/test_template.py Mako-0.7.0/test/test_template.py
--- test/test_template.py 2012-03-31 07:52:02.000000000 +0800
+++ test/test_template.py 2012-04-11 20:25:23.797168875 +0800
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-
+from __future__ import with_statement
from mako.template import Template, ModuleTemplate
from mako.lookup import TemplateLookup
from mako.ext.preprocessors import convert_comments

View File

@ -0,0 +1,56 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.0.ebuild,v 1.6 2012/08/05 19:12:41 blueness Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="nosetests"
inherit distutils eutils
MY_P="Mako-${PV}"
DESCRIPTION="A Python templating language"
HOMEPAGE="http://www.makotemplates.org/ http://pypi.python.org/pypi/Mako"
SRC_URI="http://www.makotemplates.org/downloads/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 arm ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc"
RDEPEND=">=dev-python/beaker-1.1
>=dev-python/markupsafe-0.9.2"
DEPEND="${RDEPEND}
dev-python/setuptools"
S="${WORKDIR}/${MY_P}"
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
src_prepare() {
distutils_src_prepare
epatch "${FILESDIR}/test-fix.patch"
2to3_conversion() {
[[ "${PYTHON_ABI}" == 2.* ]] && return
2to3-${PYTHON_ABI} -nw --no-diffs test
}
python_execute_function -s 2to3_conversion
}
src_test() {
distutils_src_test -P -w test
}
src_install() {
distutils_src_install
if use doc; then
pushd doc > /dev/null
rm -fr build
insinto /usr/share/doc/${PF}/html
doins -r [a-z]* _static || die "Installation of documentation failed"
popd > /dev/null
fi
}

View File

@ -0,0 +1 @@
DIST MarkupSafe-0.15.tar.gz 11265 RMD160 862475bb620c6b92be74a8daa2eafe09a488fcb8 SHA1 81e0c898c289721d5b1aa70ffc0dfc35886ea92a SHA256 339ec04d20ad9cdccbfe9f38dce6182cc504ce789e5d0f9647eaa752f0f95300

View File

@ -0,0 +1,51 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15.ebuild,v 1.13 2012/05/09 00:11:59 aballier Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
DISTUTILS_SRC_TEST="setup.py"
inherit distutils
MY_PN="MarkupSafe"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
HOMEPAGE="http://pypi.python.org/pypi/MarkupSafe"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE=""
DEPEND="dev-python/setuptools"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
set_global_options() {
if [[ "$(python_get_implementation)" = "CPython" ]]; then
DISTUTILS_GLOBAL_OPTIONS=("--with-speedups")
else
DISTUTILS_GLOBAL_OPTIONS=()
fi
}
distutils_src_compile_pre_hook() {
set_global_options
}
distutils_src_test_pre_hook() {
set_global_options
}
distutils_src_install_pre_hook() {
set_global_options
}
src_install() {
distutils_src_install
python_clean_installation_image
}

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare test
DEPEND=dev-python/setuptools test? ( dev-python/webtest ) >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose )
DESCRIPTION=A Session and Caching library with WSGI Middleware
EAPI=3
HOMEPAGE=http://beaker.groovie.org/ http://pypi.python.org/pypi/Beaker
IUSE=test test
KEYWORDS=amd64 arm ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=>=app-admin/eselect-python-20091230 dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/B/Beaker/Beaker-1.5.4.tar.gz
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68
_md5_=cb629575fb613679a5a41a09c9e95f32

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install postinst postrm prepare test
DEPEND=>=dev-python/beaker-1.1 >=dev-python/markupsafe-0.9.2 dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python test? ( dev-python/nose )
DESCRIPTION=A Python templating language
EAPI=3
HOMEPAGE=http://www.makotemplates.org/ http://pypi.python.org/pypi/Mako
IUSE=doc test
KEYWORDS=amd64 arm ~hppa ppc ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
LICENSE=MIT
RDEPEND=>=dev-python/beaker-1.1 >=dev-python/markupsafe-0.9.2 >=app-admin/eselect-python-20091230 dev-lang/python
SLOT=0
SRC_URI=http://www.makotemplates.org/downloads/Mako-0.7.0.tar.gz
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
_md5_=8fa7ec69adfa19c0c5afbe8b65b37ac5

View File

@ -0,0 +1,12 @@
DEFINED_PHASES=compile install postinst postrm prepare test
DEPEND=dev-python/setuptools >=app-admin/eselect-python-20091230 dev-lang/python
DESCRIPTION=Implements a XML/HTML/XHTML Markup safe string for Python
EAPI=3
HOMEPAGE=http://pypi.python.org/pypi/MarkupSafe
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
LICENSE=BSD
RDEPEND=>=app-admin/eselect-python-20091230 dev-lang/python
SLOT=0
SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-0.15.tar.gz
_eclasses_=distutils b4c334e216d998c4ce4b750cb091e42e multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68
_md5_=dd64fbe7f9c2d9102da63c5ec8eea4f1