Punt unreferenced patches.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 24 insertions, 190 deletions

diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index 02674eafcad0..9d758efa6aa5 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/matplotlib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.187 2015/03/20 12:57:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.188 2015/05/15 08:16:37 vapier Exp $
+
+  15 May 2015; Mike Frysinger <vapier@gentoo.org>
+  -files/matplotlib-1.1.1-ft-refcount.patch,
+  -files/matplotlib-1.2.0-ft-refcount.patch,
+  -files/matplotlib-1.2.0-setup.patch,
+  -files/matplotlib-1.3.0-setup_without_X11.patch:
+  Punt unreferenced patches.
 
   20 Mar 2015; Justin Lecher <jlec@gentoo.org> -matplotlib-1.1.1.ebuild,
   -matplotlib-1.3.0-r1.ebuild, -matplotlib-1.4.0.ebuild,
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 551b40d25004..859c2469f88a 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 AUX matplotlib-1.3.1-unbundle-agg.patch 976 SHA256 1c22a991be0d0cecf9e5a0c3ab74aeb8951844dc480635c9da814a8c6e5ee6da SHA512 2e5a9045b69fd7f84fe0540aae6bde26b34db4dae29b725dc811b054f16e671f64345d28473f83861b0cfc0b14d2dd833ef188b3ba44c955db46475668c96786 WHIRLPOOL 5a26d99451fbdb1218e12ec9d5ebe6bf23f43eb4acf4019af9fde4ecb3eb67127d446112868836cc4165d65a403cf825a630c822e1e6466516b6549849849642
 AUX matplotlib-1.3.1-unbundle-pycxx.patch 734 SHA256 ab33e8ba4879cd11c3e41394ae53566b2496c695328d9f498dd629124127fabf SHA512 4accb71a4b608c31637de354c2f6331dd69e98c352db059d0f1d3c0ade90b6fe11cdd3bfe799eabf7c52fa26e1fb81499064b15c07c34751ee6059c110956576 WHIRLPOOL 7b8c8ba9f93f282664b716358e57f61e18a022a80cdeea86d86dc8a907f1354ad8ddf8c3463ed8cfea10d0b1e0aeeacd58681b079cf2a931c9d24dc5b9f01497
 DIST matplotlib-1.4.2.tar.gz 50139344 SHA256 17a3c7154f152d8dfed1f37517c0a8c5db6ade4f6334f684989c36dab84ddb54 SHA512 3525f4e6414042fabf8d18ce9041d61197465dc07c766730c187a512277907ba33f56d49d5a468d82f65bce57217e8eb48ecfa143e55152a15607b79a7b25adc WHIRLPOOL ce6e5a15676b939bda7ad1be0f27766314f60ed44ebfba1e73d2c3d00a31d5492722cde73f943de72da038772519068602e60c830af9ffdf52710a24ce98fe7a
@@ -12,24 +8,22 @@ DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf9
 EBUILD matplotlib-1.4.2.ebuild 5933 SHA256 c1156d2f2dcdb9f73b9ceceabc0326d080d3f8be6dee19f15c3391f2dc52a0e9 SHA512 88482e5de389c122c690ddf9a0b3e122668d5268c97cad461de33bcdce7a2d3a268de800806b3602a15dbe42b1505b5df31469514328cb479155f4bdf64a8a90 WHIRLPOOL 487071898e047cead9da9f19c9957dd505d977d4b11fc52d817ecfec0017074c5f53e9a28a38e3af9e1d60b10f92e5cba656b53593b041533a8a1b64e63ac9f8
 EBUILD matplotlib-1.4.3.ebuild 6084 SHA256 9689d52cb8f6393214bace1284edfac1e23c41d6b28999875414f99410f18888 SHA512 ac13704b8aedd819fe1b7ce92ec096411cb66317ec95f435d762b9c4e647fda592445a6d61195a3f768762b282bba484741d637efce5a18476d417ff5f564697 WHIRLPOOL fec79cb66f30ba21f1033e0b54d5c8ab206212c65d147ee8de7296e536d3471fe4f6e85f3332ad13fd942c6f4264b52b87c3a4c475ec8f4b5089a27e982917a8
 EBUILD matplotlib-9999.ebuild 5934 SHA256 947ed829b65e33df8dea7be93ae5e134e6aa46718997f08538847fa520ed9c3e SHA512 87f4fd103e95d49bf61f9986d5dc4ef6b07bd349974d5355c89186153d465e88ee2023361ca7876dcdb8e5972feafdccbe49f7144dfb04557b7d8ba88ecf0595 WHIRLPOOL 2b365353ba897db882a777aed63d416b3da77d436264b7240d2940b2d853c4a3575717d0bbd6e6e6ab1a3b05388635a9c4c2bc2c56df8d4c7fcfa18a81d19b24
-MISC ChangeLog 33387 SHA256 8fc7554e43e40940cd879343547c799d7cf3cff8dc8fdcdecebd9c9181d2cf4c SHA512 0761ef1fdad371798d3ca8df251b75c23253e71d8da5992776c1b3cba51925c098ea11df9a7d2f81cd365028e044abb004d3ea204a4f6f4cb25d04c5720cf98d WHIRLPOOL 4fbb595a9f1fe7e3df312709d3f7e4c46c22e51f640facaf272c8fe5c57210bba81d170d9b95b436f49a0f3020c5d71eaba35972cb288a9ff514fc47841ebeac
+MISC ChangeLog 33649 SHA256 57c163d2ad679f168f11aa126061871829f8c9792f5f4f8c634f276b5bcedad3 SHA512 4d59fbabf3c502046551f9e7f71834b1762826ce1edc08564467d44ef4d328562ddb918e855e926c6677eeb1cb03d4de4c33943fb29a6e9db6de126eaa66e299 WHIRLPOOL f0309522489b876b25a14590d051fb44bf4f1bd2a6407be397ac9c2770f91592485aff232e7011a090d3b5088949864f5d53a260c5a569761be2e4528f4f98e5
 MISC metadata.xml 789 SHA256 12569e0385ec9776d695440fced8b0a13ab2b9fed065e764797dd8b6a48c6740 SHA512 aa78de21b25acdcb7fffdabca04dbd3ea4e1f34d85a1da7e78c877c5dd73d116f02687c756a2591dcd969220b398c01580b226978a46640b0e8862415c80fb4c WHIRLPOOL 310bfcb051f4cb9de04eef34754efe3fdf5777f3dec7d233833eaf31c882a4ae0f0bd850a3c0716ab37ac43f3960a95e769b355c739d9feb014ba933816c8e0d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVDBknXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirYbgP/238vi5SKVbHOBH+KcmXZ79k
-/mdaoVFE/bg/bg4yUhGngCFR5gqueyA8KuKNnTBkDGyryOgOUECF6plfTuGCBB9P
-GGvbdR592ptf5MgW0Bcd6e8A/fuf9rdRYcszHaf1PpgzZk4CnpNpw0yXhsRKC7oq
-3KFnkchtoGcNqlAX04PAwj/H1De8c8W/m31PvzfUpkOB/xXCWDFXdi7egjomlAdj
-9CxcmpMhR9+Vmu3rq4cUbA5NAWbvWG9EyFs7FAVHXk+fuqw+whW/ygwNgQe8Ncvf
-FfF37bZleSba8nEIwxpqZmWkkYjQDLpQwNrFZ9qmV4s9dTkf4FbX4LIXQLTMBjet
-w8nrnIqXP0hlh/nFAE2Bd/gHt3PhS+Vdlaprwa2HhF7K0UwcNv87GgOFu2+sFJn5
-AmLrMK8S83GjLxcPAjsmwNauDFlXRAG6uD/e40TccqGIEWLw9T8Rk6ZVJF4wC+5F
-yJWmF3asjDeXWC0eyOLmV3oONsGc3Y0V4Fct88e9ZPGEa9S+fT2cwnVGwQ5Zw/Me
-RtPIKRIPfvBC6K8dmf0APik09fBhxtR827IcOGdUE8ehfE3x87F5UMOMHJsrZGX2
-wt+G94k5kw/mpQP78DQ2V7U7RqAoixuI2ir2Ltxwq2T8LtBUM00A6XvjpDdbPMKT
-QzTIUX5uSa7sAegHhIxE
-=xvGh
+iQIcBAEBCAAGBQJVVatmAAoJEPGu1DbS6WIAUWIP/2Ihitx9+Ro4k8BGUUktbV60
+eYuduQGNZDyMlDPxxGyA0E/IXyRc1nwkPN7T1+qEQHRMqxm7RjRU8oGI15H5rnte
+OOYa7ZUDzPGAcFA6bZybNfzrfzzEK8qc+xd1mK6RqVbVd27m6UKQEF+dcUVIAzWX
+2Kjz9oWQSzFQ74sVwEjSw6iv/Uu2bBnDrTgj3HUpelJkLCZNibVj9jfs4un46860
+JH2dWQShnNFlH019WJ1uMtltqSDKvSR5xtsxbGUMoQfYuRysohYXqhmE+i+tlAHP
+kEAiefBRdyeQTkkF2WzxI+ZHEO4Hto7BqtPighpSKx6sz8FrusblXOAWBZG497je
+9GKbE1umcSxwffubDeSW/XV/itKsVyJ6RaIT/dSgp5kvkgil90+I5pa0WPiIyKHt
+wKiZXtuQ6Zp/I37HQGFIl4+GOJ96bCu6+rzOhdRphOOhYVa8U8iBWVEXF221jk4v
+3MI3APhLlyKtNdwuoGCDVMtXzGcE+1UxDCotiyoVsp2UsDuBnUm2TyR0yWyHp0Yc
+o6HhS/t6AMNbzOsts2uijVPShafKb3nuwDlguLNNp2237UGt4/E1RxHyi4FQywdZ
+xtCS+9VMYp+Pm25m5o/mppoFqw9WqaEX/dqTBxGbhVVuZlZ4EigaxK3rAcSJ3aq3
+px8zNM5vJTF13q+cYgzI
+=l54f
 -----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch b/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
deleted file mode 100644
index df135c201c3d..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.1.1-ft-refcount.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-#Restoring a fix to an old reference counting bug which was re-included in a recent commit. It fails stix_fonts_demo.py
-# https://github.com/matplotlib/matplotlib/commit/85af0c02bf9a8ecdd0fd18eab8c9662c6b9f4302#src/ft2font.cpp  (Keep just in case)
-
-Reinstate the manual reference counting as discovered in #1054
-commit ca678a49f37411b1b0e72d7d0dfa88c124b0e34b
-wrt Bug #442298 by Carl Michal, "the patch in the tree is missing the fifth insertion', i.e. the 2nd. hunk
-appending the 2nd hunk to bicatelli's prepared patch
-
-bicatali@gentoo.org 08/2012
---- src/ft2font.cpp.orig	2012-08-01 17:30:33.000000000 +0100
-+++ src/ft2font.cpp	2012-08-01 17:30:42.000000000 +0100
-@@ -870,24 +870,28 @@
-     {
-         std::ostringstream s;
-         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
-+	ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error == FT_Err_Cannot_Open_Resource)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
-+	ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error == FT_Err_Invalid_File_Format)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
-+	ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
-+	ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
- 
-@@ -904,6 +908,7 @@ inline double conv(int v)
-     {
-         std::ostringstream s;
-         s << "Could not set the fontsize for facefile  " << facefile << std::endl;
-+        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-
diff --git a/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch b/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch
deleted file mode 100644
index 822f3491427b..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.2.0-ft-refcount.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Issue 532; https://github.com/mdboom/matplotlib/commit/81068e9967387ea69133277242a9804d646ea4ef
-diff -ur matplotlib-1.2.0.orig/src/ft2font.cpp matplotlib-1.2.0/src/ft2font.cpp
---- src/ft2font.cpp	2012-10-31 08:11:14.000000000 +0800
-+++ src/ft2font.cpp	2012-11-29 11:09:43.569808461 +0800
-@@ -852,28 +852,24 @@
-     {
-         std::ostringstream s;
-         s << "Could not load facefile " << facefile << "; Unknown_File_Format" << std::endl;
--        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error == FT_Err_Cannot_Open_Resource)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; Cannot_Open_Resource" << std::endl;
--        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error == FT_Err_Invalid_File_Format)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; Invalid_File_Format" << std::endl;
--        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
-     else if (error)
-     {
-         std::ostringstream s;
-         s << "Could not open facefile " << facefile << "; freetype error code " << error << std::endl;
--        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
- 
-@@ -891,7 +887,6 @@
-     {
-         std::ostringstream s;
-         s << "Could not set the fontsize for facefile  " << facefile << std::endl;
--        ob_refcnt--;
-         throw Py::RuntimeError(s.str());
-     }
- 
diff --git a/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch b/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch
deleted file mode 100644
index ba0351840749..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.2.0-setup.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur matplotlib-1.2.0.orig/setup.py matplotlib-1.2.0/setup.py
---- setup.py	2012-11-08 10:24:12.000000000 +0800
-+++ setup.py	2012-11-25 06:55:27.531042898 +0800
-@@ -171,20 +171,19 @@
- # regardless of the lack of dependencies. If auto, silently skip
- # when dependencies are missing.
- if options['build_tkagg']:
--    if check_for_tk() or (options['build_tkagg'] is True):
--        options['build_agg'] = 1
--        build_tkagg(ext_modules, packages)
--        rc['backend'] = 'TkAgg'
-+    options['build_agg'] = 1
-+    build_tkagg(ext_modules, packages)
-+    rc['backend'] = 'TkAgg'
- 
--hasgtk = check_for_gtk()
--if options['build_gtk']:
--    if hasgtk or (options['build_gtk'] is True):
--        build_gdk(ext_modules, packages)
--if options['build_gtkagg']:
--    if hasgtk or (options['build_gtkagg'] is True):
--        options['build_agg'] = 1
--        build_gtkagg(ext_modules, packages)
--        rc['backend'] = 'GTKAgg'
-+if sys.version_info[0] >= 3:
-+    hasgtk = False
-+else:
-+    hasgtk = True
-+if hasgtk and (options['build_gtk'] is True):
-+    build_gdk(ext_modules, packages)
-+    options['build_agg'] = 1
-+    build_gtkagg(ext_modules, packages)
-+    rc['backend'] = 'GTKAgg'
- 
- if options['build_macosx']:
-     if check_for_macosx() or (options['build_macosx'] is True):
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
deleted file mode 100644
index 2835ae547096..000000000000
--- a/dev-python/matplotlib/files/matplotlib-1.3.0-setup_without_X11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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" % (
-