Version bump

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 65 insertions, 48 deletions

diff --git a/dev-python/sympy/ChangeLog b/dev-python/sympy/ChangeLog
index 2813bf680766..01c8bf1393c9 100644
--- a/dev-python/sympy/ChangeLog
+++ b/dev-python/sympy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/sympy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.4 2009/04/13 18:34:07 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/ChangeLog,v 1.5 2009/07/19 10:10:51 grozin Exp $
+
+*sympy-0.6.5 (19 Jul 2009)
+
+  19 Jul 2009; Andrey Grozin <grozin@gentoo.org> -sympy-0.6.3.ebuild,
+  -files/sympy-0.6.3-sphinx.patch, +sympy-0.6.5.ebuild,
+  +files/sympy-0.6.5-sphinx.patch:
+  Version bump
 
 *sympy-0.6.4 (14 Apr 2009)
 
diff --git a/dev-python/sympy/files/sympy-0.6.3-sphinx.patch b/dev-python/sympy/files/sympy-0.6.3-sphinx.patch
deleted file mode 100644
index 96cc926b0c95..000000000000
--- a/dev-python/sympy/files/sympy-0.6.3-sphinx.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -r -U2 sympy-0.6.3.orig/doc/Makefile sympy-0.6.3/doc/Makefile
---- sympy-0.6.3.orig/doc/Makefile	2008-11-20 03:12:13.000000000 +0600
-+++ sympy-0.6.3/doc/Makefile	2008-11-21 00:42:13.000000000 +0600
-@@ -1,11 +1,8 @@
- # Makefile for Sphinx documentation
- #
--RST2HTML     = rst2html
-+RST2HTML     = rst2html.py
- 
- # You can set these variables from the command line.
- SPHINXOPTS   =
--SPHINXVER    = 0.4.3
--SPHINXBUILDpy  = sphinx/Sphinx-$(SPHINXVER)/sphinx-build.py
--SPHINXBUILD  = PYTHONPATH=.. python $(SPHINXBUILDpy)
- PAPER        =
- 
-@@ -31,11 +28,5 @@
- 	-rm -rf sphinx
- 
--$(SPHINXBUILDpy):
--	rm -rf sphinx
--	mkdir sphinx
--	cd sphinx; wget http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$(SPHINXVER).tar.gz;
--	cd sphinx; tar xzf Sphinx-$(SPHINXVER).tar.gz
--
--html: $(SPHINXBUILDpy) spt-printable
-+html: spt-printable
- 	mkdir -p src/.static
- 	mkdir -p _build/html _build/doctrees
-@@ -52,5 +43,5 @@
- 	$(RST2HTML) src/sympy-patches-tutorial.txt > _build/html/spt-printable.html
- 
--htmlapi: $(SPHINXBUILDpy)
-+htmlapi:
- 	mkdir -p api/.static
- 	mkdir -p api/modules
-@@ -77,5 +68,5 @@
- 	      ".hhp project file in _build/htmlhelp."
- 
--latex: $(SPHINXBUILDpy)
-+latex:
- 	mkdir -p _build/latex _build/doctrees
- 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
diff --git a/dev-python/sympy/files/sympy-0.6.5-sphinx.patch b/dev-python/sympy/files/sympy-0.6.5-sphinx.patch
new file mode 100644
index 000000000000..32958feaffe6
--- /dev/null
+++ b/dev-python/sympy/files/sympy-0.6.5-sphinx.patch
@@ -0,0 +1,53 @@
+Index: sympy-0.6.5/doc/Makefile
+===================================================================
+--- sympy-0.6.5.orig/doc/Makefile
++++ sympy-0.6.5/doc/Makefile
+@@ -1,14 +1,10 @@
+ # Makefile for Sphinx documentation
+ #
+ PYTHON       = python
+-RST2HTML     = rst2html
++RST2HTML     = rst2html.py
+ 
+ # You can set these variables from the command line.
+ SPHINXOPTS   =
+-SPHINXVER    = 0.5
+-#SPHINXBUILDpy  = sphinx/Sphinx-$(SPHINXVER)/sphinx-build.py
+-SPHINXBUILDpy  = sphinx-build
+-SPHINXBUILD  = PYTHONPATH=.. $(SPHINXBUILDpy)
+ PAPER        =
+ 
+ ALLSPHINXOPTS = -d _build/doctrees -D latex_paper_size=$(PAPER) \
+@@ -32,13 +28,7 @@ clean:
+ 	-rm -rf _build
+ 	-rm -rf sphinx
+ 
+-$(SPHINXBUILDpy):
+-	rm -rf sphinx
+-#	mkdir sphinx
+-#	cd sphinx; wget http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$(SPHINXVER).tar.gz;
+-#	cd sphinx; tar xzf Sphinx-$(SPHINXVER).tar.gz
+-
+-html: $(SPHINXBUILDpy) spt-printable
++html: spt-printable
+ 	mkdir -p src/.static
+ 	mkdir -p _build/html _build/doctrees
+ 	mkdir -p src/modules
+@@ -53,7 +43,7 @@ spt-printable:
+ 	mkdir -p _build/html/
+ 	$(RST2HTML) src/sympy-patches-tutorial.txt > _build/html/spt-printable.html
+ 
+-htmlapi: $(SPHINXBUILDpy)
++htmlapi:
+ 	mkdir -p api/.static
+ 	mkdir -p api/modules
+ 	mkdir -p _build/api _build/doctreesapi
+@@ -78,7 +68,7 @@ htmlhelp:
+ 	@echo "Build finished; now you can run HTML Help Workshop with the" \
+ 	      ".hhp project file in _build/htmlhelp."
+ 
+-latex: $(SPHINXBUILDpy)
++latex:
+ 	mkdir -p _build/latex _build/doctrees
+ 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
+ 	@echo
diff --git a/dev-python/sympy/sympy-0.6.3.ebuild b/dev-python/sympy/sympy-0.6.5.ebuild
index 29ed43cca92a..683f63f10872 100644
--- a/dev-python/sympy/sympy-0.6.3.ebuild
+++ b/dev-python/sympy/sympy-0.6.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.6.3.ebuild,v 1.1 2008/11/20 15:49:59 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sympy/sympy-0.6.5.ebuild,v 1.1 2009/07/19 10:10:51 grozin Exp $
 EAPI=2
 NEED_PYTHON=2.4
 inherit distutils
@@ -29,8 +29,8 @@ RDEPEND="mathml? ( dev-libs/libxml2[python]
 DEPEND="doc? ( dev-python/sphinx )
 	test? ( >=dev-python/py-0.9.0 )"
 
-src_unpack() {
-	distutils_src_unpack
+src_prepare() {
+	distutils_src_prepare
 
 	# use local sphinx
 	epatch "${FILESDIR}"/${P}-sphinx.patch