gentoo resync : 14.07.2018

8 files changed, 234 insertions, 0 deletions

diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
new file mode 100644
index 000000000000..079803b070a0
--- /dev/null
+++ b/dev-vcs/git-tools/Manifest
@@ -0,0 +1,10 @@
+AUX git-tools-2015_p20151225-py3.patch 533 BLAKE2B c58361f5096a2c7df56d37cd67f8eeef7f8cac63aeeef96275b57a886eabde55b700b86df49397d3aee300c0ede33be6cfe978275f935052d05931ef0efba3ea SHA512 20aed632a90dbe0b84c745a0239124f613982e21a39a23392d698bc795269c7f30673426f4e696846c309b469ace4334fa55e21ced03d89862d762219ff72c4e
+AUX git-tools-2015_p20160201-pr21.patch 1453 BLAKE2B 57b2c705eff20eee8cf6b68fec8b1f31d27b9260f445dfbc45ac2261cdf39c23fca0d26745b5bab590edccf371c47b2f2ebce9091f9030fb5806eee52a5b8a91 SHA512 7007c83d3d013c8df49eeab5bb88d8f02373b42d977562d735a92f3db81fdec33251ff684eb6c3a6e2553c73f81dc6fa186cdbcedf77bd1f1771682345f50429
+DIST git-tools-2015_p20151225.tar.gz 12635 BLAKE2B c5414307d0db6975034f6a04b007fc5872e4af9a46cd398b3a0675470cf3f4fc328539f2907faf5e75a36570e3d2131ef7a8023a981e05df8ff671b68f07480c SHA512 c995f814a78a3afb967e435b9559e4601fd9c7ed10b30950d6d8f20db2cc8077c814fb6164351f20f3c118e0b8b139c84485d5849057654a70d81847f77dd3d0
+DIST git-tools-2015_p20160201.tar.gz 12702 BLAKE2B 14c77495f66190c18362e889d3f7a0254c3c09da2524ee8cb9717db3437e834418f0c92bee5fdcad11bb65a40524163e651af5dcdc454ce06b1f7d7e9ab33fc1 SHA512 55804d7cc67a0c41f460f4a648fd589c8b72c9de8f45d4683edc8d4c47b87bbb70dbb040a8cbd3c7fcc09a3faba17f145479b7000d93d178e32454c0b6a1a995
+DIST git-tools-2017.10.tar.gz 28049 BLAKE2B 64b5f90468226dbeb4222f0f7be77846deffa836d6743e970c9bffced699c563712c24851e112a922faf3ae4b56ecc8daf0f5f772936c43a95c3907a244a6efa SHA512 60b3006de64a4c26f00241b60d45ef8258999dabfc0a8ad1c7d6d6b386dc56caf8c3b6cd0edbce5e27277c8f900b736fe1e26c6a68ee2179f563d00d65fd7cfe
+EBUILD git-tools-2015_p20151225-r2.ebuild 1425 BLAKE2B 7d7f36d88a6197b8a7bbd122ee48fab05d8bf19a96b8c6218567ebf61ff4858683d3a6d6a63501f92b5b8691b6ab9d0557121bc923ab2d19349b7537472d7f2c SHA512 cfecf4797c7cef63909a73d0d9882f77093841146b43d3dc8562ff13ceae1a307deb421452ea6cb2de16dcba4aee9af738bea62e64e9ae58f5daaa4ddecaec69
+EBUILD git-tools-2015_p20160201-r1.ebuild 1483 BLAKE2B 0880c63cb63d1cb998078664f6e429564489a5e4e8e955d5b184a4691caf792dd4a2f5877dd8bdfe4af52a44a06d45ea8cee1938abd49a940cefb89e2c327d17 SHA512 9a82bd81eabd0b321a7e6f9e50d7d4c118c2ae3d4f0889ae47d28799c9eac6268ccc958047609c89f36190040c163511d1145255ac99cd9e52ce65f8f36bdfa9
+EBUILD git-tools-2015_p20160201.ebuild 1426 BLAKE2B 6a61da4cd5cd83b632d48544f6c1a73a1e9a3ea159ef66cad1b5c0e00694d7152300d9cb1b91e186f2b5d61631904ba9ea0432026e2c77bfb430e28bdeb7a316 SHA512 e2c5983254f9c4b25924fc57c7b5de44acb51d787fb913fd2b97ec7c9c42857a67ab3b5fe79da26697cc990e9c311b59c8121b83ae97895d750bbc887a28f2a4
+EBUILD git-tools-2017.10.ebuild 990 BLAKE2B 5a79acf90c49ced38457e3da6cc6fa02176121e92570865276484f2016823511eee32f32d5df9d4e4b4ec538ade31041291c9e026b8ff97b63f55b7e5f81372d SHA512 da803ca684574a8c4ed7897b8cc848fc3ea521d97a5074dc48644d79dfb20da52d9d923f7ce5ce312d58a6300be3c7c76354b53950ff8da37b259a7b4195186a
+MISC metadata.xml 303 BLAKE2B 1186af6cb426673a5bc636e1b9aa02377c0cff46fe7bd3313ce8499ec3d53faba66ed52834cd98ecd3a097d20e770adfd0222df5750709861bdea30f2f8816c8 SHA512 1d21c90c1bc801085cf2bba4e75f1413fd232853d651f6db511270eb5ed7d9c2648d1b4e94808ff7ab87299fbebed167793e0563fdcce5bedcc6ae8c8c945a19
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..f99994408b46
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 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 ~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..9eab3cbf380e
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 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 ~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..da7ffa5eede6
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 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 ~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/git-tools-2017.10.ebuild b/dev-vcs/git-tools/git-tools-2017.10.ebuild
new file mode 100644
index 000000000000..22bb3d5f5880
--- /dev/null
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit python-r1
+
+DESCRIPTION="Assorted git-related scripts"
+HOMEPAGE="https://github.com/MestreLion/git-tools"
+SRC_URI="https://github.com/MestreLion/git-tools/archive/v${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 ~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"
+
+src_install() {
+	dobin git-branches-rename git-clone-subset git-find-uncommitted-repos
+	dobin git-rebase-theirs git-strip-merge
+	python_foreach_impl python_doscript git-restore-mtime
+	doman man1/*.1
+	einstalldocs
+}
diff --git a/dev-vcs/git-tools/metadata.xml b/dev-vcs/git-tools/metadata.xml
new file mode 100644
index 000000000000..c4d5177abb15
--- /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>