diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-10-03 04:43:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-03 04:43:49 +0100 |
| commit | 9b22dab88308071d43d47cd078b37903900f47d3 (patch) | |
| tree | 67e9a0a10dcdbe72770cc89ba63028a4a8efd711 /dev-vcs/git-cola | |
| parent | f354cd2612137255e64a82b6578696697b0415b4 (diff) | |
gentoo auto-resync : 03:10:2024 - 04:43:49
Diffstat (limited to 'dev-vcs/git-cola')
| -rw-r--r-- | dev-vcs/git-cola/Manifest | 4 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild (renamed from dev-vcs/git-cola/git-cola-4.8.2.ebuild) | 24 | ||||
| -rw-r--r-- | dev-vcs/git-cola/metadata.xml | 6 |
3 files changed, 6 insertions, 28 deletions
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index b9260476c7b5..2271609a2e1d 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -3,5 +3,5 @@ AUX git-cola-4.2.1-fix-setuptools.patch 766 BLAKE2B 90fb4500e084af949ea11ab4d591 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 EBUILD git-cola-4.5.0.ebuild 1462 BLAKE2B ee8f104ec1483d6c37c85b1a155695e53a1170f1cd921e9c37a388c8d8068f29263b7b8cbbfb293b890ba138573886573343ca18ddedacfa94ac751a5410b448 SHA512 d70ac91fc05b4968f145613df65d312a0fe6004f3007f8275015878b90ce04586e16ec08d3aa78c0e309febe9aeb1e3d49e7079dbde63c85c8235f1fc45168aa -EBUILD git-cola-4.8.2.ebuild 2363 BLAKE2B c4b85f4f002d048156d8212a428d5947be77e6945c3616669fd10bb123e7b5842281747f603115de02b472a522c0aaf07ec747acb3199b064e4ebf2e650b9557 SHA512 63cbf10484e5f431523ed694e3b37147da6b6621c22d9ca6d137cb4e8ec5f008925457c2a2e0f1c34a8f4be024aa3b7f0963d7353b25b5c8cd7c5bafa8c7a072 -MISC metadata.xml 914 BLAKE2B ab899255190af78b3226bfd2b3710655b1701760b61024c84e3478a4aab88fefc89c5945529bed55b7164132b5a5b063a48b6b5a1b78485e9da74cf1999f7e55 SHA512 8d894d4b34eafb9b206f4a1bb5de56f2973d826e14c96ad5b06a07fc7ac477806c66146a46afeb4bbdf2c9c32c1dfd2fd1fb455e4c268edec949a53f81998777 +EBUILD git-cola-4.8.2-r1.ebuild 1664 BLAKE2B 1d572feea0cbd0ec10c352bae18ce7a4d451c9651561cf41aa6cadca3353796243059fc2401e5a08d261d48e70dd958bf99df7799fca7ab1de2ea00a80b20101 SHA512 e57477b699102de6573a5a9d9ee462ec3cd9410397993d5c8381cd533d86a5debcf8bda0636bed857f066db99c32633a52e39095f084ce6d2699500c04f49cd7 +MISC metadata.xml 595 BLAKE2B a1a74266c1afcbcf94bcb95b8218669f09ce709d0803e37cca482b2e89dee176d1d898236ba024e7266106133d1bfb3008fd1ff3ce11793c606fc7dcffb408e6 SHA512 fe44a4445bf71d09eaa6be66af2370d3c0e94dada507ace584ffe9dd8b5edafd472355cee7aceb554c31b0bafbd29faeb318e853d0d165fb1d2a7f8f8bf86379 diff --git a/dev-vcs/git-cola/git-cola-4.8.2.ebuild b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild index 1e6aa2ca09cf..c4cf267205ec 100644 --- a/dev-vcs/git-cola/git-cola-4.8.2.ebuild +++ b/dev-vcs/git-cola/git-cola-4.8.2-r1.ebuild @@ -15,21 +15,13 @@ 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}] - 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/QtPy[pyqt6,gui,network,${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] ') dev-vcs/git @@ -39,12 +31,8 @@ BDEPEND=" $(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] ) + dev-python/QtPy[pyqt6,gui,network,\${PYTHON_USEDEP}] ) ") " @@ -56,7 +44,7 @@ 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 + rm -Rf qtpy cola/polib.py || die distutils-r1_src_prepare } @@ -78,11 +66,7 @@ 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 + sed -i "s|import sys|import sys\nimport os\nos.environ['QT_API'] = 'pyqt6'\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 f723b2794ff6..b01ac73fc379 100644 --- a/dev-vcs/git-cola/metadata.xml +++ b/dev-vcs/git-cola/metadata.xml @@ -16,10 +16,4 @@ <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> |