matplotlib version bump 0.90.0

Package-Manager: portage-2.1.1-r2

7 files changed, 260 insertions, 20 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/Manifest b/dev-python/matplotlib/Manifest
index c87b677754be..f7bbfe084f22 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX matplotlib-0.86.2-no-autodetect.patch 1801 RMD160 c68dc996736e8fc81a751a72e9351b072539a3b6 SHA1 c631965fcf83c0c2469a0b82e09fd483c3a54543 SHA256 10270f1e6692d66ada676fd63b4995ecb011c6155890f237f10425568656d33c
 MD5 109c23821a4c77716b191ae8a260a123 files/matplotlib-0.86.2-no-autodetect.patch 1801
 RMD160 c68dc996736e8fc81a751a72e9351b072539a3b6 files/matplotlib-0.86.2-no-autodetect.patch 1801
@@ -13,9 +10,19 @@ AUX matplotlib-0.87.7-no-autodetect.patch 3076 RMD160 54c73b61e640aa457677cc9ca1
 MD5 81ee05d8e5c32845f91fb6df0e83ab98 files/matplotlib-0.87.7-no-autodetect.patch 3076
 RMD160 54c73b61e640aa457677cc9ca19de2e3732ce6aa files/matplotlib-0.87.7-no-autodetect.patch 3076
 SHA256 cfd7f17c133e3c734d054a8a78057754f2843c9e2721fd010cef4c4ffc7cd7a7 files/matplotlib-0.87.7-no-autodetect.patch 3076
+AUX matplotlib-0.90.0-init.patch 985 RMD160 fd5a955bd5e635944ea5124499355ba7737ff7ad SHA1 3065b542d6529085558d388cf8572589d5c50249 SHA256 e02a9adbc7aac79ea031b1e1c22448566285c3ce3374d8333a21128ec2f710ed
+MD5 bbaa0b941d0e9a5459e647dbd6255861 files/matplotlib-0.90.0-init.patch 985
+RMD160 fd5a955bd5e635944ea5124499355ba7737ff7ad files/matplotlib-0.90.0-init.patch 985
+SHA256 e02a9adbc7aac79ea031b1e1c22448566285c3ce3374d8333a21128ec2f710ed files/matplotlib-0.90.0-init.patch 985
+AUX matplotlib-0.90.0-setup.patch 3629 RMD160 7f55e9da9f400fb84029555dacf4bd45fa784157 SHA1 2947be9cf2d361b2c28d865cf36e39a5709c1ebc SHA256 8bc37c113e8fd597c84411913d73e061e017f8a79b6f84acb3011f1a4eee4ccc
+MD5 edac026c015ef396eb245d54544f4c9e files/matplotlib-0.90.0-setup.patch 3629
+RMD160 7f55e9da9f400fb84029555dacf4bd45fa784157 files/matplotlib-0.90.0-setup.patch 3629
+SHA256 8bc37c113e8fd597c84411913d73e061e017f8a79b6f84acb3011f1a4eee4ccc files/matplotlib-0.90.0-setup.patch 3629
 DIST matplotlib-0.80.tar.gz 2332845 RMD160 503924ec1567605f53b3f01656129035b688362e SHA1 639bc10a311319459214d4d23c8c94003d2589ac SHA256 9420b5eb388378310da24a00c9c8b9c0e233e37019f46ff105edd58a07ffb8f0
 DIST matplotlib-0.87.4.tar.gz 2985247 RMD160 21b2a02c02a809438c2a45835e4e5a76576884b9 SHA1 ad62e01484a3bddf045ddfd6b437015aa34f7415 SHA256 c30f68e90170acd3a2f5f7cfa188cdc5ef81880eb82c20b915a549e4b2ad2b9a
 DIST matplotlib-0.87.7.tar.gz 2767469 RMD160 823b554d0292c9cf307c187c05e44a2d12b7c646 SHA1 3b3ee920a4507410b3b7469591b8ca636bb8348a SHA256 cb02a3349f643746e492ff843c0e63675f4641ff42ddb65bdcc401cf379b6575
+DIST matplotlib-0.90.0.tar.gz 2795281 RMD160 6be8d7d1f0896378d8c8880b8b0188e2037892cc SHA1 707366d5dc736ce7446a41f748f33e7603d8f023 SHA256 c3c34a58a62706c48b98a16a0702a8114f2674780197ac715cd66f65fac5478d
+DIST users_guide_0.87.7.pdf 4207694 RMD160 15ee124fd4ac3a952365f3378d420270c742593e SHA1 795b385fbd7fd37efa3f8fdc7af770ca59560724 SHA256 2b1bad57984157faa039a932bcf9711cd72f956d70ea9a5b2a3bf9e0b3bbed20
 EBUILD matplotlib-0.80-r1.ebuild 951 RMD160 2ca61086fb685ec94027c4d38286ec03a6399c70 SHA1 29056fc11e5a8ea51217a0dc65f5be7d40675152 SHA256 37751842421327fe7b906471fc08f77bab44af5352fe6146a1acc34bbe2d91b4
 MD5 f702ffff2a8a6dd4440b63aed514552e matplotlib-0.80-r1.ebuild 951
 RMD160 2ca61086fb685ec94027c4d38286ec03a6399c70 matplotlib-0.80-r1.ebuild 951
@@ -28,14 +35,18 @@ EBUILD matplotlib-0.87.7.ebuild 1422 RMD160 8ae7b64bca1339966ae4bd213a969f928796
 MD5 d83edce54250556dff6adcd90dcf31f6 matplotlib-0.87.7.ebuild 1422
 RMD160 8ae7b64bca1339966ae4bd213a969f9287965c90 matplotlib-0.87.7.ebuild 1422
 SHA256 493dcdf3a847e7920d2bb4378c9a7882e9f043b3e40a9fe121b52e4757e5b243 matplotlib-0.87.7.ebuild 1422
-MISC ChangeLog 5454 RMD160 33e556e3389e6a40b8cc17c5a73eeb5780d622ef SHA1 0575da76cbc8a6e6ea5049bbf9c351444daaff06 SHA256 2e4b073cb73ccb181239c2fbae4644219a1a445824639bba64c6dbe6bcce25b1
-MD5 fc6ec27c298d1ea912951b526e183e0a ChangeLog 5454
-RMD160 33e556e3389e6a40b8cc17c5a73eeb5780d622ef ChangeLog 5454
-SHA256 2e4b073cb73ccb181239c2fbae4644219a1a445824639bba64c6dbe6bcce25b1 ChangeLog 5454
-MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
-SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
+EBUILD matplotlib-0.90.0.ebuild 1886 RMD160 63a698e4a649867e2006c1007de9983bd6ad3d5f SHA1 cc9cbadb84686959e44a928cc4929f167fec33b4 SHA256 5886900a00b3b5b7b71b5d42d4f4dae4b48e3ee2b0e3954bcd878f509e953959
+MD5 a786daa31edc3d31a48c604993fa6f35 matplotlib-0.90.0.ebuild 1886
+RMD160 63a698e4a649867e2006c1007de9983bd6ad3d5f matplotlib-0.90.0.ebuild 1886
+SHA256 5886900a00b3b5b7b71b5d42d4f4dae4b48e3ee2b0e3954bcd878f509e953959 matplotlib-0.90.0.ebuild 1886
+MISC ChangeLog 5936 RMD160 4b97bf284404105657be52a2acbf5801419919e9 SHA1 f4b97658168271745f26bd36e594e3721558571d SHA256 c91386fb1e0870d267415c02807a5ff8ba5f8d1cb105bb95eb10bf1caa8c628b
+MD5 30f0228db02ea3628d708ffcda9e680e ChangeLog 5936
+RMD160 4b97bf284404105657be52a2acbf5801419919e9 ChangeLog 5936
+SHA256 c91386fb1e0870d267415c02807a5ff8ba5f8d1cb105bb95eb10bf1caa8c628b ChangeLog 5936
+MISC metadata.xml 421 RMD160 47d55064d4311a383080e54ea27ea50d892c0c14 SHA1 0077ec197b51ba2f1511e2d64581378665653d85 SHA256 d613ae46270f41b93a0e89d338cd407391b9952c45f82fee81f516e01e94da08
+MD5 b1fadc2c43ec61515fc5a115fa7e3e09 metadata.xml 421
+RMD160 47d55064d4311a383080e54ea27ea50d892c0c14 metadata.xml 421
+SHA256 d613ae46270f41b93a0e89d338cd407391b9952c45f82fee81f516e01e94da08 metadata.xml 421
 MD5 a7c6b7a04166f6916487f3fe9d8c421b files/digest-matplotlib-0.80-r1 250
 RMD160 43366fac2e407cf7ccdf64071c5fe68d067121fe files/digest-matplotlib-0.80-r1 250
 SHA256 ae931697549e8b478999b85986ae7574ad7f524d2acf7d98935c1e1ccf301e03 files/digest-matplotlib-0.80-r1 250
@@ -45,10 +56,6 @@ SHA256 0f33979a3d780991c339ce1ce0a4afd6319969d625d33a888a799e2bd0c18a4e files/di
 MD5 73176428a53a49414d29a26e4f848dc1 files/digest-matplotlib-0.87.7 256
 RMD160 635ef6de2bc25a25c871b9d3b3234a390a65c9f0 files/digest-matplotlib-0.87.7 256
 SHA256 4b7ca9414e2acfeecf1fe49433c716d412c47ddf52972a3aa4f33740c64e1ea2 files/digest-matplotlib-0.87.7 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFbNwKUElL7eJpfEQRAmkhAJ9wdQLBGixpxawIZhf4TKFB88JCQACfeC3q
-jWcOIfC9NqVNaw4H7Yrq8wE=
-=l/mv
------END PGP SIGNATURE-----
+MD5 5b9d077813074fde0a8eb6137e3caf96 files/digest-matplotlib-0.90.0 506
+RMD160 b4ecb0d07cd3c051484d30ffaf3c8a7321b29639 files/digest-matplotlib-0.90.0 506
+SHA256 b7a95547b984f09d4a413f8770cc777785b41039b0a8f47b82bdaa0364e17040 files/digest-matplotlib-0.90.0 506
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>