gentoo resync : 25.05.2018

3 files changed, 1 insertions, 260 deletions

diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 2c1ffc5190f2..5468dab25492 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,8 +1,6 @@
 AUX matplotlib-2.1.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
 AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7e2cff2fb40b12c4a1a684336ddede6967c01392b722d128b4b4138b2833968f8ed67a3a412c4cbb4fb23f167b4f28851 SHA512 043a4d00c69db6f3c5473514d103c1beb0685eb329ece5596caf80740f64e0c2bcb114f889c11782a7913b9d3f86614f7bb8aedcf902c41f9d1cc7a2f6ac8e51
-DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
-EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
 EBUILD matplotlib-2.2.2-r1.ebuild 6349 BLAKE2B 3fbe4a41761a0c6c4ba3b79469815cb342b05c6e74bb26041877927fcf7e662e2e7a46d321b43fdcf48ae610b835083049731fe317a3057780e73b4a302a533d SHA512 cfdab393703c6b1106970619ab90d83896fdfaa96e3073cb6b41b430ff93eee46fbf2191cb54c993cef3869f581bc050e4507c849f713761a190a0c0725c1b5b
 EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
-MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
+MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b
diff --git a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
deleted file mode 100644
index 8e97e04dfa11..000000000000
--- a/dev-python/matplotlib/matplotlib-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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="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 ~arm ~arm64 ~ppc ppc64 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
-	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[${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 \
-		"${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
-}
diff --git a/dev-python/matplotlib/metadata.xml b/dev-python/matplotlib/metadata.xml
index 5dd5a6634838..d238bedf5ab2 100644
--- a/dev-python/matplotlib/metadata.xml
+++ b/dev-python/matplotlib/metadata.xml
@@ -19,7 +19,6 @@
 		<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>
-		<flag name="pyside">Qt support via <pkg>dev-python/pyside</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="pypi">matplotlib</remote-id>