version bump. updated patch and ebuild thanks to Alok Singhal (#119468). Supports dev-python/numpy.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 152 insertions, 13 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 7ec2320653f5..b1fdf2bb1d51 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/matplotlib
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.19 2005/12/24 15:56:19 dertobi123 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.20 2006/02/07 00:33:31 liquidx Exp $
+
+*matplotlib-0.86.2 (07 Feb 2006)
+
+  07 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  +files/matplotlib-0.86.2-no-autodetect.patch, +matplotlib-0.86.2.ebuild:
+  version bump. updated patch and ebuild thanks to Alok Singhal (#119468).
+  Supports dev-python/numpy.
 
   24 Dec 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   matplotlib-0.85.ebuild:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 674b1a8a100c..cba7a3657d73 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,13 +1,26 @@
-MD5 17e11f01a58fea254ce22a94f77d77f0 matplotlib-0.81.ebuild 1012
-MD5 53c9ba70d870c291159ba1921d9d85b0 matplotlib-0.73.1.ebuild 1069
-MD5 a2c8741b4b2898180f801106004cb82c matplotlib-0.85.ebuild 1416
-MD5 eb9d4cd5926954136af6d5ea19c2c2f9 matplotlib-0.80-r1.ebuild 921
-MD5 65c1e4bf2353b333819aaa239f6e4bda ChangeLog 3696
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 0bda51cb13751c342dc25a865311e2c7 matplotlib-0.82.ebuild 1250
-MD5 1c023ad46845c1841a367ab1d303f66f files/matplotlib-0.85-no-autodetect.patch 1560
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a10c9e911691c2cbcfeb6100ab3a233 ChangeLog 3956
+MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70
 MD5 c0167eaa6285560f9d7be0cefac5b7c3 files/digest-matplotlib-0.80-r1 68
 MD5 3285002ad0f706582bee43a5a6eae419 files/digest-matplotlib-0.81 68
 MD5 0c147de52e946a218085b30cd23ee1e2 files/digest-matplotlib-0.82 68
 MD5 df25f214484780f58da1712fa62b3ebc files/digest-matplotlib-0.85 68
-MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70
+MD5 d39f1765b5e8f4b9217b63b3c3ed75cd files/digest-matplotlib-0.86.2 70
+MD5 1c023ad46845c1841a367ab1d303f66f files/matplotlib-0.85-no-autodetect.patch 1560
+MD5 109c23821a4c77716b191ae8a260a123 files/matplotlib-0.86.2-no-autodetect.patch 1801
+MD5 53c9ba70d870c291159ba1921d9d85b0 matplotlib-0.73.1.ebuild 1069
+MD5 eb9d4cd5926954136af6d5ea19c2c2f9 matplotlib-0.80-r1.ebuild 921
+MD5 17e11f01a58fea254ce22a94f77d77f0 matplotlib-0.81.ebuild 1012
+MD5 0bda51cb13751c342dc25a865311e2c7 matplotlib-0.82.ebuild 1250
+MD5 5bce81929ee6fd05377c7d8a1f572511 matplotlib-0.85.ebuild 1413
+MD5 ce941a0e1ad46dad44dc34c745f9c658 matplotlib-0.86.2.ebuild 1442
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD5+rq9ZFPrqoILX8RAvlrAJ9yso+G1KmFexPwA/mxnpJ/XmkCegCg5DwR
+FpjBgs0Ju+p3cJL9wyVO9oA=
+=HjNu
+-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.86.2 b/dev-python/matplotlib/files/digest-matplotlib-0.86.2
new file mode 100644
index 000000000000..a0e96439b790
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.86.2
@@ -0,0 +1 @@
+MD5 2329312e4088e5f7b4d6acb373b3a7e6 matplotlib-0.86.2.tar.gz 2623905
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
new file mode 100644
index 000000000000..79d498448b3d
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.86.2-no-autodetect.patch
@@ -0,0 +1,60 @@
+--- 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/matplotlib-0.85.ebuild b/dev-python/matplotlib/matplotlib-0.85.ebuild
index f5a3a4c51afd..2ee443aaae6e 100644
--- a/dev-python/matplotlib/matplotlib-0.85.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.85.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.85.ebuild,v 1.3 2005/12/24 15:56:19 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.85.ebuild,v 1.4 2006/02/07 00:33:31 liquidx Exp $
 
 inherit distutils python
 
diff --git a/dev-python/matplotlib/matplotlib-0.86.2.ebuild b/dev-python/matplotlib/matplotlib-0.86.2.ebuild
new file mode 100644
index 000000000000..e0488239f993
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.86.2.ebuild
@@ -0,0 +1,58 @@
+# 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.86.2.ebuild,v 1.1 2006/02/07 00:33:31 liquidx 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
+}