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 A8A9F58973 for ; Thu, 28 Jan 2016 05:59:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E83CA21C00D; Thu, 28 Jan 2016 05:59:16 +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 6A8FE21C00D for ; Thu, 28 Jan 2016 05:59:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51C953409ED for ; Thu, 28 Jan 2016 05:59:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB00AD00 for ; Thu, 28 Jan 2016 05:59:12 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1453960747.d81dce703c99623faaa78cd846c71fef51814f4c.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-tools/, dev-vcs/git-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild X-VCS-Directories: dev-vcs/git-tools/ dev-vcs/git-tools/files/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: d81dce703c99623faaa78cd846c71fef51814f4c X-VCS-Branch: master Date: Thu, 28 Jan 2016 05:59:12 +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: becbd55f-b7c3-49cb-9e91-1d8c36f6e363 X-Archives-Hash: fea8f4c1fd5d6aa4bdda6bca6da38343 commit: d81dce703c99623faaa78cd846c71fef51814f4c Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jan 28 05:58:58 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jan 28 05:59:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81dce70 dev-vcs/git-tools: py3 fixup and make repoman happy. Package-Manager: portage-2.2.27 .../files/git-tools-2015_p20151225-py3.patch | 11 +++++ .../git-tools/git-tools-2015_p20151225-r2.ebuild | 48 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch new file mode 100644 index 0000000..a7f59e0 --- /dev/null +++ b/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch @@ -0,0 +1,11 @@ +--- a/git-restore-mtime 2016-01-27 14:05:09.000000000 -0800 ++++ b/git-restore-mtime 2016-01-27 21:51:17.000000000 -0800 +@@ -150,7 +150,7 @@ + ['--'] + args.pathspec, + stdout=subprocess.PIPE) + for line in gitobj.stdout: +- lsfileslist.add(os.path.relpath(line.strip(), workdir)) ++ lsfileslist.add(os.path.relpath(line.strip().decode(), workdir)) + + # List files matching user pathspec, relative to current directory + # git commands always print paths relative to work tree root diff --git a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild new file mode 100644 index 0000000..d05fd28 --- /dev/null +++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{1..5} ) +inherit python-r1 + +DESCRIPTION="Assorted git-related scripts" +HOMEPAGE="https://github.com/MestreLion/git-tools/" +MY_PV="ff7a07daa6898fd0993180f64bd232aa4def6018" +SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND=" + >=dev-vcs/git-2.5 + >=app-shells/bash-4.0" + +MY_P=${PN}-${MY_PV} +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "$FILESDIR"/git-tools-2015_p20151225-py3.patch +} + +src_compile() { + :; +} + +src_install() { + SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommited-repos git-rebase-theirs git-strip-merge" + SCRIPTS_PYTHON="git-restore-mtime" + dobin $SCRIPTS_BASH + dobin $SCRIPTS_PYTHON + for p in $SCRIPTS_PYTHON ; do + python_replicate_script "${ED}"/usr/bin/$p + done + # Make it possible to use the tools as 'git $TOOLNAME' + for i in $SCRIPTS_BASH $SCRIPTS_PYTHON ; do + dosym /usr/bin/$i /usr/libexec/git-core/$i + done + dodoc README.md +}