Version bump.

(Portage version: 14242-svn/cvs/Linux x86_64)

4 files changed, 69 insertions, 121 deletions

diff --git a/dev-python/jinja2/ChangeLog b/dev-python/jinja2/ChangeLog
index db0472b29be7..0b1563565d09 100644
--- a/dev-python/jinja2/ChangeLog
+++ b/dev-python/jinja2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/jinja2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.17 2009/08/10 20:43:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.18 2009/09/13 20:38:34 arfrever Exp $
+
+*jinja2-2.2 (13 Sep 2009)
+
+  13 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -jinja2-2.0.ebuild, -jinja2-2.1.ebuild, +jinja2-2.2.ebuild:
+  Version bump.
 
   10 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   jinja2-2.1.1-r1.ebuild:
diff --git a/dev-python/jinja2/jinja2-2.0.ebuild b/dev-python/jinja2/jinja2-2.0.ebuild
deleted file mode 100644
index ac3fc87a5ec5..000000000000
--- a/dev-python/jinja2/jinja2-2.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.0.ebuild,v 1.4 2009/02/22 12:36:32 loki_val Exp $
-# Ebuild generated by g-pypi 0.2.2 (rev. 214)
-
-inherit distutils
-
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE="http://jinja.pocoo.org/"
-SRC_URI="http://pypi.python.org/packages/source/J/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc examples i18n test"
-
-CDEPEND="virtual/python
-	dev-python/setuptools"
-DEPEND="${CDEPEND}
-	doc? ( >=dev-python/docutils-0.4
-		   >=dev-python/sphinx-0.3 )"
-RDEPEND="${CDEPEND}
-	i18n? ( >=dev-python/Babel-0.9.3 )"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="CHANGES"
-
-src_compile(){
-	distutils_src_compile
-	epatch "${FILESDIR}/${P}_no_docs.patch"
-
-	if use doc ; then
-		cd "${S}/docs"
-		PYTHONPATH=../ emake html || die "Error building docs"
-	fi
-}
-
-src_install(){
-	distutils_src_install
-
-	if use doc ; then
-		dohtml -r docs/_build/html/* ||
-			die "Failed to install docs"
-	fi
-
-	if use examples ; then
-		#Eliminate pyc files going into /usr/share
-	    $(find examples -name '*.pyc' -exec rm -rf {} ';')
-
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples ||
-			die "Failed to install examples"
-	fi
-}
-
-src_test(){
-	"${python}" setup.py test || die "Tests failed"
-}
diff --git a/dev-python/jinja2/jinja2-2.1.ebuild b/dev-python/jinja2/jinja2-2.1.ebuild
deleted file mode 100644
index 75f3991a5cf0..000000000000
--- a/dev-python/jinja2/jinja2-2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.1.ebuild,v 1.2 2009/02/22 12:36:32 loki_val Exp $
-# Ebuild generated by g-pypi 0.2.2 (rev. 214)
-
-inherit distutils
-
-MY_PN="Jinja2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
-HOMEPAGE="http://jinja.pocoo.org/"
-SRC_URI="http://pypi.python.org/packages/source/J/${MY_PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="doc examples i18n test"
-
-CDEPEND="virtual/python
-	dev-python/setuptools"
-DEPEND="${CDEPEND}
-	doc? ( >=dev-python/docutils-0.4
-		   >=dev-python/sphinx-0.3 )"
-RDEPEND="${CDEPEND}
-	i18n? ( >=dev-python/Babel-0.9.3 )"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="CHANGES"
-
-src_compile(){
-	distutils_src_compile
-	epatch "${FILESDIR}/${PN}-2.0_no_docs.patch"
-
-	if use doc ; then
-		cd "${S}/docs"
-		PYTHONPATH=../ emake html || die "Error building docs"
-	fi
-}
-
-src_install(){
-	distutils_src_install
-
-	if use doc ; then
-		dohtml -r docs/_build/html/* ||
-			die "Failed to install docs"
-	fi
-
-	if use examples ; then
-		#Eliminate pyc files going into /usr/share
-	    $(find examples -name '*.pyc' -exec rm -rf {} ';')
-
-		insinto "/usr/share/doc/${PF}"
-		doins -r examples ||
-			die "Failed to install examples"
-	fi
-}
-
-src_test(){
-	"${python}" setup.py test || die "Tests failed"
-}
diff --git a/dev-python/jinja2/jinja2-2.2.ebuild b/dev-python/jinja2/jinja2-2.2.ebuild
new file mode 100644
index 000000000000..962c60731e8c
--- /dev/null
+++ b/dev-python/jinja2/jinja2-2.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.2.ebuild,v 1.1 2009/09/13 20:38:34 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils
+
+MY_PN="Jinja2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure python."
+HOMEPAGE="http://jinja.pocoo.org/"
+SRC_URI="http://pypi.python.org/packages/source/J/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="doc examples i18n"
+
+CDEPEND="dev-python/setuptools"
+DEPEND="${CDEPEND}
+	doc? ( >=dev-python/docutils-0.4
+		   >=dev-python/sphinx-0.3 )"
+RDEPEND="${CDEPEND}
+	i18n? ( >=dev-python/Babel-0.9.3 )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="CHANGES"
+
+src_compile(){
+	distutils_src_compile
+
+	if use doc; then
+		cd "${S}/docs"
+		PYTHONPATH=.. emake html || die "Building of documentation failed"
+	fi
+}
+
+src_test(){
+	testing() {
+		PYTHONPATH="$build-${PYTHON_ABI}/lib" "$(PYTHON)" setup.py test
+	}
+	python_execute_function testing
+}
+
+src_install(){
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
+	fi
+
+	if use examples; then
+		# Eliminate .pyc files going into /usr/share
+	    find examples -name "*.pyc" -print0 | xargs -0 rm -fr
+
+		insinto "/usr/share/doc/${PF}"
+		doins -r examples || die "Failed to install examples"
+	fi
+}