dev-python/sympy: Version BUmp; fix missing py3.3 handling, #488098

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 262 insertions, 29 deletions

diff --git a/dev-python/sympy/ChangeLog b/dev-python/sympy/ChangeLog
index 86872dbe35a5..5567e723620a 100644
--- a/dev-python/sympy/ChangeLog
+++ b/dev-python/sympy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sympy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.24 2013/10/13 10:17:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.25 2013/10/15 18:17:35 jlec Exp $
+
+*sympy-0.7.3 (15 Oct 2013)
+
+  15 Oct 2013; Justin Lecher <jlec@gentoo.org> sympy-0.7.2-r1.ebuild,
+  +sympy-0.7.3.ebuild, metadata.xml:
+  Version BUmp; fix missing py3.3 handling, #488098
 
   13 Oct 2013; Pacho Ramos <pacho@gentoo.org> sympy-0.7.2-r1.ebuild:
   Also compatible with python3_3
diff --git a/dev-python/sympy/metadata.xml b/dev-python/sympy/metadata.xml
index 811352deea94..81e46ad187fa 100644
--- a/dev-python/sympy/metadata.xml
+++ b/dev-python/sympy/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-mathematics</herd>
-	<maintainer>
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<longdescription>Computer algebra system (CAS) in Python</longdescription>
-	<use>
-		<flag name='ipython'>Add support for <pkg>dev-python/ipython</pkg></flag>
-		<flag name='imaging'>Add support for <pkg>dev-python/imaging</pkg></flag>
-		<flag name='mathml'>Add support for mathml</flag>
-		<flag name='pyglet'>Use <pkg>dev-python/pyglet</pkg> for plots and print preview</flag>
-		<flag name='texmacs'>Add <pkg>app-office/texmacs</pkg> interface</flag>
-		<flag name='system-mpmath'>Use mpmath from portage instead of the bundled one</flag>
-	</use>
+  <herd>sci-mathematics</herd>
+  <maintainer>
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription>Computer algebra system (CAS) in Python</longdescription>
+  <use>
+    <flag name="ipython">Add support for <pkg>dev-python/ipython</pkg></flag>
+    <flag name="imaging">Add support for <pkg>dev-python/imaging</pkg></flag>
+    <flag name="mathml">Add support for mathml</flag>
+    <flag name="pyglet">Use <pkg>dev-python/pyglet</pkg> for plots and print preview</flag>
+    <flag name="texmacs">Add <pkg>app-office/texmacs</pkg> interface</flag>
+    <flag name="system-mpmath">Use mpmath from portage instead of the bundled one</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/sympy/sympy-0.7.2-r1.ebuild b/dev-python/sympy/sympy-0.7.2-r1.ebuild
index dd2d7cbf01a4..d3e895eab36a 100644
--- a/dev-python/sympy/sympy-0.7.2-r1.ebuild
+++ b/dev-python/sympy/sympy-0.7.2-r1.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.2-r1.ebuild,v 1.4 2013/10/13 10:17:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.2-r1.ebuild,v 1.5 2013/10/15 18:17:35 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1 eutils
 DESCRIPTION="Computer algebra system (CAS) in Python"
 HOMEPAGE="http://sympy.org/"
-SRC_URI="python_targets_python2_6? ( http://sympy.googlecode.com/files/${P}.tar.gz )
+SRC_URI="
+	python_targets_python2_6? ( http://sympy.googlecode.com/files/${P}.tar.gz )
 	python_targets_python2_7? ( http://sympy.googlecode.com/files/${P}.tar.gz )
-	python_targets_python3_2? ( http://sympy.googlecode.com/files/${P}-py3.2.tar.gz )"
+	python_targets_python3_2? ( http://sympy.googlecode.com/files/${P}-py3.2.tar.gz )
+	python_targets_python3_3? ( http://sympy.googlecode.com/files/${P}-py3.2.tar.gz )"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
 IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet system-mpmath test texmacs"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	mathml? (
-		dev-libs/libxml2:2[python]
-		dev-libs/libxslt[python]
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		dev-libs/libxslt[python_targets_python2_6?,python_targets_python2_7?]
 		gtk? ( x11-libs/gtkmathview[gtk] ) )
 	latex? (
 		virtual/latex-base
@@ -27,20 +30,21 @@ RDEPEND="
 		pdf? ( app-text/ghostscript-gpl ) )
 	texmacs? ( app-office/texmacs )
 	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[python_targets_python2_6?,python_targets_python2_7?] )
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
 	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
 	pyglet? ( dev-python/pyglet[python_targets_python2_6?,python_targets_python2_7?] )
 	>=dev-python/pexpect-2.0[python_targets_python2_6?,python_targets_python2_7?]
 	system-mpmath? ( ~dev-python/mpmath-0.17[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}"
 
 system_mpmath() {
 	local MPMATH_FILES
-	MPMATH_FILES="sympy/combinatorics/permutations.py \
+	MPMATH_FILES="
+		sympy/combinatorics/permutations.py \
 		sympy/core/containers.py \
 		sympy/core/evalf.py \
 		sympy/core/expr.py \
@@ -105,8 +109,9 @@ system_mpmath() {
 		sympy/utilities/tests/test_lambdify.py \
 		examples/advanced/pidigits.py \
 		examples/advanced/autowrap_ufuncify.py"
-		rm -rf sympy/mpmath/*
-		sed -e "s:sympy\.mpmath:mpmath:g" \
+		rm -rf sympy/mpmath/* || die
+		sed \
+			-e "s:sympy\.mpmath:mpmath:g" \
 			-e "s:from sympy import mpmath:import mpmath:g" \
 			-i ${MPMATH_FILES} || die "failed to patch mpmath imports"
 		epatch "${FILESDIR}"/${P}-mpmath.patch
@@ -114,13 +119,13 @@ system_mpmath() {
 
 src_unpack() {
 	if use python_targets_python2_6 || use python_targets_python2_7; then
-		mkdir "${WORKDIR}"/python2
-		cd "${WORKDIR}"/python2
+		mkdir "${WORKDIR}"/python2 || die
+		cd "${WORKDIR}"/python2 || die
 		unpack ${P}.tar.gz
 	fi
 	if use python_targets_python3_2; then
-		mkdir "${WORKDIR}"/python3
-		cd "${WORKDIR}"/python3
+		mkdir "${WORKDIR}"/python3 || die
+		cd "${WORKDIR}"/python3 || die
 		unpack ${P}-py3.2.tar.gz
 	fi
 }
diff --git a/dev-python/sympy/sympy-0.7.3.ebuild b/dev-python/sympy/sympy-0.7.3.ebuild
new file mode 100644
index 000000000000..ab3275b904e9
--- /dev/null
+++ b/dev-python/sympy/sympy-0.7.3.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.7.3.ebuild,v 1.1 2013/10/15 18:17:35 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Computer algebra system (CAS) in Python"
+HOMEPAGE="http://sympy.org/ https://github.com/sympy/sympy"
+SRC_URI="
+	python_targets_python2_6? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz )
+	python_targets_python2_7? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz )
+	python_targets_python3_2? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}-py3.2.tar.gz )
+	python_targets_python3_3? ( https://github.com/${PN}/${PN}/releases/download/${P}/${P}-py3.2.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos"
+IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet system-mpmath test texmacs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	mathml? (
+		dev-libs/libxml2:2[${PYTHON_USEDEP}]
+		dev-libs/libxslt[python_targets_python2_6?,python_targets_python2_7?]
+		gtk? ( x11-libs/gtkmathview[gtk] ) )
+	latex? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsextra
+		png? ( app-text/dvipng )
+		pdf? ( app-text/ghostscript-gpl ) )
+	texmacs? ( app-office/texmacs )
+	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
+	imaging? ( virtual/python-imaging[${PYTHON_USEDEP}] )
+	pyglet? ( dev-python/pyglet[python_targets_python2_6?,python_targets_python2_7?] )
+	>=dev-python/pexpect-2.0[python_targets_python2_6?,python_targets_python2_7?]
+	system-mpmath? ( ~dev-python/mpmath-0.17[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"
+
+system_mpmath() {
+	local MPMATH_FILES
+	MPMATH_FILES="
+		sympy/combinatorics/permutations.py \
+		sympy/core/containers.py \
+		sympy/core/evalf.py \
+		sympy/core/expr.py \
+		sympy/core/function.py \
+		sympy/core/numbers.py \
+		sympy/core/power.py \
+		sympy/core/sets.py \
+		sympy/core/tests/test_evalf.py \
+		sympy/core/tests/test_numbers.py \
+		sympy/core/tests/test_sets.py \
+		sympy/core/tests/test_sympify.py \
+		sympy/external/tests/test_numpy.py \
+		sympy/functions/combinatorial/numbers.py \
+		sympy/functions/combinatorial/tests/test_comb_numbers.py \
+		sympy/functions/special/bessel.py \
+		sympy/functions/special/gamma_functions.py \
+		sympy/functions/special/hyper.py \
+		sympy/functions/special/tests/test_hyper.py \
+		sympy/matrices/matrices.py \
+		sympy/ntheory/partitions_.py \
+		sympy/physics/quantum/constants.py \
+		sympy/physics/quantum/qubit.py \
+		sympy/plotting/experimental_lambdify.py \
+		sympy/plotting/intervalmath/interval_arithmetic.py \
+		sympy/polys/numberfields.py \
+		sympy/polys/polytools.py \
+		sympy/polys/rootoftools.py \
+		sympy/polys/domains/__init__.py \
+		sympy/polys/domains/algebraicfield.py \
+		sympy/polys/domains/domain.py \
+		sympy/polys/domains/expressiondomain.py \
+		sympy/polys/domains/finitefield.py \
+		sympy/polys/domains/fractionfield.py \
+		sympy/polys/domains/gmpyintegerring.py \
+		sympy/polys/domains/gmpyrationalfield.py \
+		sympy/polys/domains/groundtypes.py \
+		sympy/polys/domains/mpmathcomplexdomain.py \
+		sympy/polys/domains/mpmathrealdomain.py \
+		sympy/polys/domains/polynomialring.py \
+		sympy/polys/domains/pythoncomplexdomain.py \
+		sympy/polys/domains/pythonintegerring.py \
+		sympy/polys/domains/pythonrationalfield.py \
+		sympy/polys/domains/pythonrealdomain.py \
+		sympy/polys/domains/quotientring.py \
+		sympy/polys/domains/sympyintegerring.py \
+		sympy/polys/domains/sympyrationalfield.py \
+		sympy/polys/domains/sympyrealdomain.py \
+		sympy/polys/tests/test_domains.py \
+		sympy/printing/latex.py \
+		sympy/printing/repr.py \
+		sympy/printing/str.py \
+		sympy/simplify/simplify.py \
+		sympy/simplify/tests/test_hyperexpand.py \
+		sympy/solvers/solvers.py \
+		sympy/solvers/tests/test_numeric.py \
+		sympy/statistics/distributions.py \
+		sympy/statistics/tests/test_statistics.py \
+		sympy/utilities/decorator.py \
+		sympy/utilities/lambdify.py \
+		sympy/utilities/runtests.py \
+		sympy/utilities/tests/test_code_quality.py \
+		sympy/utilities/tests/test_lambdify.py \
+		examples/advanced/pidigits.py \
+		examples/advanced/autowrap_ufuncify.py"
+		rm -rf sympy/mpmath/* || die
+		sed \
+			-e "s:sympy\.mpmath:mpmath:g" \
+			-e "s:from sympy import mpmath:import mpmath:g" \
+			-i ${MPMATH_FILES} || die "failed to patch mpmath imports"
+		epatch "${FILESDIR}"/${P}-mpmath.patch
+}
+
+python_unpack() {
+	if ! python_is_python3; then
+		mkdir "${WORKDIR}"/python2
+		cd "${WORKDIR}"/python2 || die
+		unpack ${P}.tar.gz
+	fi
+	if python_is_python3; then
+		mkdir "${WORKDIR}"/python3
+		cd "${WORKDIR}"/python3 || die
+		unpack ${P}-py3.2.tar.gz
+	fi
+}
+
+src_unpack() {
+	python_foreach_impl python_unpack
+}
+
+python_prepare() {
+	if use system-mpmath; then
+		if ! python_is_python3; then
+			cd "${WORKDIR}"/python2/${P} || die
+			system_mpmath
+		fi
+		if python_is_python3; then
+			cd "${WORKDIR}"/python3/${P} || die
+			system_mpmath
+		fi
+	fi
+}
+
+src_prepare() {
+	python_foreach_impl python_prepare
+}
+
+python_compile() {
+	if python_is_python3; then
+		cd "${WORKDIR}"/python3/${P} || die
+		export S="${WORKDIR}"/python3/${P}
+	else
+		cd "${WORKDIR}"/python2/${P} || die
+		export S="${WORKDIR}"/python2/${P}
+	fi
+	PYTHONPATH="." distutils-r1_python_compile
+}
+
+python_compile_all() {
+	if use doc; then
+		if python_is_python3; then
+			cd "${WORKDIR}"/python3/${P} || die
+			emake html
+		else
+			cd "${WORKDIR}"/python2/${P} || die
+			emake html
+		fi
+	fi
+}
+DISTUTILS_NO_PARALLEL_BUILD=true
+python_test() {
+	if python_is_python3; then
+		cd "${WORKDIR}"/python3/${P} || die
+	else
+		cd "${WORKDIR}"/python2/${P} || die
+	fi
+	PYTHONPATH="." py.test || ewarn "tests with ${EPYTHON} failed"
+}
+
+python_install() {
+	if python_is_python3; then
+		cd "${WORKDIR}"/python3/${P} || die
+		export S="${WORKDIR}"/python3/${P}
+	else
+		cd "${WORKDIR}"/python2/${P} || die
+		export S="${WORKDIR}"/python2/${P}
+	fi
+	PYTHONPATH="." distutils-r1_python_install
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if python_is_python3; then
+		cd "${WORKDIR}"/python3/${P} || die
+	else
+		cd "${WORKDIR}"/python2/${P} || die
+	fi
+	if use doc; then
+		dohtml -r doc/_build/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${P}
+		doins -r examples
+	fi
+	if use texmacs; then
+		exeinto /usr/libexec/TeXmacs/bin/
+		doexe data/TeXmacs/bin/tm_sympy
+		insinto /usr/share/TeXmacs/plugins/sympy/
+		doins -r data/TeXmacs/progs
+	fi
+}