diff options
| -rw-r--r-- | dev-vcs/tortoisehg/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/Manifest | 23 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch | 124 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild | 93 |
5 files changed, 246 insertions, 6 deletions
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog index a1f520eaae59..426fe2ded27b 100644 --- a/dev-vcs/tortoisehg/ChangeLog +++ b/dev-vcs/tortoisehg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-vcs/tortoisehg # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.26 2012/11/24 22:37:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.27 2012/12/20 13:36:53 polynomial-c Exp $ + +*tortoisehg-2.6.1 (20 Dec 2012) + + 20 Dec 2012; Lars Wendler <polynomial-c@gentoo.org> +tortoisehg-2.6.1.ebuild, + metadata.xml: + Version bump. Added myself as maintainer. 24 Nov 2012; Mike Gilbert <floppym@gentoo.org> tortoisehg-2.6.ebuild, tortoisehg-9999.ebuild: diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest index c0874ab9c201..4533d72e2908 100644 --- a/dev-vcs/tortoisehg/Manifest +++ b/dev-vcs/tortoisehg/Manifest @@ -1,19 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX tortoisehg-2.6.1-missing_thg_script.patch 4537 SHA256 6406fa4776093c77e5da8611f4396b327e05137dea328a0b2fe9c7700e8ca14d SHA512 0244d8fc747f4e81b5b3de5dd6f70082eb762e3593169f4b4b91fab33e4ec281b27ed2eaac22e13538fb716eee48397e1e5293e868fec793b88e5a2c802cfb48 WHIRLPOOL 8b9f63d410541e74de9737f0756be1913d88b0ffb520c23291c163bb3c6c223356096845f0257a960ddd9f9ac8088fec941ea0f8ab1fc6c2226d02baff19b340 +DIST TortoiseHg-2.6.1.tar.gz 9005314 SHA256 affb6280bec4417eb444536389f17a88c7a34034f207b135b1224ae8c6937a4f SHA512 034a9777ba601150f95b3d84a239bc947a7dbd6ccd38bd486e621394782b97323884aa0d2988965c8d8df08cfc335845e1a9eb7061eb9f1aeabcdfeb69e73a0d WHIRLPOOL 55a525a4721f51188c08c974958a84ca3dd8d83c9183f6eaf37309c3f610c38bf08d43bed1a7bac7c8a3e8bd2cfdbf34101f004fba84c5a1c44803998fc50c40 DIST tortoisehg-2.4.3.tar.gz 9025948 SHA256 6db82b51c301e8e7e83a5f7730882fdd055ba99f33ed5013d8c16b68b243f373 SHA512 5321c53750959888272d7073483025b47467de3bf9946c1e816fed5672651183d0fed2dec82ddb6975272dcb6c1cbae56aba6c256edea98e434f7533f46d7d68 WHIRLPOOL 29d8bb553af5e7fc7efb1843cdd81bcb9b077528d9767ee424869e7ccc6e0e5f7b2c5542047ddd0c061ffa419535cfb84f8f848ed7c143064771927c6d68531e DIST tortoisehg-2.5.1.tar.gz 9066918 SHA256 d679738e2b15b33902dac2dd9db3ff5d0e7923acadf57c1d0d8faa9d01953749 SHA512 2671d22f15f869f3f2128bd76ae24273cc0d46b8a778d080efaf3d3eb1792874d8c92299adcdc4412a241f471f08cbbda82db8a457f493f636f913bf5a64f1ff WHIRLPOOL 62d5a6b8a3f62fe1dafb2d1a871e883e387188a57a0930eb22727340f4ce93a5cd8d8c7ca781449992edb630937d97fea6f6d87ab813cb43369b99454c0f57ef DIST tortoisehg-2.6.tar.gz 9794047 SHA256 50ca1c490feaeb112409ad4de9383b2fef34743eb0c65c7dc3f0d7a40b49c895 SHA512 64db6397ead3a1c0b6b20ecb0069665977925e89ad0322df3d25013ab10dc136b648abeefb843597fd3d2a442d3b8547e23948f2d957b2aeed769146736c85d7 WHIRLPOOL 17a04cb9bf20d01575f9435a076fb47b6720f873f412f10d18d72433df42da65d5580b686838bdd7f8cfd317386fc6e1e6c8698d8c8633bb2e984b78ab38e25a EBUILD tortoisehg-2.4.3.ebuild 1733 SHA256 c9ce919fd0a7302e857d9f9255cacdf6f53a3a32c41291356172b4dfa5de2ecb SHA512 fdf8f38f1e6fba5a720f411dc4c3532b10c3e82d982436c388c4e25c892c099670ff1d4c5c11599cc0b99c63fa17a15c9c0912438dd0dfe914a5fea72916c6e3 WHIRLPOOL b4f7e9c163123502d639cdcf72ae3a4f5607fba43b4b755e2895ff905f2da4b87ba790d4375ae922871b494d6dfa4f4f3bfae0cd940dc11b47b7086fb325c23d EBUILD tortoisehg-2.5.1.ebuild 1624 SHA256 1a4b538b73a0404e9264de5ef9ea4f0b5e5245a2d37e95c6a7df2ec13f90350d SHA512 d7b1f946e2dd223357b6e7637327310eb410da83d2659218e05885882e57453ef57b5c18df0b9893183e4c1d658b8248793375d2bab4eed41ea39e2890b21e6e WHIRLPOOL 7d6327a45a14e65808d5a64a7b34d2acc2ee9c3479f2716b825b58be0adc65e14fffcfb29ecb2021a8db0a79664f30097083c018570faa045fd8fb5791ba7daa +EBUILD tortoisehg-2.6.1.ebuild 2097 SHA256 2d03c4b6151b0a71c978a5c02efb931ade16964c842949574d1432ec985de9c5 SHA512 c2b3a1c3c1fb0c15b86a74ade0d2f53847222f94d2017a67713beb17d6ee0b557dd1da405d2e92ccac57e4cc290c78865031bfb4e3cacc14c321047e3047275b WHIRLPOOL 0c80c09513621d3bba189b5b072759397b0a726aa381b23d223bcbae1ccaf920e018afa3268c76eab961f6f6db500ae7cc1a20ff78e67d28ee087e4c1771cae4 EBUILD tortoisehg-2.6.ebuild 1813 SHA256 f13c59506eb35a5d45990e99319d4f6416e4952f345d6cd0bc249ee79cacf771 SHA512 f3d6be539eb733825d9a05cd67c6a54a0ae979a5011d91c811a529cbc69b90552852d5f1baf4caa7c7f87ededf3d9ad05935749b08cb1feac73a9996a0ce6ca5 WHIRLPOOL 5ee517246dd225270a47a6012ed870fe1446afa489a7cf441e0e9bb7cfd0b41590211df496bb6a6d1071b5046cd8aa1661a18a660683c738a9b3185ee18ba76b EBUILD tortoisehg-9999.ebuild 1815 SHA256 07af3ea0806ffed1135e95e0811c135a8f55194cf3d3ff69a43ad93c3dcebf24 SHA512 46126a172e0a8b3a384cbe549e4b2547c34cc8680f2be936406868943e23b8a0e019e17a6fb74e646faf9c888158b8d7bef70fb9654114507f3774a62a5f0708 WHIRLPOOL b3fc2a36fa079122551ea38e2e2ddda6cce3418c95aa8744c24b3b50f8e78706a3aa6d6877183d1078012b10a6feca090cebc33e65e5c4632a237edd34e0bb39 -MISC ChangeLog 4411 SHA256 4ae550b2c4c3b9ac7a0d3a6d8eb8ab8f0b8c770caba591b8078c932c02c5dac8 SHA512 4ac08228cdff95aca5b0c31d32d27839ffae45a10048785802b87867e4c57baa1019d3e4261c90b31c1de95d24d1209db998098c91acd110d16894cd8b53894f WHIRLPOOL cc47f0696b793b2604e7bb221623b620137830f283f6f353742bb53880fe6fad328495b4b02f1da18b8c0091b928b1272a1bc7254baa589c432ba723a1fd831a -MISC metadata.xml 232 SHA256 8e0308eed9efea18755c3fc2161057faa2b438c4d31895e776d2d5cd5ff109df SHA512 0ec524315be6762228ff54bca53ec039e93672dcef379ef6ef0087656d5e11644aebabcc08663af4f18bdb1b254e71f2b2d3f91277e2867022b93f00d975ae88 WHIRLPOOL bd96dd794e9fdf37bea367be6ada6deb0cf7b98f1978c9e23746f98b1fc2fef931077dd59f6bff7d64856ed284d39f638fb8e0517c61b42f6a0605db09297047 +MISC ChangeLog 4590 SHA256 da96307f368967832b0364c774d090789373d54f65d10a9c25707136ebe854f2 SHA512 97fd1f71611bbf41f178424c104e716c86382e2e22fc451a99e83231d359298608dbe58fd12c46a955369e9889b680b385daa2f0128533ee3a90cd631e3e96d5 WHIRLPOOL e656d1d43219b00c6bf6e266a37438a052fe0d431394a6951e4ab53f0482da30bc4548f9533d255d56e69d8c716c8bcda9919580906f24fbe073794d111a9122 +MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlCxTCEACgkQC77qH+pIQ6SKlgD/YWSHKe1rAoHs447pGpSReT8e -3jysENOAnYcglttMyZoBAL9diotG7oQLdSGVSTLSum4EIrab4JOD/koP9CAq/46Y -=Q/xo +iQIcBAEBCAAGBQJQ0xR2AAoJEPiazRVxLXTFsEoQAL+SRBhu3afJaKe4XxpUVqgx +pwTDxjxLXpOs4V4+5g4mp0HA97CcNTpBwee6xdkKAfsCJNLqticCMz4QgalsNL1G +iCBoBXIWUvraoUN/JAA9InkU+urLcotR8Pgc0DftcDNlxYHjEQ08jtif7dagE+G4 +13yxiQKMyY9Bb6RO7RjwwM29/aKkZAt8Uk7ZuuibNxQEWd9PIodc1UjeZaOWHl60 +5sxer2ltLKgD2Oy0fzCherPYA0m/AB3OJoO2YDhb+tA1i8fmcdFmILDMz8SPx8EA +4BtfWbULVqIEMt+RL8EKgA0np553Io/aHuNQvYCP2z7q9fb4RWKvpw+9G/QIOrJk +v+FuuxdvL9LbMxIcIbOoj/zhSHDJs3/a1JMqEcUbQdEqeM/8II9EHowumFyMCKZj +7pkc9HLulN54KWvYF4O86JIrlR9eKgnFFN7ApdppZkEcCe5Bu4DlLm1IgPUn8fkZ +W2Dg5NTkXZL+Npoi91ent6aA1wtPi3w8yFAYKPYa0iitNXy4BkP0a/WY0AbZE0uH +tyWjTMXgdZ2iIRBLNz+4Gd/570HuZQUOBFpOgAwjI5hfho/ycNMTkO3JByv7gyor +lpL1PsbOWqsVKn/QwWlAXAt/e/tRXdXgscOYnrOzCex9Qb/RGsuqj2gVA6ajgx68 +Z0rS+RDY4DKTbu+arA/5 +=ZbAQ -----END PGP SIGNATURE----- diff --git a/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch b/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch new file mode 100644 index 000000000000..dda5ddca00ea --- /dev/null +++ b/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch @@ -0,0 +1,124 @@ +--- thg ++++ thg +@@ -0,0 +1,121 @@ ++#!/usr/bin/env python ++# ++# thg - front-end script for TortoiseHg dialogs ++# ++# Copyright (C) 2008-2011 Steve Borho <steve@borho.org> ++# Copyright (C) 2008 TK Soh <teekaysoh@gmail.com> ++# ++# This software may be used and distributed according to the terms of the ++# GNU General Public License version 2, incorporated herein by reference. ++ ++import os ++import sys ++ ++argv = sys.argv[1:] ++if 'THG_OSX_APP' in os.environ: ++ # Remove the -psn argument supplied by launchd ++ if argv[0].startswith('-psn'): ++ argv = argv[1:] ++ # sys.path as created by py2app doesn't work quite right with demandimport ++ # Add the explicit path where PyQt4 and other libs are ++ bundlepath = os.path.dirname(os.path.realpath(__file__)) ++ sys.path.insert(0, os.path.join(bundlepath, 'lib/python2.6/lib-dynload')) ++ ++if hasattr(sys, "frozen"): ++ if sys.frozen == 'windows_exe' and 'THGDEBUG' in os.environ: ++ import win32traceutil ++ print 'starting' ++ # os.Popen() needs this, and Mercurial still uses os.Popen ++ if 'COMSPEC' not in os.environ: ++ comspec = os.path.join(os.environ.get('SystemRoot', r'C:\Windows'), ++ 'system32', 'cmd.exe') ++ os.environ['COMSPEC'] = comspec ++else: ++ thgpath = os.path.dirname(os.path.realpath(__file__)) ++ testpath = os.path.join(thgpath, 'tortoisehg') ++ if os.path.isdir(testpath) and thgpath not in sys.path: ++ sys.path.insert(0, thgpath) ++ ++ # compile .ui and .qrc for in-place use ++ fpath = os.path.realpath(__file__) ++ if os.path.exists(os.path.join(os.path.dirname(fpath), 'setup.py')): ++ from distutils.dist import Distribution ++ from setup import build_qt ++ build_qt(Distribution()).run() ++ ++ if 'HGPATH' in os.environ: ++ hgpath = os.environ['HGPATH'] ++ testpath = os.path.join(hgpath, 'mercurial') ++ if os.path.isdir(testpath) and hgpath not in sys.path: ++ sys.path.insert(0, hgpath) ++ ++# Make sure to load threading by main thread; otherwise, _MainThread instance ++# may have wrong thread id and results KeyError at exit. ++import threading ++ ++from mercurial import demandimport ++demandimport.ignore.append('win32com.shell') ++demandimport.ignore.append('tortoisehg.util.config') ++demandimport.ignore.append('icons_rc') ++demandimport.ignore.append('translations_rc') ++demandimport.enable() ++ ++# Verify we can reach TortoiseHg sources first ++try: ++ import tortoisehg.hgqt.run ++except ImportError, e: ++ sys.stderr.write(str(e)+'\n') ++ sys.stderr.write("abort: couldn't find tortoisehg libraries in [%s]\n" % ++ os.pathsep.join(sys.path)) ++ sys.stderr.write("(check your install and PYTHONPATH)\n") ++ sys.exit(-1) ++ ++# Verify we have an acceptable version of Mercurial ++from tortoisehg.util.hgversion import hgversion, checkhgversion ++errmsg = checkhgversion(hgversion) ++if errmsg: ++ from mercurial import ui ++ from tortoisehg.hgqt.bugreport import run ++ from tortoisehg.hgqt.run import qtrun ++ opts = {} ++ opts['cmd'] = ' '.join(argv) ++ opts['error'] = '\n' + errmsg + '\n' ++ opts['nofork'] = True ++ qtrun(run, ui.ui(), **opts) ++ sys.exit(1) ++ ++if 'THGDEBUG' in os.environ or '--profile' in sys.argv: ++ sys.exit(tortoisehg.hgqt.run.dispatch(argv)) ++else: ++ import cStringIO ++ mystderr = cStringIO.StringIO() ++ origstderr = sys.stderr ++ sys.stderr = mystderr ++ sys.__stdout__ = sys.stdout ++ sys.__stderr__ = sys.stderr ++ ret = 0 ++ try: ++ ret = tortoisehg.hgqt.run.dispatch(argv) ++ sys.stderr = origstderr ++ stderrout = mystderr.getvalue() ++ errors = ('Traceback', 'TypeError', 'NameError', 'AttributeError', ++ 'NotImplementedError') ++ for l in stderrout.splitlines(): ++ if l.startswith(errors): ++ from mercurial import ui ++ from tortoisehg.hgqt.bugreport import run ++ from tortoisehg.hgqt.run import qtrun ++ opts = {} ++ opts['cmd'] = ' '.join(argv) ++ opts['error'] = 'Recoverable error (stderr):\n' + stderrout ++ opts['nofork'] = True ++ qtrun(run, ui.ui(), **opts) ++ break ++ sys.exit(ret) ++ except: ++ if sys.exc_info()[0] not in [SystemExit, KeyboardInterrupt]: ++ import traceback ++ sys.stderr = origstderr ++ traceback.print_exc() ++ else: ++ raise SystemExit(ret) diff --git a/dev-vcs/tortoisehg/metadata.xml b/dev-vcs/tortoisehg/metadata.xml index 09ddbff14dbf..1f90b96d7742 100644 --- a/dev-vcs/tortoisehg/metadata.xml +++ b/dev-vcs/tortoisehg/metadata.xml @@ -5,4 +5,8 @@ <email>floppym@gentoo.org</email> <name>Mike Gilbert</name> </maintainer> + <maintainer> + <email>polynomial-c@gentoo.org</email> + <name>Lars Wendler</name> + </maintainer> </pkgmetadata> diff --git a/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild new file mode 100644 index 000000000000..1c7bb841109b --- /dev/null +++ b/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild,v 1.1 2012/12/20 13:36:53 polynomial-c Exp $ + +EAPI=4 + +SUPPORT_PYTHON_ABIS=1 +PYTHON_DEPEND="2:2.5" +RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*" + +inherit distutils eutils + +# version 2.6.1 has a rather uncommon source package. Files with DOS line +# endings, tarball name in caps, missing files... +MY_P="TortoiseHg-${PV}" + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${MY_P}.tar.gz" + HG_DEPEND=">=dev-vcs/mercurial-2.3 <dev-vcs/mercurial-2.5" +else + inherit mercurial + EHG_REPO_URI="https://bitbucket.org/tortoisehg/thg" + 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 + dev-python/pygments + dev-python/PyQt4 + dev-python/qscintilla-python" +DEPEND="${RDEPEND} + doc? ( >=dev-python/sphinx-1.0.3 )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + # Missing from somewhat broken source tarball. + epatch "${FILESDIR}"/${P}-missing_thg_script.patch + + if [[ ${LINGUAS+set} ]]; then + pushd i18n/tortoisehg > /dev/null || 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 + popd > /dev/null || die + fi + + distutils_src_prepare +} + +src_compile() { + distutils_src_compile + + if use doc ; then + emake -C doc html + fi +} + +src_install() { + distutils_src_install + dodoc doc/ReadMe*.txt doc/TODO + + if use doc ; then + dohtml -r doc/build/html + fi + + newicon -s scalable icons/scalable/apps/thg-logo.svg tortoisehg_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." +} |