Version bump. Thanks Nicolas Bigaouette for his testing

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index e9badab527df4c4f19aa24234fe4a7ce1e4af9c0..12d17500f9492d826d8c2f2fea592e1b363626e5 100644 (file)
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.109 2011/10/06 20:09:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.110 2011/11/25 05:47:17 bicatali Exp $
+
+*matplotlib-1.1.0 (25 Nov 2011)
+
+  25 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +matplotlib-1.1.0.ebuild:
+  Version bump. Thanks Nicolas Bigaouette for his testing
 
   06 Oct 2011; Alexis Ballier <aballier@gentoo.org> matplotlib-1.0.1-r1.ebuild:
   remove forgotten ptex dep in previous commit

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index e020b5a3f124ce1032c2d9e88b54f577f1f33489..a48b95edead12ea28ae8b78276074ef68d8d56d2 100644 (file)
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -5,14 +5,16 @@ AUX matplotlib-1.0.1-libpng15.patch 2393 RMD160 ab0fdb3ebfa3d112496f0246d084dc99
 AUX matplotlib-1.0.1-linux3.patch 985 RMD160 679247326b0bc98d61462a42658d4ae9620daeb5 SHA1 e53f58b4f4ebbe618e4ef28e25eb89e7a6db1286 SHA256 2487d4b599a0b52ebccdc79a30365aa4ad56a2cb5fd8d5d3f8cfb167780bb380
 AUX matplotlib-1.0.1-sphinx.patch 3441 RMD160 b1a7ad1184dc0e16d65ba0d409f508309db9179f SHA1 02ae98673228390d95481caa58b1674a0696a027 SHA256 4396ca43e125a08cc113d8cf0fc5fe57fac063b3c1d0da6b66e8d60ca9d19345
 DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
+DIST matplotlib-1.1.0.tar.gz 35842643 RMD160 9313fc6407271c46f3ac5af4c53df5ea57982711 SHA1 435b4f04a7e099b79f66451d69ad0b5ce66030ae SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7
 DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
 EBUILD matplotlib-1.0.1-r1.ebuild 6149 RMD160 435580b39994fb27bcf73009ce6b682bc63a76ff SHA1 ff6c88d48259e3a0e8037a82f8d06d6020c009f5 SHA256 7fadc682836d1292f862a5be4df1b40931b49782f4c91163b684fed9f06b45c5
-MISC ChangeLog 20762 RMD160 bdfbf5a4200ef42e3ffcf5da8cb65910fbc01d85 SHA1 5cd165bf1e30814006618b48f6444482c244cec0 SHA256 eea5eae4d243915adef647551fd9128c62ac9b3d0b5dab05909801ceb5f8d426
+EBUILD matplotlib-1.1.0.ebuild 6007 RMD160 0a0e4b331f1e3161511a0ef7bd90096313b0bb17 SHA1 636933331f19d221e15ff69c78b185891a37e47e SHA256 2723e5db83683efa04dfdd06c6558c8cf456dc4824fd42dab41cbc16668ea0d9
+MISC ChangeLog 20937 RMD160 eac9b22890f042ee15919b5f728cdc3f83e410ad SHA1 d0e49d1f7d65e78d6ad4983f6285c7c83e3aa0fc SHA256 4792a0a85b186f9626e78728f1e6bc9fb26c9498e61e97f4984688492c7f9ccd
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6OCvEACgkQvFcC4BYPU0q5JACgjxwpQSF4Nbm0wubQoTuci9ce
-EPoAnAy5zWYmjV+gq19rlAq0RETNDwwQ
-=3tDa
+iEYEARECAAYFAk7PLAgACgkQ1ycZbhPLE2Bi4ACfRAcTtU2Tr8WKf/ujI9HWbQ0J
+uh0An01WOnFoGHuij4nmW0TaofoMt2ht
+=SRRS
 -----END PGP SIGNATURE-----

diff --git a/dev-python/matplotlib/matplotlib-1.1.0.ebuild b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
new file mode 100644 (file)
index 0000000..da16c3d
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.1.0.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.0.ebuild,v 1.1 2011/11/25 05:47:17 bicatali Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+WX_GTK_VER="2.8"
+
+inherit distutils eutils
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.sourceforge.net/ http://pypi.python.org/pypi/matplotlib"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+       doc? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )
+       examples? ( mirror://gentoo/${PN}-sampledata.tar.bz2 )"
+
+IUSE="cairo doc excel examples fltk gtk latex qt4 traits tk wxwidgets"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+LICENSE="PYTHON BSD"
+
+CDEPEND="dev-python/numpy
+       dev-python/python-dateutil
+       dev-python/pytz
+       media-libs/freetype:2
+       media-libs/libpng
+       gtk? ( dev-python/pygtk )
+       wxwidgets? ( dev-python/wxpython:2.8 )"
+
+DEPEND="${CDEPEND}
+       dev-python/pycxx
+       dev-util/pkgconfig
+       doc? (
+               app-text/dvipng
+               dev-python/imaging
+               dev-python/ipython
+               dev-python/xlwt
+               dev-python/sphinx
+               media-gfx/graphviz[cairo]
+               dev-texlive/texlive-latexextra
+               dev-texlive/texlive-fontsrecommended
+               dev-texlive/texlive-latexrecommended
+       )"
+
+RDEPEND="${CDEPEND}
+       virtual/ttf-fonts
+       media-fonts/stix-fonts
+       media-fonts/texcm-ttf
+       dev-python/pyparsing
+       cairo?  ( dev-python/pycairo )
+       excel?  ( dev-python/xlwt )
+       fltk?   ( dev-python/pyfltk )
+       qt4?    ( dev-python/PyQt4[X] )
+       traits? ( dev-python/traits dev-python/configobj )
+       latex?  (
+               virtual/latex-base
+               app-text/ghostscript-gpl
+               app-text/dvipng
+               app-text/poppler[utils]
+               dev-texlive/texlive-fontsrecommended
+       )"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+
+PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
+
+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 wxwidgets wx)
+               $(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"
+
+       # remove internal copies of pycxx, pyparsing
+       rm -rf CXX lib/matplotlib/pyparsing.py \
+               || die "removed internal copies failed"
+
+       # bug #334429 - also see  https://developer.mozilla.org/en/Mozilla_MathML_Project/Fonts
+       # which advise against bakoma fonts
+       sed -i \
+               -e '/fontset/s/cm/stix/' \
+               lib/matplotlib/mpl-data/matplotlib.conf || die
+
+       sed -i \
+               -e 's/matplotlib.pyparsing/pyparsing/g' \
+               lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+               || die "sed pyparsing failed"
+
+       # some fixes to avoid fetching data while compiling examples in tests
+       mv "${WORKDIR}"/sample_data examples/
+       echo "examples.download : False" >> doc/matplotlibrc
+       echo "examples.directory : ${S}/examples/sample_data" >> doc/matplotlibrc
+       echo "examples.download : False" >> matplotlibrc.template
+       echo "examples.directory : ${EPREFIX}/usr/share/${PF}/examples/sample_data" >> matplotlibrc.template
+}
+
+src_compile() {
+       unset DISPLAY # bug #278524
+       distutils_src_compile_pre_hook() {
+               ln -fs "${EPREFIX}/usr/share/python$(python_get_version)/CXX" .
+       }
+       distutils_src_compile
+
+       if use doc; then
+               cd "${S}/doc"
+               export VARTEXFONTS="${T}"/fonts
+               MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \
+                       PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
+                       "$(PYTHON -f)" make.py --small all
+               [[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
+       fi
+}
+
+src_test() {
+       # if doc were enabled, all examples were built and tested
+       use doc && return
+       einfo "Tests are quite long, be patient"
+       cd "${S}/examples/tests"
+       testing() {
+               PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py agg || return 1
+               PYTHONPATH=$(ls -d "${S}"/build-${PYTHON_ABI}/lib*) "$(PYTHON)" backend_driver.py --clean
+       }
+       python_execute_function testing
+}
+
+src_install() {
+       # remove fonts bundles except some computer modern ones
+       rm lib/matplotlib/mpl-data/fonts/ttf/cm{ex,mi,r,sy}10.ttf
+       rm lib/matplotlib/mpl-data/fonts/ttf/{Vera*,*.TXT}
+       rm lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts}
+
+       # sed only after doc building, to allow using default configs
+       sed -i \
+               -e "s:path =  get_data_path():path = '${EPREFIX}/etc/matplotlib':" \
+               -e "s:os.path.dirname(__file__):'${EPREFIX}/usr/share/${PN}':g" \
+               build-*/lib*/matplotlib/__init__.py \
+               || die "sed init for FHS failed"
+       distutils_src_install
+
+       # Respect FHS
+       dodir /usr/share/${PN}
+       mv "${ED}$(python_get_sitedir -f)/${PN}/"{mpl-data,backends/Matplotlib.nib} \
+               "${ED}usr/share/${PN}" || die "Renaming failed"
+       rm -fr "${ED}"usr/lib*/python*/site-packages/${PN}/{mpl-data,backends/Matplotlib.nib}
+
+       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 doc/build/latex/Matplotlib.pdf || die
+               doins -r doc/build/html || die
+       fi
+       if use examples; then
+               doins -r examples || die
+       fi
+}