Fix insinfo / insinto typo in all versions. Version bump (bug #105443), dropping ~ppc and ~amd64 keywords because new deps have not been keyworded yet (bug #114776)

(Portage version: 2.0.53)

9 files changed, 137 insertions, 13 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index c03c12192626..b6ec0e9ad2ef 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,16 @@
 # 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.16 2005/11/24 20:47:18 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.17 2005/12/07 17:48:54 marienz Exp $
+
+*matplotlib-0.85 (07 Dec 2005)
+
+  07 Dec 2005; Marien Zwart <marienz@gentoo.org>
+  +files/matplotlib-0.85-no-autodetect.patch, matplotlib-0.73.1.ebuild,
+  matplotlib-0.80-r1.ebuild, matplotlib-0.81.ebuild, matplotlib-0.82.ebuild,
+  +matplotlib-0.85.ebuild:
+  Fix insinfo / insinto typo in all versions. Version bump (bug #105443),
+  dropping ~ppc and ~amd64 keywords because new deps have not been keyworded
+  yet (bug #114776)
 
   24 Nov 2005; Marien Zwart <marienz@gentoo.org> matplotlib-0.73.1.ebuild,
   matplotlib-0.80-r1.ebuild, matplotlib-0.81.ebuild, matplotlib-0.82.ebuild:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index dc68ea00458f..1d0ebc51e267 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,8 +3,11 @@ 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 7e49dbfb00fcc2e6f92bab923735057e matplotlib-0.73.1.ebuild 1069
-MD5 22994965e4f1bb3526f89644c8d19b17 matplotlib-0.80-r1.ebuild 921
-MD5 76685a361dccd043c3b95963ef680a6b matplotlib-0.81.ebuild 1012
-MD5 d9d53995932b6136c8cb34f7ade2a7b7 matplotlib-0.82.ebuild 1250
+MD5 df25f214484780f58da1712fa62b3ebc files/digest-matplotlib-0.85 68
+MD5 1c023ad46845c1841a367ab1d303f66f files/matplotlib-0.85-no-autodetect.patch 1560
+MD5 81ee55ff34e540a5b2b6a0be1981220a matplotlib-0.73.1.ebuild 1069
+MD5 2058d308232507d553e826346d7da103 matplotlib-0.80-r1.ebuild 921
+MD5 a5a99e16b505258dca9f6b82c3c71d2d matplotlib-0.81.ebuild 1012
+MD5 ea0eecb62b4f09b510d306380aca5665 matplotlib-0.82.ebuild 1250
+MD5 45ec21ff70dfcca87d7486b0161fc750 matplotlib-0.85.ebuild 1401
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.85 b/dev-python/matplotlib/files/digest-matplotlib-0.85
new file mode 100644
index 000000000000..104ce8e8e71c
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.85
@@ -0,0 +1 @@
+MD5 4890ef6bd7a1a83acf579d4cbb6d237c matplotlib-0.85.tar.gz 2737883
diff --git a/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch b/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch
new file mode 100644
index 000000000000..05f2fd9a14a6
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.85-no-autodetect.patch
@@ -0,0 +1,53 @@
+--- 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/matplotlib-0.73.1.ebuild b/dev-python/matplotlib/matplotlib-0.73.1.ebuild
index 373d5df24dd5..0366f5d032e0 100644
--- a/dev-python/matplotlib/matplotlib-0.73.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.73.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.5 2005/11/24 20:47:18 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.6 2005/12/07 17:48:54 marienz Exp $
 
 inherit distutils virtualx
 
@@ -32,7 +32,7 @@ src_install() {
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.py examples/README
-		insinfo /usr/share/doc/${PF}/examples/data
+		insinto /usr/share/doc/${PF}/examples/data
 		doins examples/data/*.dat
 	fi
 }
diff --git a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
index e098ba2e2d8e..547e0edc8cca 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-2005 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.4 2005/11/24 20:47:18 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.5 2005/12/07 17:48:54 marienz Exp $
 
 inherit distutils
 
@@ -25,7 +25,7 @@ src_install() {
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.py examples/README
-		insinfo /usr/share/doc/${PF}/examples/data
+		insinto /usr/share/doc/${PF}/examples/data
 		doins examples/data/*.dat
 	fi
 }
diff --git a/dev-python/matplotlib/matplotlib-0.81.ebuild b/dev-python/matplotlib/matplotlib-0.81.ebuild
index fd091a2c7fb2..5ab3b908f0e3 100644
--- a/dev-python/matplotlib/matplotlib-0.81.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.5 2005/11/24 20:47:18 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.6 2005/12/07 17:48:54 marienz Exp $
 
 inherit distutils
 
@@ -29,7 +29,7 @@ src_install() {
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.py examples/README
-		insinfo /usr/share/doc/${PF}/examples/data
+		insinto /usr/share/doc/${PF}/examples/data
 		doins examples/data/*.dat
 	fi
 }
diff --git a/dev-python/matplotlib/matplotlib-0.82.ebuild b/dev-python/matplotlib/matplotlib-0.82.ebuild
index ae74506de749..99910ae589b1 100644
--- a/dev-python/matplotlib/matplotlib-0.82.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.3 2005/11/24 20:47:18 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.4 2005/12/07 17:48:54 marienz Exp $
 
 inherit distutils
 
@@ -41,7 +41,7 @@ src_install() {
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.py examples/README
-		insinfo /usr/share/doc/${PF}/examples/data
+		insinto /usr/share/doc/${PF}/examples/data
 		doins examples/data/*.dat
 	fi
 }
diff --git a/dev-python/matplotlib/matplotlib-0.85.ebuild b/dev-python/matplotlib/matplotlib-0.85.ebuild
new file mode 100644
index 000000000000..98597e7ba5eb
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.85.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 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.1 2005/12/07 17:48:54 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="~x86"
+LICENSE="PYTHON"
+
+DEPEND="virtual/python
+		|| (
+		>=dev-python/numeric-22
+		dev-python/numarray
+		)
+		>=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}/${P}-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
+}