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 4125A158090 for ; Tue, 1 Oct 2024 18:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29F0CE29AF; Tue, 1 Oct 2024 18:32:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 0ED88E29AF for ; Tue, 1 Oct 2024 18:32:12 +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 168B5343143 for ; Tue, 1 Oct 2024 18:32:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 774A51EF3 for ; Tue, 1 Oct 2024 18:32:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1727807462.053db8aca7cc3f7d16a79269301ee1fbbc4abc8e.asturm@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-4.8.2.ebuild dev-vcs/git-cola/metadata.xml X-VCS-Directories: dev-vcs/git-cola/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 053db8aca7cc3f7d16a79269301ee1fbbc4abc8e X-VCS-Branch: master Date: Tue, 1 Oct 2024 18:32:09 +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: d528087c-d3d3-4d70-9c29-122085311a3a X-Archives-Hash: af2e032601d6ea12790af2480507e7ac commit: 053db8aca7cc3f7d16a79269301ee1fbbc4abc8e Author: David Roman ifae es> AuthorDate: Tue Sep 10 12:47:39 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 1 18:31:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=053db8ac dev-vcs/git-cola: add 4.8.2 Closes: https://bugs.gentoo.org/926353 Signed-off-by: David Roman ifae.es> Closes: https://github.com/gentoo/gentoo/pull/38550 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-vcs/git-cola/Manifest | 1 + dev-vcs/git-cola/git-cola-4.8.2.ebuild | 88 ++++++++++++++++++++++++++++++++++ dev-vcs/git-cola/metadata.xml | 6 +++ 3 files changed, 95 insertions(+) diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index 1008de4d8dbb..5e5aabe85934 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -1 +1,2 @@ DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817 +DIST git-cola-4.8.2.tar.gz 1251173 BLAKE2B 758b34e271883c5493e9a219e7f9970c1ca2e0cdb97bbab50828ea53ae2bae223692a06c353d0b017af2e82b3855708ebd2937d9656b373b8d45ab457ac50b7b SHA512 0b924837e8e5dcaa9687ffdff779bd3ed9f629713826f6c537d6470fdaed84bab3cec793aa9f1cf0e7bce3c4dae60c838822005efa93236b5964c8be74ef33cc diff --git a/dev-vcs/git-cola/git-cola-4.8.2.ebuild b/dev-vcs/git-cola/git-cola-4.8.2.ebuild new file mode 100644 index 000000000000..b584bdddea8c --- /dev/null +++ b/dev-vcs/git-cola/git-cola-4.8.2.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +DISTUTILS_SINGLE_IMPL=true +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 readme.gentoo-r1 virtualx xdg + +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" +IUSE="+pyqt5 pyqt6 pyside2 pyside6" + +REQUIRED_USE=" + || ( pyqt5 pyqt6 pyside2 pyside6 ) +" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/polib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + pyqt5? ( dev-python/QtPy[pyqt5,gui,network,${PYTHON_USEDEP}] ) + pyqt6? ( dev-python/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}] ) + pyside2? ( dev-python/QtPy[pyside2,gui,network,${PYTHON_USEDEP}] ) + pyside6? ( dev-python/QtPy[pyside6,gui,network,${PYTHON_USEDEP}] ) + dev-python/send2trash[${PYTHON_USEDEP}] + ') + dev-vcs/git +" +BDEPEND=" + sys-devel/gettext + $(python_gen_cond_dep " + dev-python/setuptools-scm[\${PYTHON_USEDEP}] + test? ( + ${VIRTUALX_DEPEND} + dev-python/pytest[\${PYTHON_USEDEP}] + pyqt5? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt5,gui,network] ) + pyqt6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyqt6,gui,network] ) + pyside2? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside2,gui,network] ) + pyside6? ( dev-python/QtPy[\${PYTHON_USEDEP},pyside6,gui,network] ) + ) + ") +" + +distutils_enable_sphinx docs \ + 'dev-python/rst-linker' +distutils_enable_tests pytest + +src_prepare() { + sed -i "s|doc/git-cola =|doc/${PF} =|" setup.cfg || die + # remove bundled qtpy and polib + rm -Rf "${S}"/qtpy "${S}"/cola/polib.py || die + distutils-r1_src_prepare +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + cd "${T}" || die + GIT_CONFIG_NOSYSTEM=true LC_ALL="C.utf8" \ + epytest "${S}"/test +} + +src_compile() { + SETUPTOOLS_SCM_PRETEND_VERSION=${PV} distutils-r1_src_compile +} + +src_install() { + distutils-r1_src_install + + # patch the binaries to use desired qtpy backend + local qt_api=$(use pyqt5 && echo "pyqt5" || ( + use pyqt6 && echo "pyqt6" || ( + use pyside2 && echo "pyside2" || echo "pyside6" + ))) + sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = '${qt_api}'\n|" "${D}"/usr/bin/* || die + + readme.gentoo_create_doc +} diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml index b01ac73fc379..f723b2794ff6 100644 --- a/dev-vcs/git-cola/metadata.xml +++ b/dev-vcs/git-cola/metadata.xml @@ -16,4 +16,10 @@ git-cola/git-cola + + Use dev-python/PyQt5 as Qt backend + Use dev-python/PyQt6 as Qt backend + Use dev-python/pyside2 as Qt backend + Use dev-python/pyside6 as Qt backend +