From 925e176732c4348d2500ae60ff3ab03e73e5fba6 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sun, 1 Jan 2012 01:13:34 +0000 Subject: Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 386757. (Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force) --- dev-vcs/monotone/ChangeLog | 14 ++- dev-vcs/monotone/files/monotone-0.36.initd | 14 +-- dev-vcs/monotone/monotone-0.99.1-r1.ebuild | 126 +++++++++++++++++++++++++++ dev-vcs/monotone/monotone-0.99.1.ebuild | 126 --------------------------- dev-vcs/monotone/monotone-1.0-r1.ebuild | 112 ------------------------ dev-vcs/monotone/monotone-1.0-r2.ebuild | 131 +++++++++++++++++++++++++++++ dev-vcs/monotone/monotone-1.0-r3.ebuild | 112 ++++++++++++++++++++++++ dev-vcs/monotone/monotone-1.0.ebuild | 131 ----------------------------- 8 files changed, 388 insertions(+), 378 deletions(-) create mode 100644 dev-vcs/monotone/monotone-0.99.1-r1.ebuild delete mode 100644 dev-vcs/monotone/monotone-0.99.1.ebuild delete mode 100644 dev-vcs/monotone/monotone-1.0-r1.ebuild create mode 100644 dev-vcs/monotone/monotone-1.0-r2.ebuild create mode 100644 dev-vcs/monotone/monotone-1.0-r3.ebuild delete mode 100644 dev-vcs/monotone/monotone-1.0.ebuild (limited to 'dev-vcs/monotone') diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog index 3e58cb89f257..24256ee90626 100644 --- a/dev-vcs/monotone/ChangeLog +++ b/dev-vcs/monotone/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-vcs/monotone -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.20 2011/09/12 10:41:42 pva Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.21 2012/01/01 01:13:34 idl0r Exp $ + +*monotone-1.0-r3 (01 Jan 2012) +*monotone-1.0-r2 (01 Jan 2012) +*monotone-0.99.1-r1 (01 Jan 2012) + + 01 Jan 2012; Christian Ruppert -monotone-0.99.1.ebuild, + +monotone-0.99.1-r1.ebuild, -monotone-1.0.ebuild, -monotone-1.0-r1.ebuild, + +monotone-1.0-r2.ebuild, +monotone-1.0-r3.ebuild, files/monotone-0.36.initd: + Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts + variable, bug 386757. 12 Sep 2011; Peter Volkov monotone-1.0-r1.ebuild: Fixed build with USE=doc, bug #380257 wrt Juergen Rose diff --git a/dev-vcs/monotone/files/monotone-0.36.initd b/dev-vcs/monotone/files/monotone-0.36.initd index 442707527cc7..fab2f03f1ef1 100644 --- a/dev-vcs/monotone/files/monotone-0.36.initd +++ b/dev-vcs/monotone/files/monotone-0.36.initd @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 2006 Gentoo Foundation +# Copyright 2006-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.1 2010/03/05 16:49:36 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/files/monotone-0.36.initd,v 1.2 2012/01/01 01:13:34 idl0r Exp $ -opts="import" +extra_commands="import" depend() { need net @@ -27,7 +27,7 @@ dbexists() { if [ ! -e ${MTN_DB:-/var/lib/monotone/default.mtn} ]; then ebegin "Creating monotone database" start-stop-daemon --start \ - --chuid ${MTN_USER}:${MTN_GROUP} \ + --user ${MTN_USER} --group ${MTN_GROUP} \ --exec /usr/bin/mtn -- ${MTN_COMMON} db init eend $? fi @@ -36,9 +36,9 @@ dbexists() { export MTN_PWD=${RANDOM} yes "${MTN_PWD}" | \ start-stop-daemon --start \ - --chuid ${MTN_USER}:${MTN_GROUP} \ + --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 <=gcc-3.4' + fi +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable ipv6) +} + +src_compile() { + emake || die + + if use doc; then + emake html || die + fi + + if use emacs; then + cd contrib + elisp-compile *.el || die + fi +} + +src_test() { + if [ ${UID} != 0 ]; then + emake check || die "emake check failed" + else + ewarn "Tests will fail if ran as root, skipping." + fi +} + +src_install() { + emake DESTDIR="${D}" install || die + + mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die + + dobashcompletion contrib/monotone.bash_completion + + if use doc; then + dohtml -r html/* + dohtml -r figures + fi + + if use emacs; then + elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ + || die + 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() { + use emacs && elisp-site-regen + bash-completion_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 +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-vcs/monotone/monotone-0.99.1.ebuild b/dev-vcs/monotone/monotone-0.99.1.ebuild deleted file mode 100644 index 4fc309d90a04..000000000000 --- a/dev-vcs/monotone/monotone-0.99.1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1.ebuild,v 1.5 2011/09/05 13:33:03 pva Exp $ - -EAPI="4" -inherit bash-completion elisp-common eutils toolchain-funcs - -DESCRIPTION="Monotone Distributed Version Control System" -HOMEPAGE="http://monotone.ca" -SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="amd64 ~ia64 x86" -IUSE="doc emacs ipv6 nls" - -RDEPEND="sys-libs/zlib - emacs? ( virtual/emacs ) - >=dev-libs/libpcre-7.6 - >=dev-libs/botan-1.8.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 )" - -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 -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable ipv6) -} - -src_compile() { - emake || die - - if use doc; then - emake html || die - fi - - if use emacs; then - cd contrib - elisp-compile *.el || die - fi -} - -src_test() { - if [ ${UID} != 0 ]; then - emake check || die "emake check failed" - else - ewarn "Tests will fail if ran as root, skipping." - fi -} - -src_install() { - emake DESTDIR="${D}" install || die - - mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die - - dobashcompletion contrib/monotone.bash_completion - - if use doc; then - dohtml -r html/* - dohtml -r figures - fi - - if use emacs; then - elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ - || die - 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() { - use emacs && elisp-site-regen - bash-completion_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 -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-vcs/monotone/monotone-1.0-r1.ebuild b/dev-vcs/monotone/monotone-1.0-r1.ebuild deleted file mode 100644 index 0d1870f754e8..000000000000 --- a/dev-vcs/monotone/monotone-1.0-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r1.ebuild,v 1.3 2011/09/12 15:21:23 mr_bones_ Exp $ - -# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ -EAPI="4" -inherit bash-completion-r1 elisp-common eutils toolchain-funcs - -DESCRIPTION="Monotone Distributed Version Control System" -HOMEPAGE="http://monotone.ca" -SRC_URI="http://monotone.ca/downloads/${PV}/${P}.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 - >=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 "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" - epatch "${FILESDIR}/monotone-1.0-botan-1.10.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 -} diff --git a/dev-vcs/monotone/monotone-1.0-r2.ebuild b/dev-vcs/monotone/monotone-1.0-r2.ebuild new file mode 100644 index 000000000000..fe228e0b8774 --- /dev/null +++ b/dev-vcs/monotone/monotone-1.0-r2.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $ + +# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ +EAPI="4" +inherit bash-completion elisp-common eutils toolchain-funcs + +DESCRIPTION="Monotone Distributed Version Control System" +HOMEPAGE="http://monotone.ca" +SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="~amd64 ~ia64 ~x86" +IUSE="doc emacs ipv6 nls test" + +RDEPEND="sys-libs/zlib + emacs? ( virtual/emacs ) + >=dev-libs/libpcre-7.6 + >=dev-libs/botan-1.8.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 "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" + epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch" +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable ipv6) +} + +src_compile() { + emake + + use doc && emake html + + if use emacs; then + cd contrib || die + elisp-compile *.el || die + fi +} + +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 + + dobashcompletion contrib/monotone.bash_completion + + if use doc; then + dohtml -r html/* + dohtml -r figures + fi + + if use emacs; then + elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ + || die + 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() { + use emacs && elisp-site-regen + bash-completion_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 +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-vcs/monotone/monotone-1.0-r3.ebuild b/dev-vcs/monotone/monotone-1.0-r3.ebuild new file mode 100644 index 000000000000..1f0228dd1ae9 --- /dev/null +++ b/dev-vcs/monotone/monotone-1.0-r3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r3.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $ + +# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ +EAPI="4" +inherit bash-completion-r1 elisp-common eutils toolchain-funcs + +DESCRIPTION="Monotone Distributed Version Control System" +HOMEPAGE="http://monotone.ca" +SRC_URI="http://monotone.ca/downloads/${PV}/${P}.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 + >=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 "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" + epatch "${FILESDIR}/monotone-1.0-botan-1.10.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 +} diff --git a/dev-vcs/monotone/monotone-1.0.ebuild b/dev-vcs/monotone/monotone-1.0.ebuild deleted file mode 100644 index efb9704b67eb..000000000000 --- a/dev-vcs/monotone/monotone-1.0.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0.ebuild,v 1.2 2011/09/11 11:26:01 pva Exp $ - -# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ -EAPI="4" -inherit bash-completion elisp-common eutils toolchain-funcs - -DESCRIPTION="Monotone Distributed Version Control System" -HOMEPAGE="http://monotone.ca" -SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="~amd64 ~ia64 ~x86" -IUSE="doc emacs ipv6 nls test" - -RDEPEND="sys-libs/zlib - emacs? ( virtual/emacs ) - >=dev-libs/libpcre-7.6 - >=dev-libs/botan-1.8.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 "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" - epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch" -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable ipv6) -} - -src_compile() { - emake - - use doc && emake html - - if use emacs; then - cd contrib || die - elisp-compile *.el || die - fi -} - -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 - - dobashcompletion contrib/monotone.bash_completion - - if use doc; then - dohtml -r html/* - dohtml -r figures - fi - - if use emacs; then - elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ - || die - 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() { - use emacs && elisp-site-regen - bash-completion_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 -} - -pkg_postrm() { - use emacs && elisp-site-regen -} -- cgit v1.2.3-65-gdbad