From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-python/matplotlib/Manifest | 5 +- dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild | 3 +- dev-python/matplotlib/matplotlib-2.2.4.ebuild | 1 + dev-python/matplotlib/matplotlib-9999.ebuild | 272 ----------------------- 4 files changed, 5 insertions(+), 276 deletions(-) delete mode 100644 dev-python/matplotlib/matplotlib-9999.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 67f70b0a1af2..cedce2fdce20 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -3,7 +3,6 @@ AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe AUX matplotlib-2.2.4-no-jqueryui-download.patch 708 BLAKE2B 8ad1b3cef23a5bf1dbaaff22367ecc09608945244852552bc22f86ae6350d4683821f4b2d7d9fd76c0e701724e17508c99fda0205d420ed21c35164533bd3dd6 SHA512 8d783f6978403737ea65741a71e0c4ca7e428297504c11351f38616d01ebf60428eb993585f27c5d39dc607bb76e146b4e642bc295fc18ce3008e868a9cc6b5a DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320 DIST matplotlib-2.2.4.tar.gz 36974286 BLAKE2B 9c4c69163a23ff02107ee155f72e142dcf31ba965f6a20f468b96f3f4b70b95ff6caade6b14bcbacd5b231848d2000ce6af9f113feefb41d6e186725349490d3 SHA512 968f5731b8a9a2c5575403c60d5b0a98a452b33094e520be44f4d901f892d082babc8fc1d73c519e1ff2baf756f3cb7652f4b796e166d66dfda31f7e50c58139 -EBUILD matplotlib-2.2.2-r1.ebuild 6346 BLAKE2B 89da0281cb6d4da020b94fe84ddd88a4d022ff634b1f97ea5e04f7a6be65cc7b72afcb16460ddf524a32012483db4b88d4fe0508e83cd7eb9819efd016a7b8c8 SHA512 c55b26b118a23752d2be977e59740169f14317a3239fda35c251190ff5e939cb62743f7d55ab1a3fd388758c84003eb0e7b9025d98b98243fd86bd592554bb83 -EBUILD matplotlib-2.2.4.ebuild 6397 BLAKE2B d8ca0bbd2ce161fcf469d39dbc3d134e2f7730669683aca718189751f802f54e5c0e4d152624f7f41a13ab99a72cb6e4d68e906c98c0176acba258b60b8da815 SHA512 497a6c7af99fc0aac6442f730dc1abe57637e9694310dcbe434d182b1c7abab5b9da0f66922c369f36b109acfe8612329cf96f5fdd6bad3487d7533a2dabf727 -EBUILD matplotlib-9999.ebuild 6299 BLAKE2B fc2b72ec9666b9c8c5e870c1b1de83ecf4af88477d2af2eaf8c3b4c6492c2893b90655e2053ade531c1105dc3d2545e9b57ca231a092a4715d3691e049951faf SHA512 daca034bc8d2cbce86d079cb6f07313752c45d247853c5f5720dbe298a0504a31f11208ca9e49fcf109044e56960fc617ddb791b499f36c33feea25384637ba2 +EBUILD matplotlib-2.2.2-r1.ebuild 6372 BLAKE2B 3bbe545c33f7c3d3178391b279f9839ba2eb1ab6d95c5cb23a7e3e064ce9f9eb5f77a262fbf37b16fb7ab2d2c73cfdd4d6f5c06338ac88f9f9213b79a0d94062 SHA512 b568a6f1e78e8aef3905f284d10e86ce2b0addb1b6bd6fd5c382ec0cdd52b065664122f8d96f24609ef89a5abb040ee03758b0f04fda02ecc9f59c6f5613b0e8 +EBUILD matplotlib-2.2.4.ebuild 6424 BLAKE2B 01e66b48f3d7544483ab259d361bffe6013a81742b628abe625bb46dd1ded264ceb62600027afa35f6ed5ddc8a582b52e78c790b778bf520490ef784c67fd3ff SHA512 65207d1c820102cde14a83f70f6fbf616ca1a8c9407c9aa4d2c24a542ec27b4787cd2d583cde29715da3bbefb96b8a083f88af7daff9a5d31997af888c1d9a83 MISC metadata.xml 990 BLAKE2B c5e7256de7565d910a32ab9d48e39b49d3868d345e16cf893cf135dd114b20032c7794dfec3c832768172b7a8437e76e2807b7027bb2a9e392473054bfc7f000 SHA512 6c47f53ce41e4cae3f58f0abbe0a8b369670a0eefddf6eead266a530589398b7d212dab9627d6b8c6ec0970717d3220e09522f63f587cfdd2613113ac896aa7b diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild index 9368841a6912..f80b95e2cc53 100644 --- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild @@ -18,8 +18,9 @@ SLOT="0" # 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" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets" +RESTRICT="!test? ( test )" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" diff --git a/dev-python/matplotlib/matplotlib-2.2.4.ebuild b/dev-python/matplotlib/matplotlib-2.2.4.ebuild index 8db934dba896..97f38a4d86b3 100644 --- a/dev-python/matplotlib/matplotlib-2.2.4.ebuild +++ b/dev-python/matplotlib/matplotlib-2.2.4.ebuild @@ -20,6 +20,7 @@ SLOT="0" LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets" +RESTRICT="!test? ( test )" PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" REQUIRED_USE=" diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild deleted file mode 100644 index ff310f6266a9..000000000000 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ /dev/null @@ -1,272 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6,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="https://matplotlib.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/matplotlib/matplotlib.git" - -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="" -IUSE="cairo doc excel examples fltk gtk2 gtk3 latex qt5 test tk wxwidgets" - -PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )" -REQUIRED_USE=" - doc? ( ${PY2_FLAGS} ) - excel? ( ${PY2_FLAGS} ) - fltk? ( ${PY2_FLAGS} ) - gtk2? ( ${PY2_FLAGS} ) - wxwidgets? ( ${PY2_FLAGS} ) - test? ( - cairo fltk 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/numpy-1.6[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/six-1.4[${PYTHON_USEDEP}] - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - media-libs/qhull - cairo? ( - || ( - dev-python/pycairo[${PYTHON_USEDEP}] - 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/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/sphinx-1.3.4 - 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} - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - excel? ( dev-python/xlwt[${PYTHON_USEDEP}] ) - fltk? ( dev-python/pyfltk[${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 - ) - 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 doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) -} - -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" - - # suggested by upstream -# sed \ -# -e '/tol/s:32:35:g' \ -# -i lib/matplotlib/tests/test_mathtext.py || die - - sed \ - -e "s:/usr/:${EPREFIX}/usr/:g" \ - -i setupext.py || die - - 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 - [directories] - basedirlist = "${EPREFIX}/usr" - [provide_packages] - pytz = False - dateutil = False - [gui_support] - agg = True - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(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 - six = True - fltk = False - fltkagg = False - gtk = False - gtkagg = False - wx = False - wxagg = False - EOF - else - cat >> "${BUILD_DIR}"/setup.cfg <<-EOF - six = False - $(use_setup fltk) - $(use_setup gtk2 gtk) - $(use_setup gtk3) - $(use_setup wxwidgets wx) - EOF - fi -} - -wrap_setup() { - local MPLSETUPCFG=${BUILD_DIR}/setup.cfg - export MPLSETUPCFG - unset DISPLAY - - # Note: remove build... if switching to out-of-source build - "${@}" build --build-lib="${BUILD_DIR}"/build/lib -} - -python_compile() { - wrap_setup distutils-r1_python_compile -} - -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 \ - "${PYTHON}" ./make.py --small html || die - fi -} - -python_test() { - wrap_setup distutils_install_for_testing - - virtx ${PYTHON} tests.py \ - --no-pep8 \ - --no-network \ - --verbose \ - --processes=$(makeopts_jobs) -} - -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 -} -- cgit v1.2.3