summaryrefslogtreecommitdiff
path: root/dev-vcs/git-tools
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git-tools')
-rw-r--r--dev-vcs/git-tools/Manifest9
-rw-r--r--dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch11
-rw-r--r--dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch27
-rw-r--r--dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild48
-rw-r--r--dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild51
-rw-r--r--dev-vcs/git-tools/git-tools-2015_p20160201.ebuild48
-rw-r--r--dev-vcs/git-tools/metadata.xml10
7 files changed, 204 insertions, 0 deletions
diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
new file mode 100644
index 000000000000..2a8ba9b86756
--- /dev/null
+++ b/dev-vcs/git-tools/Manifest
@@ -0,0 +1,9 @@
+AUX git-tools-2015_p20151225-py3.patch 533 SHA256 a810c3aee97b302aa63bc8f3adf6051450967ae484e6ff8091cc1c2da2b32eef SHA512 20aed632a90dbe0b84c745a0239124f613982e21a39a23392d698bc795269c7f30673426f4e696846c309b469ace4334fa55e21ced03d89862d762219ff72c4e WHIRLPOOL e3d7294892de65fe4ce18d6d492614e3b1803c1d52b65debf49a52792e390bc121ecad00a4535a2b871dffcb0106e48ee5cd9a243d9db34bed2245b3bcb534b6
+AUX git-tools-2015_p20160201-pr21.patch 1453 SHA256 3cf477c7c24d7902657d70592faad235cf6d5693e63f116ab39ce995db48176a SHA512 7007c83d3d013c8df49eeab5bb88d8f02373b42d977562d735a92f3db81fdec33251ff684eb6c3a6e2553c73f81dc6fa186cdbcedf77bd1f1771682345f50429 WHIRLPOOL f6429dceb20d99f2e652588ec39f85bb716acf6d48c55f325aa6a6b7aecc950e262a3f32cefa9b2c3adc246fda93aa08745694004fce8ecee082471ab6dfccf2
+DIST git-tools-2015_p20151225.tar.gz 12635 SHA256 ab98a8ac35d47d521c43e8b6f543e55757bb2ec4a3cbdeddf25348c5b0cdb36a SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0 WHIRLPOOL 6f2810d8e81bbdcb8f99a4e9e3032e11a160df969e8c11a9f8ed8e053eaaf98f895c90eed726e91bcdc2a59493950375015c4922e758256a54874e2667e21a25
+DIST git-tools-2015_p20160201.tar.gz 12702 SHA256 56622b47edcfd2149e8d23b4d840a9c808160520f9c02f5b1842976a87362cbe SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995 WHIRLPOOL 00c3a8fd887d37ce516dc07ca1594cfe6dba19cf74d7eb1c608b6b44a89869bcd6c66832b15eb8c86b58805003f4cf2b7c9298cc0a95c0f6648534c1ace6cc79
+EBUILD git-tools-2015_p20151225-r2.ebuild 1437 SHA256 af1b1c9dca7099b9158ba85f2162e4f18f5274ffe53f5a99349bb71ba4919add SHA512 3068af4da8b476049f014221858cb2a7b7e6c7edf914804e48f82e4e84a1aa0db4afcdd50172cd5f98b9d377f3f920e0284bdc9010c6c64d326353a8f578382f WHIRLPOOL 6903453b4bd8348764f9354f34eb86911de4c87cabeaf1be4d5565a608ff39733d1b8e795a077501d1c52eaca8d3147329055199a03f77834c1e172eb5ed5782
+EBUILD git-tools-2015_p20160201-r1.ebuild 1495 SHA256 8ede8be5a3a98baf6aaab3c593c4cee093ce247063be24ec0250320358cae616 SHA512 377fed838758fd267e7f3071360359a89cda3a486c674a08e8b9573a5cc0c4042e4fb2efdfbf181b31d81c7deb6b81d5a2559984235f37a769642e09fb1754a0 WHIRLPOOL baab316e5ca634578ae7cf5189166336d116addc8cf4e1de814ae57261ede4fa917c192bcef437b2f74b76549de4cd0d6005f7e2ed39c5eea9e626dfd0e2365e
+EBUILD git-tools-2015_p20160201.ebuild 1438 SHA256 c15df79f736667a230ccc4ef676832cf334107178c76d52105d947038ffa6439 SHA512 2c16dfd268a6efbc34ee9a99282348258600fcd0f717a3681b7d0137e702238060314a3206b7f63bf6ef12218a53a473b4a08ce18ca30e9d72352c63874be5ec WHIRLPOOL a2e09a942ddd72b81139095908876d6088eb71a3dac85ed72a8feda8e276d97f75cd67b01621030fd54baf45607e10255f5121ff62cec975fd7dae917080bd70
+MISC ChangeLog 1958 SHA256 228fca759097e882fbbdea3b2b9a8c96b2b47ab968b6c593f1e0e4412fd3330a SHA512 8b129ebd386dc40c2df8cd3c37279db225c2c16ffc5f015e76a10f4c007dfebe18dee015e92d11289a1dc6574e48c9a9fd23bc9ad73d2a89f864b7ef5a36d227 WHIRLPOOL 83cc349fee80a0495c66e1235bc92d56307d9150879ae825a92f719f504db715f097fb92df797620a9d45d0145a7875878ad06c1236de7bcacff95b4d0bc3d04
+MISC metadata.xml 310 SHA256 57e85087287ea284544930486cbebd6e248e0736c9fa44a9ea1f2dfa5deaa89a SHA512 f6024ab818489e341d2bd68439028e7454a2457033d0db34bc116c08a77fe6345910a110b14f5a59d049eb7b29f623a9e4414b2c781742266646b6d4932a5eb8 WHIRLPOOL 0ce8d69351968ef3b53b59b888317c2787b3114f9711d05b5a6ced8e769107c9ac3047e2cfeb3aa6f09b529317ba95c054bb989a969e8ec3f290b5f743f0eccc
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 000000000000..a7f59e0b04dc
--- /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/files/git-tools-2015_p20160201-pr21.patch b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
new file mode 100644
index 000000000000..f921efd9be22
--- /dev/null
+++ b/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
@@ -0,0 +1,27 @@
+diff --git a/git-restore-mtime b/git-restore-mtime
+index fbc05d9..7bbd375 100755
+--- a/git-restore-mtime
++++ b/git-restore-mtime
+@@ -74,6 +74,14 @@ parser.add_argument('--merge', '-m',
+ 'sometimes substantially. By default merge logs are only '
+ 'used for files missing from regular commit logs.')
+
++parser.add_argument('--first-parent',
++ action="store_true",
++ help='pass --first-parent to git whatchanged to hide the '
++ 'second parent from the merge commit logs. Only has any '
++ 'effect if --merge is also specified or --skip-missing '
++ 'is not specified and there were files not found in regular '
++ 'commit logs.')
++
+ parser.add_argument('--skip-missing', '-s',
+ action="store_false", default=True, dest='missing',
+ help='do not try to find missing files. If some files were '
+@@ -252,6 +260,7 @@ def parselog(merge=False, filterlist=[]):
+
+ gitobj = subprocess.Popen(gitcmd + shlex.split('whatchanged --pretty={}'.format(args.timeformat)) +
+ (['-m'] if merge else []) +
++ (['--first-parent'] if args.first_parent else []) +
+ ['--'] + filterlist,
+ stdout=subprocess.PIPE)
+ for line in gitobj.stdout: \ No newline at end of file
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 000000000000..89fae4dd6d1a
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ >=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
+}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
new file mode 100644
index 000000000000..3111a50cea5d
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..5} )
+inherit eutils python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools/"
+MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
+SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ >=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
+ epatch "$FILESDIR"/${P}-pr21.patch
+
+ epatch_user
+}
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ SCRIPTS_BASH="git-branches-rename git-clone-subset git-find-uncommitted-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
+}
diff --git a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
new file mode 100644
index 000000000000..41ab4ece6c17
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4..5} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools/"
+MY_PV="0431b5f4c59101c1b7250d8dd2ce3f6a22318bc6"
+SRC_URI="https://github.com/MestreLion/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ >=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-uncommitted-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
+}
diff --git a/dev-vcs/git-tools/metadata.xml b/dev-vcs/git-tools/metadata.xml
new file mode 100644
index 000000000000..ac0f43b4f27f
--- /dev/null
+++ b/dev-vcs/git-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">MestreLion/git-tools</remote-id>
+ </upstream>
+</pkgmetadata>