Revision bump for 0.86.2 to disable setuptools (install with setuptools present is completely broken). Version bump.

(Portage version: 2.1_pre7-r4)

8 files changed, 142 insertions, 15 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index b1fdf2bb1d51..850fc4c19d88 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/matplotlib
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.21 2006/04/04 23:26:52 marienz Exp $
+
+*matplotlib-0.87.2 (04 Apr 2006)
+*matplotlib-0.86.2-r1 (04 Apr 2006)
+
+  04 Apr 2006; Marien Zwart <marienz@gentoo.org>
+  +files/matplotlib-0.86.2-no-setuptools.patch, -matplotlib-0.86.2.ebuild,
+  +matplotlib-0.86.2-r1.ebuild, +matplotlib-0.87.2.ebuild:
+  Revision bump for 0.86.2 to disable setuptools (install with setuptools
+  present is completely broken). Version bump.
 
 *matplotlib-0.86.2 (07 Feb 2006)
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index cba7a3657d73..62c8f22d5041 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,26 +1,57 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 3a10c9e911691c2cbcfeb6100ab3a233 ChangeLog 3956
+RMD160 8c7ac3d510fe6c3310174c0533a282feae7824f3 ChangeLog 3956
+SHA256 40bf0f645598cf4560f2024b343aacae86844f5c2f7b9e39e9b97fa0998420a1 ChangeLog 3956
 MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70
+RMD160 4dd09ba07eb9ec70a84dbd0a9c445116a5fe667c files/digest-matplotlib-0.73.1 70
+SHA256 0bf48e1e5c697b997dc862d347f846d4a4eb110ec81a19eb962c67b0d235ddf7 files/digest-matplotlib-0.73.1 70
 MD5 c0167eaa6285560f9d7be0cefac5b7c3 files/digest-matplotlib-0.80-r1 68
+RMD160 a0b0871699af485d5573c7b142c005ed8b7ca62a files/digest-matplotlib-0.80-r1 68
+SHA256 225758e458600c62ddf6704872e95ce37b4f726d40b535665e87c36db853b800 files/digest-matplotlib-0.80-r1 68
 MD5 3285002ad0f706582bee43a5a6eae419 files/digest-matplotlib-0.81 68
+RMD160 d35726d6248b96d317c04d4dae8e6d11286fa8cf files/digest-matplotlib-0.81 68
+SHA256 89dce2e6eb50fea14840e5cab098cf4a8a9a348ca129a1e8223237e0ee2b1d38 files/digest-matplotlib-0.81 68
 MD5 0c147de52e946a218085b30cd23ee1e2 files/digest-matplotlib-0.82 68
+RMD160 b1d8fcf67261d791589a62d1a66ced43bc5fedd4 files/digest-matplotlib-0.82 68
+SHA256 61364b607cd7fb84f54b519632db67405c6324db92fd66f20ed50dad35bac46e files/digest-matplotlib-0.82 68
 MD5 df25f214484780f58da1712fa62b3ebc files/digest-matplotlib-0.85 68
-MD5 d39f1765b5e8f4b9217b63b3c3ed75cd files/digest-matplotlib-0.86.2 70
+RMD160 f761529608a02b34d8cbf97cabbfc41045cf48be files/digest-matplotlib-0.85 68
+SHA256 e9490756ea9012915af2a91bfbf2edf2dfeedac99fcb81f89cd9c49a116582f1 files/digest-matplotlib-0.85 68
+MD5 e8b1e7d8dba3d6ca40d142c100e4ed01 files/digest-matplotlib-0.86.2-r1 256
+RMD160 1024a887e856d46d2b7e4b67049698a31a49d21b files/digest-matplotlib-0.86.2-r1 256
+SHA256 b0c6ffd6eeca660c958d15c31bdbeff38f3e056c35ce96deb5e4bb5cc73a018b files/digest-matplotlib-0.86.2-r1 256
+MD5 94b83cb8a1cf24ed90b6fe43968e2c51 files/digest-matplotlib-0.87.2 256
+RMD160 0f4079d6f82229d334ca96a390d1a0f7fef658a3 files/digest-matplotlib-0.87.2 256
+SHA256 846ac609cc18b8cb26295579451ea1ad9d41cc4b3c87993e6e4eae32a8ef7727 files/digest-matplotlib-0.87.2 256
 MD5 1c023ad46845c1841a367ab1d303f66f files/matplotlib-0.85-no-autodetect.patch 1560
+RMD160 3551dcf973ee98d4f58816fe963202a6b39932b4 files/matplotlib-0.85-no-autodetect.patch 1560
+SHA256 155edaad04853824b261e47a13505b9f22ae2df32aeff978698d1e76446f803d files/matplotlib-0.85-no-autodetect.patch 1560
 MD5 109c23821a4c77716b191ae8a260a123 files/matplotlib-0.86.2-no-autodetect.patch 1801
+RMD160 c68dc996736e8fc81a751a72e9351b072539a3b6 files/matplotlib-0.86.2-no-autodetect.patch 1801
+SHA256 10270f1e6692d66ada676fd63b4995ecb011c6155890f237f10425568656d33c files/matplotlib-0.86.2-no-autodetect.patch 1801
+MD5 3e057cec7cc0247efb45523aa637f9c8 files/matplotlib-0.86.2-no-setuptools.patch 500
+RMD160 b26ef3b2fa18348f0e62142e83b8b92315d80be6 files/matplotlib-0.86.2-no-setuptools.patch 500
+SHA256 d4a0cb53070019d7842fa8f5bc1d2f7b53ee00aefdb0f840650f331c4d665cba files/matplotlib-0.86.2-no-setuptools.patch 500
 MD5 53c9ba70d870c291159ba1921d9d85b0 matplotlib-0.73.1.ebuild 1069
+RMD160 82a726a4c2853a3330df9073311d199de4a671e7 matplotlib-0.73.1.ebuild 1069
+SHA256 aa8f2c7cf3c410d9e4ded3f4c9c898f33780ccfcc9cf6b1fddc559c50a94329e matplotlib-0.73.1.ebuild 1069
 MD5 eb9d4cd5926954136af6d5ea19c2c2f9 matplotlib-0.80-r1.ebuild 921
+RMD160 a25a73e65c80617f881ce89ed8e5e6b97ba58ed6 matplotlib-0.80-r1.ebuild 921
+SHA256 536ac3dd07e3524a57458c836576dbcb43f0fda16390572e5728dc9a871fd190 matplotlib-0.80-r1.ebuild 921
 MD5 17e11f01a58fea254ce22a94f77d77f0 matplotlib-0.81.ebuild 1012
+RMD160 0dff874a893ad7495227ecf029b42c7f6edf3519 matplotlib-0.81.ebuild 1012
+SHA256 c61de38c3b123ab18fc4ebdbacc9b0b69cdfd1e125ffb06c6f0360e62e3b3da7 matplotlib-0.81.ebuild 1012
 MD5 0bda51cb13751c342dc25a865311e2c7 matplotlib-0.82.ebuild 1250
+RMD160 4c15eef409716c2ad018316c435c0ee556f19065 matplotlib-0.82.ebuild 1250
+SHA256 a33f54b3fde420eedcd16dbb71779894477b4d0e33f3163903719dbe9402af34 matplotlib-0.82.ebuild 1250
 MD5 5bce81929ee6fd05377c7d8a1f572511 matplotlib-0.85.ebuild 1413
-MD5 ce941a0e1ad46dad44dc34c745f9c658 matplotlib-0.86.2.ebuild 1442
+RMD160 9f788f75b46759338d100713119a3e4258e74101 matplotlib-0.85.ebuild 1413
+SHA256 3f528837008f149a5de13eef4d0ce9011a872664f0ec0ce689542df2675df56f matplotlib-0.85.ebuild 1413
+MD5 67cc4d2967e45339a38b8afccb6a3e75 matplotlib-0.86.2-r1.ebuild 1512
+RMD160 97d26554a262d9f2b79061d6a64d47ae481d3d2e matplotlib-0.86.2-r1.ebuild 1512
+SHA256 777d3e5530f1abba897c2514ae321cd19cc4a49d1bc8965e1f668206bb487ee8 matplotlib-0.86.2-r1.ebuild 1512
+MD5 ce941a0e1ad46dad44dc34c745f9c658 matplotlib-0.87.2.ebuild 1442
+RMD160 d0d387175e0d385a3d28321d987ce4daba13b8c9 matplotlib-0.87.2.ebuild 1442
+SHA256 f03be0962a78d374005037a1cdd90b5764891fd9da77e2de9d594799fce50190 matplotlib-0.87.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-----
+RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
+SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.86.2 b/dev-python/matplotlib/files/digest-matplotlib-0.86.2
deleted file mode 100644
index a0e96439b790..000000000000
--- a/dev-python/matplotlib/files/digest-matplotlib-0.86.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2329312e4088e5f7b4d6acb373b3a7e6 matplotlib-0.86.2.tar.gz 2623905
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.86.2-r1 b/dev-python/matplotlib/files/digest-matplotlib-0.86.2-r1
new file mode 100644
index 000000000000..b5fad127ac31
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.86.2-r1
@@ -0,0 +1,3 @@
+MD5 2329312e4088e5f7b4d6acb373b3a7e6 matplotlib-0.86.2.tar.gz 2623905
+RMD160 46520384ebe971b67e398f4a934ec39c1a08ad77 matplotlib-0.86.2.tar.gz 2623905
+SHA256 2865db34d0f9734d58bf9f71cc6cfa871f0a34b4a4994cf4e02bae58bb09cd92 matplotlib-0.86.2.tar.gz 2623905
diff --git a/dev-python/matplotlib/files/digest-matplotlib-0.87.2 b/dev-python/matplotlib/files/digest-matplotlib-0.87.2
new file mode 100644
index 000000000000..00ba0ce74aa1
--- /dev/null
+++ b/dev-python/matplotlib/files/digest-matplotlib-0.87.2
@@ -0,0 +1,3 @@
+MD5 74dde3c3e33797f56ebd6ca578090f8e matplotlib-0.87.2.tar.gz 2655790
+RMD160 0c913a357e8cec819a5a3f0812ef7854f329fb5c matplotlib-0.87.2.tar.gz 2655790
+SHA256 927d7d383f6cd757778a43fd3fdad05805bb0480a9c80cfb25a22ae65c354e45 matplotlib-0.87.2.tar.gz 2655790
diff --git a/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch b/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch
new file mode 100644
index 000000000000..74b43b8de5f8
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-0.86.2-no-setuptools.patch
@@ -0,0 +1,21 @@
+=== modified file 'setup.py'
+--- setup.py	
++++ setup.py	
+@@ -57,14 +57,8 @@
+ import os
+ if os.path.exists('MANIFEST'): os.remove('MANIFEST')
+ 
+-try:
+-    # check if we have a reasonably recent copy of setuptools
+-    from setuptools.command import bdist_egg 
+-    from setuptools import setup
+-    has_setuptools = True
+-except ImportError:
+-    from distutils.core import setup
+-    has_setuptools = False
++from distutils.core import setup
++has_setuptools = False
+     
+ import sys,os
+ import glob
+
diff --git a/dev-python/matplotlib/matplotlib-0.86.2-r1.ebuild b/dev-python/matplotlib/matplotlib-0.86.2-r1.ebuild
new file mode 100644
index 000000000000..dd725dfe07ef
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-0.86.2-r1.ebuild
@@ -0,0 +1,61 @@
+# 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-r1.ebuild,v 1.1 2006/04/04 23:26:52 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="~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
+
+	# disable setuptools
+	epatch "${FILESDIR}/${P}-no-setuptools.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
+}
diff --git a/dev-python/matplotlib/matplotlib-0.86.2.ebuild b/dev-python/matplotlib/matplotlib-0.87.2.ebuild
index e0488239f993..5a866a15f928 100644
--- a/dev-python/matplotlib/matplotlib-0.86.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.87.2.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.86.2.ebuild,v 1.1 2006/02/07 00:33:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.87.2.ebuild,v 1.1 2006/04/04 23:26:52 marienz Exp $
 
 inherit distutils python