Version bump, bug #356145, thank Dean Matzkov for report. Drop old.

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

5 files changed, 24 insertions, 274 deletions

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 8483d18243e9..341fc5f31fc0 100644
--- 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.12 2010/11/09 14:18:39 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.13 2011/03/12 16:32:03 pva Exp $
+
+*monotone-0.99.1 (12 Mar 2011)
+
+  12 Mar 2011; Peter Volkov <pva@gentoo.org> -monotone-0.45.ebuild,
+  -monotone-0.47.ebuild, -monotone-0.48.ebuild, +monotone-0.99.1.ebuild:
+  Version bump, bug #356145, thank Dean Matzkov for report. Drop old.
 
   09 Nov 2010; Brent Baude <ranger@gentoo.org> monotone-0.48.1.ebuild:
   Marking monotone-0.48.1 ppc for bug 342705
diff --git a/dev-vcs/monotone/Manifest b/dev-vcs/monotone/Manifest
index 45bbe29bb3de..fee7d4884258 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -7,15 +7,11 @@ AUX monotone-0.99-crash.patch 1017 RMD160 870ddad5494292c969ebbbe52d1e0dade48492
 AUX monotone.confd 803 RMD160 507ee4058e6f8197bd0b7a25f1115ec42ae226ec SHA1 1887e76fd00585344e614c3392527866bb94614c SHA256 4e266a08108441438fb4b3ac40216e731378d378593807b0826f58446c346e5b
 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
 DIST monotone-0.48.1.tar.gz 4868557 RMD160 c3fe7132b45fd51ec08152edf097324f0c3f6e01 SHA1 0536efda6de6bd77b23ed4891161879645deb4f7 SHA256 e5ab4917866d2c597f99577554549b7c4cda9895be7a5dd0469f1c7798fe3c10
-DIST monotone-0.48.tar.gz 4792019 RMD160 233571b3075cf7d21b9db3c74b77d8fb6757c082 SHA1 275ed47cb0bc78bc8b40b3ee234ff52d50d0fb64 SHA256 3149abf0e4433a0e14c5da805a04dbbc45b16086bc267d473b17e933407d839d
+DIST monotone-0.99.1.tar.gz 4940291 RMD160 c0db85af8b584e375ca992b3384bd8a38d5b380e SHA1 e74ba571b358f6b76370f882d15ddbd1edd9f37e SHA256 204ebb12f36599ac4c105ae5bf45edd7da13a4e57dc45f31789634fc8c2b30a1
 DIST monotone-0.99.tar.gz 4940625 RMD160 cf9c62ebd48a061c481f15d8e74d476e59bc259a SHA1 badcf38bf532193124a88463c82a55a1e1f217a9 SHA256 fa677f09169afb71452598ce92ea376fe06037d17bfe650fb6aed17cead11453
-EBUILD monotone-0.45.ebuild 3360 RMD160 15b99a25803569c7b852e2cfedc95e13b2e9d2a4 SHA1 ee6082ea1c9a6e3bb753e9e39a284929a01e9b62 SHA256 e68330fd743d7c34e202907a5574cc9d98dc963d47e4335cb72d7f45d936318e
-EBUILD monotone-0.47.ebuild 3435 RMD160 2346ce9ea311f71df638780e9999f4c235a2fb46 SHA1 8189adeea810426a154a1b27166133122534ec5c SHA256 8efbc1148eff6d4f139c8565dfdf5f97afa5a30a1f71cbb0c2c5c629709bf3d7
 EBUILD monotone-0.48.1.ebuild 3358 RMD160 20f94f2fd3aa90f68d981c686a1925cc2e622239 SHA1 6fb929ba31d086069d4b77b413884ef3f296f82b SHA256 858fe31dd3013778cf5413c3f74fe94cffc27a3e68aaad463500c7bb46d25d44
-EBUILD monotone-0.48.ebuild 3298 RMD160 110abb18444584e21c6baf32ffa1c9c63817d8db SHA1 ea3cf5da23aafb71f5e792bc6313e65b3b0ec2dc SHA256 41a60a406918444d98d88bd9a5dbdcba216755befe47d87daf17b1d9ee64d2b0
 EBUILD monotone-0.99-r1.ebuild 3340 RMD160 7fd334a24cdb4a65f033d67bbb34b7db9aa8d77d SHA1 c03a3a02e94f45c8df08bc5a7dd0a4b13cd542ca SHA256 07bdb46771f43012d329d0e0ccba83a3fe26e2cd200e785171570fc97959ac8a
-MISC ChangeLog 12692 RMD160 9ba7ddfacc6409b8a0f2ecd9b731835d476d7865 SHA1 97b1d72a0b0cfe3500123a50812ae6e7b96376ae SHA256 7320040a0454ebf87624db19edd7842f7bd7fe11874bd264ed66d4a79508f885
+EBUILD monotone-0.99.1.ebuild 3273 RMD160 2eb260703281a62d2cef626ec39531c73cbb0fa4 SHA1 8d5a1ab058f4fada39517044238f3997d32271c1 SHA256 1b2cc1198cd45a79f9414b5d351b43aaf07c7b32d28d0892fe80f29637af80b5
+MISC ChangeLog 12933 RMD160 4db1c7a1e3511bb1f6295551286d0f42f9cee95c SHA1 2944475ffe10055bf857df39748c27c528f4cba4 SHA256 a96952b411e3683f77fd6cb98139c5fa9c39ebde3186de1196e481e2688fa7d0
 MISC metadata.xml 1115 RMD160 05759456628f2c600bddfdfe28e45e570019fd41 SHA1 922579ba97cccbe0c4bc25340d0457b45712a6a1 SHA256 a22b12bb8cad7a1f220dbd74511e11790444b639a67bb7c05be389a161232c94
diff --git a/dev-vcs/monotone/monotone-0.45.ebuild b/dev-vcs/monotone/monotone-0.45.ebuild
deleted file mode 100644
index 5875806bec5a..000000000000
--- a/dev-vcs/monotone/monotone-0.45.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.45.ebuild,v 1.2 2010/04/27 17:30:46 ssuominen Exp $
-
-EAPI=2
-inherit bash-completion elisp-common eutils
-
-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
-	if [[ "$(gcc-version)" == "3.3" ]]; then
-		die 'requires >=gcc-3.4'
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	econf \
-		$(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}
-
-	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 ChangeLog NEWS README* UPGRADE
-	docinto contrib
-	dodoc 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/monotone /var/run/monotone
-	fowners monotone:monotone /var/lib/monotone /var/lib/monotone/keys/ \
-		/var/log/monotone /var/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.47.ebuild b/dev-vcs/monotone/monotone-0.47.ebuild
deleted file mode 100644
index fc90ff1cee75..000000000000
--- a/dev-vcs/monotone/monotone-0.47.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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
-}
diff --git a/dev-vcs/monotone/monotone-0.48.ebuild b/dev-vcs/monotone/monotone-0.99.1.ebuild
index f0a4aa7d61dc..41b484a523dd 100644
--- a/dev-vcs/monotone/monotone-0.48.ebuild
+++ b/dev-vcs/monotone/monotone-0.99.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.48.ebuild,v 1.4 2010/10/19 18:12:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1.ebuild,v 1.1 2011/03/12 16:32:03 pva Exp $
 
-EAPI=2
+EAPI="4"
 inherit bash-completion elisp-common eutils toolchain-funcs
 
 DESCRIPTION="Monotone Distributed Version Control System"
@@ -11,7 +11,7 @@ SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="amd64 ~ia64 ppc x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="doc emacs ipv6 nls"
 
 RDEPEND="sys-libs/zlib
@@ -40,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable nls) \
 		$(use_enable ipv6)
 }
@@ -69,7 +68,7 @@ src_test() {
 src_install() {
 	emake DESTDIR="${D}" install || die
 
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
 
 	dobashcompletion contrib/monotone.bash_completion
 
@@ -84,16 +83,17 @@ src_install() {
 			|| die
 	fi
 
-	dodoc AUTHORS NEWS README* UPGRADE || die
+	dodoc AUTHORS NEWS README* UPGRADE
 	docinto contrib
-	dodoc contrib/*
-	newconfd "${FILESDIR}"/monotone.confd monotone || die
-	newinitd "${FILESDIR}"/${PN}-0.36.initd monotone || die
+	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 || die
-	newins "${FILESDIR}"/read-permissions read-permissions || die
-	newins "${FILESDIR}"/write-permissions write-permissions || die
+	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