Two version bumps: 0.91.3, a bugfix release and 0.98.0 a release with api changes

(Portage version: 2.1.4.4)

4 files changed, 250 insertions, 64 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 3f37940231fb..120ff0ac1650 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.47 2008/05/24 08:03:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.48 2008/06/23 15:16:00 bicatali Exp $
+
+*matplotlib-0.98.0 (22 Jun 2008)
+*matplotlib-0.91.3 (22 Jun 2008)
+
+  22 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/matplotlib-0.90.1-setup.patch, +matplotlib-0.91.3.ebuild,
+  +matplotlib-0.98.0.ebuild:
+  Two version bumps: 0.91.3, a bugfix release and 0.98.0 a release with api
+  changes
 
   24 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
   +files/matplotlib-0.91.2-gcc43.patch, matplotlib-0.91.2.ebuild:
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch b/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch
deleted file mode 100644
index 7a6e81030798..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.90.1-setup.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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.91.3.ebuild b/dev-python/matplotlib/matplotlib-0.91.3.ebuild
new file mode 100644
index 000000000000..07afcdcde3db
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.91.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.91.3.ebuild,v 1.1 2008/06/23 15:16:00 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit eutils distutils
+
+DOC_PV=0.91.2svn
+
+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="cairo doc examples fltk gtk latex qt3 qt4 tk wxwindows"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON BSD stix bakoma"
+
+DEPEND="dev-python/numpy
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-python/pytz
+	dev-python/python-dateutil
+	gtk? ( dev-python/pygtk )
+	wxwindows? ( dev-python/wxpython )"
+
+RDEPEND="${DEPEND}
+	|| ( media-fonts/ttf-bitstream-vera media-fonts/dejavu )
+	latex? ( virtual/latex-base
+		virtual/ghostscript
+		app-text/dvipng
+		app-text/poppler )
+	cairo? ( dev-python/pycairo )
+	fltk?  ( dev-python/pyfltk )
+	qt3?   ( dev-python/PyQt )
+	qt4?   ( dev-python/PyQt4 )"
+
+DOCS="INTERACTIVE API_CHANGES"
+
+pkg_setup() {
+	use tk && distutils_python_tkinter
+}
+
+use_setup() {
+	local uword="${2}"
+	[ -z "${2}" ] && uword="${1}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		configobj = False
+		enthought.traits = False
+		[gui_support]
+		$(use_setup gtk)
+		$(use_setup tk)
+		$(use_setup wxwindows wx)
+		$(use_setup qt3 qt)
+		$(use_setup qt4)
+		$(use_setup fltk)
+		$(use_setup cairo)
+	EOF
+
+	# sed to avoid checks needing a X display
+	sed -i \
+		-e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \
+		-e "s/check_for_tk()/$(use tk && echo True || echo False)/" \
+		setup.py || die "sed setup.py failed"
+
+	# respect FHS: put mpl-data in /usr/share/matplotlib
+	# and config files in /etc/matplotlib
+	sed -i \
+		-e "/'mpl-data\/matplotlibrc',/d" \
+		-e "/'mpl-data\/matplotlib.conf',/d" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
+		setup.py \
+		|| die "sed setup.py for FHS failed"
+
+	sed -i \
+		-e "s:path =  get_data_path():path = '/etc/matplotlib':" \
+		-e "s:os.path.dirname(__file__):'/usr/share/${PN}':g"  \
+		lib/matplotlib/{__init__,config/cutils}.py \
+		|| die "sed init for FHS failed"
+
+	# remove vera fonts (they are now a dependency)
+	cd lib/matplotlib/mpl-data
+	rm -f ttf/Vera*.ttf ttf/*.TXT ttf/local.conf pdfcorefonts/readme.txt
+}
+
+src_install() {
+	distutils_src_install
+
+	# respect FHS
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib} \
+		"${D}"/usr/share/${PN} || die "failed renaming"
+
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf \
+		|| die "installing config files failed"
+
+	insinto /usr/share/doc/${PF}
+	use doc && newins "${DISTDIR}"/users_guide_${DOC_PV}.pdf \
+		${P}-users-guide.pdf
+	use examples && doins -r examples
+}
diff --git a/dev-python/matplotlib/matplotlib-0.98.0.ebuild b/dev-python/matplotlib/matplotlib-0.98.0.ebuild
new file mode 100644
index 000000000000..a86c9f928b25
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.98.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.0.ebuild,v 1.1 2008/06/23 15:16:00 bicatali Exp $
+
+inherit eutils distutils
+
+DOC_PV=${PV}
+
+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="cairo doc examples fltk gtk latex qt3 qt4 tk wxwindows"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON BSD stix bakoma"
+
+DEPEND=">=dev-python/numpy-1.1
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-python/pytz
+	dev-python/python-dateutil
+	gtk? ( dev-python/pygtk )
+	wxwindows? ( dev-python/wxpython )"
+
+RDEPEND="${DEPEND}
+	|| ( media-fonts/ttf-bitstream-vera media-fonts/dejavu )
+	latex? ( virtual/latex-base
+		virtual/ghostscript
+		app-text/dvipng
+		app-text/poppler )
+	cairo? ( dev-python/pycairo )
+	fltk?  ( dev-python/pyfltk )
+	qt3?   ( dev-python/PyQt )
+	qt4?   ( dev-python/PyQt4 )"
+
+DOCS="INTERACTIVE API_CHANGES"
+
+pkg_setup() {
+	use tk && distutils_python_tkinter
+}
+
+use_setup() {
+	local uword="${2}"
+	[ -z "${2}" ] && uword="${1}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		configobj = False
+		enthought.traits = False
+		[gui_support]
+		$(use_setup gtk)
+		$(use_setup tk)
+		$(use_setup wxwindows wx)
+		$(use_setup qt3 qt)
+		$(use_setup qt4)
+		$(use_setup fltk)
+		$(use_setup cairo)
+	EOF
+
+	# sed to avoid checks needing a X display
+	sed -i \
+		-e "s/check_for_gtk()/$(use gtk && echo True || echo False)/" \
+		-e "s/check_for_tk()/$(use tk && echo True || echo False)/" \
+		setup.py || die "sed setup.py failed"
+
+	# respect FHS: put mpl-data in /usr/share/matplotlib
+	# and config files in /etc/matplotlib
+	sed -i \
+		-e "/'mpl-data\/matplotlibrc',/d" \
+		-e "/'mpl-data\/matplotlib.conf',/d" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlibrc':'matplotlibrc':" \
+		-e "s:'lib/matplotlib/mpl-data/matplotlib.conf':'matplotlib.conf':" \
+		setup.py \
+		|| die "sed setup.py for FHS failed"
+
+	sed -i \
+		-e "s:path =  get_data_path():path = '/etc/matplotlib':" \
+		-e "s:os.path.dirname(__file__):'/usr/share/${PN}':g"  \
+		lib/matplotlib/{__init__,config/cutils}.py \
+		|| die "sed init for FHS failed"
+
+	# remove vera fonts (they are now a dependency)
+	cd lib/matplotlib/mpl-data
+	rm -f ttf/Vera*.ttf ttf/*.TXT ttf/local.conf pdfcorefonts/readme.txt
+}
+
+src_install() {
+	distutils_src_install
+
+	# respect FHS
+	dodir /usr/share/${PN}
+	mv "${D}"/usr/*/*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib} \
+		"${D}"/usr/share/${PN} || die "failed renaming"
+
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf \
+		|| die "installing config files failed"
+
+	insinto /usr/share/doc/${PF}
+	use doc && newins "${DISTDIR}"/users_guide_${DOC_PV}.pdf \
+		${P}-users-guide.pdf
+	use examples && doins -r examples
+}