new version

(Portage version: 2.0.51.19)

6 files changed, 90 insertions, 5 deletions

diff --git a/dev-util/bazaar/ChangeLog b/dev-util/bazaar/ChangeLog
index 20c20b5374da..f2a7a434fcf2 100644
--- a/dev-util/bazaar/ChangeLog
+++ b/dev-util/bazaar/ChangeLog
@@ -1,7 +1,15 @@
 # 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.3 2005/03/02 19:47:45 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/ChangeLog,v 1.4 2005/04/12 16:49:49 arj Exp $
 
+*bazaar-1.3 (12 Apr 2005)
+
+  12 Apr 2005; Anders Rune Jensen <arj@gentoo.org> +bazaar-1.3.ebuild:
+  New version.
+	
+  12 Apr 2005; Anders Rune Jensen <arj@gentoo.org> bazaar-1.2.ebuild:
+  Mark stable on x86 and amd64.
+	
 *bazaar-1.2 (02 Mar 2005)
 
   02 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +bazaar-1.2.ebuild:
diff --git a/dev-util/bazaar/Manifest b/dev-util/bazaar/Manifest
index a9a50d75d6fb..dd65524e6b2e 100644
--- a/dev-util/bazaar/Manifest
+++ b/dev-util/bazaar/Manifest
@@ -1,8 +1,11 @@
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
+MD5 bb27f751cc82a7680e8a88276c13ad42 bazaar-1.3.ebuild 1335
 MD5 ef94e7bc3771b7ac82487e47fb76e130 bazaar-1.1.1.ebuild 1242
-MD5 2831b8b8b2fc1119c3778cc4cc4964c0 bazaar-1.2.ebuild 1270
+MD5 b85be815b162c5da86b08d904fc3605d bazaar-1.2.ebuild 1268
 MD5 d5282be2f328cf895c9e477826af4f8c bazaar-1.1.ebuild 1176
-MD5 eeeb25497e98c3e2c30027e296e562d5 ChangeLog 713
+MD5 68a74b2aeab08a378348711edcf0c43b ChangeLog 932
+MD5 5398ce56c0e7f993e4271aa3c75ca7c4 files/baz-gpgme-fix.patch 608
 MD5 a828807cd52f3e9be2565c24905ed3ae files/digest-bazaar-1.2 115
 MD5 eaa5b71323255191ecd40198fc60ce67 files/digest-bazaar-1.1 64
+MD5 96e582e48e06f3078baa05e59348fe50 files/digest-bazaar-1.3 115
 MD5 e290be39ff970403bfe53594fc846602 files/digest-bazaar-1.1.1 65
diff --git a/dev-util/bazaar/bazaar-1.2.ebuild b/dev-util/bazaar/bazaar-1.2.ebuild
index 84b0a3537490..37c4343b80c3 100644
--- a/dev-util/bazaar/bazaar-1.2.ebuild
+++ b/dev-util/bazaar/bazaar-1.2.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/03/02 19:47:45 arj Exp $
+# $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"
@@ -10,7 +10,7 @@ HOMEPAGE="http://bazaar.canonical.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 DIR="thelove@canonical.com---dists--bazaar--1.2"
diff --git a/dev-util/bazaar/bazaar-1.3.ebuild b/dev-util/bazaar/bazaar-1.3.ebuild
new file mode 100644
index 000000000000..8fffb04cac1f
--- /dev/null
+++ b/dev-util/bazaar/bazaar-1.3.ebuild
@@ -0,0 +1,60 @@
+# 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/files/baz-gpgme-fix.patch b/dev-util/bazaar/files/baz-gpgme-fix.patch
new file mode 100644
index 000000000000..7eff9d9e009d
--- /dev/null
+++ b/dev-util/bazaar/files/baz-gpgme-fix.patch
@@ -0,0 +1,12 @@
+diff -urN thelove@canonical.com---dists--bazaar--1.3/src/baz/libarch/pfs-signatures.c thelove@canonical.com---dists--bazaar--1.3-mod/src/baz/libarch/pfs-signatures.c
+--- thelove@canonical.com---dists--bazaar--1.3/src/baz/libarch/pfs-signatures.c	2005-04-11 10:07:12.000000000 +0200
++++ thelove@canonical.com---dists--bazaar--1.3-mod/src/baz/libarch/pfs-signatures.c	2005-04-12 18:32:10.000000000 +0200
+@@ -28,7 +28,7 @@
+ #include "libarch/namespace.h"
+ #include "libarch/archives.h"
+ #include "libarch/cached-archive.h"
+-#include <gpgme.h>
++#include "gpgme/gpgme.h"
+ #include "libarch/pfs-signatures.h"
+ 
+ 
diff --git a/dev-util/bazaar/files/digest-bazaar-1.3 b/dev-util/bazaar/files/digest-bazaar-1.3
new file mode 100644
index 000000000000..c245ca6efc6c
--- /dev/null
+++ b/dev-util/bazaar/files/digest-bazaar-1.3
@@ -0,0 +1,2 @@
+MD5 9e6d217abfe68cb98f370a848393c5d3 bazaar_1.3.tar.gz 5906358
+MD5 300e96def0617ed0fb27383f8fdbafd3 baz.1.gz 19572