Version bump, also adding a bunch of new use flags, restructuring the ebuild. Thanks for Darren Dale from upstream for his help. Closing bug #198360. Dropped ppc, waiting to keyword pyfltk.

Package-Manager: portage-2.1.4_rc8

4 files changed, 153 insertions, 9 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index f7aace9eb62d..ecd922f5d475 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.36 2007/11/23 09:35:07 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.37 2007/12/07 11:29:28 bicatali Exp $
+
+*matplotlib-0.91.1 (07 Dec 2007)
+
+  07 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +matplotlib-0.91.1.ebuild:
+  Version bump, also adding a bunch of new use flags, restructuring the ebuild
+  a bit. Thanks for Darren Dale from upstream for his help. Closing bug
+  #198360. Dropped ppc, waiting to keyword pyfltk.
 
   23 Nov 2007; Ali Polatel <hawking@gentoo.org> matplotlib-0.90.1.ebuild:
   switched dvi to latex, added virtual/latex-base and virtual/ghostscript to
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index ae92902141a1..bde7ea202cbd 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -7,7 +7,9 @@ RMD160 41b950d9c85d26a802f8e7cbe7300576e7199fd7 files/matplotlib-0.90.1-setup.pa
 SHA256 e1989a1ea9002237ddf10e738d04e9609a9732b6ff9ce121da57d1c4defe6d1d files/matplotlib-0.90.1-setup.patch 1942
 DIST matplotlib-0.80.tar.gz 2332845 RMD160 503924ec1567605f53b3f01656129035b688362e SHA1 639bc10a311319459214d4d23c8c94003d2589ac SHA256 9420b5eb388378310da24a00c9c8b9c0e233e37019f46ff105edd58a07ffb8f0
 DIST matplotlib-0.90.1.tar.gz 3001159 RMD160 5cc2a8d79d89041db804522738c5989db30d1e56 SHA1 2c3e010a4cb63efafb286ebb2fd9d20a398fac09 SHA256 0a354abe6ae2cdd0e43667446cdb4013228671ce648d6db54cce18aebff5d79b
+DIST matplotlib-0.91.1.tar.gz 3941323 RMD160 ac8d807adb0d492a0dbfde8d66842affdf6d096e SHA1 147f573f37457fb85a3b577745da74a39df3915c SHA256 42b09d103a32604771a0f5233ff631e32f9e2d2716d4f0405fc84d5be89f5d28
 DIST users_guide_0.90.0.pdf 4209550 RMD160 39b3c948b9dfe6a4aa623249014eec12bb0bb1a2 SHA1 5671e5c99b62fbb7877566b17164702920901bc1 SHA256 a4c98c5a74654014e65428ebe17944b286ea20dab95934aa9f23a2e07f4752a7
+DIST users_guide_0.91.1.pdf 3154057 RMD160 ce09b3470221852c36e9a7611f5a138b270c377e SHA1 9e87ce31c3e93a4323cb76868bb96e8d350d9942 SHA256 b53a56fee48eb52302a1a29ef5f2aabacb62868c36d2a5912dfc5860bc991ba1
 EBUILD matplotlib-0.80-r1.ebuild 949 RMD160 110f6abd5afe0d719141745bc20e092fbf25e1da SHA1 67e46a710ef72b16bfa2201d61f312076d6b46d5 SHA256 fa1c2db13eccdb44ac47f7b52f97f17bd515dd4efc545b7ebbad9a2cc5bc98ea
 MD5 0204b7ee1fa35a1993da813a83a8fc7f matplotlib-0.80-r1.ebuild 949
 RMD160 110f6abd5afe0d719141745bc20e092fbf25e1da matplotlib-0.80-r1.ebuild 949
@@ -16,10 +18,14 @@ EBUILD matplotlib-0.90.1.ebuild 2278 RMD160 76c33cf89b3a77c8fa3b831a3fdaca38ae58
 MD5 9304b04430de34fdb5f1951d98d8fe26 matplotlib-0.90.1.ebuild 2278
 RMD160 76c33cf89b3a77c8fa3b831a3fdaca38ae58d14d matplotlib-0.90.1.ebuild 2278
 SHA256 d1838211b41bc277f7798c72b4f31fb522bccf5f72fe14f92252b70b2d65ec9b matplotlib-0.90.1.ebuild 2278
-MISC ChangeLog 7800 RMD160 e3e4e060ef954886b0b3cae81e4422f1a324bdb9 SHA1 f3a89b98f62e2a945f6a1ca7d7afa9b3698de2e2 SHA256 e0a38bdfeac10244de8ec1e8b5f9a808058d896f29765dd6273731b29e474b0d
-MD5 7bb9ca31b53227c8ac34e5c9cedbb4bc ChangeLog 7800
-RMD160 e3e4e060ef954886b0b3cae81e4422f1a324bdb9 ChangeLog 7800
-SHA256 e0a38bdfeac10244de8ec1e8b5f9a808058d896f29765dd6273731b29e474b0d ChangeLog 7800
+EBUILD matplotlib-0.91.1.ebuild 3200 RMD160 52261fb652c0c8441f9132fee5b394fa89ff395a SHA1 a1af180cbbf1bb8364004eedf1a79a4fbffbba18 SHA256 540d2bb0c5993b5aec1cf2bc49f48ef2d3229148cbdb36bc043ff488f31107d2
+MD5 a91c7a24fb46072722b5c8f4097153a8 matplotlib-0.91.1.ebuild 3200
+RMD160 52261fb652c0c8441f9132fee5b394fa89ff395a matplotlib-0.91.1.ebuild 3200
+SHA256 540d2bb0c5993b5aec1cf2bc49f48ef2d3229148cbdb36bc043ff488f31107d2 matplotlib-0.91.1.ebuild 3200
+MISC ChangeLog 8122 RMD160 ed3f5bd36a9173ea007cbb2c73aae42f42837fee SHA1 7960510aacc5b0f7309aa661607c64aa97b6d843 SHA256 7905759ccfe5787c91d58cd7eb4459015a0abc9345ed874f8118936db2e676bf
+MD5 1b1a685525350b364135973f98529769 ChangeLog 8122
+RMD160 ed3f5bd36a9173ea007cbb2c73aae42f42837fee ChangeLog 8122
+SHA256 7905759ccfe5787c91d58cd7eb4459015a0abc9345ed874f8118936db2e676bf ChangeLog 8122
 MISC metadata.xml 438 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 SHA1 1bd24482c5c450bfcacd353d2bd0e3b4ef1eed76 SHA256 c517e4ef0abc7aaae0e63af373711d266b687b14c441c66d216370e21f7c781f
 MD5 19fb1d100f9a8209cf7aa3066545dd7a metadata.xml 438
 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 metadata.xml 438
@@ -30,10 +36,13 @@ SHA256 ae931697549e8b478999b85986ae7574ad7f524d2acf7d98935c1e1ccf301e03 files/di
 MD5 90ed6227808df1bbeb92bdabf6a1a206 files/digest-matplotlib-0.90.1 506
 RMD160 87b9d081924cf0bc5e5703939ad2699e96f89b90 files/digest-matplotlib-0.90.1 506
 SHA256 a619c55e1b4282723c853bf33c8e7e31a760c6e266316845ec4418687ff0182e files/digest-matplotlib-0.90.1 506
+MD5 c4c2944771fa6bdcd87bb900560e0d23 files/digest-matplotlib-0.91.1 506
+RMD160 e751afaec764e544fe36f8c40ae1e65bcfe834e5 files/digest-matplotlib-0.91.1 506
+SHA256 36533da6f5beff98f1d6a4158f7f32e5a4af71f9c6e064e7352bf15814b1eb4f files/digest-matplotlib-0.91.1 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHRp7UQU4yORhF8iARAvMpAJ9lsyuuZEcUDy69uu2QpAD2u6cF6QCfQjmU
-H3KQQo0edpBbyTY7vv82DwA=
-=0EN1
+iD8DBQFHWS6e1ycZbhPLE2ARAhjjAJ0aKCjq1Zw/o7+3Xv13+/qZ487ejgCfRqZu
+9V4BAAPs946w9EYIs5rF3ls=
+=A/oL
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.91.1 b/dev-python/matplotlib/files/digest-matplotlib-0.91.1
new file mode 100644
index 000000000000..bb97f6749254
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.91.1
@@ -0,0 +1,6 @@
+MD5 79a234b4146ff9349e12dd6b2130043b matplotlib-0.91.1.tar.gz 3941323
+RMD160 ac8d807adb0d492a0dbfde8d66842affdf6d096e matplotlib-0.91.1.tar.gz 3941323
+SHA256 42b09d103a32604771a0f5233ff631e32f9e2d2716d4f0405fc84d5be89f5d28 matplotlib-0.91.1.tar.gz 3941323
+MD5 f49d987d207357f672c7f8509294a4a0 users_guide_0.91.1.pdf 3154057
+RMD160 ce09b3470221852c36e9a7611f5a138b270c377e users_guide_0.91.1.pdf 3154057
+SHA256 b53a56fee48eb52302a1a29ef5f2aabacb62868c36d2a5912dfc5860bc991ba1 users_guide_0.91.1.pdf 3154057
diff --git a/dev-python/matplotlib/matplotlib-0.91.1.ebuild b/dev-python/matplotlib/matplotlib-0.91.1.ebuild
new file mode 100644
index 000000000000..478608902f5f
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.91.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.91.1.ebuild,v 1.1 2007/12/07 11:29:28 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit distutils
+
+DOC_PV=${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/users_guide_${DOC_PV}.pdf )"
+
+IUSE="cairo doc examples fltk gtk latex qt3 qt4 tk wxwindows"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="PYTHON BSD stix bakoma"
+
+DEPEND="dev-python/numpy
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-python/pytz
+	dev-python/python-dateutil
+	gtk? ( dev-python/pygtk )
+	wxwindows? ( dev-python/wxpython )"
+
+RDEPEND="${DEPEND}
+	media-fonts/ttf-bitstream-vera
+	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 API_CHANGES"
+
+pkg_setup() {
+	use tk && distutils_python_tkinter
+}
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# create setup.cfg (see setup.cfg.template for any changes)
+	{
+		echo "[provide_packages]"
+		echo "pytz = False"
+		echo "dateutil = False"
+		echo "configobj = False"
+		echo "enthought.traits = False"
+		echo "[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
+	} > setup.cfg
+
+	# 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"
+
+	# cleaning and remove vera fonts (they are now a dependency)
+	find -name .cvsignore -exec rm -rf {} \;
+	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}
+
+	insinto /etc/matplotlib
+	doins matplotlibrc matplotlib.conf \
+		|| die "installing config files failed"
+
+	insinto /usr/share/doc/${PF}
+	use doc && doins "${DISTDIR}"/users_guide_${DOC_PV}.pdf
+	use examples && doins -r examples
+}