From 34004a9e30751ffec0029ae2cc116eca8dd5860d Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 27 Mar 2020 02:06:27 +0100 Subject: dev-vcs/git-cola: Remove due to dead PYTHON_COMPAT Signed-off-by: Sebastian Pipping --- dev-vcs/git-cola/ChangeLog | 141 --------------------- dev-vcs/git-cola/files/README.gentoo | 3 - .../files/git-cola-9999-disable-live-tests.patch | 22 ---- .../git-cola-9999-update-git-config-in-tests.patch | 13 -- dev-vcs/git-cola/files/index.html | 15 --- dev-vcs/git-cola/git-cola-9999.ebuild | 95 -------------- dev-vcs/git-cola/metadata.xml | 12 -- 7 files changed, 301 deletions(-) delete mode 100644 dev-vcs/git-cola/ChangeLog delete mode 100644 dev-vcs/git-cola/files/README.gentoo delete mode 100644 dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch delete mode 100644 dev-vcs/git-cola/files/git-cola-9999-update-git-config-in-tests.patch delete mode 100644 dev-vcs/git-cola/files/index.html delete mode 100644 dev-vcs/git-cola/git-cola-9999.ebuild delete mode 100644 dev-vcs/git-cola/metadata.xml diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog deleted file mode 100644 index 42340db..0000000 --- a/dev-vcs/git-cola/ChangeLog +++ /dev/null @@ -1,141 +0,0 @@ -# ChangeLog for dev-vcs/git-cola -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 - - 29 Jul 2015; Justin Lecher +files/README.gentoo, - +files/git-cola-9999-disable-live-tests.patch, - +files/git-cola-9999-update-git-config-in-tests.patch, - -files/git-cola-9999-disable-tests.patch, - -files/git-cola-9999-system-ssh-askpass.patch, git-cola-9999.ebuild: - dev-vcs/git-cola: Import tree changes - - 11 Aug 2014; Justin Lecher git-cola-9999.ebuild: - Fix shebang fixing, #518306 - - 25 Feb 2014; Justin Lecher git-cola-9999.ebuild: - Move to py3.3 - - 24 Feb 2014; Justin Lecher git-cola-9999.ebuild: - Add py3 support - - 29 Jan 2014; Justin Lecher git-cola-9999.ebuild: - Fix broken documentation paths, #499658 - - 15 Jan 2014; Justin Lecher git-cola-9999.ebuild, - -files/9999-system-ssh-askpass.patch, - +files/git-cola-9999-disable-tests.patch, - +files/git-cola-9999-system-ssh-askpass.patch: - Import tree changes; bump to git-r3.eclass - - 23 Oct 2013; Justin Lecher git-cola-9999.ebuild: - Update to latest HEAD - - 11 Oct 2013; Justin Lecher git-cola-9999.ebuild, - -files/9999-disable-tests.patch, files/9999-system-ssh-askpass.patch: - Fix for HEAD - - 29 Apr 2013; Justin Lecher git-cola-9999.ebuild: - Always depend on app-text/asciidoc formanpage generation - - 29 Apr 2013; Justin Lecher git-cola-9999.ebuild: - Version Bump and move to new python eclasses - - 15 Jan 2013; Justin Lecher git-cola-9999.ebuild, - metadata.xml: - Correct github owner - - 04 Sep 2012; Justin Lecher - files/9999-system-ssh-askpass.patch: - Fix patch for current HEAD - - 25 May 2012; Justin Lecher - +files/9999-system-ssh-askpass.patch, git-cola-9999.ebuild: - Import tree changes related to ssh_askpass handling - -*git-cola-9999 (11 May 2012) - - 11 May 2012; Justin Lecher +files/9999-disable-tests.patch, - +git-cola-9999.ebuild, +files/index.html, +metadata.xml: - Fix to latest Head - - 27 Oct 2011; Justin Lecher cola-9999.ebuild, metadata.xml: - Removed no-herd from herd tag in metadata.xml - - 27 Oct 2011; Justin Lecher cola-9999.ebuild: - Bump git.eclass to git-2.eclass - -*cola-9999 (15 Apr 2011) - - 15 Apr 2011; Justin Lecher +files/9999-disable-tests.patch, - +cola-9999.ebuild, +files/index.html, +metadata.xml: - Added live ebuild for dev-vcs/cola - -*cola-1.4.3.2 (13 Apr 2011) - - 13 Apr 2011; Justin Lecher +cola-1.4.3.2.ebuild: - Non-Maintainer Version Bump - -*cola-1.4.3.1 (30 Mar 2011) - - 30 Mar 2011; Justin Lecher +cola-1.4.3.1.ebuild: - Non maintainer Version Bump - - 25 Jan 2011; Arfrever Frehtes Taifersar Arahesis - cola-1.4.3.ebuild: - Use Python 2 (bug #329473). - -*cola-1.4.3 (25 Jan 2011) - - 25 Jan 2011; Tiziano Müller +cola-1.4.3.ebuild: - Version bump (bug #351580). Also solved: the installation of localization - files (bug #348130), adaption to python eclass changes (bug #329473). - - 09 Jun 2010; Tiziano Müller cola-1.4.2.1.ebuild: - Version bump. - -*cola-1.4.2.1 (08 Jun 2010) - - 08 Jun 2010; Tiziano Müller -cola-1.3.9.14.ebuild, - +cola-1.4.2.1.ebuild: - Version bump, dropped old. - - 08 Jun 2010; Tiziano Müller ChangeLog: - Moved from dev-util to dev-vcs. - - 17 Mar 2010; Sebastian Pipping cola-1.3.9.14.ebuild, - cola-1.4.1.2.ebuild: - Propagate move of dev-util/git to dev-vcs/git - -*cola-1.4.1.2 (18 Jan 2010) - - 18 Jan 2010; Tiziano Müller -cola-1.3.8.ebuild, - -cola-1.4.0.1.ebuild, -cola-1.4.1.1.ebuild, +cola-1.4.1.2.ebuild: - Version bump. Removed old. - -*cola-1.4.1.1 (16 Dec 2009) - - 16 Dec 2009; Tiziano Müller +cola-1.4.1.1.ebuild: - Version bump. - -*cola-1.4.0.1 (03 Nov 2009) - - 03 Nov 2009; Tiziano Müller +cola-1.4.0.1.ebuild, - +files/index.html: - Version bump, fixed doc deps and doc installation ^Cug #291439, thanks to - Man Shankar). - -*cola-1.3.9.14 (26 Aug 2009) - - 26 Aug 2009; Tiziano Müller +cola-1.3.9.14.ebuild: - Version bump. - - 30 Jun 2009; Christian Faulhammer cola-1.3.8.ebuild: - keyworded ~arch for x86, bug 275353 - - 19 Jun 2009; Tiziano Müller cola-1.3.8.ebuild: - Require pyinotify >=0.7.1 (thanks to a.peyser). - -*cola-1.3.8 (19 Jun 2009) - - 19 Jun 2009; Tiziano Müller - +files/1.3.8-disable-tests.patch, +cola-1.3.8.ebuild, +metadata.xml: - Initial commit, moved over from my overlay (as requested in bug #274621). diff --git a/dev-vcs/git-cola/files/README.gentoo b/dev-vcs/git-cola/files/README.gentoo deleted file mode 100644 index 0f4af85..0000000 --- a/dev-vcs/git-cola/files/README.gentoo +++ /dev/null @@ -1,3 +0,0 @@ -Please make sure you have either a SSH key management installed and activated or -installed a SSH askpass app like net-misc/x11-ssh-askpass. -Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. diff --git a/dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch deleted file mode 100644 index 2ebdc98..0000000 --- a/dev-vcs/git-cola/files/git-cola-9999-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-9999-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-update-git-config-in-tests.patch deleted file mode 100644 index 96271d0..0000000 --- a/dev-vcs/git-cola/files/git-cola-9999-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@example.com') - self.touch('A', 'B') - self.git('add', 'A', 'B') - diff --git a/dev-vcs/git-cola/files/index.html b/dev-vcs/git-cola/files/index.html deleted file mode 100644 index 7f1e814..0000000 --- a/dev-vcs/git-cola/files/index.html +++ /dev/null @@ -1,15 +0,0 @@ - - - Missing documentation - - -
- This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled. - -

- Sincerely,
- your package maintainer. -

-
- - diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild deleted file mode 100644 index 526fa64..0000000 --- a/dev-vcs/git-cola/git-cola-9999.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} ) -DISTUTILS_SINGLE_IMPL=true - -inherit distutils-r1 git-r3 readme.gentoo-r1 virtualx - -DESCRIPTION="The highly caffeinated git GUI" -HOMEPAGE="http://git-cola.github.io/" -SRC_URI="" -EGIT_REPO_URI="git://github.com/git-cola/git-cola.git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -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}] ) -" - -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" \ - GIT_COLA_NO_HISTORY=True \ - virtx nosetests \ - --verbose --with-id --with-doctest \ - --exclude=sphinxtogithub -} - -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 -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml deleted file mode 100644 index 77b9269..0000000 --- a/dev-vcs/git-cola/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - dev-zero@gentoo.org - Tiziano Müller - - - jlec@gentoo.org - Justin Lecher - - -- cgit v1.2.3-65-gdbad