gentoo resync : 18.03.2018

9 files changed, 283 insertions, 13 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 5b008fbb5192..6f1f88c80789 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -4,14 +4,17 @@ AUX matplotlib-1.4.3-cross-compile-2.patch 2066 BLAKE2B edb86f5bf9c2d53a13d27fec
 AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e4514e6654fc8eefad7aab45141d6f9768a48c90020b62178a2b7754c74c4c53e4de40392e3d1c4a49c786ec5e8b735c82f627c23a58 SHA512 5c1a7579a2cd4e97f56485e0300d9dcc7c8871e99bd93e03113e68b95996960ece039a41203775afc2c627f0a2483f038e0e693c73efdacfbb85d47ae855b7b1
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.0-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
+AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
 DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 DIST matplotlib-2.2.0.tar.gz 37246563 BLAKE2B 98d0b2cd6221f7e35d6d023b9c580733370b2def914e1ea879245a10399767f6269d81da561630518d1663da4b8afadf801c627b4c713cc37ad628a917cc446a SHA512 70932e4511e6748cc97c1c6b55705d31e93c1c2bd91b163158a4585dd916318337243ba89e6a62319c628fba955bb768bb73380991f6b7ed8678ef61413926e5
-EBUILD matplotlib-1.4.3.ebuild 6155 BLAKE2B a3332a75cd8d312b15c11c089c9e6f6d26907114125617317a2d180c17f14bd3a6948fb68dbba301fb8b42444f013f16be8a4475031030687292d02313c8c73d SHA512 5fd4a4c0ac70389555bd43e85825c21ed4a0ed18782c6777a74e6c2f8a75c90c7537fcf529f115aaf6efb4d20b4c3b50874425365301659215506b7e7aafcafb
-EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
-EBUILD matplotlib-2.1.0-r2.ebuild 6230 BLAKE2B 32fd252c9c94b28951eea2bfc76e9acc763c584484934a4b01a86515592a11dc23e476cd1714d1b47b05ba792ebce1f63d62b7729d2333488cf7ce889618614b SHA512 7bfd228192a97f11b7e44f7034abd11fe52d2820fbadacf3e2398804d86af7c4b9b28a508339aa122fb9d63c5f933aa811d1dac18d9b9bef1c6942e619dd3752
-EBUILD matplotlib-2.1.2-r1.ebuild 6319 BLAKE2B 05a46ec6a0cfb909179bf9d89ccedb782c3de3e9dd3acf9d62d1e05ceeb572c0c80a60711bba3179fdb392fcf54f13bbed6e969fed22ef90ecc03ff4a630e8df SHA512 b9c5459e54ba70a12ea88a0aad7e57be9fd8625972a049e818e7ff9bac33e4c117a344c256ca769cf99d83dbbc1f34164c61ee823a0e3e7782d10b9013a6984a
-EBUILD matplotlib-2.2.0.ebuild 6379 BLAKE2B cd24d99effe0836237aa895ae9daf82a1adf36dfb838829674e37355061d5d238e45c0f40e6fc06f71143808a56b8bd764f1081b6d4b1b97c666d9d6d6d7f786 SHA512 294dc91079cb0eb95907e5316c06fd383ceb3aef53207961853b25e87c7a0b009f5c97387861c50edcbc50c8540fc720e2abaed3db5e5a6d404be80f4331a828
-EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
+DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
+EBUILD matplotlib-1.4.3.ebuild 6156 BLAKE2B d48cb0a36a4655ab78dc43f7024d7e2101d042f3bc6db3413115cc6102224f436f442ac920777854682051c6bf6b80b4c0834e6203a6fb2818e288da99be1784 SHA512 669486c2f6554f9c133c2c0daabdfafc50de420deb8e0d25c1c3d1f8a1edabb48b546e350285ccb41b297443afd085d3913a1acd5c5f8eccac79499db99e4ab2
+EBUILD matplotlib-2.1.0-r1.ebuild 6174 BLAKE2B 678a2e9c1ba7069532359a556ff1ad21a107d7efca8ec698d160e2737a6378fd25384db32684e49cf2efa2e2fe3eda63faf4f31501c535b3353eb2a54677481b SHA512 60642db8338159374b269b0bc8c3d98afe2148f5f4febdc84f90860addc12b4e1b959f3688f4bf9abd6d6860c70eb984aa3854a83c78b194be8a81ec5e46aa18
+EBUILD matplotlib-2.1.0-r2.ebuild 6231 BLAKE2B a501deafac7d4b5c942600433a8a358c1a4f3e72bbf0c78965144e75653381f14de3f060c4f6fbf3ef637160aa28970ce2737e5820e653e66f46ea252f40161f SHA512 3e5ef32f5fdc3e950104ba143d3c9bc17063051e6cde6aa74d6717689f6f19fd887d324e0da448e39e9ab3a7b41d6c0a9c8b3e07c865b3299a80caa43aff235a
+EBUILD matplotlib-2.1.2-r1.ebuild 6320 BLAKE2B 553345005f79ca0a18f455d396d30beb9225f2d334d716fd39b23398b7b6838374a8e99f758bc287a112fcb6efb3fbeac931f44918ce330dbec01aff4269cccd SHA512 1a46216c6dce4171beb2bac3ba65759bab5d908cdb030b47db8551977b3fede07360311f9ec93ea9f6b4d1cf8a88993f9e568efb444f67d4a27a6d43ac0f8e6d
+EBUILD matplotlib-2.2.0.ebuild 6380 BLAKE2B 4f0187342115e1bf14be0453f676a748195c0ef692ca22035a1e7a866150de9c171a39817a47123b4de323c3ce429a065411c2d62a2443c296ed551152819c47 SHA512 4de97f05be6b284c74d48e1d44bf9292142892a29736ffb526fae8308487507ad1924a1c58734478b12cd84aa265ced3ef21fed5ed25929ce8149ac3dda51350
+EBUILD matplotlib-2.2.2.ebuild 6380 BLAKE2B 4f0187342115e1bf14be0453f676a748195c0ef692ca22035a1e7a866150de9c171a39817a47123b4de323c3ce429a065411c2d62a2443c296ed551152819c47 SHA512 4de97f05be6b284c74d48e1d44bf9292142892a29736ffb526fae8308487507ad1924a1c58734478b12cd84aa265ced3ef21fed5ed25929ce8149ac3dda51350
+EBUILD matplotlib-9999.ebuild 6397 BLAKE2B c40f0ebd9dd1f4a2180c8afedb8eff450bd3fb15d3b785551bcf6f16e64840dacad301054be1835137b097ad11507cdf16ee219de3a9c51ab950ca8a4c6565b1 SHA512 ab8117ddaccaa483b102f6c1d8d12717791539f669c6f2063cb246331983d46775a7bc78c99d9bed5e25b1387c5db07ed1aa7130c61472ee5bc36a9ffc2c047e
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch b/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch
new file mode 100644
index 000000000000..7ca0c6974234
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.2.2-doc-make.patch
@@ -0,0 +1,10 @@
+diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
+--- matplotlib-2.1.2.orig/doc/conf.py	2018-01-19 11:07:49.000000000 +0700
++++ matplotlib-2.1.2/doc/conf.py	2018-01-21 20:06:44.120901546 +0700
+@@ -136,5 +136,5 @@
+ }
+ 
+-plot_gallery = 'True'
++plot_gallery = True
+ 
+ # Add any paths that contain templates here, relative to this directory.
diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index cdeaf276f2c6..cdd7616e4db7 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 eutils flag-o-matic virtualx toolchain-funcs
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
index f50fb4db1178..b7315f01e482 100644
--- a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
index 0e4935861800..1dba93750f1d 100644
--- a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
index 4152f565087b..ba2381504922 100644
--- a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
 
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-2.2.0.ebuild b/dev-python/matplotlib/matplotlib-2.2.0.ebuild
index 07e3558e5ce3..08c40d2f1de5 100644
--- a/dev-python/matplotlib/matplotlib-2.2.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/matplotlib/matplotlib-2.2.2.ebuild b/dev-python/matplotlib/matplotlib-2.2.2.ebuild
new file mode 100644
index 000000000000..08c40d2f1de5
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.2.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="https://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+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"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=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[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-gallery-0.1.12[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	local PATCHES=( "${FILESDIR}"/${P}-doc-make.patch )
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		emake SPHINXOPTS= O=-Dplot_formats=png:100 html
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild
index 0591f9c414de..47834984e715 100644
--- a/dev-python/matplotlib/matplotlib-9999.ebuild
+++ b/dev-python/matplotlib/matplotlib-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ PYTHON_REQ_USE='tk?,threads(+)'
 inherit distutils-r1 eutils flag-o-matic git-r3 multiprocessing virtualx toolchain-funcs
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
-HOMEPAGE="http://matplotlib.org/"
+HOMEPAGE="https://matplotlib.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/matplotlib/matplotlib.git"