new version

(Portage version: 2.0.51.22-r1)

5 files changed, 80 insertions, 6 deletions

diff --git a/dev-util/bazaar/ChangeLog b/dev-util/bazaar/ChangeLog
index e9aa32713f70..d9b34eac7f47 100644
--- a/dev-util/bazaar/ChangeLog
+++ b/dev-util/bazaar/ChangeLog
@@ -1,8 +1,14 @@
 # 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.7 2005/05/08 17:12:33 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/ChangeLog,v 1.8 2005/06/03 10:49:10 arj Exp $
 
-  08 May 2005; David Holm <dholm@gentoo.org> bazaar-1.3.2.ebuild, 
+*bazaar-1.4 (03 Jun 2005)
+
+  03 Jun 2005; Anders Rune Jensen <arj@gentoo.org> +bazaar-1.4.ebuild, 
+  bazaar-1.3.2.ebuild:
+  New version. Mark 1.3.2 stable.
+
+  08 May 2005; Anders Rune Jensen <arj@gentoo.org> bazaar-1.3.2.ebuild, 
   -bazaar-1.3.ebuild:
   Fix #91679. Remove old buggy version.
 	
diff --git a/dev-util/bazaar/Manifest b/dev-util/bazaar/Manifest
index f7735cfbdf48..3f0f097f70cf 100644
--- a/dev-util/bazaar/Manifest
+++ b/dev-util/bazaar/Manifest
@@ -1,12 +1,14 @@
 MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
 MD5 ae8c92f23b3c67db83887772865c0d96 bazaar-1.3.ebuild 1360
+MD5 0ec81fbcd8988f08caffb6695cb1e11c bazaar-1.4.ebuild 1449
 MD5 ef94e7bc3771b7ac82487e47fb76e130 bazaar-1.1.1.ebuild 1242
 MD5 f8d7e091e24eb564a09debd82fb6b6eb bazaar-1.2.ebuild 1268
 MD5 d5282be2f328cf895c9e477826af4f8c bazaar-1.1.ebuild 1176
-MD5 99834c61780d89a4a2ca043892239dde bazaar-1.3.2.ebuild 1445
-MD5 9029250405ffd1f50e6c501b16f6767c ChangeLog 1265
+MD5 d45b56e5ffec617deb38c28dfa97d015 bazaar-1.3.2.ebuild 1443
+MD5 ceb9db0fb496cc3305f38403839f0001 ChangeLog 1428
 MD5 5398ce56c0e7f993e4271aa3c75ca7c4 files/baz-gpgme-fix.patch 608
 MD5 a828807cd52f3e9be2565c24905ed3ae files/digest-bazaar-1.2 115
+MD5 2696c4e97c01042f46019c9809f3cc26 files/digest-bazaar-1.4 117
 MD5 13c14861cfaff4f57c1fdd270e0f2ce2 files/digest-bazaar-1.3.2 117
 MD5 eaa5b71323255191ecd40198fc60ce67 files/digest-bazaar-1.1 64
 MD5 96e582e48e06f3078baa05e59348fe50 files/digest-bazaar-1.3 115
diff --git a/dev-util/bazaar/bazaar-1.3.2.ebuild b/dev-util/bazaar/bazaar-1.3.2.ebuild
index c657212bfb95..36b855c46942 100644
--- a/dev-util/bazaar/bazaar-1.3.2.ebuild
+++ b/dev-util/bazaar/bazaar-1.3.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.3.2.ebuild,v 1.3 2005/05/08 17:12:33 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bazaar/bazaar-1.3.2.ebuild,v 1.4 2005/06/03 10:49:10 arj Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://bazaar.canonical.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 
 DIR="thelove@canonical.com---dists--bazaar--1.3"
diff --git a/dev-util/bazaar/bazaar-1.4.ebuild b/dev-util/bazaar/bazaar-1.4.ebuild
new file mode 100644
index 000000000000..c7b0eb7a4ccb
--- /dev/null
+++ b/dev-util/bazaar/bazaar-1.4.ebuild
@@ -0,0 +1,64 @@
+# 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.4.ebuild,v 1.1 2005/06/03 10:49:10 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.24.7
+	>=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
+}
+
+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
new file mode 100644
index 000000000000..8b15f6c25cac
--- /dev/null
+++ b/dev-util/bazaar/files/digest-bazaar-1.4
@@ -0,0 +1,2 @@
+MD5 1c00c72b4f48f1f9abec58761d1902a0 bazaar_1.4.tar.gz 6261721
+MD5 106921625f2179cbacf62cc8095534f1 baz.1.4.gz 20224