From bc8af85e34ae993d2d117e9a521ede0e4929acde Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Fri, 19 Dec 2008 15:47:55 +0000 Subject: Version bump Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.25-gentoo-r7 x86_64 --- dev-python/matplotlib/ChangeLog | 9 +- dev-python/matplotlib/matplotlib-0.98.3.ebuild | 3 +- dev-python/matplotlib/matplotlib-0.98.4.ebuild | 119 ----------------------- dev-python/matplotlib/matplotlib-0.98.5.2.ebuild | 115 ++++++++++++++++++++++ dev-python/matplotlib/matplotlib-0.98.5.ebuild | 119 ----------------------- dev-python/matplotlib/metadata.xml | 3 + 6 files changed, 128 insertions(+), 240 deletions(-) delete mode 100644 dev-python/matplotlib/matplotlib-0.98.4.ebuild create mode 100644 dev-python/matplotlib/matplotlib-0.98.5.2.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-0.98.5.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index df670070db82..477d9dd38a59 100644 --- a/dev-python/matplotlib/ChangeLog +++ b/dev-python/matplotlib/ChangeLog @@ -1,6 +1,13 @@ # 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.53 2008/12/15 11:41:12 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.54 2008/12/19 15:47:55 bicatali Exp $ + +*matplotlib-0.98.5.2 (19 Dec 2008) + + 19 Dec 2008; Sébastien Fabbro metadata.xml, + matplotlib-0.98.3.ebuild, -matplotlib-0.98.4.ebuild, + -matplotlib-0.98.5.ebuild, +matplotlib-0.98.5.2.ebuild: + Version bump *matplotlib-0.98.5 (15 Dec 2008) diff --git a/dev-python/matplotlib/matplotlib-0.98.3.ebuild b/dev-python/matplotlib/matplotlib-0.98.3.ebuild index 7354de8cbddd..309e2474f478 100644 --- a/dev-python/matplotlib/matplotlib-0.98.3.ebuild +++ b/dev-python/matplotlib/matplotlib-0.98.3.ebuild @@ -1,6 +1,6 @@ # 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.3.ebuild,v 1.2 2008/10/10 08:44:05 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.3.ebuild,v 1.3 2008/12/19 15:47:55 bicatali Exp $ WX_GTK_VER=2.8 EAPI=1 @@ -33,6 +33,7 @@ RDEPEND="${DEPEND} app-text/dvipng app-text/poppler ) cairo? ( dev-python/pycairo ) + excel? ( dev-python/xlwt ) fltk? ( dev-python/pyfltk ) qt3? ( dev-python/PyQt ) qt4? ( dev-python/PyQt4 )" diff --git a/dev-python/matplotlib/matplotlib-0.98.4.ebuild b/dev-python/matplotlib/matplotlib-0.98.4.ebuild deleted file mode 100644 index d1596c1dee6f..000000000000 --- a/dev-python/matplotlib/matplotlib-0.98.4.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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.4.ebuild,v 1.1 2008/12/11 19:28:24 bicatali Exp $ - -WX_GTK_VER=2.8 -EAPI=2 -inherit eutils distutils wxwidgets - -PDOC="users_guide_${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/Matplotlib.pdf -> ${PDOC}.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 ) - tk? ( dev-lang/python[tk] ) - wxwindows? ( dev-python/wxpython:2.8 )" - -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" - -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_prepare() { - # 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} - if use doc; then - doins "${DISTDIR}"/${PDOC}.pdf || die - fi - if use examples; then - doins -r examples || die - fi -} diff --git a/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild b/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild new file mode 100644 index 000000000000..bbd7d5ae2a5d --- /dev/null +++ b/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild @@ -0,0 +1,115 @@ +# 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.5.2.ebuild,v 1.1 2008/12/19 15:47:55 bicatali Exp $ + +WX_GTK_VER=2.8 +EAPI=2 +inherit eutils distutils wxwidgets + +PDOC="users_guide_${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/Matplotlib.pdf -> ${PDOC}.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 ) + tk? ( dev-lang/python[tk] ) + wxwindows? ( dev-python/wxpython:2.8 )" + +RDEPEND="${DEPEND} + latex? ( virtual/latex-base + virtual/ghostscript + app-text/dvipng + app-text/poppler ) + cairo? ( dev-python/pycairo ) + excel? ( dev-python/xlwt ) + fltk? ( dev-python/pyfltk ) + qt3? ( dev-python/PyQt ) + qt4? ( dev-python/PyQt4 )" + +DOCS="INTERACTIVE" + +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_prepare() { + # 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" +} + +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} + if use doc; then + doins "${DISTDIR}"/${PDOC}.pdf || die + fi + if use examples; then + doins -r examples || die + fi +} diff --git a/dev-python/matplotlib/matplotlib-0.98.5.ebuild b/dev-python/matplotlib/matplotlib-0.98.5.ebuild deleted file mode 100644 index 180ea3f3db9a..000000000000 --- a/dev-python/matplotlib/matplotlib-0.98.5.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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.5.ebuild,v 1.1 2008/12/15 11:41:12 bicatali Exp $ - -WX_GTK_VER=2.8 -EAPI=2 -inherit eutils distutils wxwidgets - -PDOC="users_guide_${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/Matplotlib.pdf -> ${PDOC}.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 ) - tk? ( dev-lang/python[tk] ) - wxwindows? ( dev-python/wxpython:2.8 )" - -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" - -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_prepare() { - # 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} - if use doc; then - doins "${DISTDIR}"/${PDOC}.pdf || die - fi - if use examples; then - doins -r examples || die - fi -} diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml index 2f6a1873c6fd..311a2fbcf2cc 100644 --- a/dev-python/matplotlib/metadata.xml +++ b/dev-python/matplotlib/metadata.xml @@ -8,4 +8,7 @@ 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. + + Pull dev-python/xlwt for the exceltools toolkit + -- cgit v1.2.3-65-gdbad