5 files changed, 89 insertions, 4 deletions
diff --git a/dev-python/cython/ChangeLog b/dev-python/cython/ChangeLog
index 78d30be4236e..104f9a748c16 100644
--- a/dev-python/cython/ChangeLog
+++ b/dev-python/cython/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/cython
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.108 2014/02/16 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.109 2014/02/21 14:12:23 jlec Exp $
+
+*cython-0.20.1 (21 Feb 2014)
+
+  21 Feb 2014; Justin Lecher <jlec@gentoo.org> cython-0.20.ebuild,
+  +cython-0.20.1.ebuild, +files/cython-0.20.1-backport-test-fix.patch,
+  metadata.xml:
+  Version Bump; respect FLAGS* for py2, #499422
 
   16 Feb 2014; Mike Frysinger <vapier@gentoo.org> cython-0.19.1.ebuild:
   Mark arm stable.
diff --git a/dev-python/cython/cython-0.20.1.ebuild b/dev-python/cython/cython-0.20.1.ebuild
new file mode 100644
index 000000000000..2c7d0f5a0d5c
--- /dev/null
+++ b/dev-python/cython/cython-0.20.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.20.1.ebuild,v 1.1 2014/02/21 14:12:23 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND=""
+_DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[$(python_gen_usedep python{2_6,2_7,3_2,3_3})] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-backport-test-fix.patch
+)
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cython/cython-0.20.ebuild b/dev-python/cython/cython-0.20.ebuild
index c41a3381c0d5..5c0b664a1479 100644
--- a/dev-python/cython/cython-0.20.ebuild
+++ b/dev-python/cython/cython-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.20.ebuild,v 1.2 2014/01/31 07:42:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.20.ebuild,v 1.3 2014/02/21 14:12:23 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -28,7 +28,8 @@ S="${WORKDIR}/${MY_PN}-${PV%_*}"
 
 python_compile() {
 	if [[ ${EPYTHON} == python2* ]]; then
-		local CFLAGS CXXFLAGS
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
 		append-flags -fno-strict-aliasing
 	fi
 
@@ -44,6 +45,7 @@ python_compile_all() {
 }
 
 python_test() {
+	tc-export CC
 	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
 		|| die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/cython/files/cython-0.20.1-backport-test-fix.patch b/dev-python/cython/files/cython-0.20.1-backport-test-fix.patch
new file mode 100644
index 000000000000..4700c7b928ab
--- /dev/null
+++ b/dev-python/cython/files/cython-0.20.1-backport-test-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/Cython/Debugger/Tests/TestLibCython.py b/Cython/Debugger/Tests/TestLibCython.py
+index 142c665..2f91096 100644
+--- a/Cython/Debugger/Tests/TestLibCython.py
++++ b/Cython/Debugger/Tests/TestLibCython.py
+@@ -124,6 +123,7 @@ def setUp(self):
+                 workdir=self.tempdir,
+                 # we clean up everything (not only compiled files)
+                 cleanup_workdir=False,
++                tags=runtests.parse_tags(codefile),
+                 **opts
+             )
+ 
+
diff --git a/dev-python/cython/metadata.xml b/dev-python/cython/metadata.xml
index 22f134462516..3fc01d832734 100644
--- a/dev-python/cython/metadata.xml
+++ b/dev-python/cython/metadata.xml
@@ -8,6 +8,6 @@
     more cutting edge functionality and optimizations. 
   </longdescription>
   <use>
-    <flag name='numpy'>Enable support for <pkg>dev-python/numpy</pkg></flag>
+    <flag name="numpy">Enable support for <pkg>dev-python/numpy</pkg></flag>
   </use>
 </pkgmetadata>