Added linux patches, bug #375255, thanks robbat2 for the look up

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 12f9ff86f22b9501bc9f6cedf2249d63c2351f46..1677a80f16dee35d41fbbc686697d387b24d5679 100644 (file)
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.106 2011/04/14 20:10:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.107 2011/08/09 05:40:01 bicatali Exp $
+
+  09 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  matplotlib-1.0.1-r1.ebuild, +files/matplotlib-1.0.1-linux3.patch:
+  Added linux patches, bug #375255, thanks robbat2 for the look up
 
   14 Apr 2011; Brent Baude <ranger@gentoo.org> matplotlib-1.0.1-r1.ebuild:
   Marking matplotlib-1.0.1-r1 ppc for bug 360635

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 5303b9d0354b79b1ecc2cf08c31a692052817f77..a0e8cf557423935898e87ee60a5e3ec1587f85ea 100644 (file)
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,26 +2,17 @@
 Hash: SHA1
 
 AUX matplotlib-1.0.1-libpng15.patch 2393 RMD160 ab0fdb3ebfa3d112496f0246d084dc996ecfc019 SHA1 4aa6374bef7193163a9ed641fd513607566a8060 SHA256 fd6721b37b6de66b5d11804137a7040ad9bc4edcadfd1397b9afbe570e7c58c7
+AUX matplotlib-1.0.1-linux3.patch 985 RMD160 679247326b0bc98d61462a42658d4ae9620daeb5 SHA1 e53f58b4f4ebbe618e4ef28e25eb89e7a6db1286 SHA256 2487d4b599a0b52ebccdc79a30365aa4ad56a2cb5fd8d5d3f8cfb167780bb380
 AUX matplotlib-1.0.1-sphinx.patch 3441 RMD160 b1a7ad1184dc0e16d65ba0d409f508309db9179f SHA1 02ae98673228390d95481caa58b1674a0696a027 SHA256 4396ca43e125a08cc113d8cf0fc5fe57fac063b3c1d0da6b66e8d60ca9d19345
 DIST matplotlib-1.0.1.tar.gz 13285166 RMD160 e3e326f7f31ef995253da483444cb593b8e6753b SHA1 c7a832f28a66817626e7a8af21e14ea0e15f4008 SHA256 83bc6377373b3f34b18eac1883c27f3f381f5c9b9c422b4d85c91e217a947af6
 DIST matplotlib-sampledata.tar.bz2 1013421 RMD160 43a06cf7847cfe1ad744bd6444786b16843bb1f3 SHA1 b5335b05b6d3c05dcb052c81385f1304e465d2ee SHA256 0a9d45f1e5f31bee1e6efeb453775153d0553b721971830d6c1657a8d9640a3e
-EBUILD matplotlib-1.0.1-r1.ebuild 6217 RMD160 8ac0eb364329bd749e1f8948eab8fb6fe1928ab2 SHA1 b5a34ab148f0a435b7e458d04a8ec6d7f78df701 SHA256 f944ba1ebd925cb0e3b012461c41c26dc232ebc88220d183ecf487e261e548f7
-MISC ChangeLog 20322 RMD160 27781a0e969fba1ba700188e6cbd31b2db6d257f SHA1 81e221d3d7c6028b526f4e2658824c78ddf27a83 SHA256 aa84473968264e0b71d49dfc41e00d99f0fb77507348cbd8497b03b48b18fcce
+EBUILD matplotlib-1.0.1-r1.ebuild 6259 RMD160 b9455e44271467c5d1d1bfcaef20d876b1ab944a SHA1 fcb6186aae2b3119b34ebdee476eded200c88fd3 SHA256 124421f0b8cfa8c1b249d9210a9e2c0be94bf7a4bdfaad068062aeef0b8f00ad
+MISC ChangeLog 20515 RMD160 b821f95af813526b4f9a53f0f632ead331b315a8 SHA1 1a03d58fa9b4a3f9cd6bb9cb28fad7b391060bc4 SHA256 f547472ba27f9c573429aee5fadad69670b5ec0a344a257ac8f664eb08cb7bdc
 MISC metadata.xml 640 RMD160 5a3412572c06b5f54b7570a6d42e503b5711b8b9 SHA1 dbdefc26499cd67470a363f54fcb928f2f510fcf SHA256 6643fb3ec5019f58c1a7af76a25d791f1109c37929b3332ddbe1a2911f5de3b4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNp2F1AAoJENgZr6v6gHY01PgP/2y93MjK8d1tnfgxo/EhVqtJ
-h6br5Gx+TJBxVaYl06RcBxhIM5Ul8L4r6lon3VIQQXg1zM1I9FluRWrfAnBWTU5k
-9NOevK8OmSGKegBiX8r55oSxLZaMKitzKI0GhY9pUINisCgGTBS7pXillgiBO8bC
-LPeHXvbpc68BIbBCjNk0CY9qvDqmFZrKSEL5Z+UAj3YT9ab4CcPLQRXVUTN5Zpwt
-wCVoGo2oLgODYoY+tsPOg8o6FsgK99/yaCCyBWhyYDguEayqYbiZD/zZ/A04t5eN
-Z1Uz4Cg+lKfJCTkVIXnywUKWGOGXeIzbWLHcwSIr8oYpuXF2gWUPpx9XxdyZUvo2
-d/eRqdYhE9f/3w0EyNPKbrx3DobLCVbEvWa2ZWMjj3rJhySsWNXC33lIuZYfBqQ4
-Z/2DPeI0dQx9f1QRK1W0ZzwwJfukUtFhpqCaT/R0rOgyOshlV3yHOfai8fExr8Xo
-tKgfzSvLWlPWgeLUDxjEwbBbgzoHIA2FNowjITPA0/0EWkXhQW0yJ+06bvpcpk2S
-QEc9itU7JW6QbMCOG7JYSNeIhl25VYX1+Tr0rHdLVv8diXxPnsnmvkAiC4KcOjzQ
-IoY7PXemKhG9B9bB6j1y/2tsK2FODBuCg+QHds26hIHn5UYBaecZ+3lhFBq+u8wX
-TVAIFMEjZOD1eIXGR27m
-=L6Cu
+iEYEARECAAYFAk5AyEMACgkQ1ycZbhPLE2BP+QCfcoRb4DrHtGtKxo9ho5Ybnfzk
+zhYAn2PygIcqFu9+BwuI4LqF7i5M1Pjs
+=PSH7
 -----END PGP SIGNATURE-----

diff --git a/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch b/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch
new file mode 100644 (file)
index 0000000..8efe5ce
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.0.1-linux3.patch
@@ -0,0 +1,21 @@
+--- setupext.py.orig   2011-08-09 06:33:33.000000000 +0100
++++ setupext.py        2011-08-09 06:34:26.000000000 +0100
+@@ -54,6 +54,7 @@
+     'linux2-mips' : ['/usr/local', '/usr'],
+     'linux2-sparc' : ['/usr/local', '/usr'],
+     'linux2' : ['/usr/local', '/usr'],
++    'linux3' : ['/usr/local', '/usr'],
+     'linux'  : ['/usr/local', '/usr',],
+     'cygwin' : ['/usr/local', '/usr',],
+     '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+--- examples/api/font_file.py.orig     2011-08-09 06:30:37.000000000 +0100
++++ examples/api/font_file.py  2011-08-09 06:31:12.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ if sys.platform == 'win32':
+     fpath = 'C:\\Windows\\Fonts\\Tahoma.ttf'
+-elif sys.platform == 'linux2':
++elif sys.platform.startswith('linux'):
+     fonts = ['/usr/share/fonts/truetype/freefont/FreeSansBoldOblique.ttf',
+       '/usr/share/fonts/truetype/ttf-liberation/LiberationSans-BoldItalic.ttf',
+       '/usr/share/fonts/truetype/msttcorefonts/Comic_Sans_MS.ttf',

diff --git a/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild b/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild
index ac2538160c889451b9d1fc01ef276cf9a8d32fc9..2b6e6b3a92fb3788b891ba70787d0ef077474e24 100644 (file)
--- a/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild,v 1.5 2011/04/14 20:10:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.0.1-r1.ebuild,v 1.6 2011/08/09 05:40:01 bicatali Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -151,6 +151,7 @@ src_prepare() {
 
        epatch "${FILESDIR}"/${P}-libpng15.patch
        epatch "${FILESDIR}"/${P}-sphinx.patch
+       epatch "${FILESDIR}"/${P}-linux3.patch
 }
 
 src_compile() {