* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/monotone/, dev-vcs/monotone/files/
@ 2017-05-26 21:01 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2017-05-26 21:01 UTC (permalink / raw
To: gentoo-commits
commit: f0b1fd53dd05451d68ca0317020ce6e569eb7851
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May 26 03:16:08 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 26 20:59:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b1fd53
dev-vcs/monotone: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594538
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4764
dev-vcs/monotone/files/monotone-1.0-gcc6.patch | 64 ++++++++++++++++++++++++++
dev-vcs/monotone/monotone-1.0-r4.ebuild | 3 +-
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/dev-vcs/monotone/files/monotone-1.0-gcc6.patch b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch
new file mode 100644
index 00000000000..f9e1751e09b
--- /dev/null
+++ b/dev-vcs/monotone/files/monotone-1.0-gcc6.patch
@@ -0,0 +1,64 @@
+Bug: https://bugs.gentoo.org/594538
+
+--- a/src/cache_logger.hh
++++ b/src/cache_logger.hh
+@@ -23,7 +23,7 @@
+ // if given the empty filename, do nothing
+ explicit cache_logger(std::string const & filename, int max_size);
+
+- bool logging() const { return _impl; }
++ bool logging() const { return static_cast<bool>(_impl); }
+
+ void log_exists(bool exists, int position, int item_count, int est_size) const;
+ void log_touch(bool exists, int position, int item_count, int est_size) const;
+--- a/src/cmd_ws_commit.cc
++++ b/src/cmd_ws_commit.cc
+@@ -1170,7 +1170,7 @@
+ {
+ for (attr_map_t::iterator i = node->attrs.begin();
+ i != node->attrs.end(); ++i)
+- i->second = make_pair(false, "");
++ i->second = make_pair(false, attr_value(""));
+ }
+ else
+ {
+@@ -1179,7 +1179,7 @@
+ E(node->attrs.find(a_key) != node->attrs.end(), origin::user,
+ F("path '%s' does not have attribute '%s'")
+ % path % a_key);
+- node->attrs[a_key] = make_pair(false, "");
++ node->attrs[a_key] = make_pair(false, attr_value(""));
+ }
+
+ cset cs;
+--- a/src/roster.cc
++++ b/src/roster.cc
+@@ -223,7 +223,7 @@
+
+ bool marking_map::contains(node_id nid) const
+ {
+- return _store.get_if_present(nid);
++ return static_cast<bool>(_store.get_if_present(nid));
+ }
+
+ void marking_map::remove_marking(node_id nid)
+@@ -727,7 +727,7 @@
+ bool
+ roster_t::has_node(node_id n) const
+ {
+- return nodes.get_if_present(n);
++ return static_cast<bool>(nodes.get_if_present(n));
+ }
+
+ bool
+@@ -1898,8 +1898,8 @@
+ node_t const &left_node = left_roster.all_nodes().get_if_present(i->first);
+ node_t const &right_node = right_roster.all_nodes().get_if_present(i->first);
+
+- bool exists_in_left = (left_node);
+- bool exists_in_right = (right_node);
++ bool exists_in_left = static_cast<bool>(left_node);
++ bool exists_in_right = static_cast<bool>(right_node);
+
+ if (!exists_in_left && !exists_in_right)
+ mark_new_node(new_rid, n, new_markings);
diff --git a/dev-vcs/monotone/monotone-1.0-r4.ebuild b/dev-vcs/monotone/monotone-1.0-r4.ebuild
index ba474c6a345..a04a8dd6684 100644
--- a/dev-vcs/monotone/monotone-1.0-r4.ebuild
+++ b/dev-vcs/monotone/monotone-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
@@ -43,6 +43,7 @@ src_prepare() {
epatch "${FILESDIR}/monotone-1.0-boost-1.53.patch"
epatch "${FILESDIR}/monotone-1.0-pcre3.patch"
epatch "${FILESDIR}/monotone-1.0-texinfo-5.1.patch"
+ epatch "${FILESDIR}/monotone-1.0-gcc6.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/monotone/, dev-vcs/monotone/files/
@ 2018-01-28 1:27 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2018-01-28 1:27 UTC (permalink / raw
To: gentoo-commits
commit: 48cb223907cae5bbe36d9cd35fb10865e15c414b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 01:23:07 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 01:27:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cb2239
dev-vcs/monotone: remove last rited package
Closes: https://bugs.gentoo.org/634316
Closes: https://bugs.gentoo.org/434242
Closes: https://bugs.gentoo.org/496724
Closes: https://bugs.gentoo.org/526280
Closes: https://bugs.gentoo.org/537572
dev-vcs/monotone/Manifest | 2 -
dev-vcs/monotone/files/hooks.lua | 4 -
dev-vcs/monotone/files/monotone-0.36.initd | 84 ---------------------
dev-vcs/monotone/files/monotone.confd | 25 ------
dev-vcs/monotone/files/read-permissions | 7 --
dev-vcs/monotone/files/write-permissions | 2 -
dev-vcs/monotone/metadata.xml | 15 ----
dev-vcs/monotone/monotone-1.0-r4.ebuild | 117 -----------------------------
8 files changed, 256 deletions(-)
diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
deleted file mode 100644
index 38eb9d77a85..00000000000
--- a/dev-vcs/monotone/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST monotone-1.0-gentoo-patchset.tar.bz2 14029 BLAKE2B 2a75b0339f1b82836b34235ff66e90c8640d1a6eaf978c4882112e603e1123c82cb941efc06dd246c929c18018b1bcfa78f0cf0cf695aa9a293007eaf3abd7bf SHA512 70c5c885afca10ac3ab1c8ba855302333d2d137697f8f2c0cefdf0c57c466e0b03535ebd5cf936df273004646aeaa4bc55bd4b9f006285f8a825b8a665c77e60
-DIST monotone-1.0.tar.bz2 3588074 BLAKE2B 973789ba12a02f73932cd7fbc51a0570d43ea53f5b04d2ab361d445c2b1774e8603ce03b5751c06c312901484c398d82c02c34c0f127ff99e6400ace755a407b SHA512 85f5a015ee3f7a924e16b7f20974cadd18bd6aaf2815eca0da42689373fc654c661051ce6981ec473f9eac7f9796cfed3431f0cfe16d1cbe0b0b625302ef3e77
diff --git a/dev-vcs/monotone/files/hooks.lua b/dev-vcs/monotone/files/hooks.lua
deleted file mode 100644
index bbdb0042a5f..00000000000
--- a/dev-vcs/monotone/files/hooks.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Add custom hooks after the following line. It includes the identification
--- needed to start the server.
-
-include(get_confdir() .. "/passphrase.lua")
diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd
deleted file mode 100644
index 286264c5f77..00000000000
--- a/dev-vcs/monotone/files/monotone-0.36.initd
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2006-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_commands="import"
-
-depend() {
- need net
-}
-
-# Substitute common default values
-MTN_USER=${MTN_USER:-monotone}
-MTN_GROUP=${MTN_GROUP:-monotone}
-MTN_KEY=${MTN_KEY:-monotone@`hostname --fqdn`}
-MTN_CONFDIR=${MTN_CONFDIR:-/etc/monotone}
-MTN_COMMON="--norc --confdir=${MTN_CONFDIR} \
- --keydir=${MTN_KEYDIR:-/var/lib/monotone/keys} \
- --db=${MTN_DB:-/var/lib/monotone/default.mtn} \
- --rcfile=${MTN_CONFDIR}/hooks.lua --log=/var/log/monotone/monotone.log"
- #--dump=$ERRORLOG
-MTN_PIDFILE="/var/run/monotone/monotone.pid"
-MTN_HOME=$(awk -F: -vuid=$MTN_USER -vuser=$MTN_USER '$3 == uid || $1 == user { print $6 }' < /etc/passwd)
-
-dbexists() {
- # Create the database if it doesn't exist
- if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then
- ebegin "Creating monotone database"
- start-stop-daemon --start \
- --user ${MTN_USER} --group ${MTN_GROUP} \
- --exec /usr/bin/mtn -- ${MTN_COMMON} db init
- eend $?
- fi
- if [ ! -e ${MTN_KEYDIR:-/var/lib/monotone/keys}/${MTN_KEY} ]; then
- ebegin "Creating monotone server keypair"
- export MTN_PWD=${RANDOM}
- yes "${MTN_PWD}" | \
- start-stop-daemon --start \
- --user ${MTN_USER} --group ${MTN_GROUP} \
- --exec /usr/bin/mtn -- ${MTN_COMMON} genkey ${MTN_KEY}
-
- eend $?
- # Update the password lua hook
- cat > ${MTN_CONFDIR}/passphrase.lua <<EOF
--- This file is automaticaly generated by the init scripts.
--- If you want to add custom hooks, edit ${MTN_CONFDIR}/hooks.lua
--- If you want to change the settings, please edit /etc/conf.d/monotone
-
-function get_passphrase(identity)
- if (identity == "${MTN_KEY}") then
- return "${MTN_PWD}"
- end
- return false
-end
-EOF
- fi
-}
-
-start() {
- cd ${MTN_HOME}
- dbexists
-
- ebegin "Starting monotone server"
- start-stop-daemon --start --background \
- --user ${MTN_USER} --group ${MTN_GROUP} \
- --exec /usr/bin/mtn -- ${MTN_COMMON} --pid-file=${MTN_PIDFILE} \
- --key=${MTN_KEY} --bind=${MTN_ADDRESS:-0.0.0.0} serve
- eend $?
-}
-
-stop() {
- ebegin "Stopping monotone server"
- start-stop-daemon --stop --quiet --pidfile ${MTN_PIDFILE}
- eend $?
-}
-
-import() {
- cd ${MTN_HOME}
- dbexists
-
- # Read packets into the database
- einfo "Importing packets to monotone database"
- cat | /usr/bin/mtn ${MTN_COMMON} read
- eend $?
-}
diff --git a/dev-vcs/monotone/files/monotone.confd b/dev-vcs/monotone/files/monotone.confd
deleted file mode 100644
index 71772543171..00000000000
--- a/dev-vcs/monotone/files/monotone.confd
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The commented variables in this file are the defaults that are used
-
-# in the init-script. You don't need to uncomment them except to
-# customize them to different values.
-
-# Location of the served database
-#MTN_DB="/var/lib/monotone/default.mtn"
-
-# Server identification
-#MTN_KEY="monotone@`hostname --fqdn`"
-#MTN_PWD=""
-
-# User and group as which to run monotone
-#MTN_USER="monotone"
-#MTN_GROUP="monotone"
-
-# The address and or port (ADDRESS[:PORT]) monotone should listen on
-#MTN_ADDRESS=0.0.0.0
-
-# Advanced options
-#MTN_CONFDIR=/etc/monotone
-#MTN_KEYDIR=/var/lib/monotone/keys
diff --git a/dev-vcs/monotone/files/read-permissions b/dev-vcs/monotone/files/read-permissions
deleted file mode 100644
index d08200aa005..00000000000
--- a/dev-vcs/monotone/files/read-permissions
+++ /dev/null
@@ -1,7 +0,0 @@
-pattern "net.example.project.{private,security}*"
-allow "joe@example.net"
-allow "jim@example.net"
-
-comment "everyone can read these branches"
-pattern "net.example.{public,project}*"
-allow "*"
diff --git a/dev-vcs/monotone/files/write-permissions b/dev-vcs/monotone/files/write-permissions
deleted file mode 100644
index 1b138c7fc6c..00000000000
--- a/dev-vcs/monotone/files/write-permissions
+++ /dev/null
@@ -1,2 +0,0 @@
-joe@example.net
-jim@example.net
diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml
deleted file mode 100644
index fd524bde49c..00000000000
--- a/dev-vcs/monotone/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
- <longdescription>A free distributed version control system. It provides a simple,
-single-file transactional version store, with fully disconnected
-operation and an efficient peer-to-peer synchronization
-protocol. It understands history-sensitive merging, lightweight
-branches, integrated code review and 3rd party testing. It uses
-cryptographic version naming and client-side RSA certificates. It
-has good internationalization support, has no external
-dependencies, runs on linux, solaris, OSX, windows, and other
-unixes, and is licensed under the GNU GPL.
- </longdescription>
-</pkgmetadata>
diff --git a/dev-vcs/monotone/monotone-1.0-r4.ebuild b/dev-vcs/monotone/monotone-1.0-r4.ebuild
deleted file mode 100644
index 2b4a541b8a1..00000000000
--- a/dev-vcs/monotone/monotone-1.0-r4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/
-EAPI="4"
-inherit bash-completion-r1 elisp-common eutils toolchain-funcs user
-
-DESCRIPTION="Monotone Distributed Version Control System"
-HOMEPAGE="http://monotone.ca"
-SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="amd64 ~ia64 x86"
-IUSE="doc ipv6 nls test"
-
-RDEPEND="sys-libs/zlib
- >=dev-libs/libpcre-7.6
- >=dev-libs/botan-1.8.0:0
- >=dev-db/sqlite-3.3.8
- >=dev-lang/lua-5.1
- net-dns/libidn"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.33.1
- nls? ( >=sys-devel/gettext-0.11.5 )
- doc? ( sys-apps/texinfo )
- test? ( dev-tcltk/expect
- app-shells/bash-completion )"
-
-pkg_setup() {
- enewgroup monotone
- enewuser monotone -1 -1 /var/lib/monotone monotone
-}
-
-src_prepare() {
- if [[ $(gcc-major-version) -lt "3" ||
- ( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
- die 'requires >=gcc-3.4'
- fi
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-bash-completion-tests.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-botan-1.10-v2.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-glibc-2.14-file-handle.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-boost-1.53.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-pcre3.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-texinfo-5.1.patch"
- epatch "${WORKDIR}/${P}-gentoo-patchset/monotone-1.0-gcc6.patch"
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable ipv6)
-}
-
-src_compile() {
- emake
- use doc && emake html
-}
-
-src_test() {
- # Disables netsync_bind_opt test
- # https://code.monotone.ca/p/monotone/issues/179/
- export DISABLE_NETWORK_TESTS=true
- if [[ ${UID} != 0 ]]; then
- emake check
- else
- ewarn "Tests will fail if ran as root, skipping."
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
-
- rm "${ED}"/etc/bash_completion.d/monotone.bash_completion || die
- newbashcomp extra/shell/monotone.bash_completion ${PN}
-
- if use doc; then
- dohtml -r doc/html/*
- dohtml -r doc/figures
- fi
-
- dodoc AUTHORS NEWS README* UPGRADE
- docinto contrib
- docompress -x /usr/share/doc/${PF}/contrib
- dodoc -r contrib
- newconfd "${FILESDIR}"/monotone.confd monotone
- newinitd "${FILESDIR}"/${PN}-0.36.initd monotone
-
- insinto /etc/monotone
- newins "${FILESDIR}"/hooks.lua hooks.lua
- newins "${FILESDIR}"/read-permissions read-permissions
- newins "${FILESDIR}"/write-permissions write-permissions
-
- keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone
- fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone
-}
-
-pkg_postinst() {
- elog
- elog "For details and instructions to upgrade from previous versions,"
- elog "please read /usr/share/doc/${PF}/UPGRADE.bz2"
- elog
- elog " 1. edit /etc/conf.d/monotone"
- elog " 2. import the first keys to enable access with"
- elog " env HOME=\${homedir} mtn pubkey me@example.net | /etc/init.d/monotone import"
- elog " Thereafter, those with write permission can add other keys via"
- elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT"
- elog " can be used in the read-permission and write-permission files."
- elog " 3. adjust permisions in /etc/monotone/read-permissions"
- elog " and /etc/monotone/write-permissions"
- elog " 4. start the daemon: /etc/init.d/monotone start"
- elog " 5. make persistent: rc-update add monotone default"
- elog
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-28 1:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-28 1:27 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/monotone/, dev-vcs/monotone/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2017-05-26 21:01 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox