diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-10 21:05:55 +0000 |
| commit | 71deace00d1a2b091313fe137ab7092418c6f87c (patch) | |
| tree | 9f1f0dee23e13658e52f49437befe78427148c51 /dev-vcs/git-cola | |
| parent | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff) | |
gentoo resync : 10.02.2020
Diffstat (limited to 'dev-vcs/git-cola')
| -rw-r--r-- | dev-vcs/git-cola/Manifest | 6 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-2.11-r1.ebuild (renamed from dev-vcs/git-cola/git-cola-2.11.ebuild) | 20 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-3.2.ebuild | 29 | ||||
| -rw-r--r-- | dev-vcs/git-cola/git-cola-3.5-r1.ebuild (renamed from dev-vcs/git-cola/git-cola-3.5.ebuild) | 24 |
4 files changed, 46 insertions, 33 deletions
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest index 4fcee1e6900a..9592f15d2e2f 100644 --- a/dev-vcs/git-cola/Manifest +++ b/dev-vcs/git-cola/Manifest @@ -4,7 +4,7 @@ AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c DIST git-cola-3.2.tar.gz 1208723 BLAKE2B e0375502c7b760a35217c48708e34ba061934f968e6720c3560603b5a76c9474a3a8426f2120ee853a9ac475fc9cbc33ee6ee9a946336e1f28a89d541785c535 SHA512 ca171549dad692088e337efad6f480103a41a1a94f57ae66c15fab3d69e3b18ecc28ac1178886fedd6d969f783e8d5feb4922539c1739ce52c0c0ac59dc941ee DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793 -EBUILD git-cola-2.11.ebuild 2363 BLAKE2B 01ab123c26e500b8643472fc2c7461bd1e5c9430dcd4cdeca87d894f1470c972997b4cecffb71fdfcc1dd5acdc924ec18adfb8952001998327c245cb669ab46c SHA512 e685d1a9e78c4e884ec07262a9135fb19971b2fcd5cae3c67f90360dd54dea001ba3fa7ac471930ca691b03051a3c767a825249eb2e34cb40d3bc2cd56b10fd2 -EBUILD git-cola-3.2.ebuild 2248 BLAKE2B 7e6fabffd82dc9410acda407dcea904ef7d1d790b124dde760dca6b1b236a374a13340e1efc16cf1c667063174d7ca85261a53f174c0456edac0c932bd32476f SHA512 f757277d68f3187481384ec4e95323e1553e46de38ba7a4ef196f4c5c93d66353d2b93e8ee82dcbf3019e02b74eb68b2fee34cc3e6e02ab7697448432304aec2 -EBUILD git-cola-3.5.ebuild 2344 BLAKE2B 7b060cfc0e0aecc104a261fcfa84faaf28ab508a466f710f540784f0866e1b2ffcb8f513e73080b77af3a7a4f008cb38fd7c4d0902860b037b4cde18401bc966 SHA512 0d12db48bf1d9a3ba3949eab203df2e22fea1f9dd1de53a1e36745203ba14565995b7753f876a87868edede8c6e5bd99c364b66604d03d548a4f117b5d83b86b +EBUILD git-cola-2.11-r1.ebuild 2467 BLAKE2B 41c2c8d7b46bb38fd9c0e29aef1a78f2cc9fe572a66661cb8596cc1793516e03afa9033c3c1e82b1c7d894bf26d99ba422b46b07b0588fe0661a3240bd41aef5 SHA512 3186c8fcced9d3264bcd7ae6f1c1d91c024716aafce4533755d223249f4eb3083a43241e3b377fc748353b9802c5e52296b8c205d4372618bb09c4d9d63eac94 +EBUILD git-cola-3.2.ebuild 2365 BLAKE2B 68c608fbfcadd3e5b86eb5ecefbfc472acef065473d02311e72c1796463c853ae0ef99b94b9ce9419f21e8c62a640897bbd94744ae634acd5f0e140703743ee4 SHA512 de423a52b9db9e4eef1729fc1ffcac9ced5c7c9bdcfadc92380f5af83d5e204ffcef6c32c5fa42a8ffe7fe626cf73942bb0e99d7e2f30eac64c346d056883d09 +EBUILD git-cola-3.5-r1.ebuild 2457 BLAKE2B b4a74fe9749529edba8b0309b6e0368193c3b67b4ce0d3117aca4da1a32c60b8646cd7c77e79e13091a85ebea12092b23e8858f585ce1f090532ae9edf5f602b SHA512 6a7ed3a27d87ca61c4e362eb3b5c017e39233c300d1b04d309f2cf0aa26a7305547abe5ebce6a24349840a19699dbf42646b0e41d50f143b50ea02130f1202c4 MISC metadata.xml 254 BLAKE2B 0ae656bc7a829c95367497cfe1198346a0586bc944809725fc83ff0b92d33ddadb0a82407300d1467cb4ea75073d2ab0a89b8d67d8efcff400a444b06330c77c SHA512 8a5fe25f733f77a4e70a64521dfffbeeb8539dc709f55dd9a941cc920f7a7e6a8918cb5f07d7b57ee5ad63abdaf31067a217afd081164e68562239b584416109 diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild index d97f4818b85a..f0df3414753e 100644 --- a/dev-vcs/git-cola/git-cola-2.11.ebuild +++ b/dev-vcs/git-cola/git-cola-2.11-r1.ebuild @@ -20,17 +20,21 @@ 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}] + $(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 - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ${VIRTUALX_DEPEND} ) + $(python_gen_cond_dep " + doc? ( + dev-python/sphinx[\${PYTHON_MULTI_USEDEP}] + ) + test? ( dev-python/nose[\${PYTHON_MULTI_USEDEP}] ${VIRTUALX_DEPEND} ) + ") " PATCHES=( 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.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild index 9fb8610abf7d..9a1bb3679f78 100644 --- a/dev-vcs/git-cola/git-cola-3.5.ebuild +++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild @@ -19,18 +19,22 @@ 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}] + $(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 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - ${VIRTUALX_DEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - )" + $(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 |