From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EBC761387B1 for ; Mon, 20 Jan 2014 12:30:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40429E0CB2; Mon, 20 Jan 2014 12:30:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B12DDE0CB2 for ; Mon, 20 Jan 2014 12:30:35 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CCF933F9A2 for ; Mon, 20 Jan 2014 12:30:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 3F4801871B for ; Mon, 20 Jan 2014 12:30:33 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1390201624.542c24b4942da8fa5418b9319a4ab5da109cbd59.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ X-VCS-Repository: proj/betagarden X-VCS-Files: dev-vcs/git-cola/ChangeLog dev-vcs/git-cola/files/9999-system-ssh-askpass.patch dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch dev-vcs/git-cola/git-cola-9999.ebuild X-VCS-Directories: dev-vcs/git-cola/files/ dev-vcs/git-cola/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 542c24b4942da8fa5418b9319a4ab5da109cbd59 X-VCS-Branch: master Date: Mon, 20 Jan 2014 12:30:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 664c4519-0816-4158-8ae0-1c8b0baf07ce X-Archives-Hash: 80c44d0f0cfd81fedbaeb3d2a20f8399 commit: 542c24b4942da8fa5418b9319a4ab5da109cbd59 Author: Justin Lecher gentoo org> AuthorDate: Wed Jan 15 12:02:57 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 20 07:07:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=542c24b4 dev-vcs/git-cola: Import tree changes; bump to git-r3.eclass Package-Manager: portage-2.2.8 --- dev-vcs/git-cola/ChangeLog | 8 +++++++- .../files/git-cola-9999-disable-tests.patch | 21 +++++++++++++++++++++ ...patch => git-cola-9999-system-ssh-askpass.patch} | 0 dev-vcs/git-cola/git-cola-9999.ebuild | 14 +++++++------- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog index 74b4612..f821c61 100644 --- a/dev-vcs/git-cola/ChangeLog +++ b/dev-vcs/git-cola/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for dev-vcs/git-cola -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $ + 15 Jan 2014; Justin Lecher git-cola-9999.ebuild, + -files/9999-system-ssh-askpass.patch, + +files/git-cola-9999-disable-tests.patch, + +files/git-cola-9999-system-ssh-askpass.patch: + Import tree changes; bump to git-r3.eclass + 23 Oct 2013; Justin Lecher git-cola-9999.ebuild: Update to latest HEAD diff --git a/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch new file mode 100644 index 0000000..79f1ec2 --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch @@ -0,0 +1,21 @@ +diff -Naur cola-1.3.7.21.orig/test/git_test.py cola-1.3.7.21/test/git_test.py +--- cola-1.3.7.21.orig/test/git_test.py 2009-04-30 13:56:22.352319047 +0200 ++++ cola-1.3.7.21/test/git_test.py 2009-04-30 13:56:53.123149963 +0200 +@@ -24,17 +24,6 @@ + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch similarity index 100% rename from dev-vcs/git-cola/files/9999-system-ssh-askpass.patch rename to dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild index 9669e48..2aa4631 100644 --- a/dev-vcs/git-cola/git-cola-9999.ebuild +++ b/dev-vcs/git-cola/git-cola-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.1 2011/04/13 19:00:02 jlec Exp $ +# $Header: $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) DISTUTILS_SINGLE_IMPL=true -inherit distutils-r1 git-2 +inherit distutils-r1 git-r3 DESCRIPTION="The highly caffeinated git GUI" HOMEPAGE="http://git-cola.github.com/" @@ -26,14 +26,14 @@ RDEPEND=" dev-vcs/git" DEPEND="${RDEPEND} app-text/asciidoc - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - app-text/xmlto ) + app-text/xmlto sys-devel/gettext + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/nose[${PYTHON_USEDEP}] )" PATCHES=( - "${FILESDIR}"/${PV}-system-ssh-askpass.patch + "${FILESDIR}"/${P}-disable-tests.patch + "${FILESDIR}"/${P}-system-ssh-askpass.patch ) python_prepare_all() {