diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2010-06-03 19:12:10 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-06-03 19:12:10 +0000 |
commit | 1ec6c5ce267b930ed1a11b743840c70ed16cbc5f (patch) | |
tree | dbdcb3775d5f764fcdc1073283a1c386ab3ccda7 /dev-python/matplotlib | |
parent | Fix backtrace that happens when trying to use the leoslyrics plugin (bug 316397) (diff) | |
download | historical-1ec6c5ce267b930ed1a11b743840c70ed16cbc5f.tar.gz historical-1ec6c5ce267b930ed1a11b743840c70ed16cbc5f.tar.bz2 historical-1ec6c5ce267b930ed1a11b743840c70ed16cbc5f.zip |
Version bump. Also forced -DNDEBUG to fix doc generation (bug #322347)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'dev-python/matplotlib')
-rw-r--r-- | dev-python/matplotlib/ChangeLog | 9 | ||||
-rw-r--r-- | dev-python/matplotlib/Manifest | 13 | ||||
-rw-r--r-- | dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild | 14 | ||||
-rw-r--r-- | dev-python/matplotlib/matplotlib-0.99.3.ebuild (renamed from dev-python/matplotlib/matplotlib-0.99.1.1-r2.ebuild) | 25 |
4 files changed, 27 insertions, 34 deletions
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index 1f5555822dac..33c58c870140 100644 --- a/dev-python/matplotlib/ChangeLog +++ b/dev-python/matplotlib/ChangeLog @@ -1,6 +1,13 @@ # 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.88 2010/05/31 20:38:42 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.89 2010/06/03 19:12:09 bicatali Exp $ + +*matplotlib-0.99.3 (03 Jun 2010) + + 03 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> + matplotlib-0.99.1.1-r1.ebuild, -matplotlib-0.99.1.1-r2.ebuild, + +matplotlib-0.99.3.ebuild: + Version bump. Also forced -DNDEBUG to fix doc generation (bug #322347) 31 May 2010; Sébastien Fabbro <bicatali@gentoo.org> files/matplotlib-0.99.1.1-libpng14.patch: diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 6eaa3e0c1a7f..001688108db3 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -9,14 +9,15 @@ AUX matplotlib-0.99.1.1-gtk-tooltip.patch 3234 RMD160 94e84e0ddfa45bf137b29dc9c2 AUX matplotlib-0.99.1.1-libpng14.patch 404 RMD160 c259f9acb51b9981da68f14268d0c446184f1501 SHA1 eab90ab67ab4a7757f85e35f14b85c6dc363cc20 SHA256 7d1676f1b508ef27dabccd4efe52d5a47ca23c55735fd9777ae303a612cd1749 AUX matplotlib-0.99.1.1-prefix.patch 1374 RMD160 f30e66336d6e51414babc63f0cc1e79319f27a3a SHA1 8201f7f5f4ce788aac91acc8cdd1d0ff43ae6a93 SHA256 0cf04d6d5124793af0e89bbf7aa20d821dccb5b7b95eb04aeeaa2723a48345ff DIST matplotlib-0.99.1.1.tar.gz 11905737 RMD160 2bd025944eab18d41ddf9f521c00a1f065346738 SHA1 57b5f1e3f0c8866af99f72fca06b4e529acba31d SHA256 1b94b4632ee4dcd41862f2a2e90fdca8f2e6fb108700c06a16e764782da49041 -EBUILD matplotlib-0.99.1.1-r1.ebuild 5485 RMD160 9e7db22133575c4d8ee6a3f017efab263c8cc2fb SHA1 f0b72e875dca012d6e79fdea8ac15a6642913689 SHA256 218a3bc10766a9190b9cb044863a2028f32b6099db6b4eded1997abe794d93d2 -EBUILD matplotlib-0.99.1.1-r2.ebuild 5987 RMD160 032ce91b765ae85ac5485d9ebb793b35a5b9f1d8 SHA1 55d7da2241a027a3824aaa2ca24c1b2463efb07d SHA256 6c4a518b63af870891286b4d810c84de911fc5c7ad6f9ebed87f0b4194ef9846 -MISC ChangeLog 17232 RMD160 ad3892aca0f04da66602745d9c4dd4001958465d SHA1 3a193d571647d1a152610ebb5ce28a1a57ff4035 SHA256 8cd459036677dc2713cfcd010440aa89224a28b1a7122ac7230906f25ddb84f4 +DIST matplotlib-0.99.3.tar.gz 11911989 RMD160 8309fc700717119c71603829890fd0eb73b376e2 SHA1 1819ac7f9b22c942ee23c635c43825cd1e8865cc SHA256 3af9160a6d1d1bb73049d71df0906299016c9bba04d39480719a9904ed8b3ab2 +EBUILD matplotlib-0.99.1.1-r1.ebuild 5377 RMD160 359b9d1689df34aeb81cbdb6e63fda3719a7ae35 SHA1 d0e1b00c1fdbc1e435427f71be048365e1ed962a SHA256 df649a3816a7539cf2de7f7410de4342f6274c2ddf1273f3f5358e6e28b0d486 +EBUILD matplotlib-0.99.3.ebuild 5628 RMD160 35a557864ae3d8599179e566756ebeb737075410 SHA1 265001b089067d7d3bf3d01a9251a1a63c4e2a41 SHA256 43c15d744e592e65b2280b19bea7ae0e9313b62de3f404b9117b649f0c5a6310 +MISC ChangeLog 17489 RMD160 f25117a640cf4a821c234d4ed20d768dad891912 SHA1 5048e6c2f34f4621a7f672b44cd6031b88f8d01a SHA256 2702a07255e10a91fbf6b10216075bfbff7478c0d79e56f9531975e3078bdc1c MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwEJw4ACgkQ1ycZbhPLE2DPtgCgn+Pf5ugwrqC/i/VslkypSRQD -rIYAniJS9nEHBOcmObhayeIFe2lvq0/W -=pAKd +iEYEARECAAYFAkwIByEACgkQ1ycZbhPLE2Db4ACghXfHTSNc5+C5g+VB8Ze/ciXw +t+YAn3eK3KeQCHY0zff4fG6NFNGOL1dd +=cY5z -----END PGP SIGNATURE----- diff --git a/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild b/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild index 99aed28eec8c..4da07a739a61 100644 --- a/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild @@ -1,13 +1,13 @@ # 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-0.99.1.1-r1.ebuild,v 1.8 2010/05/30 16:32:31 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.99.1.1-r1.ebuild,v 1.9 2010/06/03 19:12:09 bicatali Exp $ EAPI="2" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" WX_GTK_VER="2.8" -inherit eutils distutils wxwidgets +inherit eutils distutils wxwidgets flag-o-matic PDOC="users_guide_${PV}" @@ -140,7 +140,7 @@ src_prepare() { src_compile() { unset DISPLAY # bug #278524 - + append-flags -DNDEBUG # bug #322347 distutils_src_compile_pre_hook() { ln -fs "${EPREFIX}/usr/share/python$(python_get_version)/CXX" . } @@ -149,14 +149,10 @@ src_compile() { if use doc; then cd "${S}/doc" export VARTEXFONTS="${T}"/fonts - # no die function here: broken compilation at the end, do it twice, - # result ok. - MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \ - PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \ - "$(PYTHON -f)" make.py html MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \ PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \ - "$(PYTHON -f)" make.py + "$(PYTHON -f)" make.py all + [[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed" fi } diff --git a/dev-python/matplotlib/matplotlib-0.99.1.1-r2.ebuild b/dev-python/matplotlib/matplotlib-0.99.3.ebuild index 0b3d5331e3c9..aa94af03b23f 100644 --- a/dev-python/matplotlib/matplotlib-0.99.1.1-r2.ebuild +++ b/dev-python/matplotlib/matplotlib-0.99.3.ebuild @@ -1,13 +1,13 @@ # 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-0.99.1.1-r2.ebuild,v 1.1 2010/05/31 20:23:16 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.99.3.ebuild,v 1.1 2010/06/03 19:12:10 bicatali Exp $ EAPI="2" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" WX_GTK_VER="2.8" -inherit eutils distutils wxwidgets +inherit eutils distutils wxwidgets flag-o-matic PDOC="users_guide_${PV}" @@ -79,20 +79,12 @@ use_setup() { src_prepare() { # avoid to launch xv while building examples docs epatch "${FILESDIR}"/${PN}-0.98.5.2-no-xv.patch - - # removes hardcoded lib paths, should not break non-Prefix, more - # likely to fix it in case of multilib - epatch "${FILESDIR}"/${P}-prefix.patch - epatch "${FILESDIR}"/${PN}-0.99.0-freebsd7+.patch - - # support libpng-1.4 (from upstream svn) - epatch "${FILESDIR}"/${P}-libpng14.patch # allow better small docs (from upstream svn) - epatch "${FILESDIR}"/${P}-docs.patch + epatch "${FILESDIR}"/${PN}-0.99.1.1-docs.patch # allow compatibility with pygtk-2.12 tooltop (from upstream svn) - epatch "${FILESDIR}"/${P}-gtk-tooltip.patch + epatch "${FILESDIR}"/${PN}-0.99.1.1-gtk-tooltip.patch # some font stuff (from upstream svn) - epatch "${FILESDIR}"/${P}-eintr.patch + epatch "${FILESDIR}"/${PN}-0.99.1.1-eintr.patch # create setup.cfg (see setup.cfg.template for any changes) cat > setup.cfg <<-EOF @@ -143,7 +135,7 @@ src_prepare() { src_compile() { unset DISPLAY # bug #278524 - + append-flags -DNDEBUG # bug #322347 distutils_src_compile_pre_hook() { ln -fs "${EPREFIX}/usr/share/python$(python_get_version)/CXX" . } @@ -155,10 +147,7 @@ src_compile() { MATPLOTLIBDATA="${S}/lib/matplotlib/mpl-data" \ PYTHONPATH=$(ls -d "${S}"/build-$(PYTHON -f --ABI)/lib*) \ "$(PYTHON -f)" make.py --small all - 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" + [[ -e build/latex/Matplotlib.pdf ]] || die "doc generation failed" fi } |