gentoo resync : 30.05.2020

4 files changed, 12 insertions, 39 deletions

diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
index 5d31e24a9744..7e567a7683fb 100644
--- a/dev-python/matplotlib-python2/Manifest
+++ b/dev-python/matplotlib-python2/Manifest
@@ -1,5 +1,4 @@
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
-AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a
 DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5.ebuild 5139 BLAKE2B ce574087349a22b3c6a2a9a4d96220ebd0e5d9f7cd500c354ca4f7ca5c064ff6d004c136144f05aa93a15d5100535449bfcdbb93afdff0a482a285f5a41000be SHA512 824b845d7ff6dc0a75f26caa02a15963d2bccf76735feb2beeaaa23eaa625046157189024e41ab7b32180ecc40176758bff63974dcc976137ced10f5dc1ddaac
-MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
+EBUILD matplotlib-python2-2.2.5-r1.ebuild 5006 BLAKE2B 2e7efd825c96482f6799e0d5619178ebe5adf1cf3295e5a0efbe7ea6b28c279b980b28b6e06f5a6cf13b556b9b67dc79191e8b601ed401d7d818591ad63f2f01 SHA512 c0ef61a10eb4a97a9c48dcce10f81861e58b5d4d912ad693aba7cca38db793586c612a186a375c45ffb1b02832585cc851aa4e80f521c72c75950d7bbf191d3e
+MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch b/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch
deleted file mode 100644
index 9d13adb8ab53..000000000000
--- a/dev-python/matplotlib-python2/files/matplotlib-2.2.4-no-jqueryui-download.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 41037e95d..6a438fa99 100644
---- a/setup.py
-+++ b/setup.py
-@@ -178,9 +178,10 @@ class sdist_with_jquery(_orgin_sdist):
- class install_lib_with_jquery(InstallLibCommand):
-     def run(self):
-         InstallLibCommand.run(self)
--        _download_jquery_to(
--            os.path.join(self.install_dir, "matplotlib/backends/web_backend/"))
--
-+        # Avoid downloading jquery ui during emerge: we already have it in
-+        # pypi's tarball. use this!
-+        name = "matplotlib/backends/web_backend/jquery-ui-1.12.1"
-+        os.rename(os.path.join('lib', name), os.path.join(self.install_dir, name))
- 
- class develop_with_jquery(DevelopCommand):
-     def run(self):
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
index 0e57cbe0d8c8..f0ac8775b1d8 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
@@ -16,21 +16,17 @@ HOMEPAGE="https://matplotlib.org/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 
-SLOT="0"
 # Main license: matplotlib
 # Some modules: BSD
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="cairo excel gtk2 gtk3 latex qt5 test tk wxwidgets"
-RESTRICT="!test? ( test )"
+IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
+REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
-REQUIRED_USE="
-	test? (
-		cairo latex qt5 tk wxwidgets
-		|| ( gtk2 gtk3 )
-		)"
+RESTRICT="!test? ( test )"
 
 # #456704 -- a lot of py2-only deps
 COMMON_DEPEND="
@@ -39,7 +35,7 @@ COMMON_DEPEND="
 	dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
 	dev-python/cycler[${PYTHON_USEDEP}]
 	|| (
-		>=dev-python/numpy-python2-1.7.1[${PYTHON_USEDEP}]
+		dev-python/numpy-python2[${PYTHON_USEDEP}]
 		>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
 	)
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
@@ -51,11 +47,6 @@ COMMON_DEPEND="
 	>=media-libs/qhull-2013
 	>=dev-python/kiwisolver-1.0.0[${PYTHON_USEDEP}]
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
-	gtk2? (
-		dev-libs/glib:2=
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		dev-python/pygtk[${PYTHON_USEDEP}] )
 	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PYTHON_USEDEP}] )"
 
 # internal copy of pycxx highly patched
@@ -68,7 +59,7 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
-		)"
+	)"
 
 RDEPEND="${COMMON_DEPEND}
 	!<dev-python/matplotlib-3
@@ -76,7 +67,8 @@ RDEPEND="${COMMON_DEPEND}
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection] )
+		x11-libs/gtk+:3[introspection]
+	)
 	latex? (
 		virtual/latex-base
 		app-text/ghostscript-gpl
@@ -178,7 +170,8 @@ python_configure() {
 	fi
 
 	cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
-		$(use_setup gtk2 gtk)
+		gtk = False
+		gtkagg = False
 		$(use_setup wxwidgets wx)
 	EOF
 }
diff --git a/dev-python/matplotlib-python2/metadata.xml b/dev-python/matplotlib-python2/metadata.xml
index d238bedf5ab2..f024fad13338 100644
--- a/dev-python/matplotlib-python2/metadata.xml
+++ b/dev-python/matplotlib-python2/metadata.xml
@@ -17,7 +17,6 @@
 	</longdescription>
 	<use>
 		<flag name="excel">Pull <pkg>dev-python/xlwt</pkg> for the exceltools toolkit</flag>
-		<flag name="gtk2">Enable <pkg>x11-libs/gtk+</pkg>:2 support</flag>
 		<flag name="gtk3">Enable <pkg>x11-libs/gtk+</pkg>:3 support</flag>
 	</use>
 	<upstream>