Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/monotone/, dev-vcs/monotone/files/
Date: Sun, 28 Jan 2018 01:27:55
Message-Id: 1517102846.48cb223907cae5bbe36d9cd35fb10865e15c414b.zlogene@gentoo
1 commit: 48cb223907cae5bbe36d9cd35fb10865e15c414b
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 28 01:23:07 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 28 01:27:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cb2239
7
8 dev-vcs/monotone: remove last rited package
9
10 Closes: https://bugs.gentoo.org/634316
11 Closes: https://bugs.gentoo.org/434242
12 Closes: https://bugs.gentoo.org/496724
13 Closes: https://bugs.gentoo.org/526280
14 Closes: https://bugs.gentoo.org/537572
15
16 dev-vcs/monotone/Manifest | 2 -
17 dev-vcs/monotone/files/hooks.lua | 4 -
18 dev-vcs/monotone/files/monotone-0.36.initd | 84 ---------------------
19 dev-vcs/monotone/files/monotone.confd | 25 ------
20 dev-vcs/monotone/files/read-permissions | 7 --
21 dev-vcs/monotone/files/write-permissions | 2 -
22 dev-vcs/monotone/metadata.xml | 15 ----
23 dev-vcs/monotone/monotone-1.0-r4.ebuild | 117 -----------------------------
24 8 files changed, 256 deletions(-)
25
26 diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
27 deleted file mode 100644
28 index 38eb9d77a85..00000000000
29 --- a/dev-vcs/monotone/Manifest
30 +++ /dev/null
31 @@ -1,2 +0,0 @@
32 -DIST monotone-1.0-gentoo-patchset.tar.bz2 14029 BLAKE2B 2a75b0339f1b82836b34235ff66e90c8640d1a6eaf978c4882112e603e1123c82cb941efc06dd246c929c18018b1bcfa78f0cf0cf695aa9a293007eaf3abd7bf SHA512 70c5c885afca10ac3ab1c8ba855302333d2d137697f8f2c0cefdf0c57c466e0b03535ebd5cf936df273004646aeaa4bc55bd4b9f006285f8a825b8a665c77e60
33 -DIST monotone-1.0.tar.bz2 3588074 BLAKE2B 973789ba12a02f73932cd7fbc51a0570d43ea53f5b04d2ab361d445c2b1774e8603ce03b5751c06c312901484c398d82c02c34c0f127ff99e6400ace755a407b SHA512 85f5a015ee3f7a924e16b7f20974cadd18bd6aaf2815eca0da42689373fc654c661051ce6981ec473f9eac7f9796cfed3431f0cfe16d1cbe0b0b625302ef3e77
34
35 diff --git a/dev-vcs/monotone/files/hooks.lua b/dev-vcs/monotone/files/hooks.lua
36 deleted file mode 100644
37 index bbdb0042a5f..00000000000
38 --- a/dev-vcs/monotone/files/hooks.lua
39 +++ /dev/null
40 @@ -1,4 +0,0 @@
41 --- Add custom hooks after the following line. It includes the identification
42 --- needed to start the server.
43 -
44 -include(get_confdir() .. "/passphrase.lua")
45
46 diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd
47 deleted file mode 100644
48 index 286264c5f77..00000000000
49 --- a/dev-vcs/monotone/files/monotone-0.36.initd
50 +++ /dev/null
51 @@ -1,84 +0,0 @@
52 -#!/sbin/openrc-run
53 -# Copyright 2006-2012 Gentoo Foundation
54 -# Distributed under the terms of the GNU General Public License, v2 or later
55 -
56 -extra_commands="import"
57 -
58 -depend() {
59 - need net
60 -}
61 -
62 -# Substitute common default values
63 -MTN_USER=${MTN_USER:-monotone}
64 -MTN_GROUP=${MTN_GROUP:-monotone}
65 -MTN_KEY=${MTN_KEY:-monotone@`hostname --fqdn`}
66 -MTN_CONFDIR=${MTN_CONFDIR:-/etc/monotone}
67 -MTN_COMMON="--norc --confdir=${MTN_CONFDIR} \
68 - --keydir=${MTN_KEYDIR:-/var/lib/monotone/keys} \
69 - --db=${MTN_DB:-/var/lib/monotone/default.mtn} \
70 - --rcfile=${MTN_CONFDIR}/hooks.lua --log=/var/log/monotone/monotone.log"
71 - #--dump=$ERRORLOG
72 -MTN_PIDFILE="/var/run/monotone/monotone.pid"
73 -MTN_HOME=$(awk -F: -vuid=$MTN_USER -vuser=$MTN_USER '$3 == uid || $1 == user { print $6 }' < /etc/passwd)
74 -
75 -dbexists() {
76 - # Create the database if it doesn't exist
77 - if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then
78 - ebegin "Creating monotone database"
79 - start-stop-daemon --start \
80 - --user ${MTN_USER} --group ${MTN_GROUP} \
81 - --exec /usr/bin/mtn -- ${MTN_COMMON} db init
82 - eend $?
83 - fi
84 - if [ ! -e ${MTN_KEYDIR:-/var/lib/monotone/keys}/${MTN_KEY} ]; then
85 - ebegin "Creating monotone server keypair"
86 - export MTN_PWD=${RANDOM}
87 - yes "${MTN_PWD}" | \
88 - start-stop-daemon --start \
89 - --user ${MTN_USER} --group ${MTN_GROUP} \
90 - --exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY}
91 -
92 - eend $?
93 - # Update the password lua hook
94 - cat > ${MTN_CONFDIR}/passphrase.lua <<EOF
95 --- This file is automaticaly generated by the init scripts.
96 --- If you want to add custom hooks, edit ${MTN_CONFDIR}/hooks.lua
97 --- If you want to change the settings, please edit /etc/conf.d/monotone
98 -
99 -function get_passphrase(identity)
100 - if (identity == "${MTN_KEY}") then
101 - return "${MTN_PWD}"
102 - end
103 - return false
104 -end
105 -EOF
106 - fi
107 -}
108 -
109 -start() {
110 - cd ${MTN_HOME}
111 - dbexists
112 -
113 - ebegin "Starting monotone server"
114 - start-stop-daemon --start --background \
115 - --user ${MTN_USER} --group ${MTN_GROUP} \
116 - --exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \
117 - --key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve
118 - eend $?
119 -}
120 -
121 -stop() {
122 - ebegin "Stopping monotone server"
123 - start-stop-daemon --stop --quiet --pidfile ${MTN_PIDFILE}
124 - eend $?
125 -}
126 -
127 -import() {
128 - cd ${MTN_HOME}
129 - dbexists
130 -
131 - # Read packets into the database
132 - einfo "Importing packets to monotone database"
133 - cat | /usr/bin/mtn ${MTN_COMMON} read
134 - eend $?
135 -}
136
137 diff --git a/dev-vcs/monotone/files/monotone.confd b/dev-vcs/monotone/files/monotone.confd
138 deleted file mode 100644
139 index 71772543171..00000000000
140 --- a/dev-vcs/monotone/files/monotone.confd
141 +++ /dev/null
142 @@ -1,25 +0,0 @@
143 -# Copyright 1999-2006 Gentoo Foundation
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -# The commented variables in this file are the defaults that are used
147 -
148 -# in the init-script. You don't need to uncomment them except to
149 -# customize them to different values.
150 -
151 -# Location of the served database
152 -#MTN_DB="/var/lib/monotone/default.mtn"
153 -
154 -# Server identification
155 -#MTN_KEY="monotone@`hostname --fqdn`"
156 -#MTN_PWD=""
157 -
158 -# User and group as which to run monotone
159 -#MTN_USER="monotone"
160 -#MTN_GROUP="monotone"
161 -
162 -# The address and or port (ADDRESS[:PORT]) monotone should listen on
163 -#MTN_ADDRESS=0.0.0.0
164 -
165 -# Advanced options
166 -#MTN_CONFDIR=/etc/monotone
167 -#MTN_KEYDIR=/var/lib/monotone/keys
168
169 diff --git a/dev-vcs/monotone/files/read-permissions b/dev-vcs/monotone/files/read-permissions
170 deleted file mode 100644
171 index d08200aa005..00000000000
172 --- a/dev-vcs/monotone/files/read-permissions
173 +++ /dev/null
174 @@ -1,7 +0,0 @@
175 -pattern "net.example.project.{private,security}*"
176 -allow "joe@×××××××.net"
177 -allow "jim@×××××××.net"
178 -
179 -comment "everyone can read these branches"
180 -pattern "net.example.{public,project}*"
181 -allow "*"
182
183 diff --git a/dev-vcs/monotone/files/write-permissions b/dev-vcs/monotone/files/write-permissions
184 deleted file mode 100644
185 index 1b138c7fc6c..00000000000
186 --- a/dev-vcs/monotone/files/write-permissions
187 +++ /dev/null
188 @@ -1,2 +0,0 @@
189 -joe@×××××××.net
190 -jim@×××××××.net
191
192 diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml
193 deleted file mode 100644
194 index fd524bde49c..00000000000
195 --- a/dev-vcs/monotone/metadata.xml
196 +++ /dev/null
197 @@ -1,15 +0,0 @@
198 -<?xml version="1.0" encoding="UTF-8"?>
199 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
200 -<pkgmetadata>
201 -<!-- maintainer-needed -->
202 - <longdescription>A free distributed version control system. It provides a simple,
203 -single-file transactional version store, with fully disconnected
204 -operation and an efficient peer-to-peer synchronization
205 -protocol. It understands history-sensitive merging, lightweight
206 -branches, integrated code review and 3rd party testing. It uses
207 -cryptographic version naming and client-side RSA certificates. It
208 -has good internationalization support, has no external
209 -dependencies, runs on linux, solaris, OSX, windows, and other
210 -unixes, and is licensed under the GNU GPL.
211 - </longdescription>
212 -</pkgmetadata>
213
214 diff --git a/dev-vcs/monotone/monotone-1.0-r4.ebuild b/dev-vcs/monotone/monotone-1.0-r4.ebuild
215 deleted file mode 100644
216 index 2b4a541b8a1..00000000000
217 --- a/dev-vcs/monotone/monotone-1.0-r4.ebuild
218 +++ /dev/null
219 @@ -1,117 +0,0 @@
220 -# Copyright 1999-2017 Gentoo Foundation
221 -# Distributed under the terms of the GNU General Public License v2
222 -
223 -# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
224 -EAPI="4"
225 -inherit bash-completion-r1 elisp-common eutils toolchain-funcs user
226 -
227 -DESCRIPTION="Monotone Distributed Version Control System"
228 -HOMEPAGE="http://monotone.ca"
229 -SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2
230 - https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
231 -
232 -LICENSE="GPL-2"
233 -SLOT="1"
234 -KEYWORDS="amd64 ~ia64 x86"
235 -IUSE="doc ipv6 nls test"
236 -
237 -RDEPEND="sys-libs/zlib
238 - >=dev-libs/libpcre-7.6
239 - >=dev-libs/botan-1.8.0:0
240 - >=dev-db/sqlite-3.3.8
241 - >=dev-lang/lua-5.1
242 - net-dns/libidn"
243 -DEPEND="${RDEPEND}
244 - >=dev-libs/boost-1.33.1
245 - nls? ( >=sys-devel/gettext-0.11.5 )
246 - doc? ( sys-apps/texinfo )
247 - test? ( dev-tcltk/expect
248 - app-shells/bash-completion )"
249 -
250 -pkg_setup() {
251 - enewgroup monotone
252 - enewuser monotone -1 -1 /var/lib/monotone monotone
253 -}
254 -
255 -src_prepare() {
256 - if [[ $(gcc-major-version) -lt "3" ||
257 - ( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
258 - die 'requires >=gcc-3.4'
259 - fi
260 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-bash-completion-tests.patch"
261 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-botan-1.10-v2.patch"
262 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-glibc-2.14-file-handle.patch"
263 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-boost-1.53.patch"
264 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-pcre3.patch"
265 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-texinfo-5.1.patch"
266 - epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-gcc6.patch"
267 -}
268 -
269 -src_configure() {
270 - econf \
271 - $(use_enable nls) \
272 - $(use_enable ipv6)
273 -}
274 -
275 -src_compile() {
276 - emake
277 - use doc && emake html
278 -}
279 -
280 -src_test() {
281 - # Disables netsync_bind_opt test
282 - # https://code.monotone.ca/p/monotone/issues/179/
283 - export DISABLE_NETWORK_TESTS=true
284 - if [[ ${UID} != 0 ]]; then
285 - emake check
286 - else
287 - ewarn "Tests will fail if ran as root, skipping."
288 - fi
289 -}
290 -
291 -src_install() {
292 - emake DESTDIR="${D}" install
293 -
294 - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
295 -
296 - rm "${ED}"/etc/bash_completion.d/monotone.bash_completion || die
297 - newbashcomp extra/shell/monotone.bash_completion ${PN}
298 -
299 - if use doc; then
300 - dohtml -r doc/html/*
301 - dohtml -r doc/figures
302 - fi
303 -
304 - dodoc AUTHORS NEWS README* UPGRADE
305 - docinto contrib
306 - docompress -x /usr/share/doc/${PF}/contrib
307 - dodoc -r contrib
308 - newconfd "${FILESDIR}"/monotone.confd monotone
309 - newinitd "${FILESDIR}"/${PN}-0.36.initd monotone
310 -
311 - insinto /etc/monotone
312 - newins "${FILESDIR}"/hooks.lua hooks.lua
313 - newins "${FILESDIR}"/read-permissions read-permissions
314 - newins "${FILESDIR}"/write-permissions write-permissions
315 -
316 - keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone
317 - fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone
318 -}
319 -
320 -pkg_postinst() {
321 - elog
322 - elog "For details and instructions to upgrade from previous versions,"
323 - elog "please read /usr/share/doc/${PF}/UPGRADE.bz2"
324 - elog
325 - elog " 1. edit /etc/conf.d/monotone"
326 - elog " 2. import the first keys to enable access with"
327 - elog " env HOME=\${homedir} mtn pubkey me@×××××××.net | /etc/init.d/monotone import"
328 - elog " Thereafter, those with write permission can add other keys via"
329 - elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT"
330 - elog " can be used in the read-permission and write-permission files."
331 - elog " 3. adjust permisions in /etc/monotone/read-permissions"
332 - elog " and /etc/monotone/write-permissions"
333 - elog " 4. start the daemon: /etc/init.d/monotone start"
334 - elog " 5. make persistent: rc-update add monotone default"
335 - elog
336 -}