From e814042be921a649c907d2d4ec83bc1e088c407c Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 8 Feb 2020 07:35:47 +0100 Subject: dev-vcs/git-cola: Switch to PYTHON_MULTI_USEDEP API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-vcs/git-cola/git-cola-2.11-r1.ebuild | 108 +++++++++++++++++++++++++++++++ dev-vcs/git-cola/git-cola-2.11.ebuild | 104 ----------------------------- dev-vcs/git-cola/git-cola-3.2.ebuild | 29 +++++---- dev-vcs/git-cola/git-cola-3.5-r1.ebuild | 108 +++++++++++++++++++++++++++++++ dev-vcs/git-cola/git-cola-3.5.ebuild | 104 ----------------------------- 5 files changed, 233 insertions(+), 220 deletions(-) create mode 100644 dev-vcs/git-cola/git-cola-2.11-r1.ebuild delete mode 100644 dev-vcs/git-cola/git-cola-2.11.ebuild create mode 100644 dev-vcs/git-cola/git-cola-3.5-r1.ebuild delete mode 100644 dev-vcs/git-cola/git-cola-3.5.ebuild (limited to 'dev-vcs/git-cola') diff --git a/dev-vcs/git-cola/git-cola-2.11-r1.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild new file mode 100644 index 000000000000..f0df3414753e --- /dev/null +++ b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) +DISTUTILS_SINGLE_IMPL=true + +inherit distutils-r1 readme.gentoo-r1 virtualx + +DESCRIPTION="The highly caffeinated git GUI" +HOMEPAGE="https://git-cola.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" +IUSE="doc test" +RESTRICT="!test? ( test )" + +# Since PyQt5 is preferred at runtime if installed, depend on that +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyinotify[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}] + dev-python/PyQt5[gui,network,widgets,${PYTHON_MULTI_USEDEP}] + ') + dev-vcs/git" +DEPEND="${RDEPEND} + sys-devel/gettext + $(python_gen_cond_dep " + doc? ( + dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] + ) + test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} ) + ") +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.10-disable-live-tests.patch +) + +python_prepare_all() { + # Use system QtPy + rm -r qtpy || die + + rm share/git-cola/bin/*askpass* || die + + # remove broken tests + rm test/i18n_test.py || die + + # don't install docs into wrong location + sed -i -e '/doc/d' setup.py || die + + # fix doc directory reference + sed -i \ + -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ + cola/resources.py || die + + # fix ssh-askpass directory reference + sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + mydistutilsargs=( --no-vendor-libs ) +} + +python_compile_all() { + cd share/doc/${PN}/ || die + if use doc; then + emake all + else + sed \ + -e '/^install:/s:install-html::g' \ + -e '/^install:/s:install-man::g' \ + -i Makefile || die + fi +} + +python_test() { + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \ + virtx nosetests --verbose --with-id --with-doctest \ + --exclude=sphinxtogithub +} + +src_install() { + distutils-r1_src_install +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola + python_optimize "${ED}/usr/share/git-cola/lib/cola" + + use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) + + distutils-r1_python_install_all + readme.gentoo_create_doc +} diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild deleted file mode 100644 index d97f4818b85a..000000000000 --- a/dev-vcs/git-cola/git-cola-2.11.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 readme.gentoo-r1 virtualx - -DESCRIPTION="The highly caffeinated git GUI" -HOMEPAGE="https://git-cola.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc test" -RESTRICT="!test? ( test )" - -# Since PyQt5 is preferred at runtime if installed, depend on that -RDEPEND=" - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/QtPy[gui,${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,widgets,${PYTHON_USEDEP}] - dev-vcs/git" -DEPEND="${RDEPEND} - sys-devel/gettext - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10-disable-live-tests.patch -) - -python_prepare_all() { - # Use system QtPy - rm -r qtpy || die - - rm share/git-cola/bin/*askpass* || die - - # remove broken tests - rm test/i18n_test.py || die - - # don't install docs into wrong location - sed -i -e '/doc/d' setup.py || die - - # fix doc directory reference - sed -i \ - -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ - cola/resources.py || die - - # fix ssh-askpass directory reference - sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - mydistutilsargs=( --no-vendor-libs ) -} - -python_compile_all() { - cd share/doc/${PN}/ || die - if use doc; then - emake all - else - sed \ - -e '/^install:/s:install-html::g' \ - -e '/^install:/s:install-man::g' \ - -i Makefile || die - fi -} - -python_test() { - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \ - virtx nosetests --verbose --with-id --with-doctest \ - --exclude=sphinxtogithub -} - -src_install() { - distutils-r1_src_install -} - -python_install_all() { - cd share/doc/${PN}/ || die - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}/usr/share/doc/${PF}" \ - prefix="${EPREFIX}/usr" \ - install - - python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola - python_optimize "${ED}/usr/share/git-cola/lib/cola" - - use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) - - distutils-r1_python_install_all - readme.gentoo_create_doc -} diff --git a/dev-vcs/git-cola/git-cola-3.2.ebuild b/dev-vcs/git-cola/git-cola-3.2.ebuild index de021727cffa..1d8dcb00b087 100644 --- a/dev-vcs/git-cola/git-cola-3.2.ebuild +++ b/dev-vcs/git-cola/git-cola-3.2.ebuild @@ -18,21 +18,26 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="doc test" RESTRICT="!test? ( test )" -RDEPEND="dev-python/QtPy[gui,${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}] + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + ') dev-vcs/git" DEPEND="${RDEPEND} sys-devel/gettext - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ) - test? ( - ${VIRTUALX_DEPEND} - dev-python/nose[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - )" + $(python_gen_cond_dep " + doc? ( + dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] + ) + test? ( + ${VIRTUALX_DEPEND} + dev-python/nose[\${PYTHON_MULTI_USEDEP}] + dev-python/mock[\${PYTHON_MULTI_USEDEP}] + ) + ")" python_prepare_all() { # make sure that tests also use the system provided QtPy diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild new file mode 100644 index 000000000000..9a1bb3679f78 --- /dev/null +++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +DISTUTILS_SINGLE_IMPL=true +inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils + +DESCRIPTION="The highly caffeinated git GUI" +HOMEPAGE="https://git-cola.github.io/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_MULTI_USEDEP}] + dev-python/pygments[${PYTHON_MULTI_USEDEP}] + dev-python/QtPy[gui,${PYTHON_MULTI_USEDEP}] + dev-python/send2trash[${PYTHON_MULTI_USEDEP}] + ') + dev-vcs/git" +BDEPEND="sys-devel/gettext + $(python_gen_cond_dep " + doc? ( dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] ) + test? ( + ${VIRTUALX_DEPEND} + dev-python/mock[\${PYTHON_MULTI_USEDEP}] + dev-python/nose[\${PYTHON_MULTI_USEDEP}] + ) + ")" + +python_prepare_all() { + # make sure that tests also use the system provided QtPy + rm -r qtpy || die + + rm share/git-cola/bin/*askpass* || die + + # don't install docs into wrong location + sed -i -e '/doc/d' setup.py || die + + # fix doc directory reference + sed -i \ + -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ + cola/resources.py || die + + # fix ssh-askpass directory reference + sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + mydistutilsargs=( --no-vendor-libs ) +} + +python_compile_all() { + cd share/doc/${PN}/ || die + if use doc ; then + emake all + else + sed \ + -e '/^install:/s:install-html::g' \ + -e '/^install:/s:install-man::g' \ + -i Makefile || die + fi +} + +python_test() { + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \ + virtx nosetests --verbose --with-id --with-doctest \ + --exclude=sphinxtogithub +} + +src_install() { + distutils-r1_src_install +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola + python_optimize "${ED}/usr/share/git-cola/lib/cola" + + use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) + + distutils-r1_python_install_all + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/dev-vcs/git-cola/git-cola-3.5.ebuild b/dev-vcs/git-cola/git-cola-3.5.ebuild deleted file mode 100644 index 9fb8610abf7d..000000000000 --- a/dev-vcs/git-cola/git-cola-3.5.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_SINGLE_IMPL=true -inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils - -DESCRIPTION="The highly caffeinated git GUI" -HOMEPAGE="https://git-cola.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/QtPy[gui,${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-vcs/git" -BDEPEND="sys-devel/gettext - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - ${VIRTUALX_DEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" - -python_prepare_all() { - # make sure that tests also use the system provided QtPy - rm -r qtpy || die - - rm share/git-cola/bin/*askpass* || die - - # don't install docs into wrong location - sed -i -e '/doc/d' setup.py || die - - # fix doc directory reference - sed -i \ - -e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ - cola/resources.py || die - - # fix ssh-askpass directory reference - sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - mydistutilsargs=( --no-vendor-libs ) -} - -python_compile_all() { - cd share/doc/${PN}/ || die - if use doc ; then - emake all - else - sed \ - -e '/^install:/s:install-html::g' \ - -e '/^install:/s:install-man::g' \ - -i Makefile || die - fi -} - -python_test() { - PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="en_US.utf8" \ - virtx nosetests --verbose --with-id --with-doctest \ - --exclude=sphinxtogithub -} - -src_install() { - distutils-r1_src_install -} - -python_install_all() { - cd share/doc/${PN}/ || die - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}/usr/share/doc/${PF}" \ - prefix="${EPREFIX}/usr" \ - install - - python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola - python_optimize "${ED}/usr/share/git-cola/lib/cola" - - use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) - - distutils-r1_python_install_all - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} -- cgit v1.2.3-65-gdbad