diff options
| -rw-r--r-- | dev-vcs/tortoisehg/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/Manifest | 20 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/files/2.7.1-qtversion.patch | 23 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild | 79 |
4 files changed, 115 insertions, 15 deletions
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog index aa49430c0ead..fe4c67244672 100644 --- a/dev-vcs/tortoisehg/ChangeLog +++ b/dev-vcs/tortoisehg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-vcs/tortoisehg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.36 2013/03/08 13:01:37 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.37 2013/03/16 21:58:48 floppym Exp $ + +*tortoisehg-2.7.1-r1 (16 Mar 2013) + + 16 Mar 2013; Mike Gilbert <floppym@gentoo.org> +files/2.7.1-qtversion.patch, + +tortoisehg-2.7.1-r1.ebuild: + Add patch to fix silent failure with PyQt4-4.10. *tortoisehg-2.7.1 (08 Mar 2013) diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index ce9cf35828cd..25d2a304c895 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,29 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 2.7.1-qtversion.patch 879 SHA256 092f107ab2ca82ca4dafdf2790ae5b1d82246d99c65b9f56a807b046c160d3d2 SHA512 a1e164c8e473700a6c08efb58a589b95bb44e12a6aa35b10b30beb068f2b7dc8e7435f2e0dca6d9e5b7b25b7ca8b9668085cf3584079f61d60a39ff6988478b8 WHIRLPOOL faf2d1725d4b8f3b4f2f74f5870425b03d099d4cdef054fe88edaa5700a776319d38d5d526c2692d0a7001848529ec825506702b33d847f7b285c86fef64e9e0 DIST tortoisehg-2.6.2.tar.gz 9105928 SHA256 f079488fea008bb4f73a5dbb9b80e523c87355d0b9ea34e38e78fbd5724dd609 SHA512 b9515e1d228c94e8f8dbe62ac858532bdcc0a08e8620ad07546046a2c9ae4a5f9b8c5237ea7136def6fe24e36a1192a44321d46b0692aece213a6a8d7da08259 WHIRLPOOL 17944938e4a9dadddb310dba0b3d8bc6358dcaf44abc45904a4494b45bd7d98496ea35afaa0e8bd5f83e719f750cbc490c9b6d5e7939cfb1009625bd246737b9 DIST tortoisehg-2.7.1.tar.gz 8954742 SHA256 d279432f612b2fe9790a4601119aaf50024bf2372cad2df76b9aea24c1c843c6 SHA512 d3787be0815df054fdde65e4c9077fd9abf5862a7ea5f3e8641435d2beea3422ecd6c48657decbfd95427e48cc49125882edab09d6719db896b2ccb8440b9140 WHIRLPOOL 60e65fc217f2b1dd51e247f8c2c33a5427b458b833565bc6b6ee27d9afd3d1ad54c5e405436a4c3d587d8972dd38d5bc1beaeaeb0fb9c91f5cf85bcf244f3115 DIST tortoisehg-2.7.tar.gz 9999270 SHA256 14d8180a8636ff05182683793b371c5dff8561e83b90e3008a7037f746bd818d SHA512 4dbf48e19155f90443be1a1c4444c0c161e4659ea1a680f5615149063c4a4386d03faab4e770f89cf588d6ed9d172b31231ff79fd040506f70987ea9b981688a WHIRLPOOL 5d2e0e1c0c18f38563d6bca6460c10c3232a70a4167f8899a4b0d22450fcae71eaaa4e601ea873b05f6706f2d5fa4e30c6331fdfdfb1145e1abee8b8f65c49a2 EBUILD tortoisehg-2.6.2.ebuild 1820 SHA256 f0a2a8d67866e72224ef49329a28efb245d53f434298b564f9837cee44add253 SHA512 4ad5d090dfd3e42734e2f8278883f6a7b6b067da65edfc6fb95369877a185e1531cb66f056cf533add35f01c970fce25319b21fb4d79caccf0be2f3e4f113136 WHIRLPOOL f344266e152175f908d8772955972d686246dabe626d63803bb05a6276f0b2bcbe948755746d6d1a03315817a78c66c3cea7bb8338e5f6de8a9594e6dea5c7bf +EBUILD tortoisehg-2.7.1-r1.ebuild 1967 SHA256 8a13c6cb25d7d0dd19aacf312112d09a66a1999add86462f0efb38361847915a SHA512 8c30f876f9ac1d17d1efb0a674cc2f5f7a52bed4c29616eb185b94c8ff3bc7348ae6afcf32cc7d266b89ad0cef56531ebd9d10f13d37d1fd366b7f58ec0c9820 WHIRLPOOL b1d67ed3fa1f352380897a867465aaf82e6b8213f6bfd9f8335b10b07cf2b3928445df0a680c12dbe0e14e8619ea4ac0b7b1561605e4a592aa97e731dc010b3e EBUILD tortoisehg-2.7.1.ebuild 1921 SHA256 c84c9e7d5ae19607a825e51cab15f42d335d1eade322bc07e805ffaf450c546b SHA512 3fc659a1899eb2b6b69f6d9fdcf724b432f7f4cb238e96de5fa415f9625aa052ef06214d367974d8855fe8c2d9d268f9346751155d78e3ef8d06b5b21530efcd WHIRLPOOL 0f63fe0cd07c25dd6d7129adf02c416c9e33e403f52443ebb1f8e0d27e03b72c3167cde721af7e938214903e515d4377332904d7e98f0e1cb0f171b3e11d14cc EBUILD tortoisehg-2.7.ebuild 1914 SHA256 61e3858a47767dc0baf60ba62cedaca67d0d8ec64503f11115570c89b36c1f4c SHA512 f78f30c7304e3c7ec739ee5d403ecbea55273e86d8f1c9cd84470531a6e04dafb28f3383f0edc9fb76027f35f6682e9a993409fbf7cdd975fc91d803646edc02 WHIRLPOOL 33ee83909b69c5151cf945f37c30c62a5f2b0025d63c2c8e2eef2016479f9ca5f7f9f70b4a5b28c98c6f7643c84ccaea18e53c767877f9b757c29866425519b8 EBUILD tortoisehg-9999.ebuild 1916 SHA256 fdc514219d4d8e2466d86193b2746da8d5519e42cd6c38c998365458994f5d16 SHA512 946e8016c79a9be463c95d503a3d6f0fcd68d4dabca24fdb00666ce8a64a5e9aa90b0f97aacc287db9e56d32d53df437d1500600bc2f2b0140e68f0a2a745d5d WHIRLPOOL 11808f949b8a20dbaed9ae55a509083c0c183fc01061a637d96da155c3bbd0f78107159d9594a103f4ff2ec4beb33821dd338e705996eecd576f3c95977f0c03 -MISC ChangeLog 6110 SHA256 ca04e776cc509031be153f00356537c9dec28a6e4c55da35443a3049916027ed SHA512 f70272702b911928ae4bc3792dc22d054952c90ccbe6ae80b1b3a0476a80f153e249dd94a8252f7731ab3df46cc64505bcdce55e17fedde6e6b569db69be8d70 WHIRLPOOL a0a484bada407825bf99011f0184100a36e64dfcafdd41b75275fbea29a7815d569becd8a105117db1edf0e0405df7f8deef6fc4b15eff2a7ba96d632ffc3d2c +MISC ChangeLog 6303 SHA256 9e0caf6c0ea7327130dfcd1612792ef51e7e012945487ff13edc0ca2f85946ad SHA512 69ea4e2f8b321d4e056eab7377ec5584682dcfd7e7e9ebf66b5a710badbe514218bc8d980dc3cc58f67d815a72ff41f443f0ee9bbc5c85f791f0bc6691889576 WHIRLPOOL 923ca58a80c1f0a4aec26b376a7cce73d5a4137760b581b19e4fc2e2db7494bf653baef1ba46f0b45da920b3b9157e08290b081e271f4b734257408fa795df79 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJROeEzAAoJEPiazRVxLXTFH6EQAJwDuHhJhdzWaNOaq6JJYCtF -vKz3T697DMLa+GUyi/GwpKJRcDqzwp5BRk3bECzhnZjRU+nD1ZpizvVsXNX2mYP6 -u6+UzzsDPe9EKggRoyREp3VM7itlK557QkQQIaPjP2WPoQCMJ8QJ9dYg2oRk+RSl -GLU1MnU029iKvvN1J6XQJ+LmuP/wCYS/n/HU6opDPg9qxtZdB11ZVoZdpMD4j0B/ -ZIouUWY3Uet3+GWpT2yLl3rlDCx0WhdZBWhE9Frq8mYk6UTDAjyvh+5fjEWdNlpF -7/QNb+/utcjyU7YAea/XyA+v3duz4c5CZO+Z6qo69/lER2ULdzXxwQ3bgwCm82LQ -maSrS/HUHD/bldK1j/3khjmkkB7DjygrmEnVW5cc8Vyp4zed1Xs5x/NMelatSddE -x0F1nwssZVMzsoo7u1/XyThY1F+o0zVa0cnERbUjepZymNkKPR/YSQLbWE4/+V1G -u24B4meEeusMsRL6ZDkeNcErP/4emB5A29ML8KCKC+i43zj3MYzUrjJP9rOB282U -0A1Nvn2R7bpXcTB/SVDPlyuPPepbpLZ/cftkZP1kdv4qP3injfJJMn9fSQlNxH/X -LBrv2Lod7Y4vrTCzGLjXRbAdF+9O87+6m6ja1TML8MeMS/fFbbv6Qd3gVe+eRLGk -o5np7KeLxjOKVFsTKApa -=JfPo +iF4EAREIAAYFAlFE6x0ACgkQC77qH+pIQ6SUDgEArY5nYriOCFvltZqsYu3H9yPU +SFNqJRbtUfHvi7f5E90A/jgoZAPsROe903qINAVusaskC8GLZYM78pOy8jWG3+dj +=KV1m -----END PGP SIGNATURE----- diff --git a/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch b/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch new file mode 100644 index 000000000000..aaa5b0f573d3 --- /dev/null +++ b/dev-vcs/tortoisehg/files/2.7.1-qtversion.patch @@ -0,0 +1,23 @@ +# HG changeset patch +# User Steve Borho <steve@borho.org> +# Date 1362690570 21600 +# Branch stable +# Node ID e571f9b3eadc2e2706bd350dab33d3bee5bf2315 +# Parent 6fbbe3d1974c267e5a30e4d9d1efc54a24fd1f35 +qt: use int comparison for Qt and PyQt version check (fixes #2467) + +diff --git a/tortoisehg/hgqt/qtlib.py b/tortoisehg/hgqt/qtlib.py +--- a/tortoisehg/hgqt/qtlib.py ++++ b/tortoisehg/hgqt/qtlib.py +@@ -25,9 +25,8 @@ + from PyQt4.QtCore import * + from PyQt4.QtGui import * + +-if PYQT_VERSION_STR.split('.') < ['4', '6'] or \ +- QT_VERSION_STR.split('.') < ['4', '6']: +- sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.7\n') ++if PYQT_VERSION < 0x40600 or QT_VERSION < 0x40600: ++ sys.stderr.write('TortoiseHg requires Qt 4.6 and PyQt 4.6\n') + sys.stderr.write('You have Qt %s and PyQt %s\n' % + (QT_VERSION_STR, PYQT_VERSION_STR)) + sys.exit() diff --git a/dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild new file mode 100644 index 000000000000..17ba7bbac89f --- /dev/null +++ b/dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild,v 1.1 2013/03/16 21:58:48 floppym Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) + +inherit distutils-r1 eutils + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz" + HG_DEPEND=">=dev-vcs/mercurial-2.4 <dev-vcs/mercurial-2.6" +else + inherit mercurial + EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" + EHG_REVISION="stable" + KEYWORDS="" + SRC_URI="" + HG_DEPEND="dev-vcs/mercurial" +fi + +DESCRIPTION="Set of graphical tools for Mercurial" +HOMEPAGE="http://tortoisehg.bitbucket.org" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" + +RDEPEND="${HG_DEPEND} + dev-python/iniparse[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt4[svg,${PYTHON_USEDEP}] + dev-python/qscintilla-python" +DEPEND="${RDEPEND} + doc? ( >=dev-python/sphinx-1.0.3 )" + +# Workaround race condition in build_qt +DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( "${FILESDIR}/${PV}-qtversion.patch" ) + +python_prepare_all() { + if [[ ${LINGUAS+set} ]]; then + cd i18n/tortoisehg || die + local x y keep + for x in *.po; do + keep=false + for y in ${LINGUAS}; 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 + dohtml -r doc/build/html/ + fi + newicon -s scalable icons/scalable/apps/thg-logo.svg thg_logo.svg + domenu contrib/${PN}.desktop +} + +pkg_postinst() { + elog "When startup of ${PN} fails with an API version mismatch error" + elog "between dev-python/sip and dev-python/PyQt4 please rebuild" + elog "dev-python/qscintilla-python." +} |