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 91C0E138350 for ; Thu, 16 Jan 2020 06:05:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D997E08C9; Thu, 16 Jan 2020 06:05:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 17824E08B0 for ; Thu, 16 Jan 2020 06:05:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 12F5C34E0F7 for ; Thu, 16 Jan 2020 06:05:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE848B2 for ; Thu, 16 Jan 2020 06:05:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1579154687.8fcf58f520250b861e186df46caf471925d5225c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/sympy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/sympy/sympy-1.0-r1.ebuild dev-python/sympy/sympy-1.3.ebuild dev-python/sympy/sympy-1.5.1.ebuild dev-python/sympy/sympy-1.5.ebuild X-VCS-Directories: dev-python/sympy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8fcf58f520250b861e186df46caf471925d5225c X-VCS-Branch: master Date: Thu, 16 Jan 2020 06:05:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 99fa0d12-dad5-4336-b168-3cadbdd7677b X-Archives-Hash: 349ca2aa5d11b6cad77988fd6ba334d4 commit: 8fcf58f520250b861e186df46caf471925d5225c Author: Michał Górny gentoo org> AuthorDate: Thu Jan 16 05:39:07 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 16 06:04:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcf58f5 dev-python/sympy: Remove Python 2 Signed-off-by: Michał Górny gentoo.org> dev-python/sympy/sympy-1.0-r1.ebuild | 29 ++--------------------------- dev-python/sympy/sympy-1.3.ebuild | 26 ++------------------------ dev-python/sympy/sympy-1.5.1.ebuild | 26 ++------------------------ dev-python/sympy/sympy-1.5.ebuild | 26 ++------------------------ 4 files changed, 8 insertions(+), 99 deletions(-) diff --git a/dev-python/sympy/sympy-1.0-r1.ebuild b/dev-python/sympy/sympy-1.0-r1.ebuild index ee681475875..a1b4f8b591e 100644 --- a/dev-python/sympy/sympy-1.0-r1.ebuild +++ b/dev-python/sympy/sympy-1.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 eutils virtualx @@ -14,15 +14,13 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet test texmacs theano" +IUSE="examples gtk imaging ipython latex mathml opengl pdf png test texmacs" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( || ( $(python_gen_useflags 'python2*') ) ) ipython? ( || ( $(python_gen_useflags -3) ) )" RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/pexpect-2.0[${PYTHON_USEDEP}]' python2_7) imaging? ( dev-python/pillow[${PYTHON_USEDEP}] ) ipython? ( $(python_gen_cond_dep 'dev-python/ipython[${PYTHON_USEDEP}]' -3) ) latex? ( @@ -33,23 +31,15 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] ) mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - pyglet? ( $(python_gen_cond_dep 'dev-python/pyglet[${PYTHON_USEDEP}]' python2_7) ) texmacs? ( app-office/texmacs ) - theano? ( $(python_gen_cond_dep 'dev-python/theano[${PYTHON_USEDEP}]' python2_7) ) " DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - python_prepare_all() { epatch "${FILESDIR}"/${P}-doc-makefile.patch epatch "${FILESDIR}"/${P}-zeta.patch @@ -60,15 +50,6 @@ python_compile() { PYTHONPATH="." distutils-r1_python_compile } -python_compile_all() { - if use doc; then - export XDG_CONFIG_HOME="${T}/config-dir" - mkdir "${XDG_CONFIG_HOME}" || die - chmod 0700 "${XDG_CONFIG_HOME}" || die - emake -j1 -C doc html info man cheatsheet - fi -} - python_test() { virtx "${PYTHON}" setup.py test } @@ -79,12 +60,6 @@ python_install() { python_install_all() { local DOCS=( AUTHORS README.rst ) - if use doc; then - DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \ - doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) - local HTML_DOCS=( doc/_build/html/. ) - doinfo doc/_build/texinfo/${PN}.info - fi use examples && local EXAMPLES=( examples/. ) distutils-r1_python_install_all diff --git a/dev-python/sympy/sympy-1.3.ebuild b/dev-python/sympy/sympy-1.3.ebuild index 966444c3424..078dc48e8f8 100644 --- a/dev-python/sympy/sympy-1.3.ebuild +++ b/dev-python/sympy/sympy-1.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 eutils virtualx @@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" +IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( || ( $(python_gen_useflags 'python2*') ) ) ipython? ( || ( $(python_gen_useflags -3) ) )" RESTRICT="test" @@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] ) mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) @@ -47,36 +45,16 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" PATCHES=( "${FILESDIR}"/${P}-eta.patch ) -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - -python_compile_all() { - if use doc; then - export XDG_CONFIG_HOME="${T}/config-dir" - mkdir "${XDG_CONFIG_HOME}" || die - chmod 0700 "${XDG_CONFIG_HOME}" || die - emake -j1 -C doc html info man cheatsheet - fi -} - python_test() { virtx "${PYTHON}" setup.py test } python_install_all() { local DOCS=( AUTHORS README.rst ) - if use doc; then - DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \ - doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) - local HTML_DOCS=( doc/_build/html/. ) - doinfo doc/_build/texinfo/${PN}.info - fi if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples diff --git a/dev-python/sympy/sympy-1.5.1.ebuild b/dev-python/sympy/sympy-1.5.1.ebuild index 379c5702f68..5ecc82a06a5 100644 --- a/dev-python/sympy/sympy-1.5.1.ebuild +++ b/dev-python/sympy/sympy-1.5.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 eutils virtualx @@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" +IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( || ( $(python_gen_useflags 'python2*') ) ) ipython? ( || ( $(python_gen_useflags -3) ) )" RESTRICT="test" @@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] ) mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) @@ -47,36 +45,16 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" S="${WORKDIR}/${PN}-${P}" -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - -python_compile_all() { - if use doc; then - export XDG_CONFIG_HOME="${T}/config-dir" - mkdir "${XDG_CONFIG_HOME}" || die - chmod 0700 "${XDG_CONFIG_HOME}" || die - emake -j1 -C doc html info man cheatsheet - fi -} - python_test() { virtx "${PYTHON}" setup.py test } python_install_all() { local DOCS=( AUTHORS README.rst ) - if use doc; then - DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \ - doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) - local HTML_DOCS=( doc/_build/html/. ) - doinfo doc/_build/texinfo/${PN}.info - fi if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples diff --git a/dev-python/sympy/sympy-1.5.ebuild b/dev-python/sympy/sympy-1.5.ebuild index 8fadc5ca34a..c8dda896747 100644 --- a/dev-python/sympy/sympy-1.5.ebuild +++ b/dev-python/sympy/sympy-1.5.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit distutils-r1 eutils virtualx @@ -14,10 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" +IUSE="examples gtk imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano" REQUIRED_USE="${PYTHON_REQUIRED_USE} - doc? ( || ( $(python_gen_useflags 'python2*') ) ) ipython? ( || ( $(python_gen_useflags -3) ) )" RESTRICT="test" @@ -36,7 +35,6 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] ) mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-libs/libxslt[${PYTHON_USEDEP}]' python2_7) gtk? ( x11-libs/gtkmathview[gtk] ) ) opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) @@ -47,34 +45,14 @@ RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] app-text/docbook2X ) test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )" -pkg_setup() { - use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' ) -} - -python_compile_all() { - if use doc; then - export XDG_CONFIG_HOME="${T}/config-dir" - mkdir "${XDG_CONFIG_HOME}" || die - chmod 0700 "${XDG_CONFIG_HOME}" || die - emake -j1 -C doc html info man cheatsheet - fi -} - python_test() { virtx "${PYTHON}" setup.py test } python_install_all() { local DOCS=( AUTHORS README.rst ) - if use doc; then - DOCS+=( doc/_build/cheatsheet/cheatsheet.pdf \ - doc/_build/cheatsheet/combinatoric_cheatsheet.pdf ) - local HTML_DOCS=( doc/_build/html/. ) - doinfo doc/_build/texinfo/${PN}.info - fi if use examples; then dodoc -r examples docompress -x /usr/share/doc/${PF}/examples