Version bump 0.82. 0.80-r1 stable. Removed 0.80 and 0.81.

(Portage version: 2.0.51.22-r1)

8 files changed, 36 insertions, 67 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 0dac3eb2329e..cebd9d9f96c9 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.13 2005/06/13 02:03:01 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.14 2005/07/02 15:51:39 fserb Exp $
+
+*matplotlib-0.82 (02 Jul 2005)
+
+  02 Jul 2005; Fernando Serboncini <fserb@gentoo.org>
+  -matplotlib-0.71.ebuild, -matplotlib-0.80.ebuild,
+  matplotlib-0.80-r1.ebuild, +matplotlib-0.82.ebuild:
+  Version bump. Made 0.80-r1 stable.
+  Removed 0.80 and 0.71 versions.
+  New ebuild assures that non portage extensions are always installed
+  and use correct deps.
 
   13 Jun 2005; Fernando Serboncini <fserb@gentoo.org>
   matplotlib-0.81.ebuild:
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 777daa4c9079..1c820f29945d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8e46be3db2a1036b5eeda49a74943ec3 ChangeLog 2182
-MD5 bd4ff7648421d9ec876cd7eb3d712920 matplotlib-0.80-r1.ebuild 870
-MD5 491c0eab778ca3c4081a32465ac56383 matplotlib-0.71.ebuild 1008
 MD5 146559eb501a6c3a23272595675edfaf matplotlib-0.73.1.ebuild 1017
-MD5 d876f23e265d0f6c4c89a345367ddd36 matplotlib-0.80.ebuild 1017
+MD5 85cb1419a5ba6ac84166e3cf88c151f8 matplotlib-0.80-r1.ebuild 869
+MD5 aa1136af905f471eaea9a9197747ab01 matplotlib-0.82.ebuild 1093
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 3d6ffc571a5137d4cf1baf0474890099 matplotlib-0.81.ebuild 960
+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 c114d2c51202eda7d4a722513e7dbaa4 files/digest-matplotlib-0.71 68
-MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70
-MD5 c0167eaa6285560f9d7be0cefac5b7c3 files/digest-matplotlib-0.80 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrOl9xtZcznfol0URAjuwAKCzeo4XxsXqRKB98tX1XdveoCSgfgCfaozF
-zKlksBzIMa5HIxi8fVKMDPc=
-=noKc
------END PGP SIGNATURE-----
+MD5 0c147de52e946a218085b30cd23ee1e2 files/digest-matplotlib-0.82 68
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.71 b/dev-python/matplotlib/files/digest-matplotlib-0.71
deleted file mode 100644
index bfc17847d943..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.71
+++ /dev/null
@@ -1 +0,0 @@
-MD5 286bd4ad537fd9566214e39395a3cb50 matplotlib-0.71.tar.gz 2089317
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.80 b/dev-python/matplotlib/files/digest-matplotlib-0.80
deleted file mode 100644
index 7a9c9bca874e..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0374c439d3fcbca193c1333b84713674 matplotlib-0.80.tar.gz 2332845
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.82 b/dev-python/matplotlib/files/digest-matplotlib-0.82
new file mode 100644
index 000000000000..914efa112d12
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.82
@@ -0,0 +1 @@
+MD5 a5ef59a9eed934708eedef5a0125d8d8 matplotlib-0.82.tar.gz 2688579
diff --git a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
index dfdd95e30c4b..045c26e150b1 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.1 2005/05/26 18:03:42 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.2 2005/07/02 15:51:39 fserb Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 IUSE="doc gtk"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 LICENSE="as-is"
 
 DEPEND="virtual/python
diff --git a/dev-python/matplotlib/matplotlib-0.80.ebuild b/dev-python/matplotlib/matplotlib-0.80.ebuild
deleted file mode 100644
index a709d7cd9985..000000000000
--- a/dev-python/matplotlib/matplotlib-0.80.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.ebuild,v 1.1 2005/04/14 12:29:25 kloeri Exp $
-
-inherit distutils virtualx
-
-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"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-LICENSE="as-is"
-
-DEPEND="virtual/python
-		>=dev-python/numeric-22
-		gtk? ( >=dev-python/pygtk-1.99.16 )"
-
-src_compile() {
-	export maketype="distutils_src_compile"
-	virtualmake "$*"
-}
-
-src_install() {
-	export maketype="distutils_src_install"
-	virtualmake "$*"
-	distutils_python_version
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.py examples/README
-		insinfo /usr/share/doc/${PF}/examples/data
-		doins examples/data/*.dat
-	fi
-}
-
diff --git a/dev-python/matplotlib/matplotlib-0.71.ebuild b/dev-python/matplotlib/matplotlib-0.82.ebuild
index d9d40fcc5b1f..5c08b61737f8 100644
--- a/dev-python/matplotlib/matplotlib-0.71.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.82.ebuild
@@ -1,8 +1,8 @@
 # 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.71.ebuild,v 1.4 2005/05/26 14:14:09 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.1 2005/07/02 15:51:39 fserb Exp $
 
-inherit distutils virtualx
+inherit distutils
 
 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/"
@@ -10,22 +10,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 IUSE="doc gtk"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="as-is"
 
 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 )"
 
-src_compile() {
-	export maketype="distutils_src_compile"
-	virtualmake "$*"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# This would blow things up if we had a
+	# dev-python/pytz or dev-python/dateutil
+	# Those should be added as dependencies
+	sed -i -e "151,+6d;158a\            add_dateutil()" setup.py
 }
 
 src_install() {
-	export maketype="distutils_src_install"
-	virtualmake "$*"
-	distutils_python_version
+	distutils_src_install
 
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/examples