From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50EBD1382C5 for ; Fri, 9 Mar 2018 07:39:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92ED0E09A2; Fri, 9 Mar 2018 07:39:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E9E2E09A2 for ; Fri, 9 Mar 2018 07:39:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38BC0335C07 for ; Fri, 9 Mar 2018 07:39:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E819B241 for ; Fri, 9 Mar 2018 07:39:00 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1520581124.880d4210584445a2f28aeba9f657d25137f081e5.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/matplotlib/Manifest dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild X-VCS-Directories: dev-python/matplotlib/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 880d4210584445a2f28aeba9f657d25137f081e5 X-VCS-Branch: master Date: Fri, 9 Mar 2018 07:39:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 75b4733a-8502-4713-8b3d-b9440b74e816 X-Archives-Hash: 814b4f59315c7b1285fa6a533ab18c0d commit: 880d4210584445a2f28aeba9f657d25137f081e5 Author: Andrey Grozin gentoo org> AuthorDate: Fri Mar 9 07:38:44 2018 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Fri Mar 9 07:38:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880d4210 dev-python/matplotlib: cleaning 2.1.0 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-python/matplotlib/Manifest | 1 - dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild | 252 ---------------------- dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild | 253 ----------------------- 3 files changed, 506 deletions(-) diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 8a95b4c2349..00872b99529 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,4 +1,3 @@ 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 diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild deleted file mode 100644 index f50fb4db117..00000000000 --- a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild +++ /dev/null @@ -1,252 +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="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) -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}] - 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/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 - - 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/matplotlib-2.1.0-r2.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild deleted file mode 100644 index 0e493586180..00000000000 --- a/dev-python/matplotlib/matplotlib-2.1.0-r2.ebuild +++ /dev/null @@ -1,253 +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="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) -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}] - 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 - - 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 -}