version bump for bug 323873 by Jack Lloyd <lloyd AT randombit DOT net>

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

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 9f1bb27bb808709638fbd14820cc9d1d573e01d9..983a6e779940f3261482e4a111d91d31af9d2aae 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.3 2010/05/17 17:43:33 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.4 2010/06/20 11:45:45 fauli Exp $
+
+*monotone-0.48 (20 Jun 2010)
+
+  20 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  +monotone-0.48.ebuild:
+  version bump for bug 323873 by Jack Lloyd <lloyd AT randombit DOT net>
 
 *monotone-0.47 (17 May 2010)
 

diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
index 07ae1e9d1b09eae8b5678bffd0b4a0ec47384531..f36a2e378d3ccf867df9c2347cd0d7feb90b6b7d 100644 (file)
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50monotone-gentoo.el 1217 RMD160 82532c08ab1409fe2a9a643baf0f769841f39db2 SHA1 ccdd819dd1e497a5dd546df3b898a8f3efce2e45 SHA256 bfd32a5f57abd47bd6bc35ce27c2a31dfd1c1f7517d869fc0bca6b715d8ea259
 AUX hooks.lua 154 RMD160 0297c570bafe350a4160a46351c00f46ea4fc1ef SHA1 f31bdd8d567639b2aa427e98b2df47351a8e1237 SHA256 55e17360a14ccf70d2da5b3e3ad038b1021c30f4be5c69029f50bd1ec8cbf326
 AUX monotone-0.36.initd 2431 RMD160 bfa9672644eb07cbdfc2a03f7e20c557f2b5cc97 SHA1 448eea7bf3bdf14c85ce01d7197d04cfacedd89d SHA256 361cd19633a64f6b037b98ac50a2622d8856ff2dffb89c0b11b45660ba43bdb6
@@ -7,7 +10,16 @@ AUX read-permissions 192 RMD160 de9f340da2e143f306b7cf37584d7b43b100c06b SHA1 b8
 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
+DIST monotone-0.48.tar.gz 4792019 RMD160 233571b3075cf7d21b9db3c74b77d8fb6757c082 SHA1 275ed47cb0bc78bc8b40b3ee234ff52d50d0fb64 SHA256 3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d
 EBUILD monotone-0.45.ebuild 3360 RMD160 15b99a25803569c7b852e2cfedc95e13b2e9d2a4 SHA1 ee6082ea1c9a6e3bb753e9e39a284929a01e9b62 SHA256 e68330fd743d7c34e202907a5574cc9d98dc963d47e4335cb72d7f45d936318e
 EBUILD monotone-0.47.ebuild 3435 RMD160 2346ce9ea311f71df638780e9999f4c235a2fb46 SHA1 8189adeea810426a154a1b27166133122534ec5c SHA256 8efbc1148eff6d4f139c8565dfdf5f97afa5a30a1f71cbb0c2c5c629709bf3d7
-MISC ChangeLog 11305 RMD160 7b51bdf0d1e7fe9f23647b2a53ea2f8f6e93a4bc SHA1 694d6d400896c3abdfc1d94ce65777a7b4771c72 SHA256 79b00db2fbae67a5d8ee8108aa0a6743b3d9d725328bcfd27eb077b083a4a26d
+EBUILD monotone-0.48.ebuild 3300 RMD160 2c916ae1db731690cb49a5062a39138584fec506 SHA1 8feee9f3e9ea6beab82c6ad1c66d49d75830f56f SHA256 690fb869b8fc5d058ac0ef3ef46ae7a9c49e41a1af13959a09913454d3231e62
+MISC ChangeLog 11491 RMD160 54857fea951f08968b39f47270266b04be522d37 SHA1 08b62478f277ccc0ded44c48d4375e229acde877 SHA256 229bdd22968f5bdbc5f437ec907cbffb204d01bfdc9b57da040fa16c5689f1dc
 MISC metadata.xml 1115 RMD160 05759456628f2c600bddfdfe28e45e570019fd41 SHA1 922579ba97cccbe0c4bc25340d0457b45712a6a1 SHA256 a22b12bb8cad7a1f220dbd74511e11790444b639a67bb7c05be389a161232c94
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkwd/4kACgkQNQqtfCuFnePX7QCfe+lSHkWNuYxLmjdN4mgqvM5e
+zk4An3aFxyIGxTzQQ1BnDLC7xxJW7EXb
+=hHsp
+-----END PGP SIGNATURE-----

diff --git a/dev-vcs/monotone/monotone-0.48.ebuild b/dev-vcs/monotone/monotone-0.48.ebuild
new file mode 100644 (file)
index 0000000..4e187a5
--- /dev/null
+++ b/dev-vcs/monotone/monotone-0.48.ebuild
@@ -0,0 +1,125 @@
+# 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.48.ebuild,v 1.1 2010/06/20 11:45:45 fauli 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)
+}
+
+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 "${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
+       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
+}