1 |
commit: 6fb6bae926d5020def20d28827c345094405286c |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 09:01:09 2013 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 09:01:09 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=6fb6bae9 |
7 |
|
8 |
dev-vcs/git-cola: Version BUmp and move to new python eclasses |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha173 |
11 |
|
12 |
--- |
13 |
dev-vcs/git-cola/ChangeLog | 3 + |
14 |
dev-vcs/git-cola/git-cola-9999.ebuild | 74 +++++++++++++++----------------- |
15 |
2 files changed, 38 insertions(+), 39 deletions(-) |
16 |
|
17 |
diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog |
18 |
index d4a36ea..4acdac3 100644 |
19 |
--- a/dev-vcs/git-cola/ChangeLog |
20 |
+++ b/dev-vcs/git-cola/ChangeLog |
21 |
@@ -2,6 +2,9 @@ |
22 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $ |
24 |
|
25 |
+ 29 Apr 2013; Justin Lecher <jlec@g.o> git-cola-9999.ebuild: |
26 |
+ Version BUmp and move to new python eclasses |
27 |
+ |
28 |
15 Jan 2013; Justin Lecher <jlec@g.o> git-cola-9999.ebuild, |
29 |
metadata.xml: |
30 |
Correct github owner |
31 |
|
32 |
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild |
33 |
index b5f3fa5..ef647ba 100644 |
34 |
--- a/dev-vcs/git-cola/git-cola-9999.ebuild |
35 |
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild |
36 |
@@ -2,17 +2,17 @@ |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
# $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 $ |
39 |
|
40 |
-EAPI=4 |
41 |
+EAPI=5 |
42 |
|
43 |
-PYTHON_DEPEND="2" |
44 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
45 |
+DISTUTILS_SINGLE_IMPL=true |
46 |
|
47 |
-EGIT_REPO_URI="git://github.com/git-cola/git-cola.git" |
48 |
- |
49 |
-inherit distutils eutils git-2 |
50 |
+inherit distutils-r1 git-2 |
51 |
|
52 |
DESCRIPTION="The highly caffeinated git GUI" |
53 |
HOMEPAGE="http://git-cola.github.com/" |
54 |
SRC_URI="" |
55 |
+EGIT_REPO_URI="git://github.com/git-cola/git-cola.git" |
56 |
|
57 |
LICENSE="GPL-2" |
58 |
SLOT="0" |
59 |
@@ -20,27 +20,27 @@ KEYWORDS="" |
60 |
IUSE="doc test" |
61 |
|
62 |
RDEPEND=" |
63 |
- dev-python/jsonpickle |
64 |
- dev-python/pyinotify |
65 |
- dev-python/PyQt4 |
66 |
+ dev-python/jsonpickle[${PYTHON_USEDEP}] |
67 |
+ dev-python/pyinotify[${PYTHON_USEDEP}] |
68 |
+ dev-python/PyQt4[${PYTHON_USEDEP}] |
69 |
dev-vcs/git" |
70 |
DEPEND="${RDEPEND} |
71 |
doc? ( |
72 |
app-text/asciidoc |
73 |
- dev-python/sphinx |
74 |
+ dev-python/sphinx[${PYTHON_USEDEP}] |
75 |
app-text/xmlto ) |
76 |
sys-devel/gettext |
77 |
- test? ( dev-python/nose )" |
78 |
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
79 |
|
80 |
# tests currently broken due to unfinished translation framework |
81 |
RESTRICT="test" |
82 |
|
83 |
-pkg_setup() { |
84 |
- python_set_active_version 2 |
85 |
- python_pkg_setup |
86 |
-} |
87 |
+PATCHES=( |
88 |
+ "${FILESDIR}"/${PV}-disable-tests.patch |
89 |
+ "${FILESDIR}"/${PV}-system-ssh-askpass.patch |
90 |
+ ) |
91 |
|
92 |
-src_prepare() { |
93 |
+python_prepare_all() { |
94 |
# don't install docs into wrong location |
95 |
sed -i \ |
96 |
-e '/doc/d' \ |
97 |
@@ -50,49 +50,45 @@ src_prepare() { |
98 |
-e "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \ |
99 |
cola/resources.py || die "sed failed" |
100 |
|
101 |
- epatch \ |
102 |
- "${FILESDIR}"/9999-disable-tests.patch \ |
103 |
- "${FILESDIR}"/9999-system-ssh-askpass.patch |
104 |
- |
105 |
- python_convert_shebangs 2 bin/git-cola bin/git-dag |
106 |
+ distutils-r1_python_prepare_all |
107 |
} |
108 |
|
109 |
-src_compile() { |
110 |
- distutils_src_compile |
111 |
- |
112 |
+python_compile_all() { |
113 |
+ cd share/doc/${PN}/ |
114 |
if use doc ; then |
115 |
- cd share/doc/git-cola/ |
116 |
emake all |
117 |
+ else |
118 |
+ sed \ |
119 |
+ -e '/^install:/s:install-html::g' \ |
120 |
+ -i Makefile || die |
121 |
fi |
122 |
} |
123 |
|
124 |
-src_install() { |
125 |
- distutils_src_install |
126 |
- |
127 |
- dodoc share/doc/git-cola/*.txt |
128 |
+python_install_all() { |
129 |
+ cd share/doc/${PN}/ |
130 |
+ emake \ |
131 |
+ DESTDIR="${D}" \ |
132 |
+ docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
133 |
+ prefix="${EPREFIX}/usr" \ |
134 |
+ install |
135 |
|
136 |
if use doc ; then |
137 |
- dohtml -r _build/html/* |
138 |
- doman *.1 |
139 |
+ HTML_DOCS=( share/doc/${PN}/_build/html/. ) |
140 |
else |
141 |
- dohtml "${FILESDIR}/index.html" |
142 |
+ HTML_DOCS=( "${FILESDIR}"/index.html ) |
143 |
fi |
144 |
+ |
145 |
+ distutils-r1_python_install_all |
146 |
} |
147 |
|
148 |
-src_test() { |
149 |
+python_test() { |
150 |
PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \ |
151 |
--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \ |
152 |
|| die "running nosetests failed" |
153 |
} |
154 |
|
155 |
pkg_postinst() { |
156 |
- python_mod_optimize /usr/share/git-cola/lib/cola |
157 |
- |
158 |
elog "Please make sure you have either a SSH key management installed and activated or" |
159 |
elog "installed a SSH askpass app like net-misc/x11-ssh-askpass." |
160 |
- elog "Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. " |
161 |
-} |
162 |
- |
163 |
-pkg_postrm() { |
164 |
- python_mod_cleanup /usr/share/git-cola/lib/cola |
165 |
+ elog "Otherwise ${PN} may hang when pushing/pulling from remote git repositories via SSH. " |
166 |
} |