diff options
Diffstat (limited to 'dev-vcs/tortoisehg')
-rw-r--r-- | dev-vcs/tortoisehg/Manifest | 12 | ||||
-rw-r--r-- | dev-vcs/tortoisehg/metadata.xml | 17 | ||||
-rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild | 80 | ||||
-rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild | 80 | ||||
-rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild (renamed from dev-vcs/tortoisehg/tortoisehg-4.9.ebuild) | 46 | ||||
-rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 50 |
6 files changed, 41 insertions, 244 deletions
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index 4edb82baf407..512b7f83db15 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,8 +1,4 @@ -DIST tortoisehg-4.9.1.tar.gz 7960667 BLAKE2B f8a6ed65967c6389b65fd9388b3e898bf4ce09e7f95dd88467a10c061b9454eab76d0308905fd417575bf6d75dd7129a2f303bc774fd8e68824b33c18fd8054c SHA512 aef1b0d6047114794bfe78de2c0def83748e238917ce44fb56d562d53c26666dbb385867da70c4625893b148e2affa3766e40292348b78aff428df5a77d8f902 -DIST tortoisehg-4.9.tar.gz 7960163 BLAKE2B bc13032ba1e36ed3e6aca978cb3917b2e5fdcf1b7dab2e66a34a0aca2e084960954f9ec135a1c2120e09931b876db7d1f3d0f3a8f69f950ff939eea9d7814523 SHA512 cc7b0360c6b362b0b9695a484b59eea879e1d4e28ed68e98ce6975342a22ddafc97976c5b0cdea289bfd78932dacf76c0b236e36bec48acd48ee361f2c09ff13 -DIST tortoisehg-5.0.2.tar.gz 8002109 BLAKE2B 3ac66a0b0f943bccc1e9d38f6fb1a788de0e5b538fdf42d59da26de641913802116a73039a2c3516245c1b6abe325b0dd9ca5b2f1c2b60e2dcc6a600e5f1fb97 SHA512 d33916cf3215360cada06de62db46e70c555b1f4cd509f0b863e2baa633e2c5df99f09f3a103444c30aa0a6e15e2acd7134f045cb3846cccc7b727482d94e650 -EBUILD tortoisehg-4.9.1.ebuild 1969 BLAKE2B ff541757572e30cdc72fb69da7d62b7dd78d28db6e92e48ecd7b6b04176c71d521c4e42aff55834e9fa1d677b5994a5fe0be95647870975050cb7ed8ca7aa327 SHA512 d487200fbcbe84396376ad775fe3461c0096bb0734649e3230c86dd0b0b628ee5f2286f6415431628811e5e695387238d53dcde369d0bfd25a52b66ceb7ae26a -EBUILD tortoisehg-4.9.ebuild 1967 BLAKE2B d8a4af0e86d7d09603e53c07d6b6afa637132bd0ca42bacf206215cbd3f0f89719a0adb718a21e0a26ac9a0c5727c101f88c7fb556e180053e4479d598377800 SHA512 aeaed90010a9b8ebc579a742e763b2e6740a4974796443db7111a0e2d4a3e447002b0a2d1dd9c5602f7f3d59bb6460e02e8a3175be7ef6dbc54e74437210151e -EBUILD tortoisehg-5.0.2.ebuild 1968 BLAKE2B e0c39b086c76f073d6d968e5158d0e764974614f10af902fdacfc8ccd811e809029009ee58c4b2d332540e58aaec341c741b6e7db1c1ad9cdf9eba91512599eb SHA512 1a65dafa51246db60e167aa5a758937ac19925b66970c31efc56dfe816d0b7a7e5b563139887ab6e27691978d00f622fb56d640ebe7c50642f39852beebb7ebb -EBUILD tortoisehg-9999.ebuild 1968 BLAKE2B ecd39018aac1e90b9b1811d77f6f61c13c6497095913d78386d5df43c7f06775eec96cdb3173740f8ad03fbe65c2a8053472b34b6de381bf667ee1df6fee02c7 SHA512 55c5e57b0f72a2487395b60252b7722b15fc9d79f663d262bf91ebc5d20590b67f3a3242c6e4dcb0e8af99a3d510b1759a0b71dfdc6a744756eb50467fc12f84 -MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 +DIST tortoisehg-5.3.2.tar.gz 8910859 BLAKE2B 4cc2253f0adbd79fe84507043491198ddd9fa559c3e9296c831b8e0fccd6cb2806a31ffd6d417591f5fcb3afce78e696f7052d70b760a566bf72c6602ca31ea8 SHA512 b15894158a0d5e628015d07b4f8c77c96f3e1d7543fe2984693b99b2acfa411922b06683e62de437cb50dd5817155d4e59045d7fb47c9be8ee27b9bccf77da7e +EBUILD tortoisehg-5.3.2.ebuild 1506 BLAKE2B 7ee7236d6237e664131219cc5aadc3cab5d2085fc8d113a5139b28053d870d8dec3c193e7d308d71e1fc65f814811cbd4ea6277befa60bd1a097c663918bb1e7 SHA512 05df1967214d5f238efec09cbdd5dc36f20ccfee018b179a7ef3eb2b44aedd24f1813f3b1b62a53cd8a7efa1af0be6386f62d6bb4ba67d4b67f3b323fd2eba6d +EBUILD tortoisehg-9999.ebuild 1544 BLAKE2B 2f31a2367a6b87d29c7830b9841a3af8db0b0278d11d13ec5dbf814f9baebb25b0eb35d42f79f54d2b2a755e2f2d20d54b3deb52472e388069d081eb12fd1074 SHA512 ab1dc02cbfa9b3eda70c7e5582e70f5ec864ee8c89f37c65ced12a2b79ae71881fec7142877c642fa52f428da8691a0e3de91a4a89123a2c9bcad3956339dfa8 +MISC metadata.xml 689 BLAKE2B 79a83a2f3450d6a5546baf729e3b99b9fb9083d2b3baeaad7cba52937c8d6fe313ed84030be682cd783b9ee7bfcd0ba220e17d2a0e7cfc033396b17f284d5aa8 SHA512 7ff6f7e188b9acdef943a8e35a7940fe5d97df15567ff7a76f7babfde51e8d1e480c1287097a5e0b547b7f372f920f402c86c63310e128679c11f4bacd29f0ee diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml index 7a38bb900964..1a94ad71ce80 100644 --- a/dev-vcs/tortoisehg/metadata.xml +++ b/dev-vcs/tortoisehg/metadata.xml @@ -1,5 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>denis7774@gmail.com</email> + <name>Reva Denis aka RarogCmex</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription>TortoiseHg is a Windows shell extension and a series of + applications for the Mercurial distributed revision control system. + It also includes a Gnome/Nautilus extension and a CLI wrapper + application so the TortoiseHg tools + can be used on non-Windows platforms. + </longdescription> </pkgmetadata> diff --git a/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild deleted file mode 100644 index ff68d5cb0046..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-4.9.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit desktop distutils-r1 - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10" -else - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND="dev-vcs/mercurial" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-1.0.3 )" - -# Workaround race condition in build_qt -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - if [[ ${L10N+set} ]]; then - cd i18n/tortoisehg || die - local x y keep - for x in *.po; do - keep=false - for y in ${L10N}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=true - break - fi - done - ${keep} || rm "${x}" || die - done - cd "${S}" || die - fi - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - if use doc ; then - docinto html - dodoc -r doc/build/html/. - fi - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop - - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py* \ - || die -} - -pkg_postinst() { - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} diff --git a/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild deleted file mode 100644 index 869a5571f9ff..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-5.0.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit desktop distutils-r1 - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-5.0 <dev-vcs/mercurial-5.1" -else - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" - EHG_REVISION="stable" - HG_DEPEND="dev-vcs/mercurial" -fi - -DESCRIPTION="Set of graphical tools for Mercurial" -HOMEPAGE="https://tortoisehg.bitbucket.io/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="${HG_DEPEND} - dev-python/iniparse[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] - >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-1.0.3 )" - -# Workaround race condition in build_qt -DISTUTILS_IN_SOURCE_BUILD=1 - -python_prepare_all() { - if [[ ${L10N+set} ]]; then - cd i18n/tortoisehg || die - local x y keep - for x in *.po; do - keep=false - for y in ${L10N}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=true - break - fi - done - ${keep} || rm "${x}" || die - done - cd "${S}" || die - fi - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_install_all() { - distutils-r1_python_install_all - dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - if use doc ; then - docinto html - dodoc -r doc/build/html/. - fi - newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg - domenu contrib/thg.desktop - - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py* \ - || die -} - -pkg_postinst() { - elog "When startup of ${PN} fails with an API version mismatch error" - elog "between dev-python/sip and dev-python/PyQt5 please rebuild" - elog "dev-python/qscintilla-python." -} diff --git a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild b/dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild index 6407cbc54664..757231a11582 100644 --- a/dev-vcs/tortoisehg/tortoisehg-4.9.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-5.3.2.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit desktop distutils-r1 if [[ ${PV} != *9999* ]]; then - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 ~arm64 ~x86" SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.8 <dev-vcs/mercurial-4.10" + HG_DEPEND=" >=dev-vcs/mercurial-5.3.1 + <dev-vcs/mercurial-5.4" else inherit mercurial EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" @@ -24,53 +25,26 @@ LICENSE="GPL-2" SLOT="0" IUSE="doc" +distutils_enable_sphinx html + RDEPEND="${HG_DEPEND} dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-1.0.3 )" - -# Workaround race condition in build_qt -DISTUTILS_IN_SOURCE_BUILD=1 +DEPEND="${RDEPEND}" python_prepare_all() { - if [[ ${L10N+set} ]]; then - cd i18n/tortoisehg || die - local x y keep - for x in *.po; do - keep=false - for y in ${L10N}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=true - break - fi - done - ${keep} || rm "${x}" || die - done - cd "${S}" || die - fi + # Remove file that collides with >=mercurial-4.0 (bug #599266). + rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" distutils-r1_python_prepare_all } -python_compile_all() { - use doc && emake -C doc html -} - python_install_all() { distutils-r1_python_install_all dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - if use doc ; then - docinto html - dodoc -r doc/build/html/. - fi newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg domenu contrib/thg.desktop - - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py* \ - || die } pkg_postinst() { diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild index 18e015fc174f..6f0201707268 100644 --- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild +++ b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) -inherit distutils-r1 eutils +inherit desktop distutils-r1 if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86" SRC_URI="https://www.bitbucket.org/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-4.4 <dev-vcs/mercurial-4.6" + HG_DEPEND=" >=dev-vcs/mercurial-5.3.1 + <dev-vcs/mercurial-5.4" else inherit mercurial EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" @@ -24,53 +25,26 @@ LICENSE="GPL-2" SLOT="0" IUSE="doc" +distutils_enable_sphinx html + RDEPEND="${HG_DEPEND} dev-python/iniparse[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/PyQt5[network,svg,${PYTHON_USEDEP}] >=dev-python/qscintilla-python-2.9.4:=[qt5(+),${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - doc? ( >=dev-python/sphinx-1.0.3 )" - -# Workaround race condition in build_qt -DISTUTILS_IN_SOURCE_BUILD=1 +DEPEND="${RDEPEND}" python_prepare_all() { - if [[ ${L10N+set} ]]; then - cd i18n/tortoisehg || die - local x y keep - for x in *.po; do - keep=false - for y in ${L10N}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=true - break - fi - done - ${keep} || rm "${x}" || die - done - cd "${S}" || die - fi + # Remove file that collides with >=mercurial-4.0 (bug #599266). + rm "${S}"/hgext3rd/__init__.py || die "can't remove /hgext3rd/__init__.py" distutils-r1_python_prepare_all } -python_compile_all() { - use doc && emake -C doc html -} - python_install_all() { distutils-r1_python_install_all dodoc doc/ReadMe*.txt doc/TODO contrib/mergetools.rc - if use doc ; then - docinto html - dodoc -r doc/build/html/. - fi newicon -s scalable icons/scalable/apps/thg.svg thg_logo.svg domenu contrib/thg.desktop - - # Remove file that collides with >=mercurial-4.0 (bug #599266). - rm "${ED%/}"/usr/$(get_libdir)/${EPYTHON}/site-packages/hgext3rd/__init__.py \ - || die } pkg_postinst() { |