new version that works with neon 0.26

(Portage version: 2.1.1_pre3-r1)

6 files changed, 136 insertions, 2 deletions

diff --git a/dev-util/bazaar/ChangeLog b/dev-util/bazaar/ChangeLog
index a81c3fa46348..c928966dc436 100644
--- a/dev-util/bazaar/ChangeLog
+++ b/dev-util/bazaar/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-util/bazaar
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/ChangeLog,v 1.10 2006/01/14 16:24:06 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/ChangeLog,v 1.11 2006/07/21 20:02:46 arj Exp $
 
+*bazaar-1.4.2-r1 (21 Jul 2006)
+
+  21 Jul 2006; Anders Rune Jensen <arj@gentoo.org> +bazaar-1.4.2-r1.ebuild:
+  Bumped version since this one only works with neon > 0.26
+	
   14 Jan 2006; Anders Rune Jensen <arj@gentoo.org> bazaar-1.4.2.ebuild,
   -bazaar-1.1.ebuild, -bazaar-1.1.1.ebuild, -bazaar-1.2.ebuild,
   -bazaar-1.3.ebuild: 
diff --git a/dev-util/bazaar/bazaar-1.4.2-r1.ebuild b/dev-util/bazaar/bazaar-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..2f9a0286ea1b
--- /dev/null
+++ b/dev-util/bazaar/bazaar-1.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.4.2-r1.ebuild,v 1.1 2006/07/21 20:02:46 arj Exp $
+
+inherit eutils
+
+S="${WORKDIR}/${P}/src/=build"
+DESCRIPTION="Bazaar is a user-interface branch of tla"
+SRC_URI="http://bazaar.canonical.com/releases/src/bazaar_${PV}.tar.gz
+	http://dev.gentoo.org/~arj/baz.1.4.gz"
+HOMEPAGE="http://bazaar.canonical.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+DIR="thelove@canonical.com---dists--bazaar--1.4"
+
+DEPEND="sys-apps/coreutils
+	sys-apps/diffutils
+	sys-devel/patch
+	sys-apps/findutils
+	sys-apps/gawk
+	app-arch/tar
+	sys-apps/util-linux
+	sys-apps/debianutils
+	sys-devel/make
+	>=net-misc/neon-0.26.1
+	>=app-crypt/gpgme-1.0.2"
+
+src_unpack() {
+	unpack bazaar_${PV}.tar.gz
+	unpack baz.1.4.gz
+	mv ${DIR} ${P}
+	mkdir "${P}/src/=build"
+	cd ${P}
+
+	# baz annotate does the same thing as this binary
+	rm -rf src/baz/annotate
+
+	epatch ${FILESDIR}/baz-gpgme-fix.patch
+	epatch ${FILESDIR}/neon-0.24-fix.patch
+	epatch ${FILESDIR}/neon-0.26-fix.patch
+}
+
+src_compile() {
+	../configure \
+		--prefix="/usr" \
+		--with-posix-shell="/bin/bash"	|| die "configure failed"
+	# parallel make may cause problems with this package
+	make || die "make failed"
+}
+
+src_install () {
+	make install prefix="${D}/usr" \
+		|| die "make install failed"
+
+	cd ${WORKDIR}/${P}/
+	dodoc =ARCH-USERS-README
+	cd ${WORKDIR}/${P}/src
+	dodoc COPYING
+	dodoc baz/=THANKS
+	cd ${WORKDIR}
+	doman baz.1
+}
diff --git a/dev-util/bazaar/files/digest-bazaar-1.4 b/dev-util/bazaar/files/digest-bazaar-1.4
index 8b15f6c25cac..5e6fad446b1b 100644
--- a/dev-util/bazaar/files/digest-bazaar-1.4
+++ b/dev-util/bazaar/files/digest-bazaar-1.4
@@ -1,2 +1,4 @@
-MD5 1c00c72b4f48f1f9abec58761d1902a0 bazaar_1.4.tar.gz 6261721
 MD5 106921625f2179cbacf62cc8095534f1 baz.1.4.gz 20224
+RMD160 351789903be9e60f289627558b6eed5f58204822 baz.1.4.gz 20224
+SHA256 f3576a7cd02174837b32304fa7e495bdd5003e27f715b2b7ec798e5b60583db1 baz.1.4.gz 20224
+MD5 1c00c72b4f48f1f9abec58761d1902a0 bazaar_1.4.tar.gz 6261721
diff --git a/dev-util/bazaar/files/digest-bazaar-1.4.2 b/dev-util/bazaar/files/digest-bazaar-1.4.2
index f2e0b7172b48..be73fc7b2ce2 100644
--- a/dev-util/bazaar/files/digest-bazaar-1.4.2
+++ b/dev-util/bazaar/files/digest-bazaar-1.4.2
@@ -1,2 +1,6 @@
 MD5 106921625f2179cbacf62cc8095534f1 baz.1.4.gz 20224
+RMD160 351789903be9e60f289627558b6eed5f58204822 baz.1.4.gz 20224
+SHA256 f3576a7cd02174837b32304fa7e495bdd5003e27f715b2b7ec798e5b60583db1 baz.1.4.gz 20224
 MD5 6e61d7aeec990a801977ee6cdc3958d5 bazaar_1.4.2.tar.gz 6264573
+RMD160 8a9d8159ead224b24ab84d0fd6cbc23ac004eb51 bazaar_1.4.2.tar.gz 6264573
+SHA256 4ad40013fb6572c9e7a5d14cd055ef98ca583893425c005697a5881b8ac0cc4e bazaar_1.4.2.tar.gz 6264573
diff --git a/dev-util/bazaar/files/digest-bazaar-1.4.2-r1 b/dev-util/bazaar/files/digest-bazaar-1.4.2-r1
new file mode 100644
index 000000000000..be73fc7b2ce2
--- /dev/null
+++ b/dev-util/bazaar/files/digest-bazaar-1.4.2-r1
@@ -0,0 +1,6 @@
+MD5 106921625f2179cbacf62cc8095534f1 baz.1.4.gz 20224
+RMD160 351789903be9e60f289627558b6eed5f58204822 baz.1.4.gz 20224
+SHA256 f3576a7cd02174837b32304fa7e495bdd5003e27f715b2b7ec798e5b60583db1 baz.1.4.gz 20224
+MD5 6e61d7aeec990a801977ee6cdc3958d5 bazaar_1.4.2.tar.gz 6264573
+RMD160 8a9d8159ead224b24ab84d0fd6cbc23ac004eb51 bazaar_1.4.2.tar.gz 6264573
+SHA256 4ad40013fb6572c9e7a5d14cd055ef98ca583893425c005697a5881b8ac0cc4e bazaar_1.4.2.tar.gz 6264573
diff --git a/dev-util/bazaar/files/neon-0.26-fix.patch b/dev-util/bazaar/files/neon-0.26-fix.patch
new file mode 100644
index 000000000000..cdef7f9c4594
--- /dev/null
+++ b/dev-util/bazaar/files/neon-0.26-fix.patch
@@ -0,0 +1,51 @@
+diff -urN thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/pfs.c
+--- thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c	2005-06-20 23:59:37.000000000 +0200
++++ thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/pfs.c	2006-07-21 23:46:47.000000000 +0200
+@@ -513,10 +513,10 @@
+     char *at_pos = str_chr_index (parsed_uri->host, '@');
+     if (!at_pos)
+         return;
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat (0, parsed_uri->authinfo, "@"));
+-    parsed_uri->authinfo = str_replace (parsed_uri->authinfo, 
+-					str_alloc_cat_n (0, parsed_uri->authinfo, parsed_uri->host, at_pos - parsed_uri->host));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat (0, parsed_uri->userinfo, "@"));
++    parsed_uri->userinfo = str_replace (parsed_uri->userinfo, 
++					str_alloc_cat_n (0, parsed_uri->userinfo, parsed_uri->host, at_pos - parsed_uri->host));
+     parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
+ }
+ 
+diff -urN thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/pfs-sftp.c
+--- thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs-sftp.c	2005-06-20 23:59:37.000000000 +0200
++++ thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/pfs-sftp.c	2006-07-21 23:37:22.000000000 +0200
+@@ -1496,7 +1496,7 @@
+    */
+   arch_uri_heuristics (&parsed_uri);
+ 
+-  *user = str_save (0, parsed_uri.authinfo);
++  *user = str_save (0, parsed_uri.userinfo);
+   *hostname = str_save (0, parsed_uri.host);
+   if (parsed_uri.port)
+     {
+diff -urN thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/tests/unit-sftp.c
+--- thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/tests/unit-sftp.c	2005-06-20 23:59:37.000000000 +0200
++++ thelove@canonical.com---dists--bazaar--1.4-neon-0.26-fix/src/baz/libarch/tests/unit-sftp.c	2006-07-21 23:39:07.000000000 +0200
+@@ -35,7 +35,7 @@
+     char *host;
+     unsigned int port;
+     char *path;
+-    char *authinfo;
++    char *userinfo;
+ } ne_uri;
+ */
+   invariant_int_cmp (ne_uri_parse ("sftp://user@email.com@host.phwoar/root/path", &parsed_uri), 0);
+@@ -44,7 +44,7 @@
+   invariant_str_cmp (parsed_uri.host, "email.com@host.phwoar");
+   arch_uri_heuristics (&parsed_uri);
+   invariant_str_cmp (parsed_uri.host, "host.phwoar");
+-  invariant_str_cmp (parsed_uri.authinfo, "user@email.com");
++  invariant_str_cmp (parsed_uri.userinfo, "user@email.com");
+   invariant_int_cmp (parsed_uri.port, 0);
+   ne_uri_free(&parsed_uri);
+