From 9aa70aa2e6a33436f7c2142915a26c0b2808272c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 8 Mar 2013 13:01:39 +0000 Subject: Version bump. Removed old (Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- dev-vcs/tortoisehg/ChangeLog | 9 +- .../tortoisehg-2.6.1-missing_thg_script.patch | 124 --------------------- dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild | 81 -------------- dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild | 78 ------------- dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild | 93 ---------------- dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild | 78 +++++++++++++ 6 files changed, 86 insertions(+), 377 deletions(-) delete mode 100644 dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch delete mode 100644 dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild delete mode 100644 dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild delete mode 100644 dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild create mode 100644 dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild (limited to 'dev-vcs/tortoisehg') diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog index b599a20805b7..aa49430c0ead 100644 --- a/dev-vcs/tortoisehg/ChangeLog +++ b/dev-vcs/tortoisehg/ChangeLog @@ -1,6 +1,13 @@ # 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.35 2013/03/05 03:44:16 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.36 2013/03/08 13:01:37 polynomial-c Exp $ + +*tortoisehg-2.7.1 (08 Mar 2013) + + 08 Mar 2013; Lars Wendler -tortoisehg-2.4.3.ebuild, + -tortoisehg-2.5.1.ebuild, -tortoisehg-2.6.1.ebuild, + -files/tortoisehg-2.6.1-missing_thg_script.patch, +tortoisehg-2.7.1.ebuild: + Version bump. Removed old. 05 Mar 2013; Mike Gilbert tortoisehg-2.7.ebuild, tortoisehg-9999.ebuild: 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 deleted file mode 100644 index dda5ddca00ea..000000000000 --- a/dev-vcs/tortoisehg/files/tortoisehg-2.6.1-missing_thg_script.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- thg -+++ thg -@@ -0,0 +1,121 @@ -+#!/usr/bin/env python -+# -+# thg - front-end script for TortoiseHg dialogs -+# -+# Copyright (C) 2008-2011 Steve Borho -+# Copyright (C) 2008 TK Soh -+# -+# 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/tortoisehg-2.4.3.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild deleted file mode 100644 index 2da30e850e19..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-2.4.3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# 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.4.3.ebuild,v 1.1 2012/08/21 15:17:33 floppym Exp $ - -EAPI=4 - -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND="2:2.5" -RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*" - -inherit distutils eutils multilib - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-2.2 /dev/null || die - local x y keep - for x in *.po; do - keep= - for y in ${LINGUAS}; do - if [[ ${y} == ${x%.po}* ]]; then - keep=1 - 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 -} diff --git a/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild deleted file mode 100644 index 9ef552ecfed1..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-2.5.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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.5.1.ebuild,v 1.1 2012/10/04 05:57:37 polynomial-c Exp $ - -EAPI=4 - -SUPPORT_PYTHON_ABIS=1 -PYTHON_DEPEND="2:2.5" -RESTRICT_PYTHON_ABIS="2.4 3.* *-pypy-*" - -inherit distutils eutils - -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://bitbucket/${PN}/targz/downloads/${P}.tar.gz" - HG_DEPEND=">=dev-vcs/mercurial-2.2 /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 -} diff --git a/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild deleted file mode 100644 index 1c7bb841109b..000000000000 --- a/dev-vcs/tortoisehg/tortoisehg-2.6.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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/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." -} diff --git a/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild new file mode 100644 index 000000000000..ee6db08fdb1e --- /dev/null +++ b/dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild @@ -0,0 +1,78 @@ +# 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.ebuild,v 1.1 2013/03/08 13:01:37 polynomial-c 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