From 8c63e62d0bdf027f98c7e09ec669efa30eaee6f7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 3 Jul 2014 20:40:11 +0200 Subject: [PATCH] New package: python-Jinja2-2.7.3 with 3.4 subpkg, replaces python-jinja Revbump affected pkgs. --- srcpkgs/ansible/template | 6 +++--- srcpkgs/buildbot/template | 4 ++-- srcpkgs/pelican/template | 6 +++--- srcpkgs/python-Jinja2/template | 31 +++++++++++++++++++++++++++++++ srcpkgs/python-jinja/template | 28 ---------------------------- srcpkgs/python3.4-Jinja2 | 1 + srcpkgs/python3.4-jinja | 1 - srcpkgs/wok/template | 4 ++-- 8 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 srcpkgs/python-Jinja2/template delete mode 100644 srcpkgs/python-jinja/template create mode 120000 srcpkgs/python3.4-Jinja2 delete mode 120000 srcpkgs/python3.4-jinja diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 63b9997f8e0..41ec6e607c4 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,12 +1,12 @@ # Template file for 'ansible' pkgname=ansible version=1.6.3 -revision=1 +revision=2 noarch="yes" build_style=python-module hostmakedepends="python-setuptools" -makedepends="python-devel python-jinja python-paramiko python-yaml" -depends="python python-jinja python-paramiko python-yaml" +makedepends="python-devel python-Jinja2 python-paramiko python-yaml" +depends="${makedepends//-devel/}" pycompile_module="${pkgname}" short_desc="A radically simple deployment, model-driven configuration management, and command execution framework" maintainer="Juan RP " diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template index b5188dc9fc2..fbe11357658 100644 --- a/srcpkgs/buildbot/template +++ b/srcpkgs/buildbot/template @@ -1,11 +1,11 @@ # Template file for 'buildbot' pkgname=buildbot version=0.8.8 -revision=2 +revision=3 noarch="yes" build_style=python-module hostmakedepends="python" -makedepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted" +makedepends="python python-Jinja2 sqlalchemy-migrate python-simplejson Twisted" depends="${makedepends}" pycompile_module="buildbot" short_desc="A system to automate the compile/test cycle" diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template index 66ac610b9e2..892eacbfb37 100644 --- a/srcpkgs/pelican/template +++ b/srcpkgs/pelican/template @@ -1,11 +1,11 @@ # Template file for 'pelican' pkgname=pelican version=3.4.0 -revision=2 +revision=3 noarch=yes build_style=python-module hostmakedepends="python-setuptools" -makedepends="python-devel python-feedgenerator python-jinja python-Pygments +makedepends="python-devel python-feedgenerator python-Jinja2 python-Pygments python-docutils python-pytz python-blinker python-Unidecode python-six python-dateutil" depends="${makedepends//-devel/}" @@ -14,5 +14,5 @@ short_desc="Static site generator, written in Python" maintainer="Juan RP " homepage="http://getpelican.com/" license="AGPL-3" -distfiles="https://pypi.python.org/packages/source/p/pelican/pelican-${version}.tar.gz" +distfiles="https://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a0487cc15721fcafc9b4b17a030c4655da6a365344c6bdadda8296423a746c8c diff --git a/srcpkgs/python-Jinja2/template b/srcpkgs/python-Jinja2/template new file mode 100644 index 00000000000..c52c31a1cfa --- /dev/null +++ b/srcpkgs/python-Jinja2/template @@ -0,0 +1,31 @@ +# Template file for 'python-Jinja2' +pkgname=python-Jinja2 +version=2.7.3 +revision=3 +noarch=yes +wrksrc="${pkgname#*-}-${version}" +build_style=python-module +python_versions="2.7 3.4" +pycompile_module="jinja2" +hostmakedepends="python-setuptools python3.4-setuptools" +makedepends="python-devel python3.4-devel python-MarkupSafe python3.4-MarkupSafe" +depends="python python-MarkupSafe" +replaces="python-jinja>=0" +short_desc="A full featured template engine for Python2" +maintainer="Alessio Sergi " +homepage="http://jinja.pocoo.org/" +license="BSD" +distfiles="http://pypi.python.org/packages/source/J/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz" +checksum=2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb + +python3.4-Jinja2_package() { + noarch=yes + depends="python3.4 python3.4-MarkupSafe" + replaces="python3.4-jinja>=0" + pycompile_version="3.4" + pycompile_module="jinja2" + short_desc="${short_desc/Python2/Python3.4}" + pkg_install() { + vmove usr/lib/python3.4 + } +} diff --git a/srcpkgs/python-jinja/template b/srcpkgs/python-jinja/template deleted file mode 100644 index db2f7f2d0fd..00000000000 --- a/srcpkgs/python-jinja/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'python-jinja' -pkgname=python-jinja -version=2.7.3 -revision=2 -noarch=yes -wrksrc="Jinja2-${version}" -build_style=python-module -python_versions="2.7 3.4" -pycompile_module="jinja2" -hostmakedepends="python-setuptools python3.4-setuptools" -makedepends="python-devel python3.4-devel python-MarkupSafe" -depends="python-MarkupSafe" -short_desc="Modern and designer friendly templating language for Python2" -maintainer="Juan RP " -homepage="http://jinja.pocoo.org/" -license="BSD" -distfiles="http://pypi.python.org/packages/source/J/Jinja2/Jinja2-${version}.tar.gz" -checksum=2e24ac5d004db5714976a04ac0e80c6df6e47e98c354cb2c0d82f8879d4f8fdb - -python3.4-jinja_package() { - depends="python3.4-MarkupSafe" - pycompile_version="3.4" - pycompile_module="jinja2" - short_desc="${short_desc/Python2/Python3.4}" - pkg_install() { - vmove usr/lib/python3.4 - } -} diff --git a/srcpkgs/python3.4-Jinja2 b/srcpkgs/python3.4-Jinja2 new file mode 120000 index 00000000000..a87362a4b0a --- /dev/null +++ b/srcpkgs/python3.4-Jinja2 @@ -0,0 +1 @@ +python-Jinja2 \ No newline at end of file diff --git a/srcpkgs/python3.4-jinja b/srcpkgs/python3.4-jinja deleted file mode 120000 index c2dcf9ce520..00000000000 --- a/srcpkgs/python3.4-jinja +++ /dev/null @@ -1 +0,0 @@ -python-jinja \ No newline at end of file diff --git a/srcpkgs/wok/template b/srcpkgs/wok/template index 0ea4854ee8e..0576e75d3be 100644 --- a/srcpkgs/wok/template +++ b/srcpkgs/wok/template @@ -1,12 +1,12 @@ # Template file for 'wok' pkgname=wok version=1.1.1 -revision=3 +revision=4 build_style=python-module noarch="yes" pycompile_module="wok" hostmakedepends="python-devel python-setuptools" -makedepends="python-devel python-jinja python-yaml python-docutils python-Markdown python-Pygments" +makedepends="python-devel python-Jinja2 python-yaml python-docutils python-Markdown python-Pygments" depends="${makedepends/python-devel/}" short_desc="A simple static site generator in python" maintainer="Juan RP "