[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-tools/files/, dev-vcs/git-tools/

[David Seifert]

commit:     4c8c28601b6dbeed028efc06085fd2a27e955f9c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 08:53:06 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 08:53:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c8c2860

dev-vcs/git-tools: Remove old

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-vcs/git-tools/Manifest                         |  2 -
 .../files/git-tools-2015_p20151225-py3.patch       | 11 -----
 .../files/git-tools-2015_p20160201-pr21.patch      | 27 ------------
 .../git-tools/git-tools-2015_p20151225-r2.ebuild   | 48 --------------------
 .../git-tools/git-tools-2015_p20160201-r1.ebuild   | 51 ----------------------
 dev-vcs/git-tools/git-tools-2015_p20160201.ebuild  | 48 --------------------
 6 files changed, 187 deletions(-)

diff --git a/dev-vcs/git-tools/Manifest b/dev-vcs/git-tools/Manifest
index 217b2c7d635..38d383b8c74 100644
--- a/dev-vcs/git-tools/Manifest
+++ b/dev-vcs/git-tools/Manifest
@@ -1,3 +1 @@
-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

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 a7f59e0b04d..00000000000
--- 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 f921efd9be2..00000000000
--- 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 423e2d05904..00000000000
--- 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 e3899fc74e8..00000000000
--- 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 83996058962..00000000000
--- 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
-}