summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarien Zwart <marienz@gentoo.org>2006-11-29 01:01:55 +0000
committerMarien Zwart <marienz@gentoo.org>2006-11-29 01:01:55 +0000
commit7dbc22b6e13d1254c8fb63a67fc00067627020cc (patch)
treedde57eb31209ab4579a889a50ed483acf14d3119 /dev-python/matplotlib
parentCell update part I (diff)
downloadhistorical-7dbc22b6e13d1254c8fb63a67fc00067627020cc.tar.gz
historical-7dbc22b6e13d1254c8fb63a67fc00067627020cc.tar.bz2
historical-7dbc22b6e13d1254c8fb63a67fc00067627020cc.zip
Version bump (bug #147466) that works with python 2.5 (bug #148278). Use the tk instead of tcltk USE flag (bug #17808).
Package-Manager: portage-2.1.2_rc2-r2
Diffstat (limited to 'dev-python/matplotlib')
-rw-r--r--dev-python/matplotlib/ChangeLog12
-rw-r--r--dev-python/matplotlib/files/digest-matplotlib-0.87.73
-rw-r--r--dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch98
-rw-r--r--dev-python/matplotlib/matplotlib-0.87.4.ebuild8
-rw-r--r--dev-python/matplotlib/matplotlib-0.87.7.ebuild59
5 files changed, 175 insertions, 5 deletions
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 47a44db4230f..944393773b38 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for dev-python/matplotlib
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.24 2006/11/28 21:52:12 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.25 2006/11/29 01:01:55 marienz Exp $
+
+*matplotlib-0.87.7 (29 Nov 2006)
+
+ 29 Nov 2006; Marien Zwart <marienz@gentoo.org>
+ -files/matplotlib-0.85-no-autodetect.patch,
+ -files/matplotlib-0.86.2-no-setuptools.patch,
+ +files/matplotlib-0.87.7-no-autodetect.patch, -matplotlib-0.87.2.ebuild,
+ matplotlib-0.87.4.ebuild, +matplotlib-0.87.7.ebuild:
+ Version bump (bug #147466) that works with python 2.5 (bug #148278). Use the
+ tk instead of tcltk USE flag (bug #17808).
28 Nov 2006; Marien Zwart <marienz@gentoo.org> matplotlib-0.80-r1.ebuild:
Adding freetype dependency for bug #152051. Thanks to Evil Compile Person
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.7 b/dev-python/matplotlib/files/digest-matplotlib-0.87.7
new file mode 100644
index 000000000000..342d29855a68
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.87.7
@@ -0,0 +1,3 @@
+MD5 cca3d3a644c1a84d6dcf4af8a9856b7b matplotlib-0.87.7.tar.gz 2767469
+RMD160 823b554d0292c9cf307c187c05e44a2d12b7c646 matplotlib-0.87.7.tar.gz 2767469
+SHA256 cb02a3349f643746e492ff843c0e63675f4641ff42ddb65bdcc401cf379b6575 matplotlib-0.87.7.tar.gz 2767469
diff --git a/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch b/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch
new file mode 100644
index 000000000000..0b8b5a1e500f
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch
@@ -0,0 +1,98 @@
+=== modified file 'setup.py'
+--- setup.py 2006-11-28 22:06:24 +0000
++++ setup.py 2006-11-28 22:16:00 +0000
+@@ -201,80 +201,25 @@
+ build_enthought(ext_modules, packages)
+
+ if BUILD_GTK:
+- try:
+- import gtk
+- except ImportError:
+- print 'GTK requires pygtk'
+- BUILD_GTK = 0
+- except RuntimeError:
+- print 'pygtk present but import failed'
+- BUILD_GTK = 0
+- else:
+- version = (2,2,0)
+- if gtk.pygtk_version < version:
+- print "Error: GTK backend requires PyGTK %d.%d.%d (or later), " \
+- "%d.%d.%d was detected." % (
+- version + gtk.pygtk_version)
+- BUILD_GTK = 0
+- else:
+- build_gdk(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'GTK'
++ build_gdk(ext_modules, packages, NUMERIX)
++ rc['backend'] = 'GTK'
+
+ if BUILD_GTKAGG:
+- try:
+- import gtk
+- except ImportError:
+- print 'GTKAgg requires pygtk'
+- BUILD_GTKAGG=0
+- except RuntimeError:
+- print 'pygtk present but import failed'
+- BUILD_GTKAGG = 0
+- else:
+- version = (2,2,0)
+- if gtk.pygtk_version < version:
+- print "Error: GTKAgg backend requires PyGTK %d.%d.%d " \
+- "(or later), %d.%d.%d was detected." % (
+- version + gtk.pygtk_version)
+- BUILD_GTKAGG=0
+- else:
+- BUILD_AGG = 1
+- build_gtkagg(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'GTKAgg'
++ BUILD_AGG = 1
++ build_gtkagg(ext_modules, packages, NUMERIX)
++ rc['backend'] = 'GTKAgg'
+
+ if BUILD_TKAGG:
+- try:
+- import Tkinter
+- except ImportError:
+- print 'TKAgg requires TkInter'
+- BUILD_TKAGG = 0
+- except RuntimeError:
+- print 'Tkinter present but import failed'
+- BUILD_TKAGG = 0
+- else:
+- try:
+- tk = Tkinter.Tk()
+- tk.withdraw()
+- except Tkinter.TclError:
+- print 'Tkinter present, but window failed to open'
+- BUILD_TKAGG = 0
+- else:
+- BUILD_AGG = 1
+- build_tkagg(ext_modules, packages, NUMERIX)
+- rc['backend'] = 'TkAgg'
++ BUILD_AGG = 1
++ build_tkagg(ext_modules, packages, NUMERIX)
++ rc['backend'] = 'TkAgg'
+
+ if BUILD_WXAGG:
+- try:
+- import wxPython
+- except ImportError:
+- if BUILD_WXAGG != 'auto':
+- print 'WXAgg\'s accelerator requires wxPython'
+- BUILD_WXAGG = 0
+- else:
+- BUILD_AGG = 1
+- build_wxagg(ext_modules, packages, NUMERIX,
+- not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
+- and BUILD_WXAGG.lower() == 'auto')) # is "auto"
+- rc['backend'] = 'WXAgg'
++ BUILD_AGG = 1
++ build_wxagg(ext_modules, packages, NUMERIX,
++ not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
++ and BUILD_WXAGG.lower() == 'auto')) # is "auto"
++ rc['backend'] = 'WXAgg'
+
+ if BUILD_AGG:
+ build_agg(ext_modules, packages, NUMERIX)
+
diff --git a/dev-python/matplotlib/matplotlib-0.87.4.ebuild b/dev-python/matplotlib/matplotlib-0.87.4.ebuild
index bc47b00461d1..0ef6ed97babc 100644
--- a/dev-python/matplotlib/matplotlib-0.87.4.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.87.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.87.4.ebuild,v 1.1 2006/07/17 15:59:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.87.4.ebuild,v 1.2 2006/11/29 01:01:55 marienz Exp $
inherit distutils python
@@ -8,7 +8,7 @@ DESCRIPTION="matplotlib is a pure python plotting library designed to bring publ
HOMEPAGE="http://matplotlib.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-IUSE="doc gtk tcltk"
+IUSE="doc gtk tk"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
LICENSE="PYTHON"
@@ -28,7 +28,7 @@ DEPEND="virtual/python
pkg_setup() {
- if use tcltk; then
+ if use tk; then
python_tkinter_exists
fi
}
@@ -42,7 +42,7 @@ src_unpack() {
sed -i \
-e "/^BUILD_GTK/s/'auto'/$(use gtk && echo 1 || echo 0)/" \
-e "/^BUILD_WX/s/'auto'/0/" \
- -e "/^BUILD_TK/s/'auto'/$(use tcltk && echo 1 || echo 0)/" \
+ -e "/^BUILD_TK/s/'auto'/$(use tk && echo 1 || echo 0)/" \
setup.py
epatch ${FILESDIR}/${PN}-0.87.4-fix-bad-win32-detect.patch
diff --git a/dev-python/matplotlib/matplotlib-0.87.7.ebuild b/dev-python/matplotlib/matplotlib-0.87.7.ebuild
new file mode 100644
index 000000000000..571a01c62d1e
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.87.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.87.7.ebuild,v 1.1 2006/11/29 01:01:55 marienz Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils python
+
+DESCRIPTION="matplotlib is a pure python plotting library designed to bring publication quality plotting to python with a syntax familiar to matlab users."
+HOMEPAGE="http://matplotlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="doc gtk tk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON"
+
+DEPEND="|| (
+ >=dev-python/numeric-23
+ dev-python/numarray
+ dev-python/numpy
+ )
+ >=media-libs/freetype-2.1.7
+ media-libs/libpng
+ sys-libs/zlib
+ gtk? ( >=dev-python/pygtk-2.2 )
+ dev-python/pytz
+ dev-python/python-dateutil"
+
+
+pkg_setup() {
+ if use tk; then
+ python_tkinter_exists
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # disable autodetection, rely on USE instead
+ epatch "${FILESDIR}/${PN}-0.87.7-no-autodetect.patch"
+ sed -i \
+ -e "/^BUILD_GTK/s/'auto'/$(use gtk && echo 1 || echo 0)/" \
+ -e "/^BUILD_WX/s/'auto'/0/" \
+ -e "/^BUILD_TK/s/'auto'/$(use tk && echo 1 || echo 0)/" \
+ setup.py
+}
+
+src_install() {
+ distutils_src_install
+
+ if use doc ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*.py examples/README
+ insinto /usr/share/doc/${PF}/examples/data
+ doins examples/data/*.dat
+ fi
+}