diff options
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/Manifest.gz | bin | 11851 -> 11850 bytes | |||
| -rw-r--r-- | dev-vcs/tortoisehg/Manifest | 5 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild (renamed from dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild) | 18 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 14 |
4 files changed, 18 insertions, 19 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex 35a30ab874fc..c578bdb2d132 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index ae8766f4939e..e9d3c3de0c9b 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,6 +1,5 @@ -DIST tortoisehg-6.5.1.tar.gz 8854923 BLAKE2B 7536f5d7c2b0cda5bb812b2135dcb54ce9bf02a523648e4569bbca5772d3568a63cb09549b6e10c46d212e3c98791f3014b62386d68b488f78f57a235e0be36c SHA512 0e568937f25afa681e8c5f8b8ecc40ede046999318ff80bdd27516b523169c778c695a2a800876eac40480d6e009c83c6493dec3110673f5b79f284be1d4948b DIST tortoisehg-6.6.3.tar.gz 8857342 BLAKE2B 166d1305ed3ee54496b3e0b08fc92a34a56a9398aa618a0f2266e7413fafc371be3c308debc3260a15b59c147a00bbe0773df52a838c4a4f0028b29c1cb05090 SHA512 8de8a68a753e8554dcb9936f6ba237e0598df65e6039f7c608e692bc375258e64a443e27e63c337f361fc32c0076b79bd98a972c220089902ff4489ab3507928 -EBUILD tortoisehg-6.5.1.ebuild 2356 BLAKE2B 6fd8a1e60c664ba29d0cd8513f7b6da7d4239413a3ced487046e98a7c4fedf8edb01900220cd073b4d283dc89d8c939fc54645ab52bec1eca68518c18c2ef115 SHA512 793e39125e9051a3a7a3db3db466a3aabc20b8316a3b729f813ebd42dd06fce4f15188d860dbc9e0526d0b486d891fd0f107780de496abce6c853aa01b7bc8af +EBUILD tortoisehg-6.6.3-r1.ebuild 2416 BLAKE2B 61514cd0fce00d9a17db587de5fc61414cce2ccb76aafebba9a91d865018d34bff7f1f3dfa6c6b861e077fa0af575af0563004d6a55099c0aeb14ecd752d4160 SHA512 9909c2a0cdc5ba052ab2c557dcc8b40df4acfcf476e04cf023a35d247f42334c1c0a8c39db5cc65b48013f185507d64f8f2931c000981140fcfbbce2b87e848f EBUILD tortoisehg-6.6.3.ebuild 2356 BLAKE2B 56c0810624324e045c5c265369379f157d39927b2bb07ee96545b010868c07af3a93cb87fca598fa728d02840ff7965ec9539b95eaec11bfe7c1c602a7e7d80f SHA512 07e43187a3501ffb540c71273e1093e89dcfc0ec895af6044a8b632fa9da348d0f09a0cff543537ae53be1382d71dd0f76726bdd50b0b661f7e695be9f7ee1b7 -EBUILD tortoisehg-9999.ebuild 2358 BLAKE2B 5a6598dc5f300848077667cbd6abc2533551bb81373d824c1946b35661dc00114b41fc3d63b8526af0816c0c979344f3285e6f5e5e280853241c1c8a1da0ea32 SHA512 4a189646d0995d35b91913e6de60beafa90a193ecc66b6356a3d2bf25443fd19087cff2797487b481452f9035370b6e5316ada821453948dbd5d7ec928178ab7 +EBUILD tortoisehg-9999.ebuild 2416 BLAKE2B 61514cd0fce00d9a17db587de5fc61414cce2ccb76aafebba9a91d865018d34bff7f1f3dfa6c6b861e077fa0af575af0563004d6a55099c0aeb14ecd752d4160 SHA512 9909c2a0cdc5ba052ab2c557dcc8b40df4acfcf476e04cf023a35d247f42334c1c0a8c39db5cc65b48013f185507d64f8f2931c000981140fcfbbce2b87e848f MISC metadata.xml 805 BLAKE2B b09f8454c68278c180c84a62c54410909d731307058fcfb973d48b304269ae4eac6d4e61d4f04857813659029869097e3ba5a4d2bb6fea698797b364ba588cbe SHA512 33aa011e53112a7e1589205bf563fefb3db2cc931f4643a03abfc6baafd1b57c59a4f712814dfd3e3e1eb6b299fb34af53bcb2d1c08accaed6989f23b3e41acc diff --git a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild index 1c274fbd77ca..a18ccd3822a5 100644 --- a/dev-vcs/tortoisehg/tortoisehg-6.5.1.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-6.6.3-r1.ebuild @@ -5,15 +5,14 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools - inherit desktop distutils-r1 optfeature xdg-utils if [[ ${PV} != *9999* ]]; then - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="~amd64 ~arm64 ~x86" SRC_URI="https://foss.heptapod.net/mercurial/${PN}/thg/-/archive/${PV}/thg-${PV}.tar.gz -> ${P}.tar.gz" HG_DEPEND=">=dev-vcs/mercurial-6.2[${PYTHON_USEDEP}] $(python_gen_cond_dep '>=dev-vcs/mercurial-6.3.2[${PYTHON_USEDEP}]' python3_11 ) - <dev-vcs/mercurial-6.6[${PYTHON_USEDEP}]" + <dev-vcs/mercurial-6.7[${PYTHON_USEDEP}]" S="${WORKDIR}/thg-${PV}" else inherit mercurial @@ -30,15 +29,14 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND=" - ${HG_DEPEND} +RDEPEND="${HG_DEPEND} dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyqt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}] + dev-python/pyqt6[network,svg,${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.14.1-r1[qt6(+),${PYTHON_USEDEP}] " +DEPEND="${RDEPEND}" BDEPEND=" - ${RDEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] @@ -52,6 +50,7 @@ python_prepare_all() { rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die + export THG_QT_API=PyQt6 distutils-r1_python_prepare_all } @@ -61,6 +60,7 @@ python_test() { } python_install_all() { + export THG_QT_API=PyQt6 distutils-r1_python_install_all dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg @@ -70,7 +70,7 @@ python_install_all() { pkg_postinst() { xdg_icon_cache_update elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/pyqt5 please rebuild" + elog "between dev-python/sip and dev-python/pyqt6 please rebuild" elog "dev-python/qscintilla." optfeature "the core git extension support" dev-python/pygit2 diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild index 6b4973f60df5..a18ccd3822a5 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools - inherit desktop distutils-r1 optfeature xdg-utils if [[ ${PV} != *9999* ]]; then @@ -30,15 +29,14 @@ SLOT="0" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND=" - ${HG_DEPEND} +RDEPEND="${HG_DEPEND} dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyqt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-2.11.6[qt5(+),${PYTHON_USEDEP}] + dev-python/pyqt6[network,svg,${PYTHON_USEDEP}] + >=dev-python/qscintilla-2.14.1-r1[qt6(+),${PYTHON_USEDEP}] " +DEPEND="${RDEPEND}" BDEPEND=" - ${RDEPEND} test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] @@ -52,6 +50,7 @@ python_prepare_all() { rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" sed -i -e 's:share/doc/tortoisehg:share/doc/'"${PF}"':' setup.py || die + export THG_QT_API=PyQt6 distutils-r1_python_prepare_all } @@ -61,6 +60,7 @@ python_test() { } python_install_all() { + export THG_QT_API=PyQt6 distutils-r1_python_install_all dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg @@ -70,7 +70,7 @@ python_install_all() { pkg_postinst() { xdg_icon_cache_update elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/pyqt5 please rebuild" + elog "between dev-python/sip and dev-python/pyqt6 please rebuild" elog "dev-python/qscintilla." optfeature "the core git extension support" dev-python/pygit2 |