Version bump, bug #381135; updated monotone-0.99.1 to depend on <dev-libs/botan-1.10, bug 380257, thank Dennis Schridde for both reports. Drop old.

(Portage version: 2.1.10.11/cvs/Linux x86_64)

7 files changed, 40 insertions, 220 deletions

diff --git a/dev-vcs/monotone/ChangeLog b/dev-vcs/monotone/ChangeLog
index 81219f8f42a5..2a76ec535104 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.17 2011/08/13 07:24:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.18 2011/09/05 13:33:03 pva Exp $
+
+*monotone-1.0 (05 Sep 2011)
+
+  05 Sep 2011; Peter Volkov <pva@gentoo.org> -files/monotone-0.45-gcc45.patch,
+  -monotone-0.48.1.ebuild, -files/monotone-0.48.1-sqlite-3.7.3.patch,
+  -monotone-0.99-r1.ebuild, monotone-0.99.1.ebuild,
+  -files/monotone-0.99-crash.patch, +monotone-1.0.ebuild:
+  Version bump, bug #381135; updated monotone-0.99.1 to depend on
+  <dev-libs/botan-1.10, bug 380257, thank Dennis Schridde for both reports.
+  Drop old.
 
   13 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> monotone-0.48.1.ebuild,
   monotone-0.99-r1.ebuild, monotone-0.99.1.ebuild:
diff --git a/dev-vcs/monotone/files/monotone-0.45-gcc45.patch b/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
deleted file mode 100644
index d343dcd4a626..000000000000
--- a/dev-vcs/monotone/files/monotone-0.45-gcc45.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=317509
-
---- selectors.cc
-+++ selectors.cc
-@@ -18,6 +18,7 @@
- #include "cmd.hh"
- #include "work.hh"
- #include "transforms.hh"
-+#include "roster.hh"
- 
- #include <algorithm>
- #include <boost/tokenizer.hpp>
diff --git a/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch b/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch
deleted file mode 100644
index fc0092229c0a..000000000000
--- a/dev-vcs/monotone/files/monotone-0.48.1-sqlite-3.7.3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-============================================================
---- database.cc	0afa3ff4bd9c9ee3bc62b10bcf6295a9f5388d64
-+++ database.cc	8bfff559a0894259fe3668294bd3906ae837129b
-@@ -1531,12 +1531,19 @@ database_impl::fetch(results & res,
-       vector<string> row;
-       for (int col = 0; col < ncol; col++)
-         {
-+          // We never store NULLs, so we should never see one.
-+          int const datatype = sqlite3_column_type(i->second.stmt(), col);
-+          E(datatype != SQLITE_NULL, origin::database,
-+            F("null result in query: %s") % query.sql_cmd);
-           const char * value = (const char*)sqlite3_column_blob(i->second.stmt(), col);
-           int bytes = sqlite3_column_bytes(i->second.stmt(), col);
--          E(value, origin::database,
--            F("null result in query: %s") % query.sql_cmd);
--          row.push_back(string(value, value + bytes));
--          //L(FL("row %d col %d value='%s'") % nrow % col % value);
-+          if (value) {
-+            row.push_back(string(value, value + bytes));
-+          } else {
-+            // sqlite3_column_blob() returns null for zero-length
-+            I(bytes == 0);
-+            row.push_back(string());
-+          }
-         }
-       res.push_back(row);
-     }
diff --git a/dev-vcs/monotone/files/monotone-0.99-crash.patch b/dev-vcs/monotone/files/monotone-0.99-crash.patch
deleted file mode 100644
index 0a6220dc4f69..000000000000
--- a/dev-vcs/monotone/files/monotone-0.99-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-============================================================
---- NEWS	28057863abe389acf343fd6781d215d7d99dd2eb
-+++ NEWS	287e77585d21957e85230c1fc3f06921a0621561
-@@ -1,3 +1,14 @@
-+??? ??? ?? ??:??:?? UTC 2010
-+
-+        0.99.1 release.
-+
-+        Bugs fixed
-+
-+        - monotone crashed on x86_64 when a netsync action required
-+          the parsing of an URL. This has been fixed.
-+          (closes monotone issue 100)
-+
-+
- Thu Oct 28 21:07:18 UTC 2010
- 
-         0.99 release.
-============================================================
---- pcrewrap.cc	08ac10d9a75557faba316d1b0a242b8ed3cd4243
-+++ pcrewrap.cc	42611610af4de2f7d1da39bf5c023038b7590be7
-@@ -144,7 +144,7 @@ namespace pcre
-     // because pcre_exec might not signal trailing unmatched subpatterns
-     // i.e. if "abc" matches "(abc)(de)?", the match count is two, not
-     // the expected three
--    size_t cap_count;
-+    size_t cap_count = 0;
-     int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count);
-     I(rc == 0);
- 
diff --git a/dev-vcs/monotone/monotone-0.48.1.ebuild b/dev-vcs/monotone/monotone-0.48.1.ebuild
deleted file mode 100644
index 02859227e4cb..000000000000
--- a/dev-vcs/monotone/monotone-0.48.1.ebuild
+++ /dev/null
@@ -1,127 +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.48.1.ebuild,v 1.5 2011/08/13 07:24:53 xarthisius 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 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
-
-	epatch "${FILESDIR}/monotone-0.48.1-sqlite-3.7.3.patch"
-}
-
-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
-}
diff --git a/dev-vcs/monotone/monotone-0.99.1.ebuild b/dev-vcs/monotone/monotone-0.99.1.ebuild
index 8fd6f30bde53..4fc309d90a04 100644
--- a/dev-vcs/monotone/monotone-0.99.1.ebuild
+++ b/dev-vcs/monotone/monotone-0.99.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2011/08/13 07:24:53 xarthisius Exp $
+# $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
@@ -18,6 +18,7 @@ RDEPEND="sys-libs/zlib
 	emacs? ( virtual/emacs )
 	>=dev-libs/libpcre-7.6
 	>=dev-libs/botan-1.8.0
+	<dev-libs/botan-1.10
 	>=dev-db/sqlite-3.3.8
 	>=dev-lang/lua-5.1
 	net-dns/libidn"
diff --git a/dev-vcs/monotone/monotone-0.99-r1.ebuild b/dev-vcs/monotone/monotone-1.0.ebuild
index 3c5a04144dc7..2df5564d61b7 100644
--- a/dev-vcs/monotone/monotone-0.99-r1.ebuild
+++ b/dev-vcs/monotone/monotone-1.0.ebuild
@@ -1,13 +1,14 @@
 # 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-r1.ebuild,v 1.2 2011/08/13 07:24:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0.ebuild,v 1.1 2011/09/05 13:33:03 pva Exp $
 
-EAPI=2
+# 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.gz"
+SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -36,41 +37,44 @@ src_prepare() {
 		( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then
 		die 'requires >=gcc-3.4'
 	fi
-	epatch "${FILESDIR}/${P}-crash.patch"
 }
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable nls) \
 		$(use_enable ipv6)
 }
 
 src_compile() {
-	emake || die
+	emake
 
-	if use doc; then
-		emake html || die
-	fi
+	use doc && emake html
 
 	if use emacs; then
-		cd contrib
+		cd contrib || die
 		elisp-compile *.el || die
 	fi
 }
 
 src_test() {
-	if [ ${UID} != 0 ]; then
-		emake check || die "emake check failed"
+	# Disables netsync_bind_opt test
+	# https://code.monotone.ca/p/monotone/issues/179/
+	export DISABLE_NETWORK_TESTS=true
+	# bash_completion test fails too. Expected thus disab
+	# https://code.monotone.ca/p/monotone/issues/180/
+	rm test/extra/bash_completion/ -rf
+	if [[ ${UID} != 0 ]]; then
+		emake check
 	else
-		ewarn "Tests will fail if ran as root, skipping."
+		# Tests fail if run as root
+		su portage emake check
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
-	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
 
@@ -85,16 +89,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