Backport upstream changes that allows to build matplotlib when X11 is not available. Fixes #481564 by Ian Delaney <idella4@gentoo.org>. Thanks to MarisN <maris.gis@gmail.com> and Bodo Graumann <mail@bodograumann.de> for finding and testing the patch respectively

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

4 files changed, 79 insertions, 4 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index ffd13170f0a8..7fd1a8c048c3 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.157 2013/09/22 01:50:30 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.158 2013/09/25 12:34:22 xarthisius Exp $
+
+  25 Sep 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/matplotlib-1.3.0-setup_without_X11.patch, matplotlib-1.3.0.ebuild:
+  Backport upstream changes that allows to build matplotlib when X11 is not
+  available. Fixes #481564 by Ian Delaney <idella4@gentoo.org>. Thanks to MarisN
+  <maris.gis@gmail.com> and Bodo Graumann <mail@bodograumann.de> for finding and
+  testing the patch respectively
 
   22 Sep 2013; Benda Xu <heroxbd@gentoo.org> matplotlib-1.3.0.ebuild:
   set basedir into Prefix for headers and libraries, bug 481684. Credits to
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index bf64465aaef7..3dc362f83200 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX matplotlib-1.1.1-ft-refcount.patch 1849 SHA256 4368439bce9f956ffad3cf4551103e077e433761a2d20976d9d45c2b3a84838a SHA512 6e596e7c0d2d37b4d878d36c42f33272f22ba0c25e80b8038b08ec3793d15d3d2ff88c4777fd12d36fd277374d1a1fc78424f1e6c7ccabc29230e8205cdf4d06 WHIRLPOOL 435527651c7eb3e1cf1ae5d66d8e09783564e4a53bb6aa84f7c65467a04f615ea4285c428074b97c87455f09789ffe9937436c324231379e720ec28f9ce30306
 AUX matplotlib-1.2.0-ft-refcount.patch 1474 SHA256 53ac19eb195afc55173aee7617ebf2b7ca44e93943ee3713e9e62a1d959828b1 SHA512 9195c3046c6d2673d748f1864bfcf3fb6851260cd94f05ebf5241089d4c3b17af6f0dfc52875aa914d51ef79512ba686cc040958e2b4d6892a6a11a19c35b162 WHIRLPOOL ec1303427385fc697edff451576a7d5261a39e8134807be1a8a257077296d5171adf870826e8a0c96313c014e7f698cbed8c21a67a887d4479e33402842e07ea
 AUX matplotlib-1.2.0-setup.patch 1283 SHA256 e078b2385dc0b882a7df1a13df070ad5ec704e9e18df2f19bd642c7ae40e8a97 SHA512 8741bd303f5483daf971120c5ae6f35ca568128481ab5b98a94a0391afb0f8802c8b885675d13bf8bfbfbfe650bf33c6330195adc87b54278839032f9d15ebb8 WHIRLPOOL eeb0db8a14f33ccfe82ab677c27f92456dd8255b9c0d352d1496b5ab1f9336e643698435d96b6ff2a3657445737105eb060158014001cd0cc3d894c391111ce9
+AUX matplotlib-1.3.0-setup_without_X11.patch 1349 SHA256 8161427194cbb28840153b6ac14d33deda0c7ca6ca3603127068cdead2b730e4 SHA512 160e3ac18a6c6ddd150c88a9f23d3e976d1f501e110a8da2eeb1c8433e52223477aab7b61006c9c8c03096e3a3b163e0e2101461b1ee32e17af433967337ecde WHIRLPOOL 6e50b1f3d49e642840010b471369f5945cbe08c3082f2b01c83cee3b62eb407de6a29a5a588a7f9c17ea51ec165da9d0caf90fe32f7408983d086b67039220d1
 DIST matplotlib-1.1.1.tar.gz 33704843 SHA256 63b275eb8d98903264557ffbd6ec0fee2c31b5badb3678fce1ac7044594620ab SHA512 838977c1f57f9cfd10a3cd8935a5640bca25135b2176cb83286f309d57690cca7d6ec78c552c04067b3ded10f0358b92bb2387c018ecdb38ac30f661c4a67588 WHIRLPOOL d0fcc5a7f4d54c12a5b227b78b3977bb6822a61cf50f17d057458dab616ca293201d78e3ec5f1cb8722ee8a262ae2a252cb967a6bf24f7803841fb24831c4a96
 DIST matplotlib-1.2.0.tar.gz 36893347 SHA256 48fdb3b8f27010bc81ccf3925032768d499f82be979d9b6edccc4e2cced4dcaf SHA512 5b1a0fb52dcb21ca5f0ab71c8a49550e1e8cf633552ec6598dc43f0b32c03422bf5af65b30118c163231ecdddfd40846909336f16da318959106076e80a3fad0 WHIRLPOOL 586001ebb8e03bba9c83d30cc875db564d8c7091e086e343a8221123f2ccb3252110a3e2962045ba3a7bddc0b1362fba375f3138f8ae50dcc25338f60c8bf4a0
 DIST matplotlib-1.2.1.tar.gz 38446200 SHA256 52e18972aed85f30b05cef41778ec77685df6012f0598cd216e996de9b9ea29b SHA512 497f91725eaf361bdb9bdf38db2bff5068a77038f1536df193db64c9b887e3b0d967486daee722eda6e2c4e60f034eee030673e53d07bf0db0f3f7c0ef3bd208 WHIRLPOOL 9760409051c567411520a5fb26f38cbe8bf1d62353cf82b32b3bdf3ab41f24964632fff68d9dda120bb0be8442a8661e2887383e6d9aaef41b39e8762819e99c
@@ -8,6 +12,23 @@ DIST matplotlib-1.3.0.tar.gz 42098180 SHA256 3e37044911245d7d881ddab0152cfec463c
 EBUILD matplotlib-1.1.1.ebuild 4202 SHA256 571c120562f5dc8c0cf6a912b94ece8ad7f248a702263fb4c6d5fd22ba100690 SHA512 a29c07693d3302e4698dea93e3f4542dbfd6e55c52621edd6b9141b01a877c46b36a93d0a7874e1c7980a207ec5e6d2b0ac504d27c86b028ede554105e0fcbc0 WHIRLPOOL 91cf73fa5083d0169c7aaf3ccac0b6f9df3cc1241d4d722a3b30fb65cc89cf795e3cfa9f9a91f1aead56ad65fd93c149b7e884fc14d3c831b54a058657fc1f39
 EBUILD matplotlib-1.2.0-r2.ebuild 5067 SHA256 d9fd7b05a6c018557947076ed0d0e72dfb84f405239244f49e422751d14e4665 SHA512 1c6c85dcb202a56bba90f5a9dbc586fb6b9f8be8ef62b1f0a0efe1ed5f9fcf83113839884254120cbd84225b3251f5e9993d3adc3e28a2bd4b140270e2af6662 WHIRLPOOL 09119c7f143ddf6b79ca975ef3d8e2dee9ebc6f567fa753fe79732fb7818449e5540b6bd2b7eeadd68fe06779ece76c0912fb2847b9d7654ec9594d71db1cf6f
 EBUILD matplotlib-1.2.1.ebuild 4963 SHA256 ff7f0570d332878d6bcd37f98093f8914adcc1c32252a04ff53f9cc8f449dab6 SHA512 379a6ef8e583dc94b60a55a247d3679252a02310d29a36a1c2bf9f6f29cb9e090c95b03d1cb858081e79801aa77756e139da17dbc720939121c122e4465c5326 WHIRLPOOL 1ce2159b5d33fe0617984dc23a4ff3c1936902e5959a3d25b2a1c453b0eccc797f897887119a42d6a0941abf05795523d646b4fe511120ce6a89fbca1605d3c5
-EBUILD matplotlib-1.3.0.ebuild 4839 SHA256 d5b144d02aa188e36ad9fbdd60c756de41476440696445ddcb4536454b0b665d SHA512 1ccc113d1664fb2ec1687ebacffb3247877645400030b7e5b7c5c470e0bc5a4928911cd61a7f1288b506a684e9b2ae94961569e36e97f9757deabc6b5d4ea4b3 WHIRLPOOL aa3314ca3a0d95175e41e422ade3de506c7a8611027f5eff3f814906a8cbe88b774c864b5b34a9c09253718d89287ec96386ad4d4c51d43cf466de2f7b56f31e
-MISC ChangeLog 28618 SHA256 56026271d4ddf1c665dd4831c274c9bc762e2e0cb738532e396a86c18abb3d9b SHA512 7ca7845b959955bd2560e2695c85ceb53a247910bc4243d9024c13ece82fd3bb10c8065f714f0e37833a01e447b37befa066bfeac4f2a9e7b9e6fc3d0deaf5e7 WHIRLPOOL 22c4cd18b8a4e20942943738350e8e07f5258e78f42e671f481709024056091fa429d3c3684c7611b2a7f7ec7824d3d0f609c978486816ecc9448aea5e55a70b
+EBUILD matplotlib-1.3.0.ebuild 4945 SHA256 602c996c7b2f2b570edf64f90e1e22af76eb65969b599236e40e1d179b9367bd SHA512 1a8019e722906eb120588644841e24c8cff9c800762bd8c0428ae0521cd42c85be1e7816cc07b8e64f4265d548ff1ca7d85a43a9673e1b2da788eba575d44035 WHIRLPOOL 85be7a25cab6d313b963e65af1c2f6553c199216576fb8df5d8a6854bc1f3d5e06efdab4f779c705d5ce9dff3c5dc83cfe240f67927d6befe8889dd34cf0db7f
+MISC ChangeLog 29023 SHA256 bd4de9647756d491041557011eccbebb1c4dd5c4c8caccf4dc6c55bd0af318fc SHA512 088bb4936fb9ddbea9c944cad689d11bd2e788ff32f45397a121c8674d0ca9ad58a579b382587adcd1cd39ebad61b9fc4eb3ff9656b5970ce821bdc291493599 WHIRLPOOL ed415fe43fd359bec84b0b5df3a4f49fda4d2f0ff176b5cdf0dede827b39ed3cf276f34c6131f151eab31f8b6a4c02faa4d99f81ac4285bc9a19d64ccd263b5c
 MISC metadata.xml 696 SHA256 4c63377689d37e4df00d6745a685842fe098f7d9ce85337b3638a623eb6b64f1 SHA512 0c4548c886086ce2ff3794447aeff885340852f36b1cad109605d8fb72f5f7a554e4bf1e7c979cf62ece262e51fbf14cf5892be546b218b7711421fb5a04a703 WHIRLPOOL d9f2f78b4d1a0e9978138808a1af220376608e8d677183d4eb314469aacb5c4835fa589d1b6fadd09279de13f61d95f62148c64ecb51ecee1686434c3ba357e3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSQtgNAAoJEF0huFKJUZL5XbYQAJQn9yEjAP878dILoG6kTdiO
+N+Hr19dvrrTDZp16XGTmuWRzCJUbSNIP0WNzl5AIiNAb/mpjPJTKPSprN5H5mLW+
+IBkuSebMer1v5IY8mZnDt5av8RQPAohWbFxJlc3Z2PMVczxQjRT+6XlVlVQRzfzf
+sUEIv0hZUossWQ3fMf78B+qPBjCz/cwJYGYs1Kr0aAb8dZk5FvfN5qwyCXj5c96Q
+scwll3SFdAywecBqO2MShC1Pg7G3sDNW6pUMhHh+bKpPXShR5yiQnKnWonsJEl9z
+MnjgG+g61SZByQ0sYtpJjx4xaEKCtQ5CxClupy6GSDP2+GgXEhEqH8NMguGFPc/p
+G67UALdTx8GnuwuwT+6DoH8g2S8VecmaR0FrIKdXFq5Dh96ZX6ey7EUJqjMVHB2y
+Xs+upxGRZLmAmYiDJ8gs/NEXxYf5JvQtGI04zw1WWqz/OelSvJtby+Zpek0S5mpJ
+Zh9UYoItzDLjh6AGTWdmsYTqZ3jrohADsK9B2yvV5xBc/kXCqr3R1x1sEK5Dv2IC
+cNAf9uq5mPRytMRyYG9nnIry0CYU6nYBCvO2WG68nzh69AA23xo+wKdKtCeG+1KY
+bT0pRt7Nmr7TNUIQhpYUjVjMHClqGhL2hZ/T25hgn1tnHmbMvWWN8CgVotA0Nuv/
+PU7TUqBruxqExxj5cI2d
+=hPgj
+-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch b/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
new file mode 100644
index 000000000000..2835ae547096
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
@@ -0,0 +1,42 @@
+https://bugs.gentoo.org/show_bug.cgi?id=481564
+https://github.com/matplotlib/matplotlib/commit/1b3106c1bcd6017455232e8c974f1af8383a010c
+
+--- a/setupext.py
++++ b/setupext.py
+@@ -1463,7 +1463,7 @@ def backend_gtk3agg_internal_check(x):
+ 
+     try:
+         from gi.repository import Gtk, Gdk, GObject
+-    except ImportError:
++    except (ImportError, RuntimeError):
+         return (False, "Requires pygobject to be installed.")
+ 
+     return (True, "version %s.%s.%s" % (
+@@ -1489,9 +1489,14 @@ def check(self):
+             p = multiprocessing.Pool()
+         except:
+             return "unknown (can not use multiprocessing to determine)"
+-        success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
+-        p.close()
+-        p.join()
++        try:
++            success, msg = p.map(backend_gtk3agg_internal_check, [0])[0]
++        except:
++            success = False
++            msg = "Could not determine"
++        finally:
++            p.close()
++            p.join()
+         if success:
+             BackendAgg.force = True
+ 
+@@ -1521,7 +1526,7 @@ def backend_gtk3cairo_internal_check(x):
+ 
+     try:
+         from gi.repository import Gtk, Gdk, GObject
+-    except ImportError:
++    except (RuntimeError, ImportError):
+         return (False, "Requires pygobject to be installed.")
+ 
+     return (True, "version %s.%s.%s" % (
+
diff --git a/dev-python/matplotlib/matplotlib-1.3.0.ebuild b/dev-python/matplotlib/matplotlib-1.3.0.ebuild
index 525481da249e..b856d1f68d3b 100644
--- a/dev-python/matplotlib/matplotlib-1.3.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.4 2013/09/22 01:50:30 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.3.0.ebuild,v 1.5 2013/09/25 12:34:22 xarthisius Exp $
 
 EAPI=5
 
@@ -101,6 +101,11 @@ python_prepare_all() {
 		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
 		|| die "sed pyparsing failed"
 
+	local PATCHES=(
+		# avoid checks needing a X display
+		"${FILESDIR}"/${P}-setup_without_X11.patch
+	)
+
 	distutils-r1_python_prepare_all
 }