gentoo resync : 12.11.2017

2 files changed, 251 insertions, 0 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8c3ff6313df5..c16dc8d8dd9d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,11 +8,13 @@ AUX matplotlib-2.0.2-nose-fixes.patch 586 SHA256 744722572f56fd020a54ba4eaff2a59
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
 DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
+DIST matplotlib-2.1.0.tar.bz2 33051088 SHA256 0ab32ed55311dccdb42a488e1e7be5029695adf9219bc2b545ee0443dcf365c7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f WHIRLPOOL 0fb7d7e7e2b45ca6ae9ece32fa413f9c5b47fc59f64b877fad1f8becff4828a3be948f6433222008256c469b7760075c1d694b13ea771dfcd4193c2cda405aa6
 DIST matplotlib-2.1.0.tar.gz 35727251 SHA256 4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387 SHA512 8f512400f1f15d5400e23dd8e402783c54f62567d412863530a982c6513206d49fb91fadb3ef477648a4a38d6dd032eb90741ff4495d2be71911f83677d768b4 WHIRLPOOL 4795f3d49e3a624a22debe738cbe42ce3594c91880b3e6273f7ee05ecb7016353550cb39367f1edc6588d0e75d227d79f29af709e9471147171dd7ea5b6aa687
 EBUILD matplotlib-1.4.3.ebuild 6150 SHA256 a9aac5050e5e2b85e2dabc87ff854b1a6a1f2f93ba752497357aa9323c40d34d SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46 WHIRLPOOL aee3d4046f0554a4f6f45359826961bac81d95f1533c40dedf5232f27e4e3b751fddb54285c20b69ee40c5abd79cb5dbe7a833e88775b339cc98296468c7e2b7
 EBUILD matplotlib-1.5.3-r1.ebuild 6411 SHA256 1e382cc3c6ef71005b07259d2c06d64be30b21228dda6ee4ede4dba09d0c0d58 SHA512 2b82734df065dd850ab99e4a19ed8001c45f9f9a472c54b29930f2b2447b77a2b5b2538c75d8c940d1fc5ffa774ddcb85b065bca923e9a46c4feacab0c3764af WHIRLPOOL d0964372a2796304505e7d8761f4b0d401513569f50386c9b50a3550e0a1080ffa75aed9aec897a2ae7d56216c6e7a08983acc70c51ea4b49464999da2dff121
 EBUILD matplotlib-1.5.3-r2.ebuild 6559 SHA256 6b5eee62e57b305290e0e1e64a3ed37242f3236d2cbcfdf6705e26695d95a89d SHA512 00b3fc17023fa04a4e7dc35e3c5752f0e4b16ca1edd21138448ea9e44d843762b7111a018b002fea762b6c6914f1171d72054da52427572c25d87f1c2157c537 WHIRLPOOL 6639184ce4dcfa65aa3647af85582105428e1c3fbb381873af738e5eea56c53619dc88bd3e5ca2a6b8032679ce0f54ea365144a5dbac3e4bb45ef8e9bf774ead
 EBUILD matplotlib-2.0.2.ebuild 6182 SHA256 bb37b2e70a7157fc15da9afb9fb2598e35ccd9ff13cc07388c58dec3abad56e7 SHA512 ab6b634f44041f3dc17615acece6bd8066842c42203a28bad2dca4923ac3ea969eb57354f59aac417f575aaee2c6d2f77ec0384dab08ee6776106d7971078f66 WHIRLPOOL 80314ec11af2a9f06eea0e35c47c9244e6d7dbda46bb16fa859b384fa61ec105de317a1f5cb37a9a8e4f13f723ca63e08dc4509540e52a044727050f8f89c089
+EBUILD matplotlib-2.1.0-r1.ebuild 6018 SHA256 05dae419a87304fa97eab55bf887eb2165448e62bcef0aa1844da663caab4b05 SHA512 ad3290d1be26616a206919b0f5f6f2fbeb279b7c5e8b059f55754ed175ed175d586c8452967b3a8fb67b91af8cc6acfef976f8b90742f9c44731e63495d9395c WHIRLPOOL 11b079c47c24f660567f031a89dd0c73bb0949cc8c7f9328c650943ad44e056c29dfee3641c868e2761fdf7931cc7a14d0e02c4acc3cfe792aa480d618d85cba
 EBUILD matplotlib-2.1.0.ebuild 6071 SHA256 ff5ffa4cb211dc0e032a119387c4cdf2aec9a4abffd1406003717231b1e2f7c4 SHA512 fe2f89b32566e3dc4574aa950a059b4083692c064424bab96ba732baa58449366504401366815be64b981be5eafa9957c14c4f57ba9b1c0a76a2eb96acbdf404 WHIRLPOOL 4382ac0478479b4a919716b3b0474bd3ce1cde260a717a0284081c43858f3c20c57b8cb794c34ee6aadb579491a79902cfbabaed21019f960ebb0c33d78a4e02
 EBUILD matplotlib-9999.ebuild 6396 SHA256 85daf537315da546a0b98cc4a4da704047d8499b17a9358f4ad732a58434b2f9 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc WHIRLPOOL daf26233c729a7e37d8aa6e3ac33301635215d78adc475eb2397b253868cbfd556a9d6c421980abd6ba3d217b7c4490ee1441f852f5925f2b2e89ece721faa76
 MISC ChangeLog 9810 SHA256 587f82b153d9c79045205c763ff839c4c4efafc28c9ce8c1f55181284b5ca10a SHA512 0d520483f15b6775938e767a926902f828d2626b80028a34f92ee19bb9b1c9d034e6bfa92b89b1d6ba190d2bd34f4d00db7d83571af00d3d799d2204471b42d3 WHIRLPOOL 274049289255cf08568a5eb30d1e21e3d59a6abc974b47afb0ed5c615a4fec52858cf0522174b723889e09b017b464df1266fe7a6e34709d20014923262d717c
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..db96f8cb7fbe
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2017 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="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+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)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/functools32[${PY2_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}]
+	dev-python/subprocess32[${PY2_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	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}
+	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}]
+		dev-python/sphinx[${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/backports-functools-lru-cache[${PY2_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_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
+
+	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 \
+		"${EPYTHON}" ./make.py --small html || die
+	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
+}