matplotlib version bump 0.90.0

(Portage version: 2.1.1-r2)

6 files changed, 235 insertions, 2 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 944393773b38..1b2a626c8a40 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.25 2006/11/29 01:01:55 marienz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.26 2007/02/08 22:40:07 bicatali Exp $
+
+*matplotlib-0.90.0 (08 Feb 2007)
+
+  08 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/matplotlib-0.90.0-init.patch, +files/matplotlib-0.90.0-setup.patch,
+  metadata.xml, +matplotlib-0.90.0.ebuild:
+  Version bump. Adapt some patches from the scientific overlay (fix bug 
+  #156603). Also fix bug #157030, thanks for orangewarrior@gmail.com for 
+  reporting. Added some description in metadata.xml, switch order of deps 
+  to allow numpy to be selected as a preference.
 
 *matplotlib-0.87.7 (29 Nov 2006)
 
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.90.0 b/dev-python/matplotlib/files/digest-matplotlib-0.90.0
new file mode 100644
index 000000000000..d7cf0e0e72e4
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.90.0
@@ -0,0 +1,6 @@
+MD5 31ea12395826080b5be9c1e292cda6f1 matplotlib-0.90.0.tar.gz 2795281
+RMD160 6be8d7d1f0896378d8c8880b8b0188e2037892cc matplotlib-0.90.0.tar.gz 2795281
+SHA256 c3c34a58a62706c48b98a16a0702a8114f2674780197ac715cd66f65fac5478d matplotlib-0.90.0.tar.gz 2795281
+MD5 d38d147a6f7e2d9fcb9ac864fd83c10f users_guide_0.87.7.pdf 4207694
+RMD160 15ee124fd4ac3a952365f3378d420270c742593e users_guide_0.87.7.pdf 4207694
+SHA256 2b1bad57984157faa039a932bcf9711cd72f956d70ea9a5b2a3bf9e0b3bbed20 users_guide_0.87.7.pdf 4207694
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch b/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch
new file mode 100644
index 000000000000..44ddf2dbf3f2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch
@@ -0,0 +1,24 @@
+--- lib/matplotlib/__init__.py~	2007-02-07 03:24:06.000000000 +0000
++++ lib/matplotlib/__init__.py	2007-02-08 10:33:21.000000000 +0000
+@@ -339,9 +339,11 @@
+         path = os.environ['MATPLOTLIBDATA']
+         if os.path.isdir(path): return path
+ 
+-    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
++    path = os.sep.join(['/usr/share/matplotlib', 'mpl-data'])
+     if os.path.isdir(path): return path
+ 
++    raise RuntimeError('Could not find the matplotlib data files')
++
+     # setuptools' namespace_packages may highjack this init file
+     # so need to try something known to be in matplotlib, not basemap
+     import matplotlib.afm
+@@ -923,7 +925,7 @@
+     if os.path.exists(fname): return fname
+ 
+ 
+-    path =  get_data_path() # guaranteed to exist or raise
++    path =  '/etc' # guaranteed to exist or raise
+     fname = os.path.join(path, 'matplotlibrc')
+     if not os.path.exists(fname):
+         warnings.warn('Could not find matplotlibrc; using defaults')
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch b/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch
new file mode 100644
index 000000000000..1ad108e09e3c
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch
@@ -0,0 +1,113 @@
+--- setup.py~	2006-09-29 10:33:56.000000000 +0100
++++ setup.py	2007-02-08 10:44:10.000000000 +0000
+@@ -84,7 +84,7 @@
+ data.extend(glob.glob('images/*.svg'))
+ data.extend(glob.glob('images/*.png'))
+ data.extend(glob.glob('images/*.ppm'))
+-data.append('matplotlibrc')
++#data.append('matplotlibrc')
+ 
+ data_files=[('matplotlib/mpl-data', data),
+             ('matplotlib/mpl-data/Matplotlib.nib',
+@@ -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)
+@@ -331,6 +276,6 @@
+       ext_modules = ext_modules,
+       data_files = data_files,
+       package_dir = {'': 'lib'},
+-      cmdclass = {'install_data':smart_install_data},
++      #cmdclass = {'install_data':smart_install_data},
+       **additional_params
+       )
diff --git a/dev-python/matplotlib/matplotlib-0.90.0.ebuild b/dev-python/matplotlib/matplotlib-0.90.0.ebuild
new file mode 100644
index 000000000000..cc4baa9ff1dc
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.90.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.90.0.ebuild,v 1.1 2007/02/08 22:40:07 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils python
+
+DOC_PV=0.87.7
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( http://matplotlib.sourceforge.net/users_guide_${DOC_PV}.pdf )"
+
+IUSE="doc gtk tk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON"
+
+DEPEND="|| (
+		>=dev-python/numpy-1.0
+		dev-python/numarray
+		>=dev-python/numeric-23
+	   )
+	>=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
+	media-fonts/ttf-bitstream-vera"
+
+DOCS="INTERACTIVE API_CHANGES NUMARRAY_ISSUES"
+
+pkg_setup() {
+	use tk && python_tkinter_exists
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	# disable autodetection (use flags) and install data files
+	epatch "${FILESDIR}/${P}-setup.patch"
+
+	# fix default paths for init files (depend on previous patch)
+	epatch "${FILESDIR}/${P}-init.patch"
+
+	sed -i \
+		-e "/^BUILD_GTK/s/'auto'/$(use gtk && echo 1 || echo 0)/g" \
+		-e "/^BUILD_WX/s/'auto'/0/g" \
+		-e "/^BUILD_TK/s/'auto'/$(use tk && echo 1 || echo 0)/g" \
+		setup.py
+
+	# cleaning and remove vera fonts, they are now a dependency
+	chmod 644 images/*.svg
+	find -name .cvsignore | xargs rm -rf
+	rm -f fonts/ttf/Vera*.ttf
+}
+
+src_install() {
+	distutils_src_install --install-data=usr/share
+	insinto /etc
+	doins matplotlibrc
+	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
+		insinto /usr/share/doc/${PF}/
+		doins ${DISTDIR}/users_guide_${DOC_PV}.pdf
+	fi
+}
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index de483c53568f..7282b45b4ac5 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription lang="en">
+matplotlib is an interactive library for plotting and doing basic
+data analysis in python with a syntax similar to matlab. It provides a
+variety of backends and hard copy formats for almost ready publication plots.
+</longdescription>
 </pkgmetadata>