Move to EAPI=4 and import pypy fixes from progress overlay, thanks Arfrever for the work

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 34 insertions, 32 deletions

diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index 4af0d904141b..141869135657 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.57 2012/02/21 04:11:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.58 2012/03/10 17:48:40 jlec Exp $
+
+  10 Mar 2012; Justin Lecher <jlec@gentoo.org> jinja-2.6.ebuild, metadata.xml:
+  Move to EAPI=4 and import pypy fixes from progress overlay, thanks Arfrever
+  for the work
 
   21 Feb 2012; Patrick Lauer <patrick@gentoo.org> jinja-2.5.5.ebuild,
   jinja-2.6.ebuild:
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index b7d0d7c0576f..a83b5a18e2ea 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST Jinja2-2.5.5.tar.gz 438586 RMD160 dd11840c285e05ff53d6b18f5d92c093fa6b23ca SHA1 a983513cdc4c371007323cc2288f9add32e76f65 SHA256 22f9675e42dc640c4469d4f7d210baecb5e695823af954c813d51c930235675d
 DIST Jinja2-2.6.tar.gz 389741 RMD160 77829eabfc71dd6cf7eece1fe5d0b96b21de3b18 SHA1 f122aeb324b2009bbcee341d0f001a047ac4bbe5 SHA256 a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49
 EBUILD jinja-2.5.5.ebuild 1986 RMD160 806d53eb72ef2822fe3de051bce6219e1937bb20 SHA1 431ef44f81756e94905b1f28987bb4d14db41935 SHA256 c594ef031302e44f8d78641ff23d0b582426e09780511a44fb2fa9b1864927d5
-EBUILD jinja-2.6.ebuild 2007 RMD160 aa82f9ed5ed202ca753122acb9775b857ecbc5f1 SHA1 e02c68b563ce28e114d3d23e998915cd17bba938 SHA256 fba48ae3305f265a473d20123550490cce861d63a8725681cf706b8b260eb1c3
-MISC ChangeLog 11775 RMD160 22c998951844e16d45f69c759960b056e2c75234 SHA1 6a1fb8d8d208d6cd6101350985616eae6d8b16d2 SHA256 8d267789afa3a20d3c5d572aad8ea9bd436f0e70a91e59cf82bb6f9839672a89
-MISC metadata.xml 260 RMD160 73b34094a529f5ab0dcf98717fe00e6759dfb397 SHA1 48e84c78c92d7b5cdadb9db94c7c5681158ab498 SHA256 02bf37f6abc119298b0af0cfc3ce295479e514b0c1b39465e2c4e8f1b1628f7c
+EBUILD jinja-2.6.ebuild 1656 RMD160 13ca1f11f583c421b2dcf7169145939a305f87a6 SHA1 581eab55d7acac5748a34f22b74c98c907c0e188 SHA256 884ae89d9631ffe15b23515051eeab7c15f41674e33ab8b53abcafbfcd006bdc
+MISC ChangeLog 11945 RMD160 2385f80d3f606ef3579a0f74c1a9f5cd1355f37b SHA1 fb3bd5553c6d235dcd17f4bcdfdd0d76fef1d479 SHA256 b5669ee9bae4655fc8d2f043ec66ed1215b851511c0d9fd1bbb375938dd86959
+MISC metadata.xml 260 RMD160 1c889031fcca339d7fac41f11b1686ed9879bfaa SHA1 0e482449c8e3ae532f7d8501babc5babffc44385 SHA256 bda84a3528019ac7c58b2435d70ad4a5f5c5fa29f0f8643569b4710081c2e555
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk9bk/4ACgkQgAnW8HDreRYUpwCgyi7FcVB7f5qjiGhu3A39mL3F
+TtEAn3PjnqnkwhR+Dp3pmi9P83ArT6Bk
+=o0k5
+-----END PGP SIGNATURE-----
diff --git a/dev-python/jinja/jinja-2.6.ebuild b/dev-python/jinja/jinja-2.6.ebuild
index 85e043b5137e..93da37ea6f84 100644
--- a/dev-python/jinja/jinja-2.6.ebuild
+++ b/dev-python/jinja/jinja-2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.11 2012/02/21 04:11:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6.ebuild,v 1.12 2012/03/10 17:48:40 jlec Exp $
+
+EAPI=4
 
-EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
 DISTUTILS_SRC_TEST="setup.py"
 
 inherit distutils
@@ -32,51 +32,39 @@ S="${WORKDIR}/${MY_P}"
 DOCS="CHANGES"
 PYTHON_MODNAME="jinja2"
 
-set_global_options() {
-	if [[ "$(python_get_implementation)" != "Jython" ]]; then
-		DISTUTILS_GLOBAL_OPTIONS=("--with-debugsupport")
-	else
-		DISTUTILS_GLOBAL_OPTIONS=()
-	fi
-}
-
-distutils_src_compile_pre_hook() {
-	set_global_options
-}
+DISTUTILS_GLOBAL_OPTIONS=("*-cpython --with-debugsupport")
 
 src_compile(){
 	distutils_src_compile
 
 	if use doc; then
 		einfo "Generation of documentation"
-		cd docs
-		PYTHONPATH=".." emake html || die "Building of documentation failed"
+		pushd docs > /dev/null
+		PYTHONPATH=".." emake html
+		popd > /dev/null
 	fi
 }
 
-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
 
+	delete_tests() {
+		rm -fr "${ED}$(python_get_sitedir)/jinja2/testsuite"
+	}
+	python_execute_function -q delete_tests
+
 	if use doc; then
-		dohtml -r docs/_build/html/* || die "Installation of documentation failed"
+		dohtml -r docs/_build/html/*
 	fi
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples || die "Installation of examples failed"
+		doins -r examples
 	fi
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins ext/Vim/* || die "Installation of Vim syntax files failed"
+		doins ext/Vim/*
 	fi
 }
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index aca2dd1d2030..c5dd137f8c01 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>python</herd>
 	<use>
-		<flag name='i18n'>Enables support for i18n with <pkg>dev-python/Babel</pkg></flag>
+		<flag name="i18n">Enables support for i18n with <pkg>dev-python/Babel</pkg></flag>
 	</use>
 </pkgmetadata>