| 1 |
jlec 15/07/29 07:45:09 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: git-cola-2.2.1.ebuild |
| 5 |
Log: |
| 6 |
Version Bump, bug #554456; thanks Coacher for all the work |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.50 dev-vcs/git-cola/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?rev=1.50&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?rev=1.50&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/ChangeLog?r1=1.49&r2=1.50 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v |
| 20 |
retrieving revision 1.49 |
| 21 |
retrieving revision 1.50 |
| 22 |
diff -u -r1.49 -r1.50 |
| 23 |
--- ChangeLog 27 May 2015 17:00:39 -0000 1.49 |
| 24 |
+++ ChangeLog 29 Jul 2015 07:45:09 -0000 1.50 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for dev-vcs/git-cola |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.49 2015/05/27 17:00:39 jlec Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.50 2015/07/29 07:45:09 jlec Exp $ |
| 30 |
+ |
| 31 |
+*git-cola-2.2.1 (29 Jul 2015) |
| 32 |
+ |
| 33 |
+ 29 Jul 2015; Justin Lecher <jlec@g.o> |
| 34 |
+ +files/git-cola-2.2.1-disable-live-tests.patch, |
| 35 |
+ +files/git-cola-2.2.1-update-git-config-in-tests.patch, |
| 36 |
+ +git-cola-2.2.1.ebuild: |
| 37 |
+ Version Bump, bug #554456; thanks Coacher for all the work |
| 38 |
|
| 39 |
27 May 2015; Justin Lecher <jlec@g.o> -files/1.3.8-disable-tests.patch, |
| 40 |
-files/1.8.1-system-ssh-askpass.patch, -files/1.9.1-disable-tests.patch: |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 dev-vcs/git-cola/git-cola-2.2.1.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.2.1.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/git-cola-2.2.1.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: git-cola-2.2.1.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2015 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-2.2.1.ebuild,v 1.1 2015/07/29 07:45:09 jlec Exp $ |
| 54 |
|
| 55 |
EAPI=5 |
| 56 |
|
| 57 |
PYTHON_COMPAT=( python2_7 python3_{3,4} ) |
| 58 |
DISTUTILS_SINGLE_IMPL=true |
| 59 |
|
| 60 |
inherit distutils-r1 readme.gentoo virtualx |
| 61 |
|
| 62 |
DESCRIPTION="The highly caffeinated git GUI" |
| 63 |
HOMEPAGE="https://git-cola.github.io/" |
| 64 |
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 65 |
|
| 66 |
LICENSE="GPL-2" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 69 |
IUSE="doc test" |
| 70 |
|
| 71 |
RDEPEND=" |
| 72 |
dev-python/pyinotify[${PYTHON_USEDEP}] |
| 73 |
dev-python/send2trash[${PYTHON_USEDEP}] |
| 74 |
dev-python/PyQt4[${PYTHON_USEDEP}] |
| 75 |
dev-vcs/git" |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
sys-devel/gettext |
| 78 |
doc? ( |
| 79 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 80 |
python_targets_python2_7? ( dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')] ) |
| 81 |
) |
| 82 |
test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
| 83 |
" |
| 84 |
|
| 85 |
PATCHES=( |
| 86 |
"${FILESDIR}"/${P}-disable-live-tests.patch |
| 87 |
"${FILESDIR}"/${P}-update-git-config-in-tests.patch |
| 88 |
) |
| 89 |
|
| 90 |
python_prepare_all() { |
| 91 |
rm share/git-cola/bin/*askpass* || die |
| 92 |
|
| 93 |
# remove broken tests |
| 94 |
rm test/i18n_test.py || die |
| 95 |
|
| 96 |
# don't install docs into wrong location |
| 97 |
sed -i -e '/doc/d' setup.py || die |
| 98 |
|
| 99 |
# fix doc directory reference |
| 100 |
sed -i \ |
| 101 |
-e "s/'doc', 'git-cola'/'doc', '${PF}'/" \ |
| 102 |
cola/resources.py || die |
| 103 |
|
| 104 |
# fix ssh-askpass directory reference |
| 105 |
sed -i -e 's/resources\.share/resources\.prefix/' cola/app.py || die |
| 106 |
|
| 107 |
distutils-r1_python_prepare_all |
| 108 |
} |
| 109 |
|
| 110 |
python_compile_all() { |
| 111 |
cd share/doc/${PN}/ || die |
| 112 |
if use doc; then |
| 113 |
emake all |
| 114 |
else |
| 115 |
sed \ |
| 116 |
-e '/^install:/s:install-html::g' \ |
| 117 |
-e '/^install:/s:install-man::g' \ |
| 118 |
-i Makefile || die |
| 119 |
fi |
| 120 |
} |
| 121 |
|
| 122 |
python_test() { |
| 123 |
PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \ |
| 124 |
VIRTUALX_COMMAND="nosetests --verbose --with-id --with-doctest \ |
| 125 |
--exclude=sphinxtogithub" \ |
| 126 |
virtualmake |
| 127 |
} |
| 128 |
|
| 129 |
src_install() { |
| 130 |
distutils-r1_src_install |
| 131 |
} |
| 132 |
|
| 133 |
python_install_all() { |
| 134 |
cd share/doc/${PN}/ || die |
| 135 |
emake \ |
| 136 |
DESTDIR="${D}" \ |
| 137 |
docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
| 138 |
prefix="${EPREFIX}/usr" \ |
| 139 |
install |
| 140 |
|
| 141 |
python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" |
| 142 |
python_optimize "${ED}/usr/share/git-cola/lib/cola" |
| 143 |
|
| 144 |
use doc || HTML_DOCS=( "${FILESDIR}"/index.html ) |
| 145 |
|
| 146 |
distutils-r1_python_install_all |
| 147 |
readme.gentoo_create_doc |
| 148 |
} |
Archives