Version bump. Patches were applied upstream

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 196 insertions, 5 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index f326c77c12b3..0afe75ad3b8f 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.90 2010/06/07 16:44:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.91 2010/07/07 22:28:18 bicatali Exp $
+
+*matplotlib-1.0.0 (07 Jul 2010)
+
+  07 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +matplotlib-1.0.0.ebuild:
+  Version bump. Patches were applied upstream
 
   07 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
   matplotlib-0.99.3.ebuild, +files/matplotlib-0.99.3-nopiwik.patch:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ca082b8715c8..a5c7af5183e4 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -11,14 +11,16 @@ AUX matplotlib-0.99.1.1-prefix.patch 1374 RMD160 f30e66336d6e51414babc63f0cc1e79
 AUX matplotlib-0.99.3-nopiwik.patch 1140 RMD160 ef7f28557049af8fc14ae9aa2d4d6ff8e63fe60c SHA1 d9de609da3fedadbf06ba594127bb6688f3cb1e5 SHA256 48ddbf057d0ef940c584fa154faa4b28ba254ab28661e6f6526cd099d08a24de
 DIST matplotlib-0.99.1.1.tar.gz 11905737 RMD160 2bd025944eab18d41ddf9f521c00a1f065346738 SHA1 57b5f1e3f0c8866af99f72fca06b4e529acba31d SHA256 1b94b4632ee4dcd41862f2a2e90fdca8f2e6fb108700c06a16e764782da49041
 DIST matplotlib-0.99.3.tar.gz 11911989 RMD160 8309fc700717119c71603829890fd0eb73b376e2 SHA1 1819ac7f9b22c942ee23c635c43825cd1e8865cc SHA256 3af9160a6d1d1bb73049d71df0906299016c9bba04d39480719a9904ed8b3ab2
+DIST matplotlib-1.0.0.tar.gz 12918842 RMD160 b833a1d0eb708bfe46322914171ab2714b0da549 SHA1 6004e83d09f064ecb3fe15c8ff09d61fb454757f SHA256 02abed1c359479865152ff9411f238ffd3256040da23295fd3bc4c58eb862dee
 EBUILD matplotlib-0.99.1.1-r1.ebuild 5377 RMD160 359b9d1689df34aeb81cbdb6e63fda3719a7ae35 SHA1 d0e1b00c1fdbc1e435427f71be048365e1ed962a SHA256 df649a3816a7539cf2de7f7410de4342f6274c2ddf1273f3f5358e6e28b0d486
 EBUILD matplotlib-0.99.3.ebuild 5711 RMD160 d8f21dda71a75b82bac161b5b53333b5115ed28a SHA1 de42543fae0447a3dd7d72a1cc6f4e8df0c16a48 SHA256 18e4f9cf643c4848980af001b13fa097b83e0acc33a93a5c37dad2d8b4b2c770
-MISC ChangeLog 17701 RMD160 69032ccc3bd208809b6fe5d3a4fe9e753650d9fd SHA1 5638622df9fa178e52af6be8416b493ad4c0b9c5 SHA256 e2e00c4995bf7371d804ed0dd4c6a09391aa094b17a7db433cdfcd11d680520a
+EBUILD matplotlib-1.0.0.ebuild 5184 RMD160 556aeadf28df390381a0746f4ee7019c1868d280 SHA1 5c21e4f816551002739d7dd922eaa8e01d844102 SHA256 e1f0b741f0aa5a8d172eee29ff23c8a218b9b2ca74cb3a0c1b13ef0af08fbbd9
+MISC ChangeLog 17864 RMD160 1394dc0a69e5e5d2ce864481212a7e2b3451b94d SHA1 c79d9aec9f062698fc2d66739b46d98385e69147 SHA256 ebf146e1471d2d2d91ccdb90e9d474eabaa4d769ba34a0daab1def6c7fe301e5
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwNKg4ACgkQ1ycZbhPLE2BlaQCcDSg99/qaiQ0t8ysTRpGCiuc9
-ATAAningy715lCsQ28nhrYO+gJNnCA6g
-=kLzt
+iEYEARECAAYFAkw0/4wACgkQ1ycZbhPLE2DvzwCfQW01n3gnvmcaGD+GGOGPQ7YB
+G8sAn2WFhgtJ2EmWmjwHMtu6YbVdyh+y
+=aHqq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/matplotlib-1.0.0.ebuild b/dev-python/matplotlib/matplotlib-1.0.0.ebuild
new file mode 100644
index 000000000000..048fd5b8d8c8
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-1.0.0.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.0.0.ebuild,v 1.1 2010/07/07 22:28:18 bicatali Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+WX_GTK_VER="2.8"
+
+inherit eutils distutils wxwidgets flag-o-matic
+
+PDOC="users_guide_${PV}"
+
+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 traits tk wxwidgets"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~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 )
+	tk? ( dev-lang/python[tk] )
+	wxwidgets? ( dev-python/wxpython:2.8 )"
+
+DEPEND="${CDEPEND}
+	dev-python/pycxx
+	dev-util/pkgconfig
+	doc? (
+		dev-python/sphinx
+		media-gfx/graphviz[cairo]
+		|| ( ( dev-texlive/texlive-latexextra
+			   dev-texlive/texlive-fontsrecommended
+			   dev-texlive/texlive-latexrecommended )
+			 ( app-text/ptex dev-tex/latex-unicode ) )
+		app-text/dvipng
+		dev-python/imaging
+		dev-python/ipython
+		excel?  ( dev-python/xlwt ) )"
+
+RDEPEND="${CDEPEND}
+	virtual/ttf-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
+			 app-text/ptex ) )"
+RESTRICT_PYTHON_ABIS="3.*"
+
+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 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 fonts, pycxx, pyparsing
+	rm -rf \
+		CXX \
+		lib/matplotlib/mpl-data/fonts/{afm,pdfcorefonts} \
+		lib/matplotlib/mpl-data/fonts/ttf/{Vera*,cm*,*.TXT} \
+		lib/matplotlib/pyparsing.py \
+		|| die "removed internal copies failed"
+
+	sed -i \
+		-e 's/matplotlib.pyparsing/pyparsing/g' \
+		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+}
+
+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() {
+	# 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"
+	[[ -z ${ED} ]] && local ED="${D}"
+	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
+}