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

Gentoo Archives: gentoo-commits

From: "Peter Volkov (pva)" <pva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/monotone: metadata.xml ChangeLog monotone-1.0-r4.ebuild
Date: Wed, 28 Aug 2013 13:35:58
Message-Id: 20130828133554.A42242004C@flycatcher.gentoo.org
1 pva 13/08/28 13:35:54
2
3 Modified: metadata.xml ChangeLog
4 Added: monotone-1.0-r4.ebuild
5 Log:
6 Fixed test failure with botan-1.10, thank Martin von Gagern for patch in bug #380257. Fixed another failure with pcre3 (patch from debian).
7
8 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key F1989B07)
9
10 Revision Changes Path
11 1.6 dev-vcs/monotone/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/metadata.xml?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/metadata.xml?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/metadata.xml?r1=1.5&r2=1.6
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/monotone/metadata.xml,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- metadata.xml 16 Feb 2013 12:39:34 -0000 1.5
24 +++ metadata.xml 28 Aug 2013 13:35:54 -0000 1.6
25 @@ -7,6 +7,10 @@
26 <name>Jonny</name>
27 <description>Future Maintainer</description>
28 </maintainer>
29 + <maintainer>
30 + <email>pva@g.o</email>
31 + <name>Peter Volkov</name>
32 + </maintainer>
33 <longdescription>
34 A free distributed version control system. It provides a simple,
35 single-file transactional version store, with fully disconnected
36
37
38
39 1.27 dev-vcs/monotone/ChangeLog
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?rev=1.27&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?rev=1.27&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?r1=1.26&r2=1.27
44
45 Index: ChangeLog
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v
48 retrieving revision 1.26
49 retrieving revision 1.27
50 diff -u -r1.26 -r1.27
51 --- ChangeLog 30 Jun 2013 00:18:23 -0000 1.26
52 +++ ChangeLog 28 Aug 2013 13:35:54 -0000 1.27
53 @@ -1,6 +1,14 @@
54 # ChangeLog for dev-vcs/monotone
55 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.26 2013/06/30 00:18:23 chithanh Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.27 2013/08/28 13:35:54 pva Exp $
58 +
59 +*monotone-1.0-r4 (28 Aug 2013)
60 +
61 + 28 Aug 2013; Peter Volkov <pva@g.o> +monotone-1.0-r4.ebuild,
62 + +files/monotone-1.0-botan-1.10-v2.patch, +files/monotone-1.0-pcre3.patch,
63 + metadata.xml:
64 + Fixed test failure with botan-1.10, thank Martin von Gagern for patch in bug
65 + #380257. Fixed another failure with pcre3 (patch from debian).
66
67 30 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
68 +files/monotone-1.0-boost-1.53.patch, monotone-1.0-r3.ebuild:
69
70
71
72 1.1 dev-vcs/monotone/monotone-1.0-r4.ebuild
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r4.ebuild?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r4.ebuild?rev=1.1&content-type=text/plain
76
77 Index: monotone-1.0-r4.ebuild
78 ===================================================================
79 # Copyright 1999-2013 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r4.ebuild,v 1.1 2013/08/28 13:35:54 pva Exp $
82
83 # QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
84 EAPI="4"
85 inherit bash-completion-r1 elisp-common eutils toolchain-funcs user
86
87 DESCRIPTION="Monotone Distributed Version Control System"
88 HOMEPAGE="http://monotone.ca"
89 SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2"
90
91 LICENSE="GPL-2"
92 SLOT="1"
93 KEYWORDS="~amd64 ~ia64 ~x86"
94 IUSE="doc ipv6 nls test"
95
96 RDEPEND="sys-libs/zlib
97 >=dev-libs/libpcre-7.6
98 >=dev-libs/botan-1.8.0
99 >=dev-db/sqlite-3.3.8
100 >=dev-lang/lua-5.1
101 net-dns/libidn"
102 DEPEND="${RDEPEND}
103 >=dev-libs/boost-1.33.1
104 nls? ( >=sys-devel/gettext-0.11.5 )
105 doc? ( sys-apps/texinfo )
106 test? ( dev-tcltk/expect
107 app-shells/bash-completion )"
108
109 pkg_setup() {
110 enewgroup monotone
111 enewuser monotone -1 -1 /var/lib/monotone monotone
112 }
113
114 src_prepare() {
115 if [[ $(gcc-major-version) -lt "3" ||
116 ( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
117 die 'requires >=gcc-3.4'
118 fi
119 epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch"
120 epatch "${FILESDIR}/monotone-1.0-botan-1.10-v2.patch"
121 epatch "${FILESDIR}/monotone-1.0-glibc-2.14-file-handle.patch"
122 epatch "${FILESDIR}/monotone-1.0-boost-1.53.patch"
123 epatch "${FILESDIR}/monotone-1.0-pcre3.patch"
124 }
125
126 src_configure() {
127 econf \
128 $(use_enable nls) \
129 $(use_enable ipv6)
130 }
131
132 src_compile() {
133 emake
134 use doc && emake html
135 }
136
137 src_test() {
138 # Disables netsync_bind_opt test
139 # https://code.monotone.ca/p/monotone/issues/179/
140 export DISABLE_NETWORK_TESTS=true
141 if [[ ${UID} != 0 ]]; then
142 emake check
143 else
144 ewarn "Tests will fail if ran as root, skipping."
145 fi
146 }
147
148 src_install() {
149 emake DESTDIR="${D}" install
150
151 mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
152
153 rm "${ED}"/etc/bash_completion.d/monotone.bash_completion || die
154 newbashcomp extra/shell/monotone.bash_completion ${PN}
155
156 if use doc; then
157 dohtml -r doc/html/*
158 dohtml -r doc/figures
159 fi
160
161 dodoc AUTHORS NEWS README* UPGRADE
162 docinto contrib
163 docompress -x /usr/share/doc/${PF}/contrib
164 dodoc -r contrib
165 newconfd "${FILESDIR}"/monotone.confd monotone
166 newinitd "${FILESDIR}"/${PN}-0.36.initd monotone
167
168 insinto /etc/monotone
169 newins "${FILESDIR}"/hooks.lua hooks.lua
170 newins "${FILESDIR}"/read-permissions read-permissions
171 newins "${FILESDIR}"/write-permissions write-permissions
172
173 keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone
174 fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone
175 }
176
177 pkg_postinst() {
178 elog
179 elog "For details and instructions to upgrade from previous versions,"
180 elog "please read /usr/share/doc/${PF}/UPGRADE.bz2"
181 elog
182 elog " 1. edit /etc/conf.d/monotone"
183 elog " 2. import the first keys to enable access with"
184 elog " env HOME=\${homedir} mtn pubkey me@×××××××.net | /etc/init.d/monotone import"
185 elog " Thereafter, those with write permission can add other keys via"
186 elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT"
187 elog " can be used in the read-permission and write-permission files."
188 elog " 3. adjust permisions in /etc/monotone/read-permissions"
189 elog " and /etc/monotone/write-permissions"
190 elog " 4. start the daemon: /etc/init.d/monotone start"
191 elog " 5. make persistent: rc-update add monotone default"
192 elog
193 }
Report Message
Find on MARC Find on Google Groups