* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2013-10-11 8:39 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2013-10-11 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 03e37d68bdf9c1f6415de8b4e71136a67b79b5fa
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 08:34:39 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 08:34:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=03e37d68
dev-vcs/git-cola: Fix for HEAD
Package-Manager: portage-2.2.7
---
dev-vcs/git-cola/ChangeLog | 4 ++++
dev-vcs/git-cola/files/9999-disable-tests.patch | 21 -----------------
.../git-cola/files/9999-system-ssh-askpass.patch | 27 ++++------------------
dev-vcs/git-cola/git-cola-9999.ebuild | 11 +++++----
4 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 423b6d3..9eb2e93 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+ 11 Oct 2013; Justin Lecher <jlec@gentoo.org> git-cola-9999.ebuild,
+ -files/9999-disable-tests.patch, files/9999-system-ssh-askpass.patch:
+ Fix for HEAD
+
29 Apr 2013; Justin Lecher <jlec@gentoo.org> git-cola-9999.ebuild:
Always depend on app-text/asciidoc formanpage generation
diff --git a/dev-vcs/git-cola/files/9999-disable-tests.patch b/dev-vcs/git-cola/files/9999-disable-tests.patch
deleted file mode 100644
index 25462c2..0000000
--- a/dev-vcs/git-cola/files/9999-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
---- cola-1.3.7.21.orig/test/test_cola_git.py 2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/test_cola_git.py 2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
- version = self.git.version()
- self.failUnless(version.startswith('git version'))
-
-- def test_tag(self):
-- """Test running 'git tag'"""
-- tags = self.git.tag().splitlines()
-- self.failUnless( 'v1.0.0' in tags )
--
-- def test_show(self):
-- """Test running 'git show'"""
-- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
-- contents = self.git.show(sha).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/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
index b5133c0..0aa476f 100644
--- a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
+++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
@@ -1,12 +1,8 @@
- cola/app.py | 4 ++--
- setup.py | 4 ----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
diff --git a/cola/app.py b/cola/app.py
-index d4351e3..9ec4ba8 100644
+index f9236de..4636c81 100644
--- a/cola/app.py
+++ b/cola/app.py
-@@ -69,9 +69,9 @@ def setup_environment():
+@@ -66,9 +66,9 @@ def setup_environment():
elif ssh_askpass:
askpass = ssh_askpass
elif sys.platform == 'darwin':
@@ -16,20 +12,5 @@ index d4351e3..9ec4ba8 100644
- askpass = resources.share('bin', 'ssh-askpass')
+ askpass = resources.prefix('bin', 'ssh-askpass')
- os.environ['GIT_ASKPASS'] = askpass
- os.putenv('GIT_ASKPASS', askpass)
-diff --git a/setup.py b/setup.py
-index e202edc..81765a1 100755
---- a/setup.py
-+++ b/setup.py
-@@ -101,10 +101,6 @@ def cola_data_files():
- data.extend([_app_path(localedir, 'git-cola.mo')
- for localedir in glob('share/locale/*/LC_MESSAGES')])
-
-- if sys.platform == 'darwin':
-- data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
-- else:
-- data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
- return data
-
-
+ compat.setenv('GIT_ASKPASS', askpass)
+ compat.setenv('SSH_ASKPASS', askpass)
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index d331989..e67fc25 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -32,15 +32,16 @@ DEPEND="${RDEPEND}
sys-devel/gettext
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-# tests currently broken due to unfinished translation framework
-RESTRICT="test"
-
PATCHES=(
- "${FILESDIR}"/${PV}-disable-tests.patch
"${FILESDIR}"/${PV}-system-ssh-askpass.patch
)
python_prepare_all() {
+ rm share/git-cola/bin/*askpass* || die
+
+ # unfinished translate framework
+ rm test/test_cola_i18n.py || die
+
# don't install docs into wrong location
sed -i \
-e '/doc/d' \
@@ -65,7 +66,7 @@ python_compile_all() {
}
python_install_all() {
- cd share/doc/${PN}/
+ cd share/doc/${PN}/ || die
emake \
DESTDIR="${D}" \
docdir="${EPREFIX}/usr/share/doc/${PF}" \
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2015-07-29 7:50 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2015-07-29 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 50dff11cb471b57291f9f8acf9ed7c9605229dce
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 07:50:04 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 07:50:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=50dff11c
dev-vcs/git-cola: Import tree changes
Package-Manager: portage-2.2.20
dev-vcs/git-cola/ChangeLog | 10 ++-
dev-vcs/git-cola/files/README.gentoo | 3 +
...atch => git-cola-9999-disable-live-tests.patch} | 9 ++-
.../files/git-cola-9999-system-ssh-askpass.patch | 16 ----
.../git-cola-9999-update-git-config-in-tests.patch | 13 ++++
dev-vcs/git-cola/git-cola-9999.ebuild | 89 ++++++++++------------
6 files changed, 69 insertions(+), 71 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 2d51921..b04b697 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for dev-vcs/git-cola
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+ 29 Jul 2015; Justin Lecher <jlec@gentoo.org> +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 <jlec@gentoo.org> git-cola-9999.ebuild:
Fix shebang fixing, #518306
@@ -133,4 +140,3 @@
19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org>
+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
new file mode 100644
index 0000000..0f4af85
--- /dev/null
+++ b/dev-vcs/git-cola/files/README.gentoo
@@ -0,0 +1,3 @@
+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-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch
similarity index 71%
rename from dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch
rename to dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch
index 79f1ec2..2ebdc98 100644
--- a/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch
+++ b/dev-vcs/git-cola/files/git-cola-9999-disable-live-tests.patch
@@ -1,7 +1,8 @@
-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 @@
+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'))
diff --git a/dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch
deleted file mode 100644
index 0aa476f..0000000
--- a/dev-vcs/git-cola/files/git-cola-9999-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-9999-update-git-config-in-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-update-git-config-in-tests.patch
new file mode 100644
index 0000000..96271d0
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-9999-update-git-config-in-tests.patch
@@ -0,0 +1,13 @@
+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-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index 12f7de6..9eefc58 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
DISTUTILS_SINGLE_IMPL=true
-inherit distutils-r1 git-r3
+inherit distutils-r1 git-r3 readme.gentoo virtualx
DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="http://git-cola.github.com/"
+HOMEPAGE="http://git-cola.github.io/"
SRC_URI=""
EGIT_REPO_URI="git://github.com/git-cola/git-cola.git"
@@ -20,60 +20,66 @@ KEYWORDS=""
IUSE="doc test"
RDEPEND="
- dev-python/jsonpickle[${PYTHON_USEDEP}]
dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/send2trash[${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}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- sys-apps/net-tools
- )"
+ 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-tests.patch
- "${FILESDIR}"/${P}-system-ssh-askpass.patch
- )
-
-pkg_pretend() {
- if use test && [[ -z "$(hostname -d)" ]] ; then
- die "Test will fail if no domain is set"
- fi
-}
+ "${FILESDIR}"/${P}-disable-live-tests.patch
+)
python_prepare_all() {
rm share/git-cola/bin/*askpass* || die
- # unfinished translate framework
+ # remove broken tests
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 '/doc/d' setup.py || die
+ # fix doc directory reference
sed -i \
- -e "s|'doc', 'git-cola'|'doc', '${PF}'|" \
- cola/resources.py || die "sed failed"
+ -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}/
- if use doc ; then
+ 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 \
@@ -82,26 +88,11 @@ python_install_all() {
prefix="${EPREFIX}/usr" \
install
- if use doc ; then
- HTML_DOCS=( share/doc/${PN}/_build/html/. )
- else
- HTML_DOCS=( "${FILESDIR}"/index.html )
- fi
-
- distutils-r1_python_install_all
- docompress /usr/share/doc/${PF}/git-cola.txt
-
- python_fix_shebang "${ED}"
-}
+ python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
+ python_optimize "${ED}/usr/share/git-cola/lib/cola"
-python_test() {
- PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \
- --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
- || die "running nosetests failed"
-}
+ use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
-pkg_postinst() {
- elog "Please make sure you have either a SSH key management installed and activated or"
- elog "installed a SSH askpass app like net-misc/x11-ssh-askpass."
- elog "Otherwise ${PN} may hang when pushing/pulling from remote git repositories via SSH. "
+ distutils-r1_python_install_all
+ readme.gentoo_create_doc
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2014-01-20 12:30 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2014-01-20 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 542c24b4942da8fa5418b9319a4ab5da109cbd59
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 12:02:57 2014 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 07:07:04 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=542c24b4
dev-vcs/git-cola: Import tree changes; bump to git-r3.eclass
Package-Manager: portage-2.2.8
---
dev-vcs/git-cola/ChangeLog | 8 +++++++-
.../files/git-cola-9999-disable-tests.patch | 21 +++++++++++++++++++++
...patch => git-cola-9999-system-ssh-askpass.patch} | 0
dev-vcs/git-cola/git-cola-9999.ebuild | 14 +++++++-------
4 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 74b4612..f821c61 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-vcs/git-cola
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+ 15 Jan 2014; Justin Lecher <jlec@gentoo.org> 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 <jlec@gentoo.org> git-cola-9999.ebuild:
Update to latest HEAD
diff --git a/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch b/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch
new file mode 100644
index 0000000..79f1ec2
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-9999-disable-tests.patch
@@ -0,0 +1,21 @@
+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/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch
similarity index 100%
rename from dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
rename to dev-vcs/git-cola/files/git-cola-9999-system-ssh-askpass.patch
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index 9669e48..2aa4631 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.1 2011/04/13 19:00:02 jlec Exp $
+# $Header: $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
DISTUTILS_SINGLE_IMPL=true
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
DESCRIPTION="The highly caffeinated git GUI"
HOMEPAGE="http://git-cola.github.com/"
@@ -26,14 +26,14 @@ RDEPEND="
dev-vcs/git"
DEPEND="${RDEPEND}
app-text/asciidoc
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- app-text/xmlto )
+ app-text/xmlto
sys-devel/gettext
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
PATCHES=(
- "${FILESDIR}"/${PV}-system-ssh-askpass.patch
+ "${FILESDIR}"/${P}-disable-tests.patch
+ "${FILESDIR}"/${P}-system-ssh-askpass.patch
)
python_prepare_all() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2012-09-04 6:44 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-09-04 6:44 UTC (permalink / raw
To: gentoo-commits
commit: 33777a90ef7932485293cc6d0dcbdb6bb5c0d6bf
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 4 06:44:16 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep 4 06:44:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=33777a90
dev-vcs/git-cola: Fix patch for current HEAD
(Portage version: 2.2.0_alpha124/git/Linux x86_64, unsigned Manifest commit)
---
dev-vcs/git-cola/ChangeLog | 4 +++
.../git-cola/files/9999-system-ssh-askpass.patch | 29 +++++++++++---------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index aae5ee1..804e67b 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+ 04 Sep 2012; Justin Lecher <jlec@gentoo.org>
+ files/9999-system-ssh-askpass.patch:
+ Fix patch for current HEAD
+
25 May 2012; Justin Lecher <jlec@gentoo.org>
+files/9999-system-ssh-askpass.patch, git-cola-9999.ebuild:
Import tree changes related to ssh_askpass handling
diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
index 665070d..b5133c0 100644
--- a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
+++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
@@ -1,22 +1,25 @@
+ cola/app.py | 4 ++--
+ setup.py | 4 ----
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
diff --git a/cola/app.py b/cola/app.py
-index a689fdb..9618c3e 100644
+index d4351e3..9ec4ba8 100644
--- a/cola/app.py
+++ b/cola/app.py
-@@ -52,10 +52,10 @@ def setup_environment():
- # Provide an SSH_ASKPASS fallback
- if sys.platform == 'darwin':
- os.environ.setdefault('SSH_ASKPASS',
-- resources.share('bin', 'ssh-askpass-darwin'))
-+ resources.prefix('bin', 'ssh-askpass-darwin'))
+@@ -69,9 +69,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:
- os.environ.setdefault('SSH_ASKPASS',
-- resources.share('bin', 'ssh-askpass'))
-+ resources.prefix('bin', 'x11-ssh-askpass'))
+- askpass = resources.share('bin', 'ssh-askpass')
++ askpass = resources.prefix('bin', 'ssh-askpass')
- # Setup the path so that git finds us when we run 'git cola'
- path_entries = os.environ.get('PATH').split(os.pathsep)
+ os.environ['GIT_ASKPASS'] = askpass
+ os.putenv('GIT_ASKPASS', askpass)
diff --git a/setup.py b/setup.py
-index d639eda..90d5fd0 100755
+index e202edc..81765a1 100755
--- a/setup.py
+++ b/setup.py
@@ -101,10 +101,6 @@ def cola_data_files():
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2012-05-25 14:02 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-05-25 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 0f539a6c98c29c6bfe4800953a458f7342275634
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 14:02:22 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri May 25 14:02:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=0f539a6c
dev-vcs/git-cola: Import tree changes related to ssh_askpass handling
(Portage version: 2.2.0_alpha108/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
dev-vcs/git-cola/ChangeLog | 4 ++
.../git-cola/files/9999-system-ssh-askpass.patch | 32 ++++++++++++++++++++
dev-vcs/git-cola/git-cola-9999.ebuild | 11 +++++-
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 5b8fcc3..aae5ee1 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+ 25 May 2012; Justin Lecher <jlec@gentoo.org>
+ +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 <jlec@gentoo.org> +files/9999-disable-tests.patch,
diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
new file mode 100644
index 0000000..665070d
--- /dev/null
+++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
@@ -0,0 +1,32 @@
+diff --git a/cola/app.py b/cola/app.py
+index a689fdb..9618c3e 100644
+--- a/cola/app.py
++++ b/cola/app.py
+@@ -52,10 +52,10 @@ def setup_environment():
+ # Provide an SSH_ASKPASS fallback
+ if sys.platform == 'darwin':
+ os.environ.setdefault('SSH_ASKPASS',
+- resources.share('bin', 'ssh-askpass-darwin'))
++ resources.prefix('bin', 'ssh-askpass-darwin'))
+ else:
+ os.environ.setdefault('SSH_ASKPASS',
+- resources.share('bin', 'ssh-askpass'))
++ resources.prefix('bin', 'x11-ssh-askpass'))
+
+ # Setup the path so that git finds us when we run 'git cola'
+ path_entries = os.environ.get('PATH').split(os.pathsep)
+diff --git a/setup.py b/setup.py
+index d639eda..90d5fd0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -101,10 +101,6 @@ def cola_data_files():
+ data.extend([_app_path(localedir, 'git-cola.mo')
+ for localedir in glob('share/locale/*/LC_MESSAGES')])
+
+- if sys.platform == 'darwin':
+- data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
+- else:
+- data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
+ return data
+
+
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index dab8fb4..bbd4f21 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -20,6 +20,7 @@ KEYWORDS=""
IUSE="doc test"
RDEPEND="
+ dev-python/jsonpickle
dev-python/pyinotify
dev-python/PyQt4
dev-vcs/git"
@@ -49,9 +50,11 @@ src_prepare() {
-e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \
cola/resources.py || die "sed failed"
- epatch "${FILESDIR}/9999-disable-tests.patch"
+ epatch \
+ "${FILESDIR}"/9999-disable-tests.patch \
+ "${FILESDIR}"/9999-system-ssh-askpass.patch
- python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/ssh-askpass
+ python_convert_shebangs 2 bin/git-cola bin/git-dag
}
src_compile() {
@@ -84,6 +87,10 @@ src_test() {
pkg_postinst() {
python_mod_optimize /usr/share/git-cola/lib/cola
+
+ elog "Please make sure you have either a SSH key management installed and activated or"
+ elog "installed a SSH askpass app like net-misc/x11-ssh-askpass."
+ elog "Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. "
}
pkg_postrm() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/
@ 2012-05-11 10:45 Justin Lecher
0 siblings, 0 replies; 6+ messages in thread
From: Justin Lecher @ 2012-05-11 10:45 UTC (permalink / raw
To: gentoo-commits
commit: e97e52c4df9c015a4d5c4c60ad073dad9e25de02
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 10:45:09 2012 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri May 11 10:45:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e97e52c4
dev-vcs/git-cola: Fix to latest Head
(Portage version: 2.2.0_alpha103/git/Linux x86_64, signed Manifest commit with key 70EB7916)
---
dev-vcs/git-cola/ChangeLog | 93 +++++++++++++++++++++++
dev-vcs/git-cola/files/9999-disable-tests.patch | 21 +++++
dev-vcs/git-cola/files/index.html | 15 ++++
dev-vcs/git-cola/git-cola-9999.ebuild | 91 ++++++++++++++++++++++
dev-vcs/git-cola/metadata.xml | 12 +++
5 files changed, 232 insertions(+), 0 deletions(-)
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
new file mode 100644
index 0000000..5b8fcc3
--- /dev/null
+++ b/dev-vcs/git-cola/ChangeLog
@@ -0,0 +1,93 @@
+# ChangeLog for dev-vcs/git-cola
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+
+*git-cola-9999 (11 May 2012)
+
+ 11 May 2012; Justin Lecher <jlec@gentoo.org> +files/9999-disable-tests.patch,
+ +git-cola-9999.ebuild, +files/index.html, +metadata.xml:
+ Fix to latest Head
+
+ 27 Oct 2011; Justin Lecher <jlec@gentoo.org> cola-9999.ebuild, metadata.xml:
+ Removed no-herd from herd tag in metadata.xml
+
+ 27 Oct 2011; Justin Lecher <jlec@gentoo.org> cola-9999.ebuild:
+ Bump git.eclass to git-2.eclass
+
+*cola-9999 (15 Apr 2011)
+
+ 15 Apr 2011; Justin Lecher <jlec@gentoo.org> +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 <jlec@gentoo.org> +cola-1.4.3.2.ebuild:
+ Non-Maintainer Version Bump
+
+*cola-1.4.3.1 (30 Mar 2011)
+
+ 30 Mar 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.1.ebuild:
+ Non maintainer Version Bump
+
+ 25 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ cola-1.4.3.ebuild:
+ Use Python 2 (bug #329473).
+
+*cola-1.4.3 (25 Jan 2011)
+
+ 25 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> +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 <dev-zero@gentoo.org> cola-1.4.2.1.ebuild:
+ Version bump.
+
+*cola-1.4.2.1 (08 Jun 2010)
+
+ 08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.9.14.ebuild,
+ +cola-1.4.2.1.ebuild:
+ Version bump, dropped old.
+
+ 08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+ Moved from dev-util to dev-vcs.
+
+ 17 Mar 2010; Sebastian Pipping <sping@gentoo.org> 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 <dev-zero@gentoo.org> -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 <dev-zero@gentoo.org> +cola-1.4.1.1.ebuild:
+ Version bump.
+
+*cola-1.4.0.1 (03 Nov 2009)
+
+ 03 Nov 2009; Tiziano Müller <dev-zero@gentoo.org> +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 <dev-zero@gentoo.org> +cola-1.3.9.14.ebuild:
+ Version bump.
+
+ 30 Jun 2009; Christian Faulhammer <fauli@gentoo.org> cola-1.3.8.ebuild:
+ keyworded ~arch for x86, bug 275353
+
+ 19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> 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 <dev-zero@gentoo.org>
+ +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/9999-disable-tests.patch b/dev-vcs/git-cola/files/9999-disable-tests.patch
new file mode 100644
index 0000000..25462c2
--- /dev/null
+++ b/dev-vcs/git-cola/files/9999-disable-tests.patch
@@ -0,0 +1,21 @@
+diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
+--- cola-1.3.7.21.orig/test/test_cola_git.py 2009-04-30 13:56:22.352319047 +0200
++++ cola-1.3.7.21/test/test_cola_git.py 2009-04-30 13:56:53.123149963 +0200
+@@ -24,17 +24,6 @@
+ version = self.git.version()
+ self.failUnless(version.startswith('git version'))
+
+- def test_tag(self):
+- """Test running 'git tag'"""
+- tags = self.git.tag().splitlines()
+- self.failUnless( 'v1.0.0' in tags )
+-
+- def test_show(self):
+- """Test running 'git show'"""
+- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
+- contents = self.git.show(sha).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/index.html b/dev-vcs/git-cola/files/index.html
new file mode 100644
index 0000000..7f1e814
--- /dev/null
+++ b/dev-vcs/git-cola/files/index.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+ <title>Missing documentation</title>
+</head>
+<body>
+<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;">
+ This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled.
+
+ <p style="text-align: right;">
+ Sincerely,<br/>
+ your package maintainer.
+ </p>
+</div>
+</body>
+</html>
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
new file mode 100644
index 0000000..dab8fb4
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.1 2011/04/13 19:00:02 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+EGIT_REPO_URI="git://github.com/davvid/git-cola.git"
+
+inherit distutils eutils git-2
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/pyinotify
+ dev-python/PyQt4
+ dev-vcs/git"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/asciidoc
+ dev-python/sphinx
+ app-text/xmlto )
+ sys-devel/gettext
+ test? ( dev-python/nose )"
+
+# tests currently broken due to unfinished translation framework
+RESTRICT="test"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # 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}', 'html'|" \
+ cola/resources.py || die "sed failed"
+
+ epatch "${FILESDIR}/9999-disable-tests.patch"
+
+ python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/ssh-askpass
+}
+
+src_compile() {
+ distutils_src_compile
+
+ if use doc ; then
+ cd share/doc/git-cola/
+ emake all
+ fi
+}
+
+src_install() {
+ distutils_src_install
+
+ dodoc share/doc/git-cola/*.txt
+
+ if use doc ; then
+ dohtml -r _build/html/*
+ doman *.1
+ else
+ dohtml "${FILESDIR}/index.html"
+ fi
+}
+
+src_test() {
+ PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \
+ --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
+ || die "running nosetests failed"
+}
+
+pkg_postinst() {
+ python_mod_optimize /usr/share/git-cola/lib/cola
+}
+
+pkg_postrm() {
+ python_mod_cleanup /usr/share/git-cola/lib/cola
+}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
new file mode 100644
index 0000000..8e67c9e
--- /dev/null
+++ b/dev-vcs/git-cola/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <name>Justin Lecher</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-07-29 7:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-11 8:39 [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-07-29 7:50 Justin Lecher
2014-01-20 12:30 Justin Lecher
2012-09-04 6:44 Justin Lecher
2012-05-25 14:02 Justin Lecher
2012-05-11 10:45 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox