Version bump, bug #309577, thank Jack Lloyd for report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 42cc09d4d99f7ee9da7befe72cd893620c3fb253..9f1bb27bb808709638fbd14820cc9d1d573e01d9 100644 (file)
--- a/dev-vcs/monotone/ChangeLog
+++ b/dev-vcs/monotone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/monotone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.2 2010/04/27 17:30:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.3 2010/05/17 17:43:33 pva Exp $
+
+*monotone-0.47 (17 May 2010)
+
+  17 May 2010; Peter Volkov <pva@gentoo.org> +monotone-0.47.ebuild,
+  metadata.xml:
+  Version bump, bug #309577, thank Jack Lloyd for report.
 
   27 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> monotone-0.45.ebuild,
   +files/monotone-0.45-gcc45.patch:

diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
index 14abeaa6a0d6026719c3597551e6db590d7ceffb..07ae1e9d1b09eae8b5678bffd0b4a0ec47384531 100644 (file)
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -6,6 +6,8 @@ AUX monotone.confd 803 RMD160 507ee4058e6f8197bd0b7a25f1115ec42ae226ec SHA1 1887
 AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b83336348987f9c6f9a46f0191adf9fa87d1b83c SHA256 4f93a644b2f16d6ea5c4d28e3039dfddd7f8e38ca1b8d54389094be751fbfa7c
 AUX write-permissions 32 RMD160 164bc129fb3cdb2314d7ec96d23a9fc6f0e856a3 SHA1 0b48801914336a5a3baebf79725be81b52d279f4 SHA256 ddd40fac5d6fe98d9f58c4731a500eb1350a42ae7ca0ddaa40eaa3bbeb99026c
 DIST monotone-0.45.tar.gz 4645511 RMD160 d225595ba908d2d9366ffc3490caba83aa9ad9bb SHA1 84bd7ab5f7b1bfe98028f5105e3dbcd82c809e51 SHA256 64c734274715f392eb4a879172a11c0606d37c02b4a6f23045772af5f8e2a9ec
+DIST monotone-0.47.tar.gz 4698647 RMD160 8473366009542ea334ccfabba813f43d0bc89404 SHA1 a901c9e1a7dd1138c30483934bbf5f02945c2d2f SHA256 7a99f1a5e4eb2bb7bf82794ab7fc61435fbc55826b710243243c52f7b10be51b
 EBUILD monotone-0.45.ebuild 3360 RMD160 15b99a25803569c7b852e2cfedc95e13b2e9d2a4 SHA1 ee6082ea1c9a6e3bb753e9e39a284929a01e9b62 SHA256 e68330fd743d7c34e202907a5574cc9d98dc963d47e4335cb72d7f45d936318e
-MISC ChangeLog 11138 RMD160 cd44c8fefb9239e93a40867b0117742c46bbe90e SHA1 2607ab9c38d455232e137a86f5f6b18ba1453f1e SHA256 486fb02917f0666ee32c8caeee5961a9233f0f8d89edd23ec7eb2113fa6f7e06
-MISC metadata.xml 1024 RMD160 85108ed2778629efe1db730bcca17511c1df0acf SHA1 f51b9fba062d2a7011df881c8c907b7bfa30373c SHA256 e55ef6758ed6927c8412a7514e43e869c1304b503b7ca3e6d8311558c2413c7c
+EBUILD monotone-0.47.ebuild 3435 RMD160 2346ce9ea311f71df638780e9999f4c235a2fb46 SHA1 8189adeea810426a154a1b27166133122534ec5c SHA256 8efbc1148eff6d4f139c8565dfdf5f97afa5a30a1f71cbb0c2c5c629709bf3d7
+MISC ChangeLog 11305 RMD160 7b51bdf0d1e7fe9f23647b2a53ea2f8f6e93a4bc SHA1 694d6d400896c3abdfc1d94ce65777a7b4771c72 SHA256 79b00db2fbae67a5d8ee8108aa0a6743b3d9d725328bcfd27eb077b083a4a26d
+MISC metadata.xml 1115 RMD160 05759456628f2c600bddfdfe28e45e570019fd41 SHA1 922579ba97cccbe0c4bc25340d0457b45712a6a1 SHA256 a22b12bb8cad7a1f220dbd74511e11790444b639a67bb7c05be389a161232c94

diff --git a/dev-vcs/monotone/metadata.xml b/dev-vcs/monotone/metadata.xml
index 4175e4d93d627f7ac5008a1ca4bac8b8f1c6a9d4..b695e43401bac4dc89c7693bf7ab9a102f23aa4e 100644 (file)
--- a/dev-vcs/monotone/metadata.xml
+++ b/dev-vcs/monotone/metadata.xml
@@ -11,6 +11,10 @@
     <name>Jonny</name>
        <description>Future Maintainer</description>
   </maintainer>
+  <maintainer>
+       <email>pva@gentoo.org</email>
+       <name>Peter Volkov</name>
+  </maintainer>
   <longdescription>
     A free distributed version control system. It provides a simple,
     single-file transactional version store, with fully disconnected

diff --git a/dev-vcs/monotone/monotone-0.47.ebuild b/dev-vcs/monotone/monotone-0.47.ebuild
new file mode 100644 (file)
index 0000000..fc90ff1
--- /dev/null
+++ b/dev-vcs/monotone/monotone-0.47.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.47.ebuild,v 1.1 2010/05/17 17:43:33 pva Exp $
+
+EAPI=2
+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 ~ppc ~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 \
+               --disable-dependency-tracking \
+               $(use_enable nls) \
+               $(use_enable ipv6) \
+               --with-system-pcre
+}
+
+src_compile() {
+       emake || die "emake failed"
+
+       if use doc; then
+               emake html || die "emake html failed"
+       fi
+
+       if use emacs; then
+               cd contrib
+               elisp-compile *.el || die "elisp-compile failed"
+       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 "emake install failed"
+
+       mv "${D}"/usr/share/doc/${PN} "${D}"/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 "elisp-site-file-install failed"
+       fi
+
+       dodoc AUTHORS NEWS README* UPGRADE || die
+       docinto contrib
+       dodoc contrib/*
+       newconfd "${FILESDIR}"/monotone.confd monotone || die
+       newinitd "${FILESDIR}"/${PN}-0.36.initd monotone || die
+
+       insinto /etc/monotone
+       newins "${FILESDIR}"/hooks.lua hooks.lua || die
+       newins "${FILESDIR}"/read-permissions read-permissions || die
+       newins "${FILESDIR}"/write-permissions write-permissions || die
+
+       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
+}