From cc599d5631ea27eb3b918b8bb15211cc0fd0e917 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 5 Mar 2007 10:43:00 +0000 Subject: [PATCH] removed matplotlib-0.87.4.ebuild and patches, obsolete and incompatibles with newer numpy. Package-Manager: portage-2.1.2-r9 --- dev-python/matplotlib/ChangeLog | 9 ++- .../matplotlib/files/digest-matplotlib-0.87.4 | 3 - .../matplotlib-0.86.2-no-autodetect.patch | 60 ------------------- ...tplotlib-0.87.4-fix-bad-win32-detect.patch | 12 ---- .../matplotlib/matplotlib-0.87.4.ebuild | 60 ------------------- 5 files changed, 8 insertions(+), 136 deletions(-) delete mode 100644 dev-python/matplotlib/files/digest-matplotlib-0.87.4 delete mode 100644 dev-python/matplotlib/files/matplotlib-0.86.2-no-autodetect.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-0.87.4-fix-bad-win32-detect.patch delete mode 100644 dev-python/matplotlib/matplotlib-0.87.4.ebuild diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog index 641f36566a1f..d2d155ef4bc0 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.27 2007/02/23 22:32:09 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.28 2007/03/05 10:43:00 bicatali Exp $ + + 05 Mar 2007; Sébastien Fabbro + -files/matplotlib-0.86.2-no-autodetect.patch, + -files/matplotlib-0.87.4-fix-bad-win32-detect.patch, + -matplotlib-0.87.4.ebuild: + Removed matplotlib-0.87.4.ebuild and patches, obsolete and unsupported with + newer numpy. Closing bug #145664. 23 Feb 2007; Sébastien Fabbro metadata.xml, matplotlib-0.90.0.ebuild: diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.4 b/dev-python/matplotlib/files/digest-matplotlib-0.87.4 deleted file mode 100644 index 5d10ebe7218b..000000000000 --- a/dev-python/matplotlib/files/digest-matplotlib-0.87.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b8ef6ee4b4a7267d94980b4678f950ea matplotlib-0.87.4.tar.gz 2985247 -RMD160 21b2a02c02a809438c2a45835e4e5a76576884b9 matplotlib-0.87.4.tar.gz 2985247 -SHA256 c30f68e90170acd3a2f5f7cfa188cdc5ef81880eb82c20b915a549e4b2ad2b9a matplotlib-0.87.4.tar.gz 2985247 diff --git a/dev-python/matplotlib/files/matplotlib-0.86.2-no-autodetect.patch b/dev-python/matplotlib/files/matplotlib-0.86.2-no-autodetect.patch deleted file mode 100644 index 79d498448b3d..000000000000 --- a/dev-python/matplotlib/files/matplotlib-0.86.2-no-autodetect.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- setup.bak.py 2006-01-17 12:54:55.000000000 -0500 -+++ setup.py 2006-01-17 12:59:47.000000000 -0500 -@@ -203,47 +203,20 @@ - 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' -- --if BUILD_GTK: -- build_gdk(ext_modules, packages, NUMERIX) -- rc['backend'] = 'GTK' -+ build_gdk(ext_modules, packages, NUMERIX) -+ rc['backend'] = 'GTK' - - if BUILD_TKAGG: -- try: import Tkinter -- except ImportError: print 'TKAgg requires TkInter' -- 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' -- --if BUILD_GTKAGG: -- try: -- import gtk -- except ImportError: -- print 'GTKAgg requires pygtk' -- BUILD_GTKAGG=0 -- except RuntimeError: -- print 'pygtk present but import failed' -+ 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_GTKAGG: - BUILD_AGG = 1 diff --git a/dev-python/matplotlib/files/matplotlib-0.87.4-fix-bad-win32-detect.patch b/dev-python/matplotlib/files/matplotlib-0.87.4-fix-bad-win32-detect.patch deleted file mode 100644 index 38958567bf23..000000000000 --- a/dev-python/matplotlib/files/matplotlib-0.87.4-fix-bad-win32-detect.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- setupext.py~ 2006-07-10 18:55:59.000000000 +0100 -+++ setupext.py 2006-07-17 16:47:19.000000000 +0100 -@@ -116,7 +116,8 @@ - return 'mingw32' - return 'msvc' - win32_compiler = get_win32_compiler() --if win32_compiler == 'msvc': -+ -+if sys.platform == 'win32' and win32_compiler == 'msvc': - std_libs = [] - else: - std_libs = ['stdc++', 'm'] diff --git a/dev-python/matplotlib/matplotlib-0.87.4.ebuild b/dev-python/matplotlib/matplotlib-0.87.4.ebuild deleted file mode 100644 index 0ef6ed97babc..000000000000 --- a/dev-python/matplotlib/matplotlib-0.87.4.ebuild +++ /dev/null @@ -1,60 +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.4.ebuild,v 1.2 2006/11/29 01:01:55 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 tk" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -LICENSE="PYTHON" - -DEPEND="virtual/python - || ( - >=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.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 tk && echo 1 || echo 0)/" \ - setup.py - - epatch ${FILESDIR}/${PN}-0.87.4-fix-bad-win32-detect.patch -} - -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 -} -- 2.26.2