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.

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

8 files changed, 44 insertions, 241 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/Manifest b/dev-vcs/monotone/Manifest
index 3750706d0709..4f17ca17bad9 100644
--- a/dev-vcs/monotone/Manifest
+++ b/dev-vcs/monotone/Manifest
@@ -1,29 +1,12 @@
------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
-AUX monotone-0.45-gcc45.patch 242 RMD160 1928c622e4493deac474d73e6a7cd675a24ce1a0 SHA1 4c498e24eb47d7a28c2e04bef9dcc7e08d909500 SHA256 bbde8fe9c5ae2d259d09a9bc1dbd7fb2b38aca9ba9b021d03f4b5481d145b734
-AUX monotone-0.48.1-sqlite-3.7.3.patch 1248 RMD160 d89d6659a86c758727830a08e9c8a36fbe616795 SHA1 b5db46f3dddaaba047cfd9943f7513a0b21533c9 SHA256 ad10f9d4b0c170d1bbfcaf5125000cf038f92b662444b6607432d344153eb620
-AUX monotone-0.99-crash.patch 1017 RMD160 870ddad5494292c969ebbbe52d1e0dade4849268 SHA1 fb3982db22aeec4939391a66ca16bc185c736278 SHA256 cd030914b0fdfb87fa142a455182b382bd6b20d2cca043744841f94133bd6c70
 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.48.1.tar.gz 4868557 RMD160 c3fe7132b45fd51ec08152edf097324f0c3f6e01 SHA1 0536efda6de6bd77b23ed4891161879645deb4f7 SHA256 e5ab4917866d2c597f99577554549b7c4cda9895be7a5dd0469f1c7798fe3c10
 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.48.1.ebuild 3358 RMD160 b98bcf1cb6c5d905d4ab3af96b1bbeb0108fc0b1 SHA1 38eb745ddb1ee608af678fe4454994c24482182d SHA256 dbb343f6c94fb0837047e074511640ed2278aacde0df43f2e8f0aedd7abb6aae
-EBUILD monotone-0.99-r1.ebuild 3342 RMD160 177feefdd697e5aed9fc76a44a9c7f690a139548 SHA1 a3127bf779e2051713c2ad3a77468001e2c8f58e SHA256 67e5bd75a7ed845cf5d07580c6ac0f33abcb16a56f844d90879995551de36b0a
-EBUILD monotone-0.99.1.ebuild 3273 RMD160 334129f43a4f77579268de9d256cfc07860ac299 SHA1 4f9e0d5bab4cb3fefc229852791201f513afbee3 SHA256 783160c67ef3eb9c9f4db22619b3cbd7416cde2d1fe4a100ff83dcb16ee84516
-MISC ChangeLog 13423 RMD160 b77439ce86ea0054dbcc14235c7223d620324ebe SHA1 4513a7a5b7b5ed69c18f301fb4662b38ff31e791 SHA256 3b3f8e7dd993146ccda7be93326e0d6b702fff49b5a774a3dd3d445d66ab5cf7
+DIST monotone-1.0.tar.bz2 3588074 RMD160 4c0813ae0c11f271dc88f42dd8814e474a67e988 SHA1 aac556bb26d92910b74b65450a0be6c5045e2052 SHA256 5c530bc4652b2c08b5291659f0c130618a14780f075f981e947952dcaefc31dc
+EBUILD monotone-0.99.1.ebuild 3288 RMD160 53d5667793dc8f63d4ca35d858a3f59bca25026a SHA1 94f10eb61ef62422053e18c91f5a43c6a2424de4 SHA256 fba553e9fbe3020e8cad865e257c937bd66f014036f6849604ade3ba431a606c
+EBUILD monotone-1.0.ebuild 3554 RMD160 cce85f217d4f76393614a8bdc72f3822df82cc6d SHA1 0d2d8bae4f3da87f3565724521762d29e3816e63 SHA256 67f9f378e7b9dce6d340a7802386124451832162e6c05175bc090e78e580532a
+MISC ChangeLog 13859 RMD160 aabe625b79fa5413a0d85840d2e619a11450a7a8 SHA1 6c64b2b059f1a48ddff75bfdea3878917ee4d337 SHA256 48720546d48144727c6d56740c0a29281662f53426128647f472381a3e26212c
 MISC metadata.xml 1012 RMD160 8ab75164d1a500d0a4e20e6b1054c3bd9256a7a2 SHA1 27985c7fa4c9cf22a8487aa1e05355d2b6e6cbe6 SHA256 6ab175d43a137dd1660ff85f9e7a9604dd3f319630b77230f054e7072010e419
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk5GJssACgkQIiMqcbOVdxSHoAP/TtI/xWfB/XSNV+hohUt/bW9I
-85qG+gxMEkHOGuDLJRBkIUaD4g4E1KFM4ZCEVOzAz2rb+ErwnIWz5dcj0lTsnJH8
-H/ey80RpGI4A4cJ/PjRddwgxMPalAD5hR/Y1zRUGqU4DamnGcdlkiuEPLdvnqnU6
-hVzdTLLo7e8tVg38kjs=
-=g5nD
------END PGP SIGNATURE-----
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