gentoo resync : 08.01.2021

6 files changed, 40 insertions, 13 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 7ffe05d446b7..a459321cd111 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -2,13 +2,14 @@ AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f
 AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c
 AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928beeaddb22be236a17244f289c9032564d3bb1e2e5bd63f6017e51d71008efbd8c86ccc96eed0d30abc50537563720271 SHA512 445076feec916e508a3673babacbf8a8372a6f05c3d067eb77584c4352387d1bc3b1dc6c76beb18549df4601b50943d271c8db510f30748dbcdfc56727030b41
 AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878919e5d5183eac017928f12da0f9636d62ca42b1a7206e8f2131613bfa5249a835083c461c14c5be95091c37ce94902ea17 SHA512 45aaca6349269b5ab7476cbb82ba1dda6f8fa89100f7a8c7c1c5c037db1213b252daccfc5e905cb09d259f4e28d726c583d5a71f2da2421a787bb3b31fca6e5a
+AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed
 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75
 DIST matplotlib-3.3.2.tar.gz 37939974 BLAKE2B f28e184a0fccd4192ba8135b70569bf463d08cae0f4eb8e7f997f417cb947500a9fe46eb5f979473b4d7d22c0ad03ab55aba4067082c86f63eacbf837b8606ad SHA512 cae68e63d879bcfb41b25df4de48472461f7987403d42d34c7205a65ed3ef567660309c04d2a55e155fbe1ef708fd9de0b0d66e71578f34c3ee93379c4ea1e1a
 DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdacf31ac900d5c06b22c7ebc7217d6cabcc76b7e29cea6af0b4711b5b1724ce34dd065f63cabcfd40c0fcf9788f94c1fe SHA512 36b482a6c36ee08c47f3c02c160289bbdec8746d4d246084723bd3e1fd632c6383f6db58c950a9773a6993d10f24dacd870a91faafc34864616288cd05b6232c
-EBUILD matplotlib-3.2.2-r2.ebuild 6536 BLAKE2B b1e13fa0b6247a6f8d70c7ffbc8e3c32af8a4da4aa110ff276b730bc58304c3311fa595d675dd177e9712a4eebb636938dc4f6d0c88a8ed3f4b4d14205afb40d SHA512 534db15787c1c773c70c6e0a322fe872cb9acd8a6b2c660e72265b6066e8f142a214f150e7b7c7ff47e363bfde3e763ad6d1001f4dbbafd705db3972a459656a
-EBUILD matplotlib-3.3.0-r1.ebuild 6658 BLAKE2B 37583fb82f1833e6615bff7aad7449e17dbe5f4a3f2d590ab8ed9cb04c454b780f9c945282e006022d687ab95be2f9097f2405aeb495aeaabf4c919be7bc9746 SHA512 240eae8dc22b41b9511fe55b38e637eba26daadf7ab6a7aad9b8e75f063ec2da0def8efc764c4908a5993e19ad2aac3337885009eb28344fe3c38fde48b49c6b
-EBUILD matplotlib-3.3.2.ebuild 6774 BLAKE2B eee51d9d7d703d02ee1f910cb3de90c6bc109e5f61e6926030d035463174299ee3f94b09709c8ad7dedd34cfb1aa89e2c2d1986bc83deb1d41955a4f13c90dac SHA512 c4db6e53eff7e10ec9ce534bf159640a2ccb81a89cca67015456fe87abc3ef316f2d0b5b4c459069bb63e61ab6b6af3100a83cd25179eb6cb53ede339ef10523
-EBUILD matplotlib-3.3.3.ebuild 6863 BLAKE2B 80a21b2486e3ca49fa2e71ccc0ad63d2bd79395a5fefc129a092414341b576d7ec57b3005130025b8ae68fb6d4af985cec085b73952d68b608b3c3f39cf4d0b8 SHA512 8070103c8844b710bb4320032a00b4c5484f381fe934bc630e6497ecc1cd479ab81d38abcce45bc3b752b039a3b6862be31eeccaf64388131491b07f0c4048b2
+EBUILD matplotlib-3.2.2-r2.ebuild 6538 BLAKE2B ca667cd13da94cf3c9d72edcdcfed8dbbe0fbd77bbe79904e6dcef1e9d1f31b344c089e02cf7e789cbdaeead12146762ee7b0d58be5725b8ad8888ade7f05fbe SHA512 f3ee6edeca3f58aa930ba68bc91f2b3ddd741ee432b10dba16281d56274fdaa83d1fff9e2627c32b162dd033e93f1ceb0f7172034c431c4614094476d20e9d92
+EBUILD matplotlib-3.3.0-r1.ebuild 6660 BLAKE2B ef599ab23ef9cd664d3f7e7be431c9a5a05416a101d7417bb348ba2b2fc6fc6310c669e6b43a59f46231163810d6c16b18afd8d66882f74c434ed5c3f2474a33 SHA512 3029efbbdb4cea586b986b705ae9a6c8a7e7e358f569e4015b73f84fe4cfd7e9a5b179550822b22dcd6db359178ed253cc9a6fe9ec56b0ba0b271846b7edf140
+EBUILD matplotlib-3.3.2.ebuild 6776 BLAKE2B 932894c72b8419149af15414564f349238968472809f959a5698bed81bdd334bda4afa0b2960e05351680ade6d9f14f394625ba452eb6950ff44bd9578124615 SHA512 82385d62b6d47b4672ee25f1941e2532d17f33a26ebf899d86f24e251e06c4d95121314d7d84616c3d05333894b2575fbe0682ffa3c545216bd6c71707b1a1bc
+EBUILD matplotlib-3.3.3-r1.ebuild 6915 BLAKE2B 7e735d8bd23031d0fd64924185cabafbf65be078ef2440d85799421bf9d25b2e1a02574eb10e86ad5d112f6ae3fa5cf312a76044190419f2be60e7ce729b4fef SHA512 c99a4da5b72e831bcc2066553bac1d95a9ad19dd1cb562f5e29326973c9c2bf49070b7466c6ce91bab395788f435cf5a5438e5a326e3d4b10ac3f3da3c358ce8
 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608
diff --git a/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch
new file mode 100644
index 000000000000..ab377e7f19b2
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-3.3.3-disable-lto.patch
@@ -0,0 +1,25 @@
+From 7382d6205bfdc647a8e47c8e417c991d3822eace Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 4 Jan 2021 10:03:32 +0100
+Subject: [PATCH] Disable -flto
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 6e1d19d..ed85d14 100644
+--- a/setup.py
++++ b/setup.py
+@@ -147,7 +147,7 @@ class BuildExtraLibraries(BuildExtCommand):
+                         ranlib = True
+                     else:
+                         ranlib = shutil.which('llvm-ranlib')
+-        if ranlib and has_flag(self.compiler, '-flto'):
++        if False and ranlib and has_flag(self.compiler, '-flto'):
+             for ext in self.extensions:
+                 ext.extra_compile_args.append('-flto')
+             cppflags.append('-flto')
+-- 
+2.30.0
+
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index de55fd15dca0..03e7f09e6dd5 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index 068882d344d6..c3c157c2478d 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
index e9c00e13a2cd..581b0e4bb976 100644
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	>=www-servers/tornado-6.0.4[${PYTHON_USEDEP}]
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.3.ebuild b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
index 1f794c150269..d8be658481ff 100644
--- a/dev-python/matplotlib/matplotlib-3.3.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
 
 # internal copy of pycxx highly patched
@@ -43,7 +43,7 @@ RDEPEND="
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	>=media-libs/qhull-2013
+	>=media-libs/qhull-2013:=
 	cairo? (
 		dev-python/cairocffi[${PYTHON_USEDEP}]
 	)
@@ -150,6 +150,7 @@ python_prepare_all() {
 	local PATCHES=(
 		"${FILESDIR}"/matplotlib-3.3.0-test.patch
 		"${FILESDIR}"/matplotlib-3.3.2-test-extra.patch
+		"${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch
 	)
 
 	# requires jupyter-nbconvert