Dropped old versions. Removed unnecessary inherit python.

(Portage version: 2.1.3_rc5)

10 files changed, 12 insertions, 389 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/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() {