fix bug

(Portage version: 2.1_pre3-r1)

13 files changed, 94 insertions, 237 deletions

diff --git a/dev-util/bazaar/ChangeLog b/dev-util/bazaar/ChangeLog
index c5e5f7b10aa8..a81c3fa46348 100644
--- a/dev-util/bazaar/ChangeLog
+++ b/dev-util/bazaar/ChangeLog
@@ -1,7 +1,13 @@
 # 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.9 2005/07/05 00:34:31 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/ChangeLog,v 1.10 2006/01/14 16:24:06 arj Exp $
 
+  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: 
+  Fix to make register-archive work with neon 0.25. Fixes #115933. Remove
+  old versions.
+	
 *bazaar-1.4.2 (05 Jul 2005)
 
   05 Jul 2005; Anders Rune Jensen <arj@gentoo.org> +bazaar-1.4.2.ebuild:
diff --git a/dev-util/bazaar/Manifest b/dev-util/bazaar/Manifest
index cd0c05e0efa3..cd6a6a1dcf47 100644
--- a/dev-util/bazaar/Manifest
+++ b/dev-util/bazaar/Manifest
@@ -4,9 +4,8 @@ MD5 d5282be2f328cf895c9e477826af4f8c bazaar-1.1.ebuild 1176
 MD5 f8d7e091e24eb564a09debd82fb6b6eb bazaar-1.2.ebuild 1268
 MD5 92331bd9176b37fb50a75500a0407724 bazaar-1.3.2.ebuild 1443
 MD5 ae8c92f23b3c67db83887772865c0d96 bazaar-1.3.ebuild 1360
+MD5 4159d1f27d0caa60539d205442dca9b4 bazaar-1.4.2.ebuild 1489
 MD5 4b48265e9ce31c425f342e07e424f1b5 bazaar-1.4.ebuild 1447
-MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
-MD5 3c945674024e30d9d86fdb7bae66f7e9 bazaar-1.4.2.ebuild 1449
 MD5 5398ce56c0e7f993e4271aa3c75ca7c4 files/baz-gpgme-fix.patch 608
 MD5 eaa5b71323255191ecd40198fc60ce67 files/digest-bazaar-1.1 64
 MD5 e290be39ff970403bfe53594fc846602 files/digest-bazaar-1.1.1 65
@@ -14,4 +13,6 @@ MD5 a828807cd52f3e9be2565c24905ed3ae files/digest-bazaar-1.2 115
 MD5 96e582e48e06f3078baa05e59348fe50 files/digest-bazaar-1.3 115
 MD5 13c14861cfaff4f57c1fdd270e0f2ce2 files/digest-bazaar-1.3.2 117
 MD5 2696c4e97c01042f46019c9809f3cc26 files/digest-bazaar-1.4 117
-MD5 21b8e2928da0cc314c0d7ea08f6a895c files/digest-bazaar-1.4.2 119
+MD5 97c88f25b3a55bd8dc672df152ab0e7b files/digest-bazaar-1.4.2 119
+MD5 856a3825ec8a3787872754a1bddfbcd3 files/neon-0.24-fix.patch 3071
+MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
diff --git a/dev-util/bazaar/bazaar-1.1.1.ebuild b/dev-util/bazaar/bazaar-1.1.1.ebuild
deleted file mode 100644
index 1a74cfcfaac5..000000000000
--- a/dev-util/bazaar/bazaar-1.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.1.1.ebuild,v 1.2 2005/03/02 19:47:45 arj Exp $
-
-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"
-HOMEPAGE="http://bazaar.canonical.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DIR="thelove@canonical.com---dists--bazaar--1.1"
-
-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.24.7"
-
-src_unpack() {
-	unpack "${A}"
-	mv ${DIR} ${P}
-	mkdir "${P}/src/=build"
-}
-
-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
-	cd docs-baz
-	dodoc =README
-	docinto ps
-	dodoc ps/*.ps
-	docinto html
-	dohtml -r html/
-}
diff --git a/dev-util/bazaar/bazaar-1.1.ebuild b/dev-util/bazaar/bazaar-1.1.ebuild
deleted file mode 100644
index 3ab9f5341e5a..000000000000
--- a/dev-util/bazaar/bazaar-1.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.1.ebuild,v 1.1 2005/01/22 01:21:57 arj Exp $
-
-S="${WORKDIR}/${P}/src/=build"
-DESCRIPTION="Bazaar is a user-interface branch of tla"
-SRC_URI="http://bazaar.canonical.com/packages/src/bazaar_${PV}.tar.gz"
-HOMEPAGE="http://bazaar.canonical.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-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.24.7"
-
-src_unpack() {
-	unpack "${A}"
-	mkdir "${P}/src/=build"
-}
-
-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
-	cd docs-baz
-	dodoc =README
-	docinto ps
-	dodoc ps/*.ps
-	docinto html
-	dohtml -r html/
-}
diff --git a/dev-util/bazaar/bazaar-1.2.ebuild b/dev-util/bazaar/bazaar-1.2.ebuild
deleted file mode 100644
index 37c4343b80c3..000000000000
--- a/dev-util/bazaar/bazaar-1.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.2.ebuild,v 1.2 2005/04/12 16:49:49 arj Exp $
-
-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.gz"
-HOMEPAGE="http://bazaar.canonical.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DIR="thelove@canonical.com---dists--bazaar--1.2"
-
-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.24.7"
-
-src_unpack() {
-	unpack bazaar_${PV}.tar.gz
-	unpack baz.1.gz
-	mv ${DIR} ${P}
-	mkdir "${P}/src/=build"
-}
-
-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/bazaar-1.3.ebuild b/dev-util/bazaar/bazaar-1.3.ebuild
deleted file mode 100644
index 8fffb04cac1f..000000000000
--- a/dev-util/bazaar/bazaar-1.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.3.ebuild,v 1.1 2005/04/12 16:49:49 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.gz"
-HOMEPAGE="http://bazaar.canonical.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DIR="thelove@canonical.com---dists--bazaar--1.3"
-
-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.24.7
-	>=app-crypt/gpgme-1.0.2"
-
-src_unpack() {
-	unpack bazaar_${PV}.tar.gz
-	unpack baz.1.gz
-	mv ${DIR} ${P}
-	mkdir "${P}/src/=build"
-	cd ${P}
-	epatch ${FILESDIR}/baz-gpgme-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/bazaar-1.4.2.ebuild b/dev-util/bazaar/bazaar-1.4.2.ebuild
index b2f1940d1aa1..e03f92b088e6 100644
--- a/dev-util/bazaar/bazaar-1.4.2.ebuild
+++ b/dev-util/bazaar/bazaar-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.1 2005/07/05 00:34:31 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.4.2.ebuild,v 1.2 2006/01/14 16:24:06 arj Exp $
 
 inherit eutils
 
@@ -40,6 +40,7 @@ src_unpack() {
 	rm -rf src/baz/annotate
 
 	epatch ${FILESDIR}/baz-gpgme-fix.patch
+	epatch ${FILESDIR}/neon-0.24-fix.patch
 }
 
 src_compile() {
diff --git a/dev-util/bazaar/files/digest-bazaar-1.1 b/dev-util/bazaar/files/digest-bazaar-1.1
deleted file mode 100644
index 2497f065e2bc..000000000000
--- a/dev-util/bazaar/files/digest-bazaar-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebc9f51d3e7c5174d79aa50f401a8d12 bazaar_1.1.tar.gz 10867586
diff --git a/dev-util/bazaar/files/digest-bazaar-1.1.1 b/dev-util/bazaar/files/digest-bazaar-1.1.1
deleted file mode 100644
index 43c023fd6ba9..000000000000
--- a/dev-util/bazaar/files/digest-bazaar-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d39a059b28cbc6ee320a039501b6765 bazaar_1.1.1.tar.gz 5494535
diff --git a/dev-util/bazaar/files/digest-bazaar-1.2 b/dev-util/bazaar/files/digest-bazaar-1.2
deleted file mode 100644
index fcdfc989a1bf..000000000000
--- a/dev-util/bazaar/files/digest-bazaar-1.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1fdb0aa41d7db06bf3429118d0136c8a bazaar_1.2.tar.gz 5387009
-MD5 300e96def0617ed0fb27383f8fdbafd3 baz.1.gz 19572
diff --git a/dev-util/bazaar/files/digest-bazaar-1.3 b/dev-util/bazaar/files/digest-bazaar-1.3
deleted file mode 100644
index c245ca6efc6c..000000000000
--- a/dev-util/bazaar/files/digest-bazaar-1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9e6d217abfe68cb98f370a848393c5d3 bazaar_1.3.tar.gz 5906358
-MD5 300e96def0617ed0fb27383f8fdbafd3 baz.1.gz 19572
diff --git a/dev-util/bazaar/files/digest-bazaar-1.4.2 b/dev-util/bazaar/files/digest-bazaar-1.4.2
index 70cd73d7503b..f2e0b7172b48 100644
--- a/dev-util/bazaar/files/digest-bazaar-1.4.2
+++ b/dev-util/bazaar/files/digest-bazaar-1.4.2
@@ -1,2 +1,2 @@
-MD5 6e61d7aeec990a801977ee6cdc3958d5 bazaar_1.4.2.tar.gz 6264573
 MD5 106921625f2179cbacf62cc8095534f1 baz.1.4.gz 20224
+MD5 6e61d7aeec990a801977ee6cdc3958d5 bazaar_1.4.2.tar.gz 6264573
diff --git a/dev-util/bazaar/files/neon-0.24-fix.patch b/dev-util/bazaar/files/neon-0.24-fix.patch
new file mode 100644
index 000000000000..55df9e6a3dba
--- /dev/null
+++ b/dev-util/bazaar/files/neon-0.24-fix.patch
@@ -0,0 +1,79 @@
+diff -uN -r thelove@canonical.com---dists--bazaar--1.4/src/baz/libarch/pfs.c thelove@canonical.com---dists--bazaar--1.4-fixed/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-fixed/src/baz/libarch/pfs.c	2006-01-14 17:12:24.000000000 +0100
+@@ -520,6 +520,66 @@
+     parsed_uri->host = str_replace (parsed_uri->host, str_save (0, at_pos + 1));
+ }
+ 
++/* RFC2396 spake:
++ * "Data must be escaped if it does not have a representation 
++ * using an unreserved character".
++ */
++
++/* Lookup table: character classes from 2396. (This is overkill) */
++
++#define SP 0   /* space    = <US-ASCII coded character 20 hexadecimal>                 */
++#define CO 0   /* control  = <US-ASCII coded characters 00-1F and 7F hexadecimal>      */
++#define DE 0   /* delims   = "<" | ">" | "#" | "%" | <">                               */
++#define UW 0   /* unwise   = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`"             */
++#define MA 1   /* mark     = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"       */
++#define AN 2   /* alphanum = alpha | digit                                             */
++#define RE 2   /* reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," */
++
++static const char uri_chars[128] = {
++/*                +2      +4      +6      +8     +10     +12     +14     */
++/*   0 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
++/*  16 */ CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO, CO,
++/*  32 */ SP, MA, DE, DE, RE, DE, RE, MA, MA, MA, MA, RE, RE, MA, MA, RE,
++/*  48 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, RE, RE, DE, RE, DE, RE,
++/*  64 */ RE, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
++/*  80 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, UW, MA,
++/*  96 */ UW, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN,
++/* 112 */ AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, AN, UW, UW, UW, MA, CO 
++};
++
++#define ESCAPE(ch) (((const signed char)(ch) < 0 || \
++		uri_chars[(unsigned int)(ch)] == 0))
++
++char *oldneon_ne_path_escape(const char *abs_path) 
++{
++    const char *pnt;
++    char *ret, *retpos;
++    int count = 0;
++    for (pnt = abs_path; *pnt != '\0'; pnt++) {
++	if (ESCAPE(*pnt)) {
++	    count++;
++	}
++    }
++    if (count == 0) {
++	return ne_strdup(abs_path);
++    }
++    /* An escaped character is "%xx", i.e., two MORE
++     * characters than the original string */
++    retpos = ret = ne_malloc(strlen(abs_path) + 2*count + 1);
++    for (pnt = abs_path; *pnt != '\0'; pnt++) {
++	if (ESCAPE(*pnt)) {
++	    /* Escape it - %<hex><hex> */
++	    sprintf(retpos, "%%%02x", (unsigned char) *pnt);
++	    retpos += 3;
++	} else {
++	    /* It's cool */
++	    *retpos++ = *pnt;
++	}
++    }
++    *retpos = '\0';
++    return ret;
++}
++
+ /**
+  * \brief escape a location
+  *
+@@ -528,7 +588,7 @@
+ t_uchar *
+ escape_location (t_uchar const *location)
+ {
+-    return ne_path_escape(location);
++    return oldneon_ne_path_escape(location);
+ }
+ 
+ /**