* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/, dev-vcs/git-cola/files/
@ 2015-09-20 10:24 Justin Lecher
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher @ 2015-09-20 10:24 UTC (permalink / raw
To: gentoo-commits
commit: af409959195138b7a3efba40c9aa8019851ca30d
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:18:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:24:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af409959
dev-vcs/git-cola: Clean old
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-vcs/git-cola/Manifest | 1 -
.../files/git-cola-1.9.1-system-ssh-askpass.patch | 16 ---
.../files/git-cola-1.9.3-disable-tests.patch | 21 ----
dev-vcs/git-cola/git-cola-2.1.2.ebuild | 111 ---------------------
4 files changed, 149 deletions(-)
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index a0fa8dc..00611fa 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,2 @@
-DIST git-cola-2.1.2.tar.gz 960514 SHA256 f0465f74858fc78b1b30e06856cdd6b5fa5f0cb9587b5c7e9b489f4d0e4d8f8d SHA512 79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d WHIRLPOOL 8797f0f0d02eaea1c7e1ef5544fc7e5e2bf6ca738cff721ce56db194de8cd94a3e825bf557f478237d75c5cf782ed43cdafc7a7afdaf1417fa4f3d8b65bcb756
DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
DIST git-cola-2.3.tar.gz 1005858 SHA256 3319810c16f6864deb5f94f533c7cfd17f30961595454da7c3c75879f56511b3 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023 WHIRLPOOL 177996e40cc83dd2d2fe9db1ac97ba318d9d311779415e8e4327f3824a7c19f36f592ed1d6118e5a2d46a594a8dd681d0a2e2e54f2846c3636d9f4f3d8f196f5
diff --git a/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch
deleted file mode 100644
index 0aa476f..0000000
--- a/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cola/app.py b/cola/app.py
-index f9236de..4636c81 100644
---- a/cola/app.py
-+++ b/cola/app.py
-@@ -66,9 +66,9 @@ def setup_environment():
- elif ssh_askpass:
- askpass = ssh_askpass
- elif sys.platform == 'darwin':
-- askpass = resources.share('bin', 'ssh-askpass-darwin')
-+ askpass = resources.prefix('bin', 'ssh-askpass-darwin')
- else:
-- askpass = resources.share('bin', 'ssh-askpass')
-+ askpass = resources.prefix('bin', 'ssh-askpass')
-
- compat.setenv('GIT_ASKPASS', askpass)
- compat.setenv('SSH_ASKPASS', askpass)
diff --git a/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch b/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch
deleted file mode 100644
index 79f1ec2..0000000
--- a/dev-vcs/git-cola/files/git-cola-1.9.3-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/git_test.py cola-1.3.7.21/test/git_test.py
---- cola-1.3.7.21.orig/test/git_test.py 2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/git_test.py 2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
- 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/git-cola-2.1.2.ebuild b/dev-vcs/git-cola/git-cola-2.1.2.ebuild
deleted file mode 100644
index d7412c3..0000000
--- a/dev-vcs/git-cola/git-cola-2.1.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.com/"
-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"
-
-REQUIRED_USE="doc? ( python_targets_python2_7 )"
-
-RDEPEND="
- dev-python/jsonpickle[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-vcs/git"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-devel/gettext
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
- )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- sys-apps/net-tools
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.3-disable-tests.patch
- "${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
- )
-
-pkg_pretend() {
- if use test && [[ -z "$(hostname -d)" ]] ; then
- die "Test will fail if no domain is set"
- fi
-}
-
-python_prepare_all() {
- rm share/git-cola/bin/*askpass* || die
-
- # unfinished translate framework
- rm test/i18n_test.py || die
-
- # don't install docs into wrong location
- sed -i \
- -e '/doc/d' \
- setup.py || die "sed failed"
-
- sed -i \
- -e "s|'doc', 'git-cola'|'doc', '${PF}'|" \
- cola/resources.py || die "sed failed"
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- cd share/doc/${PN}/
- 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"
-
- if ! use doc ; then
- HTML_DOCS=( "${FILESDIR}"/index.html )
- fi
-
- distutils-r1_python_install_all
- readme.gentoo_create_doc
- docompress /usr/share/doc/${PF}/git-cola.txt
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/, dev-vcs/git-cola/files/
@ 2017-06-18 21:09 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2017-06-18 21:09 UTC (permalink / raw
To: gentoo-commits
commit: 875a97f9223c356ac53da70be705a8e11a1de613
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 21:09:12 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 21:09:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875a97f9
dev-vcs/git-cola: Version bump to 2.11 wrt bug 601786
Non-Maintainer commit, maintainer unresponsive for several months.
This version adds python 3.5 and PyQt5 as the primary GUI
One encoding test fails, but it seems to be minor.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-vcs/git-cola/Manifest | 1 +
.../files/git-cola-2.10-disable-live-tests.patch | 24 +++++
dev-vcs/git-cola/git-cola-2.11.ebuild | 104 +++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index c27708f6d40..60279e63470 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,3 +1,4 @@
+DIST git-cola-2.11.tar.gz 1179769 SHA256 bc4007e0d9c80763ef58d630b033bfdbd8406af77bbd292a6c647ed3ca655b5b SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c WHIRLPOOL e7a3a1d50b6730aefd48e2d0a91cb3bf413240c516194ae39a2b6a7ebb5b07807bba10f51e1c3669817eed49aa938b01328416ca60cfcc684f95bbcd0005eaa2
DIST git-cola-2.2.1.tar.gz 996484 SHA256 df0a3e1d3c49629926f2e30f55d635eca3c8da12e96232196b307613fa4b3aec SHA512 a91fe706ea150d9bd9a05a9d494c63d373cae0154deca8e40e30fc20e70be32d4fd1f021a971c067d46ab24f472965a12c115eeb4bd94e4f62c21e546d89c109 WHIRLPOOL ac68a558775bc5fdf3a168416132dedbeffe554f6f60f50b7e33f0d17d67aa829318b7a0df2607b47e41b8823d60e206e0544e03382eae7651b9ca1c3b9dfc09
DIST git-cola-2.3.tar.gz 1005858 SHA256 3319810c16f6864deb5f94f533c7cfd17f30961595454da7c3c75879f56511b3 SHA512 2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023 WHIRLPOOL 177996e40cc83dd2d2fe9db1ac97ba318d9d311779415e8e4327f3824a7c19f36f592ed1d6118e5a2d46a594a8dd681d0a2e2e54f2846c3636d9f4f3d8f196f5
DIST git-cola-2.4.tar.gz 987829 SHA256 ef735431a2e58bac7671c4b9ab4fbb369195b16987fe9d3d931a9097c06c7f36 SHA512 702d5c7322a21e5807354d3b3b7b31fd5cef3c12c3294e2ad57add99f586277d4805e85122682acde40e6243529588e62762f9483d807ed12340057c6a37a0cc WHIRLPOOL de95800c0d8f67d301a102a8f623945170ca5961cde91fdabf2dd396f2470e52e8b51dde1f65b5aed408ebc3cd6802426c7bd3b9cd86db53b2965067d2646f47
diff --git a/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
new file mode 100644
index 00000000000..1f58ea0eddb
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-2.10-disable-live-tests.patch
@@ -0,0 +1,24 @@
+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,19 +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()
+- if os.getenv('GIT_COLA_NO_HISTORY', False):
+- return
+- self.failUnless('v1.0.0' in tags)
+-
+- def test_show(self):
+- """Test running 'git show'"""
+- oid = 'HEAD'
+- content = self.git.show(oid)[STDOUT]
+- self.failUnless(content.startswith('commit '))
+-
+ def test_stdout(self):
+ """Test overflowing the stdout buffer"""
+ # Write to stdout only
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
new file mode 100644
index 00000000000..149e64908a5
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 readme.gentoo-r1 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"
+
+# Since PyQt5 is preferred at runtime if installed, depend on that
+RDEPEND="
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ dev-python/QtPy[gui,${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,network,widgets,${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}] ${VIRTUALX_DEPEND} )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.10-disable-live-tests.patch
+)
+
+python_prepare_all() {
+ # Use system QtPy
+ rm -r qtpy || die
+
+ 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_configure_all() {
+ mydistutilsargs=( --no-vendor-libs )
+}
+
+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" \
+ virtx nosetests --verbose --with-id --with-doctest \
+ --exclude=sphinxtogithub
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/, dev-vcs/git-cola/files/
@ 2018-02-28 22:27 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-02-28 22:27 UTC (permalink / raw
To: gentoo-commits
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@example.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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-28 22:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-28 22:27 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-cola/, dev-vcs/git-cola/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2017-06-18 21:09 Brian Evans
2015-09-20 10:24 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox