Dropped old versions. Removed unnecessary inherit python.

Package-Manager: portage-2.1.3_rc5

11 files changed, 28 insertions, 433 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index c0c75460b54f..a004bdff3caf 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,13 @@
 # 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.31 2007/06/05 12:02:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.32 2007/06/26 12:23:56 lucass Exp $
+
+  26 Jun 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/matplotlib-0.87.7-no-autodetect.patch,
+  -files/matplotlib-0.90.0-init.patch, -files/matplotlib-0.90.0-setup.patch,
+  -matplotlib-0.87.7.ebuild, -matplotlib-0.90.0.ebuild,
+  matplotlib-0.90.1.ebuild:
+  Dropped old versions. Removed unnecessary inherit python.
 
 *matplotlib-0.90.1 (05 Jun 2007)
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7bc50645540e..7bdba054fd66 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,47 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-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
-AUX matplotlib-0.90.0-init.patch 985 RMD160 fd5a955bd5e635944ea5124499355ba7737ff7ad SHA1 3065b542d6529085558d388cf8572589d5c50249 SHA256 e02a9adbc7aac79ea031b1e1c22448566285c3ce3374d8333a21128ec2f710ed
-MD5 bbaa0b941d0e9a5459e647dbd6255861 files/matplotlib-0.90.0-init.patch 985
-RMD160 fd5a955bd5e635944ea5124499355ba7737ff7ad files/matplotlib-0.90.0-init.patch 985
-SHA256 e02a9adbc7aac79ea031b1e1c22448566285c3ce3374d8333a21128ec2f710ed files/matplotlib-0.90.0-init.patch 985
-AUX matplotlib-0.90.0-setup.patch 3629 RMD160 7f55e9da9f400fb84029555dacf4bd45fa784157 SHA1 2947be9cf2d361b2c28d865cf36e39a5709c1ebc SHA256 8bc37c113e8fd597c84411913d73e061e017f8a79b6f84acb3011f1a4eee4ccc
-MD5 edac026c015ef396eb245d54544f4c9e files/matplotlib-0.90.0-setup.patch 3629
-RMD160 7f55e9da9f400fb84029555dacf4bd45fa784157 files/matplotlib-0.90.0-setup.patch 3629
-SHA256 8bc37c113e8fd597c84411913d73e061e017f8a79b6f84acb3011f1a4eee4ccc files/matplotlib-0.90.0-setup.patch 3629
 AUX matplotlib-0.90.1-setup.patch 1942 RMD160 41b950d9c85d26a802f8e7cbe7300576e7199fd7 SHA1 683148fd3362417d9969211494d3ec3e0a5a1ba4 SHA256 e1989a1ea9002237ddf10e738d04e9609a9732b6ff9ce121da57d1c4defe6d1d
 MD5 d679355cf6d0c3b69bfdd0c46c242226 files/matplotlib-0.90.1-setup.patch 1942
 RMD160 41b950d9c85d26a802f8e7cbe7300576e7199fd7 files/matplotlib-0.90.1-setup.patch 1942
 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.87.7.tar.gz 2767469 RMD160 823b554d0292c9cf307c187c05e44a2d12b7c646 SHA1 3b3ee920a4507410b3b7469591b8ca636bb8348a SHA256 cb02a3349f643746e492ff843c0e63675f4641ff42ddb65bdcc401cf379b6575
-DIST matplotlib-0.90.0.tar.gz 2795281 RMD160 6be8d7d1f0896378d8c8880b8b0188e2037892cc SHA1 707366d5dc736ce7446a41f748f33e7603d8f023 SHA256 c3c34a58a62706c48b98a16a0702a8114f2674780197ac715cd66f65fac5478d
 DIST matplotlib-0.90.1.tar.gz 3001159 RMD160 5cc2a8d79d89041db804522738c5989db30d1e56 SHA1 2c3e010a4cb63efafb286ebb2fd9d20a398fac09 SHA256 0a354abe6ae2cdd0e43667446cdb4013228671ce648d6db54cce18aebff5d79b
 DIST users_guide_0.90.0.pdf 4209550 RMD160 39b3c948b9dfe6a4aa623249014eec12bb0bb1a2 SHA1 5671e5c99b62fbb7877566b17164702920901bc1 SHA256 a4c98c5a74654014e65428ebe17944b286ea20dab95934aa9f23a2e07f4752a7
-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.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
-EBUILD matplotlib-0.90.0.ebuild 2012 RMD160 39724bb6afd6ce6cf532bd5b5f624864770604cd SHA1 be7851c6cbea91ba231f8e13b278fc03ee1e3fd7 SHA256 1d608bfc75605a696b82e080cbbf5312de65c39aca34f120f934cd851aa19c44
-MD5 195548bf8f24babbe7a798b89434ef43 matplotlib-0.90.0.ebuild 2012
-RMD160 39724bb6afd6ce6cf532bd5b5f624864770604cd matplotlib-0.90.0.ebuild 2012
-SHA256 1d608bfc75605a696b82e080cbbf5312de65c39aca34f120f934cd851aa19c44 matplotlib-0.90.0.ebuild 2012
-EBUILD matplotlib-0.90.1.ebuild 2209 RMD160 6f85f012a12db1a21205280adc0cae8c6c3076da SHA1 d5f508c037e3c6637d0d3febffa8e479f297b760 SHA256 eaba4c90a0d632b583dba2b43971d829e934ab6a2116e2d8c47f529f9dae6d92
-MD5 c2c90c26a7ab5d3378f3e77f38ba4c81 matplotlib-0.90.1.ebuild 2209
-RMD160 6f85f012a12db1a21205280adc0cae8c6c3076da matplotlib-0.90.1.ebuild 2209
-SHA256 eaba4c90a0d632b583dba2b43971d829e934ab6a2116e2d8c47f529f9dae6d92 matplotlib-0.90.1.ebuild 2209
-MISC ChangeLog 6874 RMD160 7a56839ca11033f2de0162ef07851eea438028a6 SHA1 acb615b7a9bf18f13490f73abda2b6aa9175b56e SHA256 f74c49b61fe8a499ca7643841e2d76a214da8cfffc7c185321e6bc3a2a1cc2c0
-MD5 903a828cc51b103d0bd19affd6cb6dc9 ChangeLog 6874
-RMD160 7a56839ca11033f2de0162ef07851eea438028a6 ChangeLog 6874
-SHA256 f74c49b61fe8a499ca7643841e2d76a214da8cfffc7c185321e6bc3a2a1cc2c0 ChangeLog 6874
+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
+SHA256 fa1c2db13eccdb44ac47f7b52f97f17bd515dd4efc545b7ebbad9a2cc5bc98ea matplotlib-0.80-r1.ebuild 949
+EBUILD matplotlib-0.90.1.ebuild 2203 RMD160 4284b49ab994b003f8f7825249df37099dc351f4 SHA1 2404069ba98067375bd92b1b3db5939c95059039 SHA256 9ed76b11ce7c60b858f2010dd0898e3182da844c5ddd131d6ac7fc9b4d656ffd
+MD5 2617dc3f0adc8c1ff04713f29a9b5ea3 matplotlib-0.90.1.ebuild 2203
+RMD160 4284b49ab994b003f8f7825249df37099dc351f4 matplotlib-0.90.1.ebuild 2203
+SHA256 9ed76b11ce7c60b858f2010dd0898e3182da844c5ddd131d6ac7fc9b4d656ffd matplotlib-0.90.1.ebuild 2203
+MISC ChangeLog 7196 RMD160 aa0d5c57d53b042892b533e02e8c439433e6d4d7 SHA1 ffa5be93e2be9e46c216880e3eb9bef5fb28b51c SHA256 3773efe00071a6d7c446e06ef87e3a6de28d1117aaefae91050bf561d910cf8a
+MD5 7bdc40c65b2cbabc45b9e841f326e727 ChangeLog 7196
+RMD160 aa0d5c57d53b042892b533e02e8c439433e6d4d7 ChangeLog 7196
+SHA256 3773efe00071a6d7c446e06ef87e3a6de28d1117aaefae91050bf561d910cf8a ChangeLog 7196
 MISC metadata.xml 438 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 SHA1 1bd24482c5c450bfcacd353d2bd0e3b4ef1eed76 SHA256 c517e4ef0abc7aaae0e63af373711d266b687b14c441c66d216370e21f7c781f
 MD5 19fb1d100f9a8209cf7aa3066545dd7a metadata.xml 438
 RMD160 8a9d50857f90e2dc74852e944d66923cba9117d0 metadata.xml 438
@@ -49,19 +27,13 @@ SHA256 c517e4ef0abc7aaae0e63af373711d266b687b14c441c66d216370e21f7c781f 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 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
-MD5 559b3a4f91f3469e066089933b232c83 files/digest-matplotlib-0.90.0 506
-RMD160 0a657c87d26b36c86f812a719f47013200d8c73f files/digest-matplotlib-0.90.0 506
-SHA256 7fd3ca9af2a1fe2fc9f82b09ff88480eee753256cf2d02ea6265f0d43f80db83 files/digest-matplotlib-0.90.0 506
 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGZVDm1ycZbhPLE2ARAqwgAJ4nBwt2plgYczZM6R1TjSUa9aMNGwCeIRkp
-+oU727bz78pYA+4gwDv6oS0=
-=gm2u
+iD8DBQFGgQVp2jLqHNfbg2URAvtIAJ9sto64G8cwsigha3UaEJdtoyMX+QCfaBD4
+We4XLug7/IONCX4kSVbjki4=
+=kYh/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.7 b/dev-python/matplotlib/files/digest-matplotlib-0.87.7
deleted file mode 100644
index 342d29855a68..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.87.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cca3d3a644c1a84d6dcf4af8a9856b7b matplotlib-0.87.7.tar.gz 2767469
-RMD160 823b554d0292c9cf307c187c05e44a2d12b7c646 matplotlib-0.87.7.tar.gz 2767469
-SHA256 cb02a3349f643746e492ff843c0e63675f4641ff42ddb65bdcc401cf379b6575 matplotlib-0.87.7.tar.gz 2767469
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.90.0 b/dev-python/matplotlib/files/digest-matplotlib-0.90.0
deleted file mode 100644
index db285b4bcba4..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.90.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 31ea12395826080b5be9c1e292cda6f1 matplotlib-0.90.0.tar.gz 2795281
-RMD160 6be8d7d1f0896378d8c8880b8b0188e2037892cc matplotlib-0.90.0.tar.gz 2795281
-SHA256 c3c34a58a62706c48b98a16a0702a8114f2674780197ac715cd66f65fac5478d matplotlib-0.90.0.tar.gz 2795281
-MD5 832f8190ce207cca5cfeae5e4e6b362f users_guide_0.90.0.pdf 4209550
-RMD160 39b3c948b9dfe6a4aa623249014eec12bb0bb1a2 users_guide_0.90.0.pdf 4209550
-SHA256 a4c98c5a74654014e65428ebe17944b286ea20dab95934aa9f23a2e07f4752a7 users_guide_0.90.0.pdf 4209550
diff --git a/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch b/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch
deleted file mode 100644
index 0b8b5a1e500f..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.87.7-no-autodetect.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2006-11-28 22:06:24 +0000
-+++ setup.py	2006-11-28 22:16:00 +0000
-@@ -201,80 +201,25 @@
- 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_GTK = 0
--    else:
--        version = (2,2,0)
--        if gtk.pygtk_version < version:
--            print "Error: GTK backend requires PyGTK %d.%d.%d (or later), " \
--                  "%d.%d.%d was detected." % (
--                version + gtk.pygtk_version)
--            BUILD_GTK = 0
--        else:
--            build_gdk(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'GTK'
-+    build_gdk(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'GTK'
- 
- if BUILD_GTKAGG:
--    try:
--        import gtk
--    except ImportError:
--        print 'GTKAgg requires pygtk'
--        BUILD_GTKAGG=0
--    except RuntimeError:
--        print 'pygtk present but import failed'
--        BUILD_GTKAGG = 0
--    else:
--        version = (2,2,0)
--        if gtk.pygtk_version < version:
--            print "Error: GTKAgg backend requires PyGTK %d.%d.%d " \
--                  "(or later), %d.%d.%d was detected." % (
--                version + gtk.pygtk_version)
--            BUILD_GTKAGG=0
--        else:
--            BUILD_AGG = 1
--            build_gtkagg(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'GTKAgg'
-+    BUILD_AGG = 1
-+    build_gtkagg(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'GTKAgg'
- 
- if BUILD_TKAGG:
--    try:
--        import Tkinter
--    except ImportError:
--        print 'TKAgg requires TkInter'
--        BUILD_TKAGG = 0
--    except RuntimeError:
--        print 'Tkinter present but import failed'
--        BUILD_TKAGG = 0
--    else:
--        try:
--            tk = Tkinter.Tk()
--            tk.withdraw()
--        except Tkinter.TclError:
--            print 'Tkinter present, but window failed to open'
--            BUILD_TKAGG = 0
--        else:
--            BUILD_AGG = 1
--            build_tkagg(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'TkAgg'
-+    BUILD_AGG = 1
-+    build_tkagg(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'TkAgg'
- 
- 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,
--            not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
--                 and BUILD_WXAGG.lower() == 'auto')) # is "auto"
--        rc['backend'] = 'WXAgg'
-+    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"
-+    rc['backend'] = 'WXAgg'
- 
- if BUILD_AGG:
-     build_agg(ext_modules, packages, NUMERIX)
-
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch b/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch
deleted file mode 100644
index 44ddf2dbf3f2..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.90.0-init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- lib/matplotlib/__init__.py~	2007-02-07 03:24:06.000000000 +0000
-+++ lib/matplotlib/__init__.py	2007-02-08 10:33:21.000000000 +0000
-@@ -339,9 +339,11 @@
-         path = os.environ['MATPLOTLIBDATA']
-         if os.path.isdir(path): return path
- 
--    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
-+    path = os.sep.join(['/usr/share/matplotlib', 'mpl-data'])
-     if os.path.isdir(path): return path
- 
-+    raise RuntimeError('Could not find the matplotlib data files')
-+
-     # setuptools' namespace_packages may highjack this init file
-     # so need to try something known to be in matplotlib, not basemap
-     import matplotlib.afm
-@@ -923,7 +925,7 @@
-     if os.path.exists(fname): return fname
- 
- 
--    path =  get_data_path() # guaranteed to exist or raise
-+    path =  '/etc' # guaranteed to exist or raise
-     fname = os.path.join(path, 'matplotlibrc')
-     if not os.path.exists(fname):
-         warnings.warn('Could not find matplotlibrc; using defaults')
diff --git a/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch b/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch
deleted file mode 100644
index 1ad108e09e3c..000000000000
--- a/dev-python/matplotlib/files/matplotlib-0.90.0-setup.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- setup.py~	2006-09-29 10:33:56.000000000 +0100
-+++ setup.py	2007-02-08 10:44:10.000000000 +0000
-@@ -84,7 +84,7 @@
- data.extend(glob.glob('images/*.svg'))
- data.extend(glob.glob('images/*.png'))
- data.extend(glob.glob('images/*.ppm'))
--data.append('matplotlibrc')
-+#data.append('matplotlibrc')
- 
- data_files=[('matplotlib/mpl-data', data),
-             ('matplotlib/mpl-data/Matplotlib.nib',
-@@ -201,80 +201,25 @@
- 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_GTK = 0
--    else:
--        version = (2,2,0)
--        if gtk.pygtk_version < version:
--            print "Error: GTK backend requires PyGTK %d.%d.%d (or later), " \
--                  "%d.%d.%d was detected." % (
--                version + gtk.pygtk_version)
--            BUILD_GTK = 0
--        else:
--            build_gdk(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'GTK'
-+    build_gdk(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'GTK'
- 
- if BUILD_GTKAGG:
--    try:
--        import gtk
--    except ImportError:
--        print 'GTKAgg requires pygtk'
--        BUILD_GTKAGG=0
--    except RuntimeError:
--        print 'pygtk present but import failed'
--        BUILD_GTKAGG = 0
--    else:
--        version = (2,2,0)
--        if gtk.pygtk_version < version:
--            print "Error: GTKAgg backend requires PyGTK %d.%d.%d " \
--                  "(or later), %d.%d.%d was detected." % (
--                version + gtk.pygtk_version)
--            BUILD_GTKAGG=0
--        else:
--            BUILD_AGG = 1
--            build_gtkagg(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'GTKAgg'
-+    BUILD_AGG = 1
-+    build_gtkagg(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'GTKAgg'
- 
- if BUILD_TKAGG:
--    try:
--        import Tkinter
--    except ImportError:
--        print 'TKAgg requires TkInter'
--        BUILD_TKAGG = 0
--    except RuntimeError:
--        print 'Tkinter present but import failed'
--        BUILD_TKAGG = 0
--    else:
--        try:
--            tk = Tkinter.Tk()
--            tk.withdraw()
--        except Tkinter.TclError:
--            print 'Tkinter present, but window failed to open'
--            BUILD_TKAGG = 0
--        else:
--            BUILD_AGG = 1
--            build_tkagg(ext_modules, packages, NUMERIX)
--            rc['backend'] = 'TkAgg'
-+    BUILD_AGG = 1
-+    build_tkagg(ext_modules, packages, NUMERIX)
-+    rc['backend'] = 'TkAgg'
- 
- 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,
--            not (isinstance(BUILD_WXAGG, str) # don't about if BUILD_WXAGG
--                 and BUILD_WXAGG.lower() == 'auto')) # is "auto"
--        rc['backend'] = 'WXAgg'
-+    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"
-+    rc['backend'] = 'WXAgg'
- 
- if BUILD_AGG:
-     build_agg(ext_modules, packages, NUMERIX)
-@@ -331,6 +276,6 @@
-       ext_modules = ext_modules,
-       data_files = data_files,
-       package_dir = {'': 'lib'},
--      cmdclass = {'install_data':smart_install_data},
-+      #cmdclass = {'install_data':smart_install_data},
-       **additional_params
-       )
diff --git a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
index 03f10534b2ac..2a0b39ac9509 100644
--- a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.80-r1.ebuild,v 1.6 2006/11/28 21:52:12 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.7 2007/06/26 12:23:56 lucass Exp $
 
 inherit distutils
 
@@ -30,4 +30,3 @@ src_install() {
 		doins examples/data/*.dat
 	fi
 }
-
diff --git a/dev-python/matplotlib/matplotlib-0.87.7.ebuild b/dev-python/matplotlib/matplotlib-0.87.7.ebuild
deleted file mode 100644
index 571a01c62d1e..000000000000
--- a/dev-python/matplotlib/matplotlib-0.87.7.ebuild
+++ /dev/null
@@ -1,59 +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.7.ebuild,v 1.1 2006/11/29 01:01:55 marienz Exp $
-
-NEED_PYTHON=2.3
-
-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 tk"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="PYTHON"
-
-DEPEND="|| (
-		>=dev-python/numeric-23
-		dev-python/numarray
-		dev-python/numpy
-	)
-	>=media-libs/freetype-2.1.7
-	media-libs/libpng
-	sys-libs/zlib
-	gtk? ( >=dev-python/pygtk-2.2 )
-	dev-python/pytz
-	dev-python/python-dateutil"
-
-
-pkg_setup() {
-	if use tk; then
-		python_tkinter_exists
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# disable autodetection, rely on USE instead
-	epatch "${FILESDIR}/${PN}-0.87.7-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 tk && 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
-}
diff --git a/dev-python/matplotlib/matplotlib-0.90.0.ebuild b/dev-python/matplotlib/matplotlib-0.90.0.ebuild
deleted file mode 100644
index 24054b75c02a..000000000000
--- a/dev-python/matplotlib/matplotlib-0.90.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.90.0.ebuild,v 1.4 2007/05/28 15:40:49 bicatali Exp $
-
-NEED_PYTHON=2.3
-
-inherit distutils python
-
-DOC_PV=0.90.0
-
-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="doc examples gtk tk"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="PYTHON"
-
-DEPEND="|| (
-		>=dev-python/numpy-1.0
-		dev-python/numarray
-		>=dev-python/numeric-23
-	   )
-	!<dev-python/numpy-1.0
-	>=media-libs/freetype-2.1.7
-	media-libs/libpng
-	sys-libs/zlib
-	gtk? ( >=dev-python/pygtk-2.2 )
-	dev-python/pytz
-	dev-python/python-dateutil
-	media-fonts/ttf-bitstream-vera"
-
-DOCS="INTERACTIVE API_CHANGES NUMARRAY_ISSUES"
-
-pkg_setup() {
-	use tk && python_tkinter_exists
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# disable autodetection (use flags) and install data files
-	epatch "${FILESDIR}/${P}-setup.patch"
-
-	# fix default paths for init files (depend on previous patch)
-	epatch "${FILESDIR}/${P}-init.patch"
-
-	sed -i \
-		-e "/^BUILD_GTK/s/'auto'/$(use gtk && echo 1 || echo 0)/g" \
-		-e "/^BUILD_WX/s/'auto'/0/g" \
-		-e "/^BUILD_TK/s/'auto'/$(use tk && echo 1 || echo 0)/g" \
-		setup.py || die "sed failed"
-
-	# cleaning and remove vera fonts (they are now a dependency)
-	chmod 644 images/*.svg
-	find -name .cvsignore | xargs rm -rf
-	rm -f fonts/ttf/Vera*.ttf
-
-	# default to gtk backend if both gtk and tk are selected
-	if use gtk; then
-		sed -i \
-			-e "s/^#rc\['backend'\] = GTKAgg/rc\['backend'\] = 'GTKAgg'/" \
-			setup.py || die "sed backend failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install --install-data=usr/share
-
-	insinto /etc
-	doins matplotlibrc
-
-	insinto /usr/share/doc/${PF}
-	use doc && doins "${DISTDIR}"/users_guide_${DOC_PV}.pdf
-	use examples && doins -r examples
-}
diff --git a/dev-python/matplotlib/matplotlib-0.90.1.ebuild b/dev-python/matplotlib/matplotlib-0.90.1.ebuild
index b36137bf91f4..6ce49b3ea0ca 100644
--- a/dev-python/matplotlib/matplotlib-0.90.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.90.1.ebuild
@@ -1,10 +1,10 @@
 # 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.90.1.ebuild,v 1.1 2007/06/05 12:02:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.90.1.ebuild,v 1.2 2007/06/26 12:23:56 lucass Exp $
 
 NEED_PYTHON=2.3
 
-inherit distutils python
+inherit distutils
 
 DOC_PV=0.90.0
 
@@ -35,7 +35,7 @@ DEPEND="|| (
 DOCS="INTERACTIVE API_CHANGES NUMARRAY_ISSUES"
 
 pkg_setup() {
-	use tk && python_tkinter_exists
+	use tk && distutils_python_tkinter
 }
 
 src_unpack() {