diff options
Diffstat (limited to 'dev-vcs/git-cola')
| -rw-r--r-- | dev-vcs/git-cola/Manifest | 10 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-4.1.0.ebuild | 79 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild | 80 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-4.8.2.ebuild (renamed from dev-vcs/git-cola/git-cola-4.4.1.ebuild) | 31 | ||||
| -rw-r--r-- | dev-vcs/git-cola/metadata.xml | 6 |
5 files changed, 35 insertions, 171 deletions
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index 9accc0e4006c..b9260476c7b5 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -1,11 +1,7 @@ AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d AUX git-cola-4.2.1-fix-setuptools.patch 766 BLAKE2B 90fb4500e084af949ea11ab4d5917252b2e847fa1a536f24c639d4898bb1fe934dbfc3314e0ca16c643f2c9ac9e80c125725ca2f8ecdbf50093b4667652d7329 SHA512 3b6ed05926421aedf1c0437f9634421628e9f00a4e52ed950d9e06740f0dd7841bcc0b88a99f5acc7228dfdc82043d87cccec2b7493e9af7e5bc4e37ca0a33ea -DIST git-cola-4.1.0.tar.gz 1140393 BLAKE2B 3236e06f86d23a7311e3cd639cbf2adcecb18810abcae938d1ff7cf25b477d814e614fffa20ce39dd9a2c6ab4f8e6b6b67f3ad3144163abe6530ac227313ca98 SHA512 4d2617947d4dbf3273f02c072de5ede10a656981f3653273780e2c1b1d3d613cd359fbb93cfb0a1d5de24b0c90818503cd9041ad3fa1a05b2ecd2db305bbe1a0 -DIST git-cola-4.2.1.tar.gz 1191680 BLAKE2B 8dd9d4b52672e32deba2f54e7f9141d3364dcbf3a823b05e766f333063a26cc49ea9e5e2f43f9492447b6b7344c930a2a1160653fb2699ff7d23cb22783f4cd1 SHA512 1a9d63c985d3566f81edd3ed3debc4d499fa5147650d479f3b1bc833d08836a17d63a8eb23c1cd5c2c31f6f7202219fb77cacb628df8f85dd3d367dcdd110891 -DIST git-cola-4.4.1.tar.gz 1212338 BLAKE2B 8f95720fa8af0acdecf744f657808b969f914bfd1cb2ccd2ed3af35f2811ab8aca7022ba888e0fc447a685af4c7dba27a0f0305f0b2d07cc31ccd22953d4fa14 SHA512 3e4e1cb8cd148b34e663c72c6b3d1e887815b5a86558ffbf13a19a5dfd3fb6b37c123290dc514b6f098893587dc67ca34424aaad5482768795e353f0efe92797 DIST git-cola-4.5.0.tar.gz 1233372 BLAKE2B da9bbe2d1e49b5ebc49ae6ddecf72a73b4b262de2de6c5a9ef77d9946a338bb393154e91e8431dc11fc08f72e3fcfd19d424d68c2b846d05c0a87393f8cc33ac SHA512 99a17bf0398dc3049417b6af6f3fc3bc20682186859879c6fc3d2b8f9a8b3599612c555b40f76dd226323cefab0dec0b4424a566dc74637449743f675cb56817 -EBUILD git-cola-4.1.0.ebuild 1648 BLAKE2B 770caf615c1bcc95d8991b3c5a2e138fdd7cc1c40548a5d914bd22873912c4cb9dc300b0008e1bd0aebf162fe6ec10412de4b624f5536717ed962cc55003b328 SHA512 0b265b6bffa78d3b2f50ba91fc0bd97f0ecdc9b4f9ea9190e54900aeb71a99ccd7bc0d63ce0228acaaf3e4fcc45edba00ff894a3cef5c864403fcba2504f64f5 -EBUILD git-cola-4.2.1-r1.ebuild 1689 BLAKE2B 18b99a0b89a3c26919c37e4a11ac63e437a2d86003e378ed36481bb627fe35a38feced2560fb0f24d7c02c70d7da5e5d21404bb3215efe579add097384792f93 SHA512 7a5f73a4cda44aaf730cb22450ea4d16b4132e382d603389f429531e5745822a05530be4d810f21506b80af920a541c77960cb319db9b0ce566cfe9414c1e7eb -EBUILD git-cola-4.4.1.ebuild 1464 BLAKE2B fdadc820b29a768c9184fc10387fef0b65e1f6fab20a2a645627b7e0e7e8aa290d7e0c39638a7db46bb8beb838c40c481da975c1a94bc1454734e7cb4a99fd6e SHA512 b757e5e174ea0e899d535184ba3d2d52dc73d2c716cbe3d3473296c6ed26cd28420469b500a54a2acb6553b8cd7da60f230e1b85f3cc603be916917399100be8 +DIST git-cola-4.8.2.tar.gz 1251173 BLAKE2B 758b34e271883c5493e9a219e7f9970c1ca2e0cdb97bbab50828ea53ae2bae223692a06c353d0b017af2e82b3855708ebd2937d9656b373b8d45ab457ac50b7b SHA512 0b924837e8e5dcaa9687ffdff779bd3ed9f629713826f6c537d6470fdaed84bab3cec793aa9f1cf0e7bce3c4dae60c838822005efa93236b5964c8be74ef33cc EBUILD git-cola-4.5.0.ebuild 1462 BLAKE2B ee8f104ec1483d6c37c85b1a155695e53a1170f1cd921e9c37a388c8d8068f29263b7b8cbbfb293b890ba138573886573343ca18ddedacfa94ac751a5410b448 SHA512 d70ac91fc05b4968f145613df65d312a0fe6004f3007f8275015878b90ce04586e16ec08d3aa78c0e309febe9aeb1e3d49e7079dbde63c85c8235f1fc45168aa -MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379 +EBUILD git-cola-4.8.2.ebuild 2363 BLAKE2B c4b85f4f002d048156d8212a428d5947be77e6945c3616669fd10bb123e7b5842281747f603115de02b472a522c0aaf07ec747acb3199b064e4ebf2e650b9557 SHA512 63cbf10484e5f431523ed694e3b37147da6b6621c22d9ca6d137cb4e8ec5f008925457c2a2e0f1c34a8f4be024aa3b7f0963d7353b25b5c8cd7c5bafa8c7a072 +MISC metadata.xml 914 BLAKE2B ab899255190af78b3226bfd2b3710655b1701760b61024c84e3478a4aab88fefc89c5945529bed55b7164132b5a5b063a48b6b5a1b78485e9da74cf1999f7e55 SHA512 8d894d4b34eafb9b206f4a1bb5de56f2973d826e14c96ad5b06a07fc7ac477806c66146a46afeb4bbdf2c9c32c1dfd2fd1fb455e4c268edec949a53f81998777 diff --git a/dev-vcs/git-cola/git-cola-4.1.0.ebuild b/dev-vcs/git-cola/git-cola-4.1.0.ebuild deleted file mode 100644 index 09761dd50b1e..000000000000 --- a/dev-vcs/git-cola/git-cola-4.1.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_SINGLE_IMPL=true -DISTUTILS_USE_PEP517=setuptools -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="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/QtPy[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}] - dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets] - ) - ") -" - -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 - sed -i -e 's:--flake8::' pytest.ini || 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 - 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-4.2.1-r1.ebuild b/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild deleted file mode 100644 index 6edb3f03319f..000000000000 --- a/dev-vcs/git-cola/git-cola-4.2.1-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -DISTUTILS_SINGLE_IMPL=true -DISTUTILS_USE_PEP517=setuptools -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="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/QtPy[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}] - dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets] - ) - ") -" -# https://bugs.gentoo.org/920534 -PATCHES=( "${FILESDIR}/${P}-fix-setuptools.patch" ) - -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 - 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 - 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-4.4.1.ebuild b/dev-vcs/git-cola/git-cola-4.8.2.ebuild index fe84fd6d276d..1e6aa2ca09cf 100644 --- a/dev-vcs/git-cola/git-cola-4.4.1.ebuild +++ b/dev-vcs/git-cola/git-cola-4.8.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_SINGLE_IMPL=true DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 readme.gentoo-r1 virtualx xdg @@ -15,13 +15,21 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" +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}] - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] - dev-python/QtPy[gui,network,${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 @@ -33,7 +41,10 @@ BDEPEND=" test? ( ${VIRTUALX_DEPEND} dev-python/pytest[\${PYTHON_USEDEP}] - dev-python/PyQt5[\${PYTHON_USEDEP},gui,widgets] + 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] ) ) ") " @@ -44,6 +55,8 @@ 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 } @@ -63,5 +76,13 @@ 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 @@ <upstream> <remote-id type="github">git-cola/git-cola</remote-id> </upstream> + <use> + <flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt backend</flag> + <flag name="pyqt6">Use <pkg>dev-python/PyQt6</pkg> as Qt backend</flag> + <flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt backend</flag> + <flag name="pyside6">Use <pkg>dev-python/pyside6</pkg> as Qt backend</flag> + </use> </pkgmetadata> |