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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4171C158087 for ; Sat, 29 Jan 2022 06:20:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3FC02BC01B; Sat, 29 Jan 2022 06:20:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D4BF32BC009 for ; Sat, 29 Jan 2022 06:20:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D8E734338F for ; Sat, 29 Jan 2022 06:20:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B93B02AF for ; Sat, 29 Jan 2022 06:20:17 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643437162.4a60b4b2e933461519049e8ed72eeb87cb109116.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-cola/Manifest dev-vcs/git-cola/git-cola-3.12.0.ebuild X-VCS-Directories: dev-vcs/git-cola/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4a60b4b2e933461519049e8ed72eeb87cb109116 X-VCS-Branch: master Date: Sat, 29 Jan 2022 06:20:17 +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: 88c0701a-b26a-4c74-b0ad-65d10a586b9e X-Archives-Hash: b06590f934e9eefbced1d3a74b87d589 commit: 4a60b4b2e933461519049e8ed72eeb87cb109116 Author: Martin Gysel bearsh org> AuthorDate: Thu Jan 20 19:28:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 29 06:19:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a60b4b2 dev-vcs/git-cola: version bump to 3.12.0 Closes: https://bugs.gentoo.org/831630 Signed-off-by: Martin Gysel bearsh.org> Signed-off-by: Sam James gentoo.org> dev-vcs/git-cola/Manifest | 1 + dev-vcs/git-cola/git-cola-3.12.0.ebuild | 109 ++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index f160122dd063..6d06c491524e 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -1,2 +1,3 @@ DIST git-cola-3.10.1.tar.gz 996036 BLAKE2B 2d705b853cf67a0f437d8dc77d46d5804124af600f872717c832843586d3c739e67a79ebe50ba2a8db38afd4217a7bb94db9cb8e27d51a00087ced340f4877d6 SHA512 79496023bfaa05049079eec2cdaf8449a6598faebedb4a13acf178209edc63e725eb1b003700a1dcfee09072d34e5a49d7053f070e45b498562cc124cd0582d4 DIST git-cola-3.11.0.tar.gz 997046 BLAKE2B 7a8270c30e0cbd919dcd6f8e38ca420257630717e535ef11ed337fde2461b544453b20363906a5b769cd23d96ca77ce72d71729f46ae6abada83ae4d33628cbc SHA512 f05862b9b27ff5dfe9b220bbee4f3f455a7ce98acaa0bb0a8cdbb44f8cb97ce265df036ba48d5abb0bf46a91fd782cd73a67ca544b4662d36e8023e92c80b541 +DIST git-cola-3.12.0.tar.gz 1004892 BLAKE2B 9396768256341e59500dffc95136e710b2d3d1c9d5cb4d70fc7fba8e81e16a3656006b5558dae417fbbad7baf1373d953708006b96a8873f68502ea469462326 SHA512 4b8ec716f572682747f43ae1a9232612d95d44384d28bbf97ef461a93546cdfcc81125f816b4c8ea5efcf4d23f42edeb8a89df3c7167ceac4709eeeaf49965a9 diff --git a/dev-vcs/git-cola/git-cola-3.12.0.ebuild b/dev-vcs/git-cola/git-cola-3.12.0.ebuild new file mode 100644 index 000000000000..1aa8af03490f --- /dev/null +++ b/dev-vcs/git-cola/git-cola-3.12.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_SINGLE_IMPL=true +DISTUTILS_USE_SETUPTOOLS=no +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" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/QtPy[gui,network,${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + ') + dev-vcs/git +" +BDEPEND="sys-devel/gettext + $(python_gen_cond_dep " + doc? ( dev-python/sphinx[\${PYTHON_USEDEP}] ) + test? ( + ${VIRTUALX_DEPEND} + dev-python/pytest[\${PYTHON_USEDEP}] + dev-python/pytest-flake8[\${PYTHON_USEDEP}] + dev-python/mock[\${PYTHON_USEDEP}] + dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets] + ) + ") +" + +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() { + DISTUTILS_ARGS=( --no-vendor-libs --no-private-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() { + GIT_CONFIG_NOSYSTEM=true \ + PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C.utf8" \ + virtx epytest cola test +} + +python_install_all() { + cd share/doc/${PN}/ || die + emake \ + DESTDIR="${D}" \ + docdir="${EPREFIX}/usr/share/doc/${PF}" \ + prefix="${EPREFIX}/usr" \ + install + + # remove empty bin folder + rm -R "${ED}"/usr/share/git-cola/bin || die + + 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 +}