new version that works with neon 0.26

Package-Manager: portage-2.1.1_pre3-r1

7 files changed, 185 insertions, 8 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/Manifest b/dev-util/bazaar/Manifest
index daa5d9176398..48c1caca9788 100644
--- a/dev-util/bazaar/Manifest
+++ b/dev-util/bazaar/Manifest
@@ -1,10 +1,53 @@
-MD5 920e5dade8b5ee6c159f5d533cd1bea0 ChangeLog 1799
+AUX baz-gpgme-fix.patch 608 RMD160 b844779c755292009d14673704a6678bf4706553 SHA1 cc273212808766f7db6d976abfeba63104a2be05 SHA256 33a6091834a17351f3b15b673ba0f6ce92390e113279406f4565b67913126434
+MD5 5398ce56c0e7f993e4271aa3c75ca7c4 files/baz-gpgme-fix.patch 608
+RMD160 b844779c755292009d14673704a6678bf4706553 files/baz-gpgme-fix.patch 608
+SHA256 33a6091834a17351f3b15b673ba0f6ce92390e113279406f4565b67913126434 files/baz-gpgme-fix.patch 608
+AUX neon-0.24-fix.patch 3071 RMD160 3b07d6437b79450849002c81dcec5eca28db4574 SHA1 c93be1a15c7738b70225deebd7d88360c021c84d SHA256 e852c8fa7ca95e1098ca39b667167f475a98e8225241e4d1932fe720cddc7ff4
+MD5 856a3825ec8a3787872754a1bddfbcd3 files/neon-0.24-fix.patch 3071
+RMD160 3b07d6437b79450849002c81dcec5eca28db4574 files/neon-0.24-fix.patch 3071
+SHA256 e852c8fa7ca95e1098ca39b667167f475a98e8225241e4d1932fe720cddc7ff4 files/neon-0.24-fix.patch 3071
+AUX neon-0.26-fix.patch 2803 RMD160 f9fcc9a1ac4e6445fdbdaf675c54539dbcbef658 SHA1 8733416aa7647960df4c96fab66fc0f2a9f50477 SHA256 23e70d4e8e548a6e79441597690411ba86612fa3675f584000979a622edf96f0
+MD5 cdc44d54e78f99b3034f44becc11a22f files/neon-0.26-fix.patch 2803
+RMD160 f9fcc9a1ac4e6445fdbdaf675c54539dbcbef658 files/neon-0.26-fix.patch 2803
+SHA256 23e70d4e8e548a6e79441597690411ba86612fa3675f584000979a622edf96f0 files/neon-0.26-fix.patch 2803
+DIST baz.1.4.gz 20224 RMD160 351789903be9e60f289627558b6eed5f58204822 SHA1 eaa23c7b18528a7ce9c70c17c93996e795e820df SHA256 f3576a7cd02174837b32304fa7e495bdd5003e27f715b2b7ec798e5b60583db1
+DIST baz.1.gz 19572
+DIST bazaar_1.3.2.tar.gz 5908689
+DIST bazaar_1.4.2.tar.gz 6264573 RMD160 8a9d8159ead224b24ab84d0fd6cbc23ac004eb51 SHA1 030fcf1d2de6392c6ab3c23d7af1fddbbeb65a73 SHA256 4ad40013fb6572c9e7a5d14cd055ef98ca583893425c005697a5881b8ac0cc4e
+DIST bazaar_1.4.tar.gz 6261721
+EBUILD bazaar-1.3.2.ebuild 1443 RMD160 4526f092a50951a915ac6bff581a4985b0f96a29 SHA1 2377e885f3712e6e784b201a14db22ca21804f77 SHA256 e0af47e56907a2c684dd21cf80ef11dc380bf7a57544d2466ec6867c554f4a23
 MD5 92331bd9176b37fb50a75500a0407724 bazaar-1.3.2.ebuild 1443
+RMD160 4526f092a50951a915ac6bff581a4985b0f96a29 bazaar-1.3.2.ebuild 1443
+SHA256 e0af47e56907a2c684dd21cf80ef11dc380bf7a57544d2466ec6867c554f4a23 bazaar-1.3.2.ebuild 1443
+EBUILD bazaar-1.4.2-r1.ebuild 1532 RMD160 018f9486a0e583a806f6d1b0007b7f4ee6928df8 SHA1 968e19c1219b6999bdd4ed54cb85a149a838e2dd SHA256 4adcab3abfdf7ecae28f21b2859be2587b3a58e37fcb8e0ffa3472b033bfb555
+MD5 b6f0f1512fa1847c0e8bb28262ceb3ab bazaar-1.4.2-r1.ebuild 1532
+RMD160 018f9486a0e583a806f6d1b0007b7f4ee6928df8 bazaar-1.4.2-r1.ebuild 1532
+SHA256 4adcab3abfdf7ecae28f21b2859be2587b3a58e37fcb8e0ffa3472b033bfb555 bazaar-1.4.2-r1.ebuild 1532
+EBUILD bazaar-1.4.2.ebuild 1489 RMD160 7a1f614c28a95f44a32061611789b9518e400727 SHA1 d6c7dc3d056c74569cd03d084a87c119d06bb805 SHA256 086a170dbf173264a3e4ad9b85ab27f6755b0d26baaeb0ffdcb0e2a7b8820108
 MD5 91426a333b50ccb1b05a2acce4b2e40b bazaar-1.4.2.ebuild 1489
+RMD160 7a1f614c28a95f44a32061611789b9518e400727 bazaar-1.4.2.ebuild 1489
+SHA256 086a170dbf173264a3e4ad9b85ab27f6755b0d26baaeb0ffdcb0e2a7b8820108 bazaar-1.4.2.ebuild 1489
+EBUILD bazaar-1.4.ebuild 1447 RMD160 81b8059a4c9ec2937792c5e57bfdf43635d8c229 SHA1 2ec99146ee0310dcf6ee05cdde92ed7180587606 SHA256 c127713194d49b4b0e7430b6d720779b2caa0b1842e798b7378750fc369706b4
 MD5 4b48265e9ce31c425f342e07e424f1b5 bazaar-1.4.ebuild 1447
-MD5 5398ce56c0e7f993e4271aa3c75ca7c4 files/baz-gpgme-fix.patch 608
-MD5 13c14861cfaff4f57c1fdd270e0f2ce2 files/digest-bazaar-1.3.2 117
-MD5 2696c4e97c01042f46019c9809f3cc26 files/digest-bazaar-1.4 117
-MD5 97c88f25b3a55bd8dc672df152ab0e7b files/digest-bazaar-1.4.2 119
-MD5 856a3825ec8a3787872754a1bddfbcd3 files/neon-0.24-fix.patch 3071
+RMD160 81b8059a4c9ec2937792c5e57bfdf43635d8c229 bazaar-1.4.ebuild 1447
+SHA256 c127713194d49b4b0e7430b6d720779b2caa0b1842e798b7378750fc369706b4 bazaar-1.4.ebuild 1447
+MISC ChangeLog 1969 RMD160 2ec46e26ab7fd31948919c06283f8ad53c448255 SHA1 ebd3939dbe319cb365373d01d202ce89f540dce0 SHA256 ed70e4a70e1d3cd2985572c825419e60de04d3f40f44cabe0e22c1169d442025
+MD5 bf02512df8f5ae4442515dbe14a79dba ChangeLog 1969
+RMD160 2ec46e26ab7fd31948919c06283f8ad53c448255 ChangeLog 1969
+SHA256 ed70e4a70e1d3cd2985572c825419e60de04d3f40f44cabe0e22c1169d442025 ChangeLog 1969
+MISC metadata.xml 215 RMD160 393ad11a7ed92426bb0c3e44f9bf3a9d4e25246e SHA1 8e66d2013069e51e4e703d4fd56d35342ac4a76d SHA256 268bcaa7dbd534b681bc5b342c38bf491e083f641ef426a86976086ef2e23358
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
+RMD160 393ad11a7ed92426bb0c3e44f9bf3a9d4e25246e metadata.xml 215
+SHA256 268bcaa7dbd534b681bc5b342c38bf491e083f641ef426a86976086ef2e23358 metadata.xml 215
+MD5 13c14861cfaff4f57c1fdd270e0f2ce2 files/digest-bazaar-1.3.2 117
+RMD160 fdc0bf288842619cbe50fab228e653785d5219b1 files/digest-bazaar-1.3.2 117
+SHA256 60d649baa2edddca91c9caf5a6261f0a74308a73d1437047995784d023df7ef2 files/digest-bazaar-1.3.2 117
+MD5 937af1244775ef48773cdca31294d1f0 files/digest-bazaar-1.4 271
+RMD160 4d8b5473a9927654a157450c666c00d2d1a2ded8 files/digest-bazaar-1.4 271
+SHA256 4cefee2f1b6926d76ab91156ac41dc4c42adf4eaf3ee4620ebe2928fa80cef43 files/digest-bazaar-1.4 271
+MD5 3fd436ef78d9465142b85f6adc4b9c70 files/digest-bazaar-1.4.2 449
+RMD160 b8403fb42b489077d16fccd1ddefffac186ad0df files/digest-bazaar-1.4.2 449
+SHA256 ce6484b347ac375db30f473d645d46fce44c76347ae5fc7ec0384149779c7241 files/digest-bazaar-1.4.2 449
+MD5 3fd436ef78d9465142b85f6adc4b9c70 files/digest-bazaar-1.4.2-r1 449
+RMD160 b8403fb42b489077d16fccd1ddefffac186ad0df files/digest-bazaar-1.4.2-r1 449
+SHA256 ce6484b347ac375db30f473d645d46fce44c76347ae5fc7ec0384149779c7241 files/digest-bazaar-1.4.2-r1 449
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);
+