Version bump. Restructure a bit according to new API

Package-Manager: portage-2.1.2.7

5 files changed, 178 insertions, 8 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 2426e04ecafe..c0c75460b54f 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.30 2007/05/28 15:40:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.31 2007/06/05 12:02:40 bicatali Exp $
+
+*matplotlib-0.90.1 (05 Jun 2007)
+
+  05 Jun 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/matplotlib-0.90.1-setup.patch, +matplotlib-0.90.1.ebuild:
+  Version bump. Restructure a bit according to new API
 
   28 May 2007; Sébastien Fabbro <bicatali@gentoo.org>
   matplotlib-0.90.0.ebuild:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 19ecfef547bb..7bc50645540e 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -13,9 +13,14 @@ AUX matplotlib-0.90.0-setup.patch 3629 RMD160 7f55e9da9f400fb84029555dacf4bd45fa
 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
+AUX matplotlib-0.90.1-setup.patch 1942 RMD160 41b950d9c85d26a802f8e7cbe7300576e7199fd7 SHA1 683148fd3362417d9969211494d3ec3e0a5a1ba4 SHA256 e1989a1ea9002237ddf10e738d04e9609a9732b6ff9ce121da57d1c4defe6d1d
+MD5 d679355cf6d0c3b69bfdd0c46c242226 files/matplotlib-0.90.1-setup.patch 1942
+RMD160 41b950d9c85d26a802f8e7cbe7300576e7199fd7 files/matplotlib-0.90.1-setup.patch 1942
+SHA256 e1989a1ea9002237ddf10e738d04e9609a9732b6ff9ce121da57d1c4defe6d1d files/matplotlib-0.90.1-setup.patch 1942
 DIST matplotlib-0.80.tar.gz 2332845 RMD160 503924ec1567605f53b3f01656129035b688362e SHA1 639bc10a311319459214d4d23c8c94003d2589ac SHA256 9420b5eb388378310da24a00c9c8b9c0e233e37019f46ff105edd58a07ffb8f0
 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 matplotlib-0.90.1.tar.gz 3001159 RMD160 5cc2a8d79d89041db804522738c5989db30d1e56 SHA1 2c3e010a4cb63efafb286ebb2fd9d20a398fac09 SHA256 0a354abe6ae2cdd0e43667446cdb4013228671ce648d6db54cce18aebff5d79b
 DIST users_guide_0.90.0.pdf 4209550 RMD160 39b3c948b9dfe6a4aa623249014eec12bb0bb1a2 SHA1 5671e5c99b62fbb7877566b17164702920901bc1 SHA256 a4c98c5a74654014e65428ebe17944b286ea20dab95934aa9f23a2e07f4752a7
 EBUILD matplotlib-0.80-r1.ebuild 951 RMD160 2ca61086fb685ec94027c4d38286ec03a6399c70 SHA1 29056fc11e5a8ea51217a0dc65f5be7d40675152 SHA256 37751842421327fe7b906471fc08f77bab44af5352fe6146a1acc34bbe2d91b4
 MD5 f702ffff2a8a6dd4440b63aed514552e matplotlib-0.80-r1.ebuild 951
@@ -29,10 +34,14 @@ EBUILD matplotlib-0.90.0.ebuild 2012 RMD160 39724bb6afd6ce6cf532bd5b5f6248647706
 MD5 195548bf8f24babbe7a798b89434ef43 matplotlib-0.90.0.ebuild 2012
 RMD160 39724bb6afd6ce6cf532bd5b5f624864770604cd matplotlib-0.90.0.ebuild 2012
 SHA256 1d608bfc75605a696b82e080cbbf5312de65c39aca34f120f934cd851aa19c44 matplotlib-0.90.0.ebuild 2012
-MISC ChangeLog 6662 RMD160 b5412d6a2aabbf5617d234daa14e472116ae4074 SHA1 e3c7ed4191003c9ee8694b40640442106e031f99 SHA256 e1bfe148a9f87335312ede470ff276e4303e37802645353bc07bd6660184e3cd
-MD5 7a9197480281a64f082c789dfe732264 ChangeLog 6662
-RMD160 b5412d6a2aabbf5617d234daa14e472116ae4074 ChangeLog 6662
-SHA256 e1bfe148a9f87335312ede470ff276e4303e37802645353bc07bd6660184e3cd ChangeLog 6662
+EBUILD matplotlib-0.90.1.ebuild 2209 RMD160 6f85f012a12db1a21205280adc0cae8c6c3076da SHA1 d5f508c037e3c6637d0d3febffa8e479f297b760 SHA256 eaba4c90a0d632b583dba2b43971d829e934ab6a2116e2d8c47f529f9dae6d92
+MD5 c2c90c26a7ab5d3378f3e77f38ba4c81 matplotlib-0.90.1.ebuild 2209
+RMD160 6f85f012a12db1a21205280adc0cae8c6c3076da matplotlib-0.90.1.ebuild 2209
+SHA256 eaba4c90a0d632b583dba2b43971d829e934ab6a2116e2d8c47f529f9dae6d92 matplotlib-0.90.1.ebuild 2209
+MISC ChangeLog 6874 RMD160 7a56839ca11033f2de0162ef07851eea438028a6 SHA1 acb615b7a9bf18f13490f73abda2b6aa9175b56e SHA256 f74c49b61fe8a499ca7643841e2d76a214da8cfffc7c185321e6bc3a2a1cc2c0
+MD5 903a828cc51b103d0bd19affd6cb6dc9 ChangeLog 6874
+RMD160 7a56839ca11033f2de0162ef07851eea438028a6 ChangeLog 6874
+SHA256 f74c49b61fe8a499ca7643841e2d76a214da8cfffc7c185321e6bc3a2a1cc2c0 ChangeLog 6874
 MISC metadata.xml 438 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 SHA1 1bd24482c5c450bfcacd353d2bd0e3b4ef1eed76 SHA256 c517e4ef0abc7aaae0e63af373711d266b687b14c441c66d216370e21f7c781f
 MD5 19fb1d100f9a8209cf7aa3066545dd7a metadata.xml 438
 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 metadata.xml 438
@@ -46,10 +55,13 @@ SHA256 4b7ca9414e2acfeecf1fe49433c716d412c47ddf52972a3aa4f33740c64e1ea2 files/di
 MD5 559b3a4f91f3469e066089933b232c83 files/digest-matplotlib-0.90.0 506
 RMD160 0a657c87d26b36c86f812a719f47013200d8c73f files/digest-matplotlib-0.90.0 506
 SHA256 7fd3ca9af2a1fe2fc9f82b09ff88480eee753256cf2d02ea6265f0d43f80db83 files/digest-matplotlib-0.90.0 506
+MD5 90ed6227808df1bbeb92bdabf6a1a206 files/digest-matplotlib-0.90.1 506
+RMD160 87b9d081924cf0bc5e5703939ad2699e96f89b90 files/digest-matplotlib-0.90.1 506
+SHA256 a619c55e1b4282723c853bf33c8e7e31a760c6e266316845ec4418687ff0182e files/digest-matplotlib-0.90.1 506
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGWvgH1ycZbhPLE2ARAtqdAKCvFvgnsspwNRtSBc5aOreN53KZQgCfYg64
-a7HM5q71pErGTqA0Ye80Pdk=
-=Oc3Q
+iD8DBQFGZVDm1ycZbhPLE2ARAqwgAJ4nBwt2plgYczZM6R1TjSUa9aMNGwCeIRkp
++oU727bz78pYA+4gwDv6oS0=
+=gm2u
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.90.1 b/dev-python/matplotlib/files/digest-matplotlib-0.90.1
new file mode 100644
index 000000000000..fa0259cb3ffb
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.90.1
@@ -0,0 +1,6 @@
+MD5 e1344bd72660e7c9c0b7540a72cc45b8 matplotlib-0.90.1.tar.gz 3001159
+RMD160 5cc2a8d79d89041db804522738c5989db30d1e56 matplotlib-0.90.1.tar.gz 3001159
+SHA256 0a354abe6ae2cdd0e43667446cdb4013228671ce648d6db54cce18aebff5d79b matplotlib-0.90.1.tar.gz 3001159
+MD5 832f8190ce207cca5cfeae5e4e6b362f users_guide_0.90.0.pdf 4209550
+RMD160 39b3c948b9dfe6a4aa623249014eec12bb0bb1a2 users_guide_0.90.0.pdf 4209550
+SHA256 a4c98c5a74654014e65428ebe17944b286ea20dab95934aa9f23a2e07f4752a7 users_guide_0.90.0.pdf 4209550
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch b/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch
new file mode 100644
index 000000000000..7a6e81030798
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch
@@ -0,0 +1,63 @@
+--- setup.py.orig	2007-06-05 12:02:25.680689000 +0100
++++ setup.py	2007-06-05 12:29:59.507990500 +0100
+@@ -226,50 +226,26 @@
+ 
+ havegtk.gotit = None
+ 
+-if BUILD_GTK and havegtk():
++if BUILD_GTK:
+     build_gdk(ext_modules, packages, NUMERIX)
+     rc['backend'] = 'GTK'
+ 
+-if BUILD_GTKAGG and havegtk():
++if BUILD_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 wx
+-    except ImportError:
+-        if BUILD_WXAGG != 'auto':
+-            print 'WXAgg\'s accelerator requires wxPython'
+-        BUILD_WXAGG = 0
+-    else:
+-        if getattr(wx, '__version__', '0.0')[0:3] < '2.8':
+-            BUILD_AGG = 1
+-            build_wxagg(ext_modules, packages, NUMERIX,
+-                not (isinstance(BUILD_WXAGG, str) # don't abort 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 abort 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.90.1.ebuild b/dev-python/matplotlib/matplotlib-0.90.1.ebuild
new file mode 100644
index 000000000000..b36137bf91f4
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.90.1.ebuild
@@ -0,0 +1,83 @@
+# 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.1.ebuild,v 1.1 2007/06/05 12:02:40 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils python
+
+DOC_PV=0.90.0
+
+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 examples gtk tk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON"
+
+DEPEND="|| (
+		>=dev-python/numpy-1.0
+		dev-python/numarray
+		>=dev-python/numeric-23
+	   )
+	!<dev-python/numpy-1.0
+	>=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"
+	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 || die "sed autodetection failed"
+
+	# default matplotlibrc in /etc
+	sed -i \
+		-e '/mpl-data\/matplotlibrc/d' \
+		setup.py || die "sed matplotlibrc failed"
+	sed -i \
+		-e "s:path =  get_data_path():path = '/etc':" \
+		lib/matplotlib/__init__.py || die "sed init failed"
+
+	# cleaning and remove vera fonts (they are now a dependency)
+	find -name .cvsignore -exec rm -rf {} \;
+	rm -f lib/matplotlib/mpl-data/fonts/ttf/Vera*.ttf
+
+}
+
+src_install() {
+	distutils_src_install
+
+	# default to gtk backend if both gtk and tk are selected
+	if use gtk && use tk; then
+		sed -i \
+			-e '/^backend/s/TkAgg/GTKAgg/' \
+			lib/matplotlib/mpl-data/matplotlibrc || die "sed backend failed"
+	fi
+	insinto /etc
+	doins lib/matplotlib/mpl-data/matplotlibrc || die "installing matplotlibrc failed"
+
+	insinto /usr/share/doc/${PF}
+	use doc && doins "${DISTDIR}"/users_guide_${DOC_PV}.pdf
+	use examples && doins -r examples
+}