Version bump. Restructure a bit according to new API

(Portage version: 2.1.2.7)

4 files changed, 159 insertions, 1 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/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
+}