Version bump. Keep bundling of pycxx because it is patched, and some fonts to ease maintenance and portability

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 215 insertions, 3 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 4e737d50cfaa..eff3c4dd4628 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.123 2012/05/04 15:12:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.124 2012/08/01 19:17:40 bicatali Exp $
+
+*matplotlib-1.1.1 (01 Aug 2012)
+
+  01 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/matplotlib-1.1.1-ft-refcount.patch, +matplotlib-1.1.1.ebuild:
+  Version bump. Keep bundling of pycxx because it is patched, and some fonts to
+  ease maintenance and portability
 
   04 May 2012; Patrick Lauer <patrick@gentoo.org> matplotlib-1.0.1-r1.ebuild,
   matplotlib-1.1.0.ebuild:
@@ -612,4 +619,3 @@
   05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> :
   Initial import, ebuild by Fernando A. Serboncini <fserb@terra.com.br> in bug
   32895.
-
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 2eea1a8f639e..54162c3fa76a 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,11 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX matplotlib-1.0.1-libpng15.patch 2393 SHA256 fd6721b37b6de66b5d11804137a7040ad9bc4edcadfd1397b9afbe570e7c58c7 SHA512 608bf5ef86c5671dd472629224256e2b0ece9cd5f57fb1b5467e30fdd9c483aa74a53e62292c25fd5cfcb496c11b46465c199cd77906147a894d403ee179c7ba WHIRLPOOL df7d75efc0da51f8d19f84698d40ef4ac7dd311b24e45223fd016677165da9252c9ae502655c9207f12eaade1f578921aadd570c0e4b1d686e4adcbf5d2ce8b8
 AUX matplotlib-1.0.1-linux3.patch 985 SHA256 2487d4b599a0b52ebccdc79a30365aa4ad56a2cb5fd8d5d3f8cfb167780bb380 SHA512 d4cb8152c5383434730b5145df8f2e845ff85e7ce22e64034d2c721ca38d8293fb3be3d7d94b555e97c6b3027003928ddfd62075f58baaedc055a3100ec32d8a WHIRLPOOL 3a0b689e630bd5bc0542b67afa341fdfa5890d73b966cfe40f100c3fbb17d400886f98d23140af9789296b7b58cbb4d279af4371169df8ddeaf8aa16ff070e66
 AUX matplotlib-1.0.1-sphinx.patch 3441 SHA256 4396ca43e125a08cc113d8cf0fc5fe57fac063b3c1d0da6b66e8d60ca9d19345 SHA512 044d0087eab9138067a4ad7a3b25f67d70c143ea7910df2708ba8540985280e6fcbb33e9f27ef79457f7965ba5d3bf62a00827c2e225e2c3edc912d4abf8454a WHIRLPOOL b91291da20ee1b78b7a834daf25519b39f0ab988a4301a0329bea933eb0779bf4d44a9d41ad0c795ebeba027fbb9bddd61e8407a7601725b457667023a92ad86
+AUX matplotlib-1.1.1-ft-refcount.patch 1313 SHA256 7e6e232445d3c32bb6227cd67a25439034acc85593b64c851acaa23553e29ac5 SHA512 7a89acec10b0ebe8aea57e3652d716c619e82ca388a26231aa19a208f9c2d3ff7b1e54106c125415cb328868484e45f790e03a16feacd37f40b3d583ba7fe0f6 WHIRLPOOL f2551dc4a3b1e70625a863fc4895c8009bd182e4d617ae9d8085a1136aaf847e7648c85b774c6a6714814851657845c091e4599b984215ca6ed240461082f422
 DIST matplotlib-1.0.1.tar.gz 13285166 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6 SHA512 20f8987be1cabbb2c10a8f4e34884f7bb5132c923ffe0217e6c847017975112dd6818e725772ebcd04cdfca6a8957ae9d52c116890115b2128f91364b6206331 WHIRLPOOL bcfab3944c0cdb604e90e1639e8a6fc0509557b25dd3fe1c48060fdc464c974b9ab8ac080552809903641b9b512c3cacbdfc79dbb28700def732b06cde6cec3e
 DIST matplotlib-1.1.0.tar.gz 35842643 SHA256 be37e1d86c65ecacae6683f8805e051e9904e5f2e02bf2b7a34262c46a6d06a7 SHA512 f5ab95c29ef6958096970265a6079f0eb8c43a500924346c4a6c6eb89d9110eeeb6c34a53715e71240e82ded2b76a7b8d5a9b05a07baa000b2926718264ad8ff WHIRLPOOL 1d3c7f0bd8662a0581fc0ba2f1f526933a1e4e0ad17341101ed3ad1efcd9bfb182b876b3bc03d4992cf064d1b17cbea9b6eedf610000c25261a03b5748e23612
+DIST matplotlib-1.1.1.tar.gz 33704843 SHA256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab SHA512 838977c1f57f9cfd10a3cd8935a5640bca25135b2176cb83286f309d57690cca7d6ec78c552c04067b3ded10f0358b92bb2387c018ecdb38ac30f661c4a67588 WHIRLPOOL d0fcc5a7f4d54c12a5b227b78b3977bb6822a61cf50f17d057458dab616ca293201d78e3ec5f1cb8722ee8a262ae2a252cb967a6bf24f7803841fb24831c4a96
 DIST matplotlib-sampledata.tar.bz2 1013421 SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e SHA512 2ca518bdd3a053f0119199c80120cd348ae8d4fdaf5ce6f09606229a6644d0ce9d0cddf13cb0021179b211439f3cbb42db51a802497be2c8ac3482e042c5c99c WHIRLPOOL 581828e041982dbc6162256849b10fa8b4139e6aa7e88a29461147702f00ec5e3b86ac1f72f82a6255b8285fd5197cb794f46836ecd3e519ec1416c7853b8d94
 DIST mpl_sampledata-1.1.0.tar.gz 874730 SHA256 eee173eaf9bd42bc57fb1bcff7044a184da85e6ea1262c1a7d1fdc2e303e78d8 SHA512 7dac7c8a653c11934db3e5a7782c9c444cc037a32fa378d2a65184c3b7ecd7db98f9469068670447359b7e98ac30341973643f267582df0206e183663def401b WHIRLPOOL ce5b2e05c7f9a400fbd276c229b7fb38a8ec5a3f6c4dcaad7f119520f666ce71bb903dadfa61a24e2e85efa2ade034fa95b65edd1e22d18ef7305ed9755ff9d8
 EBUILD matplotlib-1.0.1-r1.ebuild 6295 SHA256 025a3e1c92f996c2c683c55e74eb35afae2b2a85eef03b2a74a53ad5d980925d SHA512 bd47e184f9d13acd8c640c9864230a059bc54d7412e0307bfa0e5f3d581da20c1a2aa6e17f157455afc59bd0444efc95e79530e7f8218b4af6ac2848d7afffe5 WHIRLPOOL 24c74e60cd82219b17de97ed68bb0358efc197f1c65702d561faeab282ffc01a8fd459065b2e824d99317e2a4ec2c37d179bff501028770504e777fa2c450e5b
 EBUILD matplotlib-1.1.0.ebuild 6078 SHA256 5bf26982bcbf6dc1cce209e17632dec2b26ab268f915136598f8458d1f9a68fe SHA512 5b9e2692084fc6a800234e89c1e724863e4b2cfb5f1d50129789e5615cded4049b2f3aa623c28feb69c047c07a88a57cfe3634fbfa664e9010c47d46241c0be3 WHIRLPOOL f5bbea32a9b1287ea427bf21c2102be329daf87fc802c8dfb654a17d4b3567500d2f6b726426184944ea25fca5eda2977a9621e174fbbcdb9ba4c0005499132e
-MISC ChangeLog 22766 SHA256 391a6d9924539d6284f8aeb5077f90bfb23c7836eac1eed45eec6b692787c047 SHA512 2696b1343c582addc9212e5329ebd81d23d17d6fa3016ead10ffa03266e22c3344a9f6c7077fc83af3da7ab20c145e2867ae2626065dacfde30e6c7892136871 WHIRLPOOL 31b211783d315f1d5faf127b08fcb014173dbff3bcebb3dfb9424bd53c700eb7d863a25f449e94f313b2847eeafb36653a9334ac33a91fa91bea9edf2e0a9580
+EBUILD matplotlib-1.1.1.ebuild 4100 SHA256 150a84cde337cfc9a3b448f37c7d089ce01d020d70e45c3a987e495eb2e2b0b7 SHA512 4baf66acf44b2adc3334129c9fb16fd2ed048d4e445b813b591e64534a7fc78810dfebf2ac1ccd33b1d3940108e8883b2a442f910aebfc7fb4fed01a6355ffb0 WHIRLPOOL 3b09b782934cda4d8c4d5041035a7675d74181415f5100de415fc3b931e0ad43bda57f13ab01a0273c4a85feba828d2309a511b37f5fa9bb32e0ef7bf2a7884b
+MISC ChangeLog 23041 SHA256 f3e4c21cf8695efb9cb5b7de84d6536a3a3db549886ae200651710a7353a9c96 SHA512 5bcf3416e83db25d7a43c8f9ed7a4190854935e86d75db6b72a90aa39e3c5ba82b8906656f1047f35fdc47344aefc6d843bbb59ccee96b869a0cc5e5ebeed13a WHIRLPOOL c59018bf52c7755119d8864359e0125f2ddea21a38eb2f757c06d8de11d6ff454b7e7adbda965db7603926351fbd06934f9032586e4b0cbf1fcb0e1333df3e17
 MISC metadata.xml 640 SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4 SHA512 8c53de2d65743b8bd37def8261aea4571db0eb3c72e79b968b5342619d75370de84e26f4808f7b6c069811a5a14c24add4e768a78cea9e0156125bfa2f7ccfb3 WHIRLPOOL 13996de565060c484b96f78396f6acfbd3e795722fc6344d02105b7bf1abfda705dd47c3ec227e68e8f4fbb798704779f18a5ff0a7f99e78a837461959b28b97
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAZgNwACgkQ1ycZbhPLE2CeCgCggHrbOGkquU8ljLrCv8JL7GbR
+JvkAn2QbcK3jwTeFW3DzYKHqIwxlT8da
+=m1hd
+-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch b/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
new file mode 100644
index 000000000000..810037777621
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
@@ -0,0 +1,35 @@
+Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
+https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp
+
+bicatali@gentoo.org 08/2012
+--- src/ft2font.cpp.orig	2012-08-01 17:30:33.000000000 +0100
++++ src/ft2font.cpp	2012-08-01 17:30:42.000000000 +0100
+@@ -870,24 +870,28 @@
+     {
+         std::ostringstream s;
+         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
++	ob_refcnt--;
+         throw Py::RuntimeError(s.str());
+     }
+     else if (error == FT_Err_Cannot_Open_Resource)
+     {
+         std::ostringstream s;
+         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
++	ob_refcnt--;
+         throw Py::RuntimeError(s.str());
+     }
+     else if (error == FT_Err_Invalid_File_Format)
+     {
+         std::ostringstream s;
+         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
++	ob_refcnt--;
+         throw Py::RuntimeError(s.str());
+     }
+     else if (error)
+     {
+         std::ostringstream s;
+         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
++	ob_refcnt--;
+         throw Py::RuntimeError(s.str());
+     }
+ 
diff --git a/dev-python/matplotlib/matplotlib-1.1.1.ebuild b/dev-python/matplotlib/matplotlib-1.1.1.ebuild
new file mode 100644
index 000000000000..21dc3d81f1e7
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.1.1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.1.1.ebuild,v 1.1 2012/08/01 19:17:40 bicatali Exp $
+
+EAPI="3"
+
+# python eclass bloat
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3* *-jython 2.7-pypy-*"
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_MODNAME="matplotlib mpl_toolkits pylab.py"
+
+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"
+
+IUSE="cairo doc excel examples fltk gtk latex qt4 test tk wxwidgets"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-freebsd ~x86-linux ~x86-macos"
+
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+
+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 )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/imaging
+		dev-python/ipython
+		dev-python/xlwt
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? ( dev-python/nose )"
+
+RDEPEND="${CDEPEND}
+	dev-python/pyparsing
+	cairo? ( dev-python/pycairo )
+	excel? ( dev-python/xlwt )
+	fltk? ( dev-python/pyfltk )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+	)
+	qt4? ( || ( dev-python/PyQt4[X] dev-python/pyside[X] ) )"
+
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ft-refcount.patch
+	# create setup.cfg (see setup.cfg.template for any changes)
+	cat > setup.cfg <<-EOF
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[gui_support]
+		$(use_setup cairo)
+		$(use_setup fltk)
+		$(use_setup gtk)
+		$(use_setup qt4)
+		$(use_setup tk)
+		$(use_setup wxwidgets wx)
+	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"
+
+	# remove internal copies of pyparsing
+	rm lib/matplotlib/pyparsing.py || die
+	sed -i \
+		-e 's/matplotlib.pyparsing/pyparsing/g' \
+		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+	distutils_src_prepare
+}
+
+src_compile() {
+	unset DISPLAY # bug #278524
+	distutils_src_compile
+	if use doc; then
+		cd "${S}/doc"
+		VARTEXFONTS="${T}"/fonts \
+			PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \
+			./make.py --small all
+		[[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed"
+	fi
+}
+
+src_test() {
+	# if doc was enabled, all examples were built and tested
+	use doc && return
+	testing() {
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
+			--home="${S}/test-${PYTHON_ABI}" --no-compile \
+			|| die "install test failed"
+		pushd "${S}/test-${PYTHON_ABI}/"lib* > /dev/null
+		PYTHONPATH=python \
+			"$(PYTHON)" -c "import matplotlib as m; m.test(verbosity=2)" \
+			2>&1 | tee test.log
+		grep -Eq "^(ERROR|FAIL):" test.log && return 1
+		popd > /dev/null
+		rm -r test-${PYTHON_ABI}
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/build/latex/Matplotlib.pdf doc/build/html || die
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die
+	fi
+}