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

[Andreas Sturmlechner]

commit:     f8a2ab3e9c5d11afbda52516167b7e8772a3dcd8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 22:26:15 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 22:26:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8a2ab3e

dev-vcs/git-cola: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-vcs/git-cola/Manifest                          |  3 -
 .../files/git-cola-2.2.1-disable-live-tests.patch  | 22 -----
 ...git-cola-2.2.1-update-git-config-in-tests.patch | 13 ---
 dev-vcs/git-cola/git-cola-2.2.1.ebuild             | 97 ----------------------
 dev-vcs/git-cola/git-cola-2.3.ebuild               | 96 ---------------------
 dev-vcs/git-cola/git-cola-2.4.ebuild               | 96 ---------------------
 6 files changed, 327 deletions(-)

diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 020e6f48381..64328eade56 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,4 +1 @@
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
-DIST git-cola-2.2.1.tar.gz 996484 BLAKE2B 2c2c2bc085eec36c4ef6809a93458d8faa5ca6a880310877aa0dc56e4ad0ffb6a7d7c86785d8f5354d613d4b8c5fa5bce057be60bd97220f64d66aa905ae78f4 SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109
-DIST git-cola-2.3.tar.gz 1005858 BLAKE2B 18265a959ff4662ac2ba5a1ba0c304a5b79a485d96ac744a9525c2dfb84d898c314742857665728bae8c85366b00f348bc043133ef842f140a49a8e0c1af1246 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023
-DIST git-cola-2.4.tar.gz 987829 BLAKE2B 38ab959c19642349c6910d1131aa5e20d3577d39816a93759b9c2f18e4a3ccc65a972317910dde872f870237bf55c62dd63e83d04ae80b0ecf8afd2adcb5d56b SHA512 702d5c7322a21e5807354d3b3b7b31fd5cef3c12c3294e2ad57add99f586277d4805e85122682acde40e6243529588e62762f9483d807ed12340057c6a37a0cc

diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch
deleted file mode 100644
index 2ebdc9880d1..00000000000
--- a/dev-vcs/git-cola/files/git-cola-2.2.1-disable-live-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/test/git_test.py b/test/git_test.py
-index 9f812b2..ff7da24 100644
---- a/test/git_test.py
-+++ b/test/git_test.py
-@@ -53,17 +53,6 @@ class GitCommandTest(unittest.TestCase):
-         version = self.git.version()[STDOUT]
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag()[STDOUT].splitlines()
--        self.failUnless( 'v1.0.0' in tags )
--
--    def test_show(self):
--        """Test running 'git show'"""
--        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
--        contents = self.git.show(sha)[STDOUT].splitlines()
--        self.failUnless(contents[0] == '/build')
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only

diff --git a/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch
deleted file mode 100644
index 96271d05548..00000000000
--- a/dev-vcs/git-cola/files/git-cola-2.2.1-update-git-config-in-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/helper.py b/test/helper.py
-index 006a5b1..64d0dfc 100644
---- a/test/helper.py
-+++ b/test/helper.py
-@@ -87,6 +87,8 @@ class GitRepositoryTestCase(TmpPathTestCase):
- 
-     def initialize_repo(self):
-         self.git('init')
-+        self.git('config', '--local', 'user.name', 'Your Name')
-+        self.git('config', '--local', 'user.email', 'you@×××××××.com')
-         self.touch('A', 'B')
-         self.git('add', 'A', 'B')
- 

diff --git a/dev-vcs/git-cola/git-cola-2.2.1.ebuild b/dev-vcs/git-cola/git-cola-2.2.1.ebuild
deleted file mode 100644
index cad0264b76b..00000000000
--- a/dev-vcs/git-cola/git-cola-2.2.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-live-tests.patch
-	"${FILESDIR}"/${P}-update-git-config-in-tests.patch
-)
-
-python_prepare_all() {
-	rm share/git-cola/bin/*askpass* || die
-
-	# remove broken tests
-	rm test/i18n_test.py || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub" \
-	virtualmake
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}

diff --git a/dev-vcs/git-cola/git-cola-2.3.ebuild b/dev-vcs/git-cola/git-cola-2.3.ebuild
deleted file mode 100644
index 878eef70db2..00000000000
--- a/dev-vcs/git-cola/git-cola-2.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-disable-live-tests.patch
-)
-
-python_prepare_all() {
-	rm share/git-cola/bin/*askpass* || die
-
-	# remove broken tests
-	rm test/i18n_test.py || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub" \
-	virtualmake
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}

diff --git a/dev-vcs/git-cola/git-cola-2.4.ebuild b/dev-vcs/git-cola/git-cola-2.4.ebuild
deleted file mode 100644
index 3b2f509edd4..00000000000
--- a/dev-vcs/git-cola/git-cola-2.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/send2trash[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]
-	dev-vcs/git"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] )
-		)
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.1-disable-live-tests.patch
-)
-
-python_prepare_all() {
-	rm share/git-cola/bin/*askpass* || die
-
-	# remove broken tests
-	rm test/i18n_test.py || die
-
-	# don't install docs into wrong location
-	sed -i -e '/doc/d' setup.py || die
-
-	# fix doc directory reference
-	sed -i \
-		-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \
-		cola/resources.py || die
-
-	# fix ssh-askpass directory reference
-	sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	cd share/doc/${PN}/ || die
-	if use doc; then
-		emake all
-	else
-		sed \
-			-e '/^install:/s:install-html::g' \
-			-e '/^install:/s:install-man::g' \
-			-i Makefile || die
-	fi
-}
-
-python_test() {
-	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
-	VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \
-		--exclude=sphinxtogithub" \
-	virtualmake
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-python_install_all() {
-	cd share/doc/${PN}/ || die
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		prefix="${EPREFIX}/usr" \
-		install
-
-	python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
-	python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
-	use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-
-	distutils-r1_python_install_all
-	readme.gentoo_create_doc
-}