5 files changed, 66 insertions, 163 deletions
diff --git a/dev-python/cython/ChangeLog b/dev-python/cython/ChangeLog
index bb05d0f7dc15..2a4290995b27 100644
--- a/dev-python/cython/ChangeLog
+++ b/dev-python/cython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.93 2013/02/16 22:07:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.94 2013/05/23 08:26:53 patrick Exp $
+
+*cython-0.19 (23 May 2013)
+
+  23 May 2013; Patrick Lauer <patrick@gentoo.org> +cython-0.19.ebuild,
+  -cython-0.14.1-r1.ebuild, -cython-0.14.1.ebuild, -cython-0.15.1-r1.ebuild:
+  Bump
 
   16 Feb 2013; Michał Górny <mgorny@gentoo.org> cython-0.18-r1.ebuild:
   Enable py3.3.
diff --git a/dev-python/cython/cython-0.14.1-r1.ebuild b/dev-python/cython/cython-0.14.1-r1.ebuild
deleted file mode 100644
index 788c7cf524e5..000000000000
--- a/dev-python/cython/cython-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.14.1-r1.ebuild,v 1.1 2012/03/31 19:13:10 floppym Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="The Cython compiler for writing C extensions for the Python language"
-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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/cython"
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.14.1.ebuild b/dev-python/cython/cython-0.14.1.ebuild
deleted file mode 100644
index a231bd7ee7dd..000000000000
--- a/dev-python/cython/cython-0.14.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.14.1.ebuild,v 1.8 2012/02/20 10:04:45 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="The Cython compiler for writing C extensions for the Python language"
-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="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.15.1-r1.ebuild b/dev-python/cython/cython-0.15.1-r1.ebuild
deleted file mode 100644
index 1481c32aa83b..000000000000
--- a/dev-python/cython/cython-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.15.1-r1.ebuild,v 1.1 2012/03/31 19:13:10 floppym Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="Compiler for writing C extensions for the Python language"
-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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples numpy"
-
-DEPEND="numpy? ( >=dev-python/numpy-1.6.1-r1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-test.patch
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/cython"
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.19.ebuild b/dev-python/cython/cython-0.19.ebuild
new file mode 100644
index 000000000000..8674ad5b54d9
--- /dev/null
+++ b/dev-python/cython/cython-0.19.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.ebuild,v 1.1 2013/05/23 08:26:53 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 flag-o-matic
+
+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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+# Note: update numpy dep when it is fixed for py3.3.
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-python/numpy-1.6.1-r1[$(python_gen_usedep 'python2*' 'python3_[12]' )]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS 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 && emake -C docs html
+}
+
+python_test() {
+	"${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
+}