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 4FB72138A1F for ; Wed, 29 Jan 2014 11:56:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C053CE0A53; Wed, 29 Jan 2014 11:56:03 +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 586B5E0A53 for ; Wed, 29 Jan 2014 11:56:03 +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 8A43D33EE7F for ; Wed, 29 Jan 2014 11:56:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 4B62418191 for ; Wed, 29 Jan 2014 11:56:01 +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: <1390996558.0f11efdd6adbeaa6b069c5411666119a05b0ce68.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/ X-VCS-Repository: proj/betagarden X-VCS-Files: dev-vcs/git-cola/ChangeLog dev-vcs/git-cola/git-cola-9999.ebuild X-VCS-Directories: dev-vcs/git-cola/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0f11efdd6adbeaa6b069c5411666119a05b0ce68 X-VCS-Branch: master Date: Wed, 29 Jan 2014 11:56:01 +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: 5d0df99a-a4be-413e-864e-8a8819b6d4cd X-Archives-Hash: 000650862751596a78fa75af6f007810 commit: 0f11efdd6adbeaa6b069c5411666119a05b0ce68 Author: Justin Lecher gentoo org> AuthorDate: Wed Jan 29 11:55:58 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed Jan 29 11:55:58 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=0f11efdd dev-vcs/git-cola: Fix broken documentation paths, #499658 Package-Manager: portage-2.2.8-r1 --- dev-vcs/git-cola/ChangeLog | 3 +++ dev-vcs/git-cola/git-cola-9999.ebuild | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog index 429dda1..21e257c 100644 --- a/dev-vcs/git-cola/ChangeLog +++ b/dev-vcs/git-cola/ChangeLog @@ -2,6 +2,9 @@ # 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 $ + 29 Jan 2014; Justin Lecher git-cola-9999.ebuild: + Fix broken documentation paths, #499658 + 15 Jan 2014; Justin Lecher git-cola-9999.ebuild, -files/9999-system-ssh-askpass.patch, +files/git-cola-9999-disable-tests.patch, diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild index 2aa4631..e5cfd8c 100644 --- a/dev-vcs/git-cola/git-cola-9999.ebuild +++ b/dev-vcs/git-cola/git-cola-9999.ebuild @@ -29,13 +29,22 @@ DEPEND="${RDEPEND} app-text/xmlto sys-devel/gettext doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" + test? ( + dev-python/nose[${PYTHON_USEDEP}] + sys-apps/net-tools + )" PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch "${FILESDIR}"/${P}-system-ssh-askpass.patch ) +pkg_pretend() { + if use test && [[ -z "$(hostname -d)" ]] ; then + die "Test will fail if no domain is set" + fi +} + python_prepare_all() { rm share/git-cola/bin/*askpass* || die @@ -48,7 +57,7 @@ python_prepare_all() { setup.py || die "sed failed" sed -i \ - -e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ + -e "s|'doc', 'git-cola'|'doc', '${PF}'|" \ cola/resources.py || die "sed failed" distutils-r1_python_prepare_all @@ -80,6 +89,7 @@ python_install_all() { fi distutils-r1_python_install_all + docompress /usr/share/doc/${PF}/git-cola.txt } python_test() {