gentoo resync : 15.01.2020

7 files changed, 3 insertions, 195 deletions

diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 69036776a098..126bf90f62ce 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -1,10 +1,3 @@
-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 1384 BLAKE2B 091cde4ee8e9ad7b7eebb748fc0024ac002c810738319b8218ef8a21baecd90abb27b20300cd3919aa920d3ca9d9a5d96306f62726cae233af252fdc9c60d5b5 SHA512 2a793b412d277775f5c7efda1a203230874b95448ed7ae97eb606a6951e288b926cbb8a9e1f7ad7d4bf8b9260ce8abe3b68d565eaa924822e5bd0bd56148ad5e
-EBUILD git-tools-2015_p20160201-r1.ebuild 1442 BLAKE2B c32f797e06519d8eb21c0d1c493ed7b3369d1f6ac23e1244c786271163e43f5723fff89cdea8c54025ffb6de980dab0a20af4f6ffcb6d340821a4bc9c940f60d SHA512 3aba416b320e23c037c03c78aefc4e9f84e250266b2c0fa66ee8e58849dc385ad02108fac30b5349778480473eabcb9d1aeba6f66327a87405f6e92eee2a14ea
-EBUILD git-tools-2015_p20160201.ebuild 1385 BLAKE2B 63979ee2d474bf8a8596b9c7ad960ac16255ae0a811acd5fd9cdc305fcee683223d5e1452f6456f2fe81ad30a5e0852c6789b04325e6b27a3db287beb64ee89a SHA512 e7076ef1d84870145f2698afcf2f047b1a2b8e43df262960ce941b349128318c342603cb2dc107c176c864876ae42b3cc39eda668d72b74fa23653a97a51d450
-EBUILD git-tools-2017.10.ebuild 950 BLAKE2B 87cd3d9b1df6555f4e318c7f5ac7421eced26e7bf3eb9bf1ee2621e8270b20e80c5e8f87918acdd83bd3822e4d0cb8043fc8ddf242fe19507a7074551dacfe43 SHA512 38531c7a2bebbc917dc36cc51b5cb84b52a3400e46c80ec91fc6d59b0d7d6c0ff1f19538c8d4a93bef6baaccd7fbef8f70c2925b591fcb2a7bfa6323956cdf50
+EBUILD git-tools-2017.10.ebuild 946 BLAKE2B 83bae1059ba37ebd9c3821670df31b1012aba53d950a3e4acca0f96c6c7b3a54eb168b54ad378cef984dc5e3c0331638e06aa2e700439df47f1751b0f89b68fe SHA512 fafe3de661ced560ff17443555b27ce77c838c9a05c6aec2a7ab4f19d3c231453de3a3f773d8c5c6146731749fc409c1a80e6788bebf41985e9ca3baf7ca1c3f
 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
deleted file mode 100644
index a7f59e0b04dc..000000000000
--- a/dev-vcs/git-tools/files/git-tools-2015_p20151225-py3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index f921efd9be22..000000000000
--- a/dev-vcs/git-tools/files/git-tools-2015_p20160201-pr21.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 423e2d059046..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20151225-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_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-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
deleted file mode 100644
index e3899fc74e8d..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20160201-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_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-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
deleted file mode 100644
index 83996058962e..000000000000
--- a/dev-vcs/git-tools/git-tools-2015_p20160201.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_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-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
index a59daf00e24d..555da1d3cb5d 100644
--- a/dev-vcs/git-tools/git-tools-2017.10.ebuild
+++ b/dev-vcs/git-tools/git-tools-2017.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit python-r1
 
 DESCRIPTION="Assorted git-related scripts"