Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/mercurial: ChangeLog mercurial-9999.ebuild mercurial-2.4.1-r2.ebuild
Date: Wed, 02 Jan 2013 08:32:30
Message-Id: 20130102083219.C602B2171D@flycatcher.gentoo.org
1 djc 13/01/02 08:32:19
2
3 Modified: ChangeLog mercurial-9999.ebuild
4 mercurial-2.4.1-r2.ebuild
5 Log:
6 Fix up mercurial docs brokenness (bug 449434).
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.99 dev-vcs/mercurial/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.99&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?rev=1.99&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/ChangeLog?r1=1.98&r2=1.99
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v
20 retrieving revision 1.98
21 retrieving revision 1.99
22 diff -u -r1.98 -r1.99
23 --- ChangeLog 31 Dec 2012 08:20:42 -0000 1.98
24 +++ ChangeLog 2 Jan 2013 08:32:19 -0000 1.99
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.98 2012/12/31 08:20:42 djc Exp $
29 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/ChangeLog,v 1.99 2013/01/02 08:32:19 djc Exp $
31 +
32 + 02 Jan 2013; Dirkjan Ochtman <djc@g.o> mercurial-2.4.1-r2.ebuild,
33 + mercurial-9999.ebuild:
34 + Fix up docs brokenness (bug 449434).
35
36 31 Dec 2012; Dirkjan Ochtman <djc@g.o> -mercurial-2.3.2.ebuild,
37 -mercurial-2.4-r1.ebuild:
38
39
40
41 1.17 dev-vcs/mercurial/mercurial-9999.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.17&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?rev=1.17&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild?r1=1.16&r2=1.17
46
47 Index: mercurial-9999.ebuild
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v
50 retrieving revision 1.16
51 retrieving revision 1.17
52 diff -u -r1.16 -r1.17
53 --- mercurial-9999.ebuild 31 Dec 2012 08:16:12 -0000 1.16
54 +++ mercurial-9999.ebuild 2 Jan 2013 08:32:19 -0000 1.17
55 @@ -1,6 +1,6 @@
56 -# Copyright 1999-2012 Gentoo Foundation
57 +# Copyright 1999-2013 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.16 2012/12/31 08:16:12 djc Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-9999.ebuild,v 1.17 2013/01/02 08:32:19 djc Exp $
61
62 EAPI=3
63 PYTHON_DEPEND="2"
64 @@ -17,7 +17,7 @@
65 LICENSE="GPL-2"
66 SLOT="0"
67 KEYWORDS=""
68 -IUSE="bugzilla doc emacs gpg test tk zsh-completion"
69 +IUSE="bugzilla emacs gpg test tk zsh-completion"
70
71 RDEPEND="bugzilla? ( dev-python/mysql-python )
72 gpg? ( app-crypt/gnupg )
73 @@ -27,8 +27,8 @@
74 DEPEND="emacs? ( virtual/emacs )
75 test? ( app-arch/unzip
76 dev-python/pygments )
77 - doc? ( app-text/asciidoc
78 - dev-python/docutils )"
79 + app-text/asciidoc
80 + dev-python/docutils"
81
82 PYTHON_CFLAGS=(
83 "2.* + -fno-strict-aliasing"
84 @@ -47,16 +47,11 @@
85
86 src_compile() {
87 distutils_src_compile
88 -
89 - if use doc; then
90 - make doc || die
91 - fi
92 -
93 + make doc || die
94 if use emacs; then
95 cd "${S}"/contrib || die
96 elisp-compile mercurial.el || die "elisp-compile failed!"
97 fi
98 -
99 rm -rf contrib/{win32,macosx} || die
100 }
101
102 @@ -72,7 +67,7 @@
103 fi
104
105 rm -f doc/*.?.txt || die
106 - dodoc CONTRIBUTORS PKG-INFO README doc/*.txt || die
107 + dodoc CONTRIBUTORS README doc/*.txt || die
108 cp hgweb*.cgi "${ED}"/usr/share/doc/${PF}/ || die
109
110 dobin hgeditor || die
111
112
113
114 1.4 dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild
115
116 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.4&view=markup
117 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?rev=1.4&content-type=text/plain
118 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild?r1=1.3&r2=1.4
119
120 Index: mercurial-2.4.1-r2.ebuild
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v
123 retrieving revision 1.3
124 retrieving revision 1.4
125 diff -u -r1.3 -r1.4
126 --- mercurial-2.4.1-r2.ebuild 31 Dec 2012 08:16:12 -0000 1.3
127 +++ mercurial-2.4.1-r2.ebuild 2 Jan 2013 08:32:19 -0000 1.4
128 @@ -1,6 +1,6 @@
129 -# Copyright 1999-2012 Gentoo Foundation
130 +# Copyright 1999-2013 Gentoo Foundation
131 # Distributed under the terms of the GNU General Public License v2
132 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.3 2012/12/31 08:16:12 djc Exp $
133 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-2.4.1-r2.ebuild,v 1.4 2013/01/02 08:32:19 djc Exp $
134
135 EAPI=3
136 PYTHON_DEPEND="2"
137 @@ -17,7 +17,7 @@
138 LICENSE="GPL-2"
139 SLOT="0"
140 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
141 -IUSE="bugzilla doc emacs gpg test tk zsh-completion"
142 +IUSE="bugzilla emacs gpg test tk zsh-completion"
143
144 RDEPEND="bugzilla? ( dev-python/mysql-python )
145 gpg? ( app-crypt/gnupg )
146 @@ -26,9 +26,7 @@
147 app-misc/ca-certificates"
148 DEPEND="emacs? ( virtual/emacs )
149 test? ( app-arch/unzip
150 - dev-python/pygments )
151 - doc? ( app-text/asciidoc
152 - dev-python/docutils )"
153 + dev-python/pygments )"
154
155 PYTHON_CFLAGS=(
156 "2.* + -fno-strict-aliasing"
157 @@ -47,16 +45,10 @@
158
159 src_compile() {
160 distutils_src_compile
161 -
162 - if use doc; then
163 - make doc || die
164 - fi
165 -
166 if use emacs; then
167 cd "${S}"/contrib || die
168 elisp-compile mercurial.el || die "elisp-compile failed!"
169 fi
170 -
171 rm -rf contrib/{win32,macosx} || die
172 }
Report Message
Find on MARC Find on Google Groups