[gentoo-commits] gentoo-x86 commit in dev-python/matplotlib: metadata.xml ChangeLog matplotlib-0.98.5.2-r1.ebuild matplotlib-0.98.5.2.ebuild matplotlib-0.98.3.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    09/01/15 09:57:46

  Modified:             metadata.xml ChangeLog matplotlib-0.98.5.2.ebuild
  Added:                matplotlib-0.98.5.2-r1.ebuild
  Removed:              matplotlib-0.98.3.ebuild
  Log:
  Reorganized dependencies. Added enthought traits support, removed bundled pyparsing, pycxx (bug #252947) and fonts. Temporary mirror restricting since upstream has changed source (bug #252578)
  (Portage version: 2.2_rc20/cvs/Linux 2.6.25-gentoo-r7 x86_64)

Revision  Changes    Path
1.6                  dev-python/matplotlib/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/metadata.xml?r1=1.5&r2=1.6

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml	19 Dec 2008 15:47:55 -0000	1.5
+++ metadata.xml	15 Jan 2009 09:57:46 -0000	1.6
@@ -9,6 +9,9 @@
   variety of backends and hard copy formats for almost ready publication plots.
 </longdescription>
 <use>
-  <flag name='excel'>Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
+  <flag name='excel'>Pull <pkg>dev-python/xlwt</pkg> for the
+  exceltools toolkit</flag>
+  <flag name='traits'>Pull <pkg>dev-python/traits</pkg> for the
+  experimental enthought traits support</flag>
 </use>
 </pkgmetadata>



1.56                 dev-python/matplotlib/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	23 Dec 2008 11:41:41 -0000	1.55
+++ ChangeLog	15 Jan 2009 09:57:46 -0000	1.56
@@ -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.55 2008/12/23 11:41:41 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.56 2009/01/15 09:57:46 bicatali Exp $
+
+*matplotlib-0.98.5.2-r1 (15 Jan 2009)
+
+  15 Jan 2009; Sébastien Fabbro <bicatali@g.o>
+  -matplotlib-0.98.3.ebuild, matplotlib-0.98.5.2.ebuild,
+  +matplotlib-0.98.5.2-r1.ebuild:
+  Reorganized dependencies. Added enthought traits support, removed bundled
+  pyparsing, pycxx (bug #252947) and fonts. Temporary mirror restricting
+  since upstream has changed source (bug #252578)
 
   23 Dec 2008; Sébastien Fabbro <bicatali@g.o>
   matplotlib-0.98.5.2.ebuild:



1.3                  dev-python/matplotlib/matplotlib-0.98.5.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild?r1=1.2&r2=1.3

Index: matplotlib-0.98.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- matplotlib-0.98.5.2.ebuild	23 Dec 2008 11:41:41 -0000	1.2
+++ matplotlib-0.98.5.2.ebuild	15 Jan 2009 09:57:46 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2 2008/12/23 11:41:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2.ebuild,v 1.3 2009/01/15 09:57:46 bicatali Exp $
 
 WX_GTK_VER=2.8
 EAPI=2
@@ -39,7 +39,7 @@
 	qt4?   ( dev-python/PyQt4 )"
 
 DOCS="INTERACTIVE"
-
+RESTRICT="mirror"
 use_setup() {
 	local uword="${2}"
 	[ -z "${2}" ] && uword="${1}"



1.1                  dev-python/matplotlib/matplotlib-0.98.5.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/matplotlib/matplotlib-0.98.5.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: matplotlib-0.98.5.2-r1.ebuild
===================================================================
# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/01/15 09:57:46 bicatali Exp $

WX_GTK_VER=2.8
EAPI=2
inherit 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 excel examples fltk gtk latex qt3 qt4 traits tk wxwindows"
SLOT="0"
KEYWORDS="~amd64 ~x86"
LICENSE="PYTHON BSD"

CDEPEND=">=dev-python/numpy-1.1
	dev-python/python-dateutil
	dev-python/pytz
	media-libs/freetype:2
	media-libs/libpng
	gtk? ( dev-python/pygtk )
	tk? ( dev-lang/python[tk] )
	wxwindows? ( dev-python/wxpython:2.8 )"

DEPEND="${CDEPEND}
	dev-python/pycxx
	dev-util/pkgconfig"

RDEPEND="${CDEPEND}
	dev-python/pyparsing
	|| ( media-fonts/dejavu media-fonts/ttf-bitstream-vera )
	cairo?  ( dev-python/pycairo )
	excel?  ( dev-python/xlwt )
	fltk?   ( dev-python/pyfltk )
	qt3?    ( dev-python/PyQt )
	qt4?    ( dev-python/PyQt4 )
	traits? ( dev-python/traits dev-python/configobj )
	latex?  (
		virtual/latex-base
		virtual/ghostscript
		app-text/dvipng
		app-text/poppler
		media-fonts/stix-fonts
		|| ( dev-texlive/texlive-fontsrecommended
			 app-text/tetex
			 app-text/ptex ) )"

RESTRICT=mirror
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

	# 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:
	#  - mpl-data in /usr/share/matplotlib
	#  - 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 internal copies of fonts, pycxx, pyparsing
	rm -rf \
		CXX \
		lib/matplotlib/mpl-data/fonts \
		lib/matplotlib/pyparsing.py \
		|| die "removed internal copies failed"
	ln -s /usr/share/python*/CXX . || die
	sed -i \
		-e 's/matplotlib.pyparsing/pyparsing/g' \
		lib/matplotlib/*.py || die "sed for pyparsing 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"

	# doc and examples
	insinto /usr/share/doc/${PF}
	if use doc; then
		doins "${DISTDIR}"/${PDOC}.pdf || die
	fi
	if use examples; then
		doins -r examples || die
	fi
}