Version bump (bug #147466) that works with python 2.5 (bug #148278). Use the tk instead of tcltk USE flag (bug #17808).

(Portage version: 2.1.2_rc2-r2)
 (Signed Manifest commit)

5 files changed, 23 insertions, 162 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 5ab2bd05bdec..c87b677754be 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,41 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX matplotlib-0.85-no-autodetect.patch 1560 RMD160 3551dcf973ee98d4f58816fe963202a6b39932b4 SHA1 bce2b344f81652ea7fa15fee5094b2401f517e7a SHA256 155edaad04853824b261e47a13505b9f22ae2df32aeff978698d1e76446f803d
-MD5 1c023ad46845c1841a367ab1d303f66f files/matplotlib-0.85-no-autodetect.patch 1560
-RMD160 3551dcf973ee98d4f58816fe963202a6b39932b4 files/matplotlib-0.85-no-autodetect.patch 1560
-SHA256 155edaad04853824b261e47a13505b9f22ae2df32aeff978698d1e76446f803d files/matplotlib-0.85-no-autodetect.patch 1560
 AUX matplotlib-0.86.2-no-autodetect.patch 1801 RMD160 c68dc996736e8fc81a751a72e9351b072539a3b6 SHA1 c631965fcf83c0c2469a0b82e09fd483c3a54543 SHA256 10270f1e6692d66ada676fd63b4995ecb011c6155890f237f10425568656d33c
 MD5 109c23821a4c77716b191ae8a260a123 files/matplotlib-0.86.2-no-autodetect.patch 1801
 RMD160 c68dc996736e8fc81a751a72e9351b072539a3b6 files/matplotlib-0.86.2-no-autodetect.patch 1801
 SHA256 10270f1e6692d66ada676fd63b4995ecb011c6155890f237f10425568656d33c files/matplotlib-0.86.2-no-autodetect.patch 1801
-AUX matplotlib-0.86.2-no-setuptools.patch 500 RMD160 b26ef3b2fa18348f0e62142e83b8b92315d80be6 SHA1 b5da19aa564d1f8de210725a12dfe3a6aa0f339c SHA256 d4a0cb53070019d7842fa8f5bc1d2f7b53ee00aefdb0f840650f331c4d665cba
-MD5 3e057cec7cc0247efb45523aa637f9c8 files/matplotlib-0.86.2-no-setuptools.patch 500
-RMD160 b26ef3b2fa18348f0e62142e83b8b92315d80be6 files/matplotlib-0.86.2-no-setuptools.patch 500
-SHA256 d4a0cb53070019d7842fa8f5bc1d2f7b53ee00aefdb0f840650f331c4d665cba files/matplotlib-0.86.2-no-setuptools.patch 500
 AUX matplotlib-0.87.4-fix-bad-win32-detect.patch 361 RMD160 393c5e6c536c56a25a01786423da5ec6ef875a94 SHA1 76f55e02f8d9b4f12609a76975e75b8a5fbcfddb SHA256 3abf742b407177abc2846c75043c2bf269e70cba5ccb538f5a66ec8d74cbed6f
 MD5 be6af9de4b7d8c5897c4cf510a791dee files/matplotlib-0.87.4-fix-bad-win32-detect.patch 361
 RMD160 393c5e6c536c56a25a01786423da5ec6ef875a94 files/matplotlib-0.87.4-fix-bad-win32-detect.patch 361
 SHA256 3abf742b407177abc2846c75043c2bf269e70cba5ccb538f5a66ec8d74cbed6f files/matplotlib-0.87.4-fix-bad-win32-detect.patch 361
+AUX matplotlib-0.87.7-no-autodetect.patch 3076 RMD160 54c73b61e640aa457677cc9ca19de2e3732ce6aa SHA1 a9293275d55c6cebaf1c221a59612598f878959f SHA256 cfd7f17c133e3c734d054a8a78057754f2843c9e2721fd010cef4c4ffc7cd7a7
+MD5 81ee05d8e5c32845f91fb6df0e83ab98 files/matplotlib-0.87.7-no-autodetect.patch 3076
+RMD160 54c73b61e640aa457677cc9ca19de2e3732ce6aa files/matplotlib-0.87.7-no-autodetect.patch 3076
+SHA256 cfd7f17c133e3c734d054a8a78057754f2843c9e2721fd010cef4c4ffc7cd7a7 files/matplotlib-0.87.7-no-autodetect.patch 3076
 DIST matplotlib-0.80.tar.gz 2332845 RMD160 503924ec1567605f53b3f01656129035b688362e SHA1 639bc10a311319459214d4d23c8c94003d2589ac SHA256 9420b5eb388378310da24a00c9c8b9c0e233e37019f46ff105edd58a07ffb8f0
-DIST matplotlib-0.87.2.tar.gz 2655790 RMD160 0c913a357e8cec819a5a3f0812ef7854f329fb5c SHA1 9d969da7cf8ecb545f8c3a9030645292f32e1cbb SHA256 927d7d383f6cd757778a43fd3fdad05805bb0480a9c80cfb25a22ae65c354e45
 DIST matplotlib-0.87.4.tar.gz 2985247 RMD160 21b2a02c02a809438c2a45835e4e5a76576884b9 SHA1 ad62e01484a3bddf045ddfd6b437015aa34f7415 SHA256 c30f68e90170acd3a2f5f7cfa188cdc5ef81880eb82c20b915a549e4b2ad2b9a
+DIST matplotlib-0.87.7.tar.gz 2767469 RMD160 823b554d0292c9cf307c187c05e44a2d12b7c646 SHA1 3b3ee920a4507410b3b7469591b8ca636bb8348a SHA256 cb02a3349f643746e492ff843c0e63675f4641ff42ddb65bdcc401cf379b6575
 EBUILD matplotlib-0.80-r1.ebuild 951 RMD160 2ca61086fb685ec94027c4d38286ec03a6399c70 SHA1 29056fc11e5a8ea51217a0dc65f5be7d40675152 SHA256 37751842421327fe7b906471fc08f77bab44af5352fe6146a1acc34bbe2d91b4
 MD5 f702ffff2a8a6dd4440b63aed514552e matplotlib-0.80-r1.ebuild 951
 RMD160 2ca61086fb685ec94027c4d38286ec03a6399c70 matplotlib-0.80-r1.ebuild 951
 SHA256 37751842421327fe7b906471fc08f77bab44af5352fe6146a1acc34bbe2d91b4 matplotlib-0.80-r1.ebuild 951
-EBUILD matplotlib-0.87.2.ebuild 1442 RMD160 0a7f0a30a313fd7b6f87401927fd4671aa0d95a6 SHA1 b9b606de23c5b0230a452ebf06b4c714e34ce590 SHA256 50a3e09d24b57f333593c3a3c9dfaffb01b1824d6028c4ead4581ecc4aa87043
-MD5 9c5ebf8dfd90b3c538e460607ceb65a3 matplotlib-0.87.2.ebuild 1442
-RMD160 0a7f0a30a313fd7b6f87401927fd4671aa0d95a6 matplotlib-0.87.2.ebuild 1442
-SHA256 50a3e09d24b57f333593c3a3c9dfaffb01b1824d6028c4ead4581ecc4aa87043 matplotlib-0.87.2.ebuild 1442
-EBUILD matplotlib-0.87.4.ebuild 1499 RMD160 64e868cccbe37ffbf62389bcf0a2c583f9a2b4fe SHA1 0842b34d9a7fd5ce7f78cedb4f4f0259f0a87a0d SHA256 c39adc88d3ace5fa87e27345106cb8253c599e82f3bc88959a18aeee52eab064
-MD5 bc3ff62f2297ffa093f553beefd27c2b matplotlib-0.87.4.ebuild 1499
-RMD160 64e868cccbe37ffbf62389bcf0a2c583f9a2b4fe matplotlib-0.87.4.ebuild 1499
-SHA256 c39adc88d3ace5fa87e27345106cb8253c599e82f3bc88959a18aeee52eab064 matplotlib-0.87.4.ebuild 1499
-MISC ChangeLog 5022 RMD160 4f9e4017b1396de24cfe67a9d4d310513d78aed1 SHA1 edcf43a848f931586b2b0adb8529d9dad19e79d1 SHA256 a186310a868fab05275db9c8cd6c4dce7bc57a87f2fda7385e1c8fb884a66bb3
-MD5 00c4f90a66ddfdfb3469d14f48088b95 ChangeLog 5022
-RMD160 4f9e4017b1396de24cfe67a9d4d310513d78aed1 ChangeLog 5022
-SHA256 a186310a868fab05275db9c8cd6c4dce7bc57a87f2fda7385e1c8fb884a66bb3 ChangeLog 5022
+EBUILD matplotlib-0.87.4.ebuild 1490 RMD160 3d3da71ae05f73a07864efa459c9156a32c650a7 SHA1 7507b2862509fcf5d516892d05223f0076e25543 SHA256 9cd5f5f7fab3092efa1fc257cea52f2519166f991538b73feeafcac74d116a4b
+MD5 f7f1825df84f4229fd12233d6fb9265a matplotlib-0.87.4.ebuild 1490
+RMD160 3d3da71ae05f73a07864efa459c9156a32c650a7 matplotlib-0.87.4.ebuild 1490
+SHA256 9cd5f5f7fab3092efa1fc257cea52f2519166f991538b73feeafcac74d116a4b matplotlib-0.87.4.ebuild 1490
+EBUILD matplotlib-0.87.7.ebuild 1422 RMD160 8ae7b64bca1339966ae4bd213a969f9287965c90 SHA1 4c93272023afeb8f8e961cdf4215ff4eaba5de09 SHA256 493dcdf3a847e7920d2bb4378c9a7882e9f043b3e40a9fe121b52e4757e5b243
+MD5 d83edce54250556dff6adcd90dcf31f6 matplotlib-0.87.7.ebuild 1422
+RMD160 8ae7b64bca1339966ae4bd213a969f9287965c90 matplotlib-0.87.7.ebuild 1422
+SHA256 493dcdf3a847e7920d2bb4378c9a7882e9f043b3e40a9fe121b52e4757e5b243 matplotlib-0.87.7.ebuild 1422
+MISC ChangeLog 5454 RMD160 33e556e3389e6a40b8cc17c5a73eeb5780d622ef SHA1 0575da76cbc8a6e6ea5049bbf9c351444daaff06 SHA256 2e4b073cb73ccb181239c2fbae4644219a1a445824639bba64c6dbe6bcce25b1
+MD5 fc6ec27c298d1ea912951b526e183e0a ChangeLog 5454
+RMD160 33e556e3389e6a40b8cc17c5a73eeb5780d622ef ChangeLog 5454
+SHA256 2e4b073cb73ccb181239c2fbae4644219a1a445824639bba64c6dbe6bcce25b1 ChangeLog 5454
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -43,16 +39,16 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 a7c6b7a04166f6916487f3fe9d8c421b files/digest-matplotlib-0.80-r1 250
 RMD160 43366fac2e407cf7ccdf64071c5fe68d067121fe files/digest-matplotlib-0.80-r1 250
 SHA256 ae931697549e8b478999b85986ae7574ad7f524d2acf7d98935c1e1ccf301e03 files/digest-matplotlib-0.80-r1 250
-MD5 94b83cb8a1cf24ed90b6fe43968e2c51 files/digest-matplotlib-0.87.2 256
-RMD160 0f4079d6f82229d334ca96a390d1a0f7fef658a3 files/digest-matplotlib-0.87.2 256
-SHA256 846ac609cc18b8cb26295579451ea1ad9d41cc4b3c87993e6e4eae32a8ef7727 files/digest-matplotlib-0.87.2 256
 MD5 ec009db656d1691714d12a939182bd29 files/digest-matplotlib-0.87.4 256
 RMD160 2d1707d099bfc1a7761920de2890889fcf44489e files/digest-matplotlib-0.87.4 256
 SHA256 0f33979a3d780991c339ce1ce0a4afd6319969d625d33a888a799e2bd0c18a4e files/digest-matplotlib-0.87.4 256
+MD5 73176428a53a49414d29a26e4f848dc1 files/digest-matplotlib-0.87.7 256
+RMD160 635ef6de2bc25a25c871b9d3b3234a390a65c9f0 files/digest-matplotlib-0.87.7 256
+SHA256 4b7ca9414e2acfeecf1fe49433c716d412c47ddf52972a3aa4f33740c64e1ea2 files/digest-matplotlib-0.87.7 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFbK+SUElL7eJpfEQRAtj8AJ9+m/b8zCZRN4rquCY7DmqhstfmgACguWaw
-zFXMLMMqHub6bUSU99npAt0=
-=8DhZ
+iD8DBQFFbNwKUElL7eJpfEQRAmkhAJ9wdQLBGixpxawIZhf4TKFB88JCQACfeC3q
+jWcOIfC9NqVNaw4H7Yrq8wE=
+=l/mv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.2 b/dev-python/matplotlib/files/digest-matplotlib-0.87.2
deleted file mode 100644
index 00ba0ce74aa1..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.87.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 74dde3c3e33797f56ebd6ca578090f8e matplotlib-0.87.2.tar.gz 2655790
-RMD160 0c913a357e8cec819a5a3f0812ef7854f329fb5c matplotlib-0.87.2.tar.gz 2655790
-SHA256 927d7d383f6cd757778a43fd3fdad05805bb0480a9c80cfb25a22ae65c354e45 matplotlib-0.87.2.tar.gz 2655790
diff --git a/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch b/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch
deleted file mode 100644
index 05f2fd9a14a6..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- matplotlib-0.84-orig/setup.py	2005-11-25 10:37:14.000000000 +0100
-+++ matplotlib-0.84/setup.py	2005-11-25 11:51:46.000000000 +0100
-@@ -165,45 +165,19 @@
- build_enthought(ext_modules, packages)
- 
- if BUILD_GTK:
--    try:
--        import gtk
--    except ImportError:
--        print 'GTK requires pygtk'
--        BUILD_GTK=0
--    except RuntimeError:
--        print 'pygtk present but import failed'
-+    build_gdk(ext_modules, packages, NUMERIX)
- 
--if BUILD_GTK:
--        build_gdk(ext_modules, packages, NUMERIX)
--
--if BUILD_GTKAGG:
--    try:
--        import gtk
--    except ImportError:
--        print 'GTKAgg requires pygtk'
--        BUILD_GTKAGG=0
--    except RuntimeError:
--        print 'pygtk present but import failed'
- if BUILD_GTKAGG:
-     BUILD_AGG = 1
-     build_gtkagg(ext_modules, packages, NUMERIX)
- 
- if BUILD_TKAGG:
--    try: import Tkinter
--    except ImportError: print 'TKAgg requires TkInter'
--    else:
--        BUILD_AGG = 1
--        build_tkagg(ext_modules, packages, NUMERIX)
-+    BUILD_AGG = 1
-+    build_tkagg(ext_modules, packages, NUMERIX)
- 
- if BUILD_WXAGG:
--    try: import wxPython
--    except ImportError:
--        if BUILD_WXAGG != 'auto':
--            print 'WXAgg\'s accelerator requires wxPython'
--        BUILD_WXAGG = 0
--    else:
--        BUILD_AGG = 1
--        build_wxagg(ext_modules, packages, NUMERIX,
-+    BUILD_AGG = 1
-+    build_wxagg(ext_modules, packages, NUMERIX,
-             not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
-                  and BUILD_WXAGG.lower() == 'auto')) # is "auto"
- 
diff --git a/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch b/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch
deleted file mode 100644
index 74b43b8de5f8..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	
-+++ setup.py	
-@@ -57,14 +57,8 @@
- import os
- if os.path.exists('MANIFEST'): os.remove('MANIFEST')
- 
--try:
--    # check if we have a reasonably recent copy of setuptools
--    from setuptools.command import bdist_egg 
--    from setuptools import setup
--    has_setuptools = True
--except ImportError:
--    from distutils.core import setup
--    has_setuptools = False
-+from distutils.core import setup
-+has_setuptools = False
-     
- import sys,os
- import glob
-
diff --git a/dev-python/matplotlib/matplotlib-0.87.2.ebuild b/dev-python/matplotlib/matplotlib-0.87.2.ebuild
deleted file mode 100644
index 5a866a15f928..000000000000
--- a/dev-python/matplotlib/matplotlib-0.87.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.87.2.ebuild,v 1.1 2006/04/04 23:26:52 marienz Exp $
-
-inherit distutils python
-
-DESCRIPTION="matplotlib is a pure python plotting library designed to bring publication quality plotting to python with a syntax familiar to matlab users."
-HOMEPAGE="http://matplotlib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="doc gtk tcltk"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="PYTHON"
-
-DEPEND="virtual/python
-		|| (
-		>=dev-python/numeric-22
-		dev-python/numarray
-		dev-python/numpy
-		)
-		>=media-libs/freetype-2.1.7
-		media-libs/libpng
-		sys-libs/zlib
-		gtk? ( >=dev-python/pygtk-1.99.16 )
-		dev-python/pytz
-		dev-python/python-dateutil"
-
-
-pkg_setup() {
-	if use tcltk; then
-		python_tkinter_exists
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable autodetection, rely on USE instead
-	epatch "${FILESDIR}/${PN}-0.86.2-no-autodetect.patch"
-	sed -i \
-		-e "/^BUILD_GTK/s/'auto'/$(use gtk && echo 1 || echo 0)/" \
-		-e "/^BUILD_WX/s/'auto'/0/" \
-		-e "/^BUILD_TK/s/'auto'/$(use tcltk && echo 1 || echo 0)/" \
-		setup.py
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.py examples/README
-		insinto /usr/share/doc/${PF}/examples/data
-		doins examples/data/*.dat
-	fi
-}