1 |
djc 12/12/30 15:46:31 |
2 |
|
3 |
Modified: ChangeLog mercurial-9999.ebuild |
4 |
mercurial-2.4.1-r1.ebuild |
5 |
Log: |
6 |
Bring mercurial versions closer together. |
7 |
|
8 |
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB) |
9 |
|
10 |
Revision Changes Path |
11 |
1.94 dev-vcs/mercurial/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.94&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.94&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.93&r2=1.94 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v |
20 |
retrieving revision 1.93 |
21 |
retrieving revision 1.94 |
22 |
diff -u -r1.93 -r1.94 |
23 |
--- ChangeLog 30 Dec 2012 15:21:57 -0000 1.93 |
24 |
+++ ChangeLog 30 Dec 2012 15:46:31 -0000 1.94 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for dev-vcs/mercurial |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.93 2012/12/30 15:21:57 djc Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.94 2012/12/30 15:46:31 djc Exp $ |
30 |
+ |
31 |
+ 30 Dec 2012; Dirkjan Ochtman <djc@g.o> mercurial-2.4.1-r1.ebuild, |
32 |
+ mercurial-9999.ebuild: |
33 |
+ Bring 2.4.1-r1 and 9999 versions closer together. |
34 |
|
35 |
*mercurial-2.4.1-r1 (30 Dec 2012) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.14 dev-vcs/mercurial/mercurial-9999.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.14&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.14&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?r1=1.13&r2=1.14 |
45 |
|
46 |
Index: mercurial-9999.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v |
49 |
retrieving revision 1.13 |
50 |
retrieving revision 1.14 |
51 |
diff -u -r1.13 -r1.14 |
52 |
--- mercurial-9999.ebuild 27 Dec 2012 18:47:52 -0000 1.13 |
53 |
+++ mercurial-9999.ebuild 30 Dec 2012 15:46:31 -0000 1.14 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2012 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.13 2012/12/27 18:47:52 ottxor Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.14 2012/12/30 15:46:31 djc Exp $ |
59 |
|
60 |
EAPI=3 |
61 |
PYTHON_DEPEND="2" |
62 |
@@ -22,7 +22,8 @@ |
63 |
RDEPEND="bugzilla? ( dev-python/mysql-python ) |
64 |
gpg? ( app-crypt/gnupg ) |
65 |
tk? ( dev-lang/tk ) |
66 |
- zsh-completion? ( app-shells/zsh )" |
67 |
+ zsh-completion? ( app-shells/zsh ) |
68 |
+ app-misc/ca-certificates" |
69 |
DEPEND="emacs? ( virtual/emacs ) |
70 |
test? ( app-arch/unzip |
71 |
dev-python/pygments ) |
72 |
@@ -36,6 +37,14 @@ |
73 |
PYTHON_MODNAME="${PN} hgext" |
74 |
SITEFILE="70${PN}-gentoo.el" |
75 |
|
76 |
+src_prepare() { |
77 |
+ distutils_src_prepare |
78 |
+ |
79 |
+ # fix up logic that won't work in Gentoo Prefix (also won't outside in |
80 |
+ # certain cases), bug #362891 |
81 |
+ sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die |
82 |
+} |
83 |
+ |
84 |
src_compile() { |
85 |
distutils_src_compile |
86 |
|
87 |
@@ -44,12 +53,13 @@ |
88 |
elisp-compile mercurial.el || die "elisp-compile failed!" |
89 |
fi |
90 |
|
91 |
- rm -rf contrib/{win32,macosx} |
92 |
+ rm -rf contrib/{win32,macosx} || die |
93 |
make doc || die |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
distutils_src_install |
98 |
+ python_convert_shebangs 2 contrib/hg-ssh |
99 |
|
100 |
newbashcomp contrib/bash_completion ${PN} || die |
101 |
|
102 |
@@ -58,17 +68,17 @@ |
103 |
newins contrib/zsh_completion _hg || die |
104 |
fi |
105 |
|
106 |
- rm -f doc/*.?.txt |
107 |
- dodoc CONTRIBUTORS README doc/*.txt || die |
108 |
+ rm -f doc/*.?.txt || die |
109 |
+ dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die |
110 |
cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die |
111 |
|
112 |
dobin hgeditor || die |
113 |
dobin contrib/hgk || die |
114 |
dobin contrib/hg-ssh || die |
115 |
|
116 |
- rm -f contrib/hgk contrib/hg-ssh |
117 |
+ rm -f contrib/hgk contrib/hg-ssh || die |
118 |
|
119 |
- rm -f contrib/bash_completion |
120 |
+ rm -f contrib/bash_completion || die |
121 |
cp -r contrib "${ED}"/usr/share/doc/${PF}/ || die |
122 |
doman doc/*.? || die |
123 |
|
124 |
@@ -81,34 +91,37 @@ |
125 |
elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" |
126 |
elisp-site-file-install "${FILESDIR}"/${SITEFILE} |
127 |
fi |
128 |
+ |
129 |
+ insinto /etc/mercurial/hgrc.d |
130 |
+ doins "${FILESDIR}/cacerts.rc" |
131 |
} |
132 |
|
133 |
src_test() { |
134 |
cd "${S}/tests/" || die |
135 |
- rm -rf *svn* # Subversion tests fail with 1.5 |
136 |
- rm -f test-archive # Fails due to verbose tar output changes |
137 |
- rm -f test-convert-baz* # GNU Arch baz |
138 |
- rm -f test-convert-cvs* # CVS |
139 |
- rm -f test-convert-darcs* # Darcs |
140 |
- rm -f test-convert-git* # git |
141 |
- rm -f test-convert-mtn* # monotone |
142 |
- rm -f test-convert-tla* # GNU Arch tla |
143 |
- rm -f test-doctest* # doctest always fails with python 2.5.x |
144 |
+ rm -rf *svn* || die # Subversion tests fail with 1.5 |
145 |
+ rm -f test-archive || die # Fails due to verbose tar output changes |
146 |
+ rm -f test-convert-baz* || die # GNU Arch baz |
147 |
+ rm -f test-convert-cvs* || die # CVS |
148 |
+ rm -f test-convert-darcs* || die # Darcs |
149 |
+ rm -f test-convert-git* || die # git |
150 |
+ rm -f test-convert-mtn* || die # monotone |
151 |
+ rm -f test-convert-tla* || die # GNU Arch tla |
152 |
+ rm -f test-doctest* || die # doctest always fails with python 2.5.x |
153 |
if [[ ${EUID} -eq 0 ]]; then |
154 |
einfo "Removing tests which require user privileges to succeed" |
155 |
- rm -f test-command-template # Test is broken when run as root |
156 |
- rm -f test-convert # Test is broken when run as root |
157 |
- rm -f test-lock-badness # Test is broken when run as root |
158 |
- rm -f test-permissions # Test is broken when run as root |
159 |
- rm -f test-pull-permission # Test is broken when run as root |
160 |
- rm -f test-clone-failure |
161 |
- rm -f test-journal-exists |
162 |
- rm -f test-repair-strip |
163 |
+ rm -f test-command-template || die # Test is broken when run as root |
164 |
+ rm -f test-convert || die # Test is broken when run as root |
165 |
+ rm -f test-lock-badness || die # Test is broken when run as root |
166 |
+ rm -f test-permissions || die # Test is broken when run as root |
167 |
+ rm -f test-pull-permission || die # Test is broken when run as root |
168 |
+ rm -f test-clone-failure || die |
169 |
+ rm -f test-journal-exists || die |
170 |
+ rm -f test-repair-strip || die |
171 |
fi |
172 |
|
173 |
testing() { |
174 |
local testdir="${T}/tests-${PYTHON_ABI}" |
175 |
- rm -rf "${testdir}" |
176 |
+ rm -rf "${testdir}" || die |
177 |
"$(PYTHON)" run-tests.py --tmpdir="${testdir}" |
178 |
} |
179 |
python_execute_function testing |
180 |
|
181 |
|
182 |
|
183 |
1.2 dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild |
184 |
|
185 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild?rev=1.2&view=markup |
186 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild?rev=1.2&content-type=text/plain |
187 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild?r1=1.1&r2=1.2 |
188 |
|
189 |
Index: mercurial-2.4.1-r1.ebuild |
190 |
=================================================================== |
191 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild,v |
192 |
retrieving revision 1.1 |
193 |
retrieving revision 1.2 |
194 |
diff -u -r1.1 -r1.2 |
195 |
--- mercurial-2.4.1-r1.ebuild 30 Dec 2012 15:21:57 -0000 1.1 |
196 |
+++ mercurial-2.4.1-r1.ebuild 30 Dec 2012 15:46:31 -0000 1.2 |
197 |
@@ -1,6 +1,6 @@ |
198 |
# Copyright 1999-2012 Gentoo Foundation |
199 |
# Distributed under the terms of the GNU General Public License v2 |
200 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild,v 1.1 2012/12/30 15:21:57 djc Exp $ |
201 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r1.ebuild,v 1.2 2012/12/30 15:46:31 djc Exp $ |
202 |
|
203 |
EAPI=3 |
204 |
PYTHON_DEPEND="2" |
205 |
@@ -26,7 +26,8 @@ |
206 |
app-misc/ca-certificates" |
207 |
DEPEND="emacs? ( virtual/emacs ) |
208 |
test? ( app-arch/unzip |
209 |
- dev-python/pygments )" |
210 |
+ dev-python/pygments ) |
211 |
+ app-text/asciidoc" |
212 |
|
213 |
PYTHON_CFLAGS=( |
214 |
"2.* + -fno-strict-aliasing" |
215 |
@@ -53,6 +54,7 @@ |
216 |
fi |
217 |
|
218 |
rm -rf contrib/{win32,macosx} || die |
219 |
+ make doc || die |
220 |
} |
221 |
|
222 |
src_install() { |
223 |
@@ -96,19 +98,19 @@ |
224 |
|
225 |
src_test() { |
226 |
cd "${S}/tests/" || die |
227 |
- rm -rf *svn* || die # Subversion tests fail with 1.5 |
228 |
- rm -f test-archive || die # Fails due to verbose tar output changes |
229 |
+ rm -rf *svn* || die # Subversion tests fail with 1.5 |
230 |
+ rm -f test-archive || die # Fails due to verbose tar output changes |
231 |
rm -f test-convert-baz* || die # GNU Arch baz |
232 |
rm -f test-convert-cvs* || die # CVS |
233 |
rm -f test-convert-darcs* || die # Darcs |
234 |
rm -f test-convert-git* || die # git |
235 |
rm -f test-convert-mtn* || die # monotone |
236 |
rm -f test-convert-tla* || die # GNU Arch tla |
237 |
- rm -f test-doctest* || die # doctest always fails with python 2.5.x |
238 |
+ rm -f test-doctest* || die # doctest always fails with python 2.5.x |
239 |
if [[ ${EUID} -eq 0 ]]; then |
240 |
einfo "Removing tests which require user privileges to succeed" |
241 |
rm -f test-command-template || die # Test is broken when run as root |
242 |
- rm -f test-convert || die # Test is broken when run as root |
243 |
+ rm -f test-convert || die # Test is broken when run as root |
244 |
rm -f test-lock-badness || die # Test is broken when run as root |
245 |
rm -f test-permissions || die # Test is broken when run as root |
246 |
rm -f test-pull-permission || die # Test is broken when run as root |