New upstream version. Remove rc5

(Portage version: 2.1.2.12)

5 files changed, 29 insertions, 45 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index faf1bf37d77c..f227d60c0b77 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.214 2007/08/24 09:24:36 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.215 2007/08/29 10:58:32 ferdy Exp $
+
+*git-1.5.3_rc7 (29 Aug 2007)
+
+  29 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/git-1.5.3_rc5-read-tree.patch, -git-1.5.3_rc5-r1.ebuild,
+  +git-1.5.3_rc7.ebuild:
+  New upstream version. Remove rc5
 
   24 Aug 2007; Fernando J. Pereda <ferdy@gentoo.org> -git-1.5.2.4.ebuild,
   -git-1.5.3_rc4.ebuild:
diff --git a/dev-util/git/files/digest-git-1.5.3_rc5-r1 b/dev-util/git/files/digest-git-1.5.3_rc5-r1
deleted file mode 100644
index 9ee7159daa23..000000000000
--- a/dev-util/git/files/digest-git-1.5.3_rc5-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5e8b9bbab681efdf5b587416e4d4d648 git-1.5.3.rc5.tar.bz2 1333359
-RMD160 3677a265f8242db0f2baecb088e68b15bfc61b93 git-1.5.3.rc5.tar.bz2 1333359
-SHA256 0eff4c012911d779b96a816ca904ff8aa56e027fdb8c7d77e1e8a82908d9df7c git-1.5.3.rc5.tar.bz2 1333359
-MD5 4a76d961c81e1f6f9595bab41c768bef git-htmldocs-1.5.3.rc5.tar.bz2 535904
-RMD160 b4cb74c54b658b2cb6039b31c5aff89b71e9c74d git-htmldocs-1.5.3.rc5.tar.bz2 535904
-SHA256 ee2b490b9d265aae3911cf44a3caa22c97709977762b34def10458e32b5f2a5f git-htmldocs-1.5.3.rc5.tar.bz2 535904
-MD5 77fc14e6c946b3f5fe31a4a7ff5c403d git-manpages-1.5.3.rc5.tar.bz2 150206
-RMD160 c84867d4adb21ad7147501a4875fd491f62b5906 git-manpages-1.5.3.rc5.tar.bz2 150206
-SHA256 ed3aac966068519e2370b5cc0dcc1046f1b6f31a11797a787f4a15ffaf08a2d3 git-manpages-1.5.3.rc5.tar.bz2 150206
diff --git a/dev-util/git/files/digest-git-1.5.3_rc7 b/dev-util/git/files/digest-git-1.5.3_rc7
new file mode 100644
index 000000000000..e8a83c39ac53
--- /dev/null
+++ b/dev-util/git/files/digest-git-1.5.3_rc7
@@ -0,0 +1,9 @@
+MD5 3122611c8aa15798985604d7734aff27 git-1.5.3.rc7.tar.bz2 1342581
+RMD160 aa676ac692ada42347a6c50852e840bb6502063a git-1.5.3.rc7.tar.bz2 1342581
+SHA256 caf550f7ebd51930a4ffcd03377a7a2ad4b2510483f4da8a8f613f66f8f7ba76 git-1.5.3.rc7.tar.bz2 1342581
+MD5 bcb0a6b3feeb0855499df2258703d3f9 git-htmldocs-1.5.3.rc7.tar.bz2 537898
+RMD160 c8c7cdd3a6d7b823a0cfc7bc52ef6888aa141404 git-htmldocs-1.5.3.rc7.tar.bz2 537898
+SHA256 7610784f154c7eacfcaa94a9aef6f8683ebf56be36080d01ffe8b80ed6a0874b git-htmldocs-1.5.3.rc7.tar.bz2 537898
+MD5 b76e7bf5ae40db466067d1c961fc3d2b git-manpages-1.5.3.rc7.tar.bz2 151570
+RMD160 ac256f12afbcc21c29ed03b5a20b56fd209bb3b7 git-manpages-1.5.3.rc7.tar.bz2 151570
+SHA256 a5fa4a4f2d9878909aafab7ce144c8af550b816977a2453e183f1ac736f3be74 git-manpages-1.5.3.rc7.tar.bz2 151570
diff --git a/dev-util/git/files/git-1.5.3_rc5-read-tree.patch b/dev-util/git/files/git-1.5.3_rc5-read-tree.patch
deleted file mode 100644
index 375a128d49f9..000000000000
--- a/dev-util/git/files/git-1.5.3_rc5-read-tree.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/builtin-read-tree.c b/builtin-read-tree.c
-index 1967d10..5b07e9a 100644
---- a/builtin-read-tree.c
-+++ b/builtin-read-tree.c
-@@ -96,7 +96,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
- {
- 	int i, newfd, stage = 0;
- 	unsigned char sha1[20];
--	struct tree_desc t[3];
-+	struct tree_desc t[20];
- 	struct unpack_trees_options opts;
- 
- 	memset(&opts, 0, sizeof(opts));
-@@ -263,6 +263,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
- 			opts.head_idx = 1;
- 	}
- 
-+	if (ARRAY_SIZE(t) < nr_trees)
-+		die("I cannot read more than %d trees", ARRAY_SIZE(t));
-+
- 	for (i = 0; i < nr_trees; i++) {
- 		struct tree *tree = trees[i];
- 		parse_tree(tree);
diff --git a/dev-util/git/git-1.5.3_rc5-r1.ebuild b/dev-util/git/git-1.5.3_rc7.ebuild
index 6664baf8f7d8..37efc0afabb9 100644
--- a/dev-util/git/git-1.5.3_rc5-r1.ebuild
+++ b/dev-util/git/git-1.5.3_rc7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3_rc5-r1.ebuild,v 1.1 2007/08/15 23:20:15 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/git-1.5.3_rc7.ebuild,v 1.1 2007/08/29 10:58:32 ferdy Exp $
 
 inherit toolchain-funcs eutils elisp-common perl-module bash-completion
 
@@ -20,17 +20,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="curl doc elibc_uclibc emacs gtk mozsha1 perl ppcsha1 tk webdav"
 
-DEPEND="dev-libs/openssl
-		sys-libs/zlib
-		!app-misc/git
-		curl? ( net-misc/curl )
-		webdav? ( dev-libs/expat )
-		emacs? ( virtual/emacs )"
+DEPEND="
+	dev-libs/openssl
+	!app-misc/git
+	sys-libs/zlib
+	dev-lang/perl
+	tk?     ( dev-lang/tk )
+	curl?   ( net-misc/curl )
+	webdav? ( dev-libs/expat )
+	emacs?  ( virtual/emacs )"
 RDEPEND="${DEPEND}
-		dev-lang/perl
-		perl? ( dev-perl/Error )
-		tk? ( dev-lang/tk )
-		gtk? ( >=dev-python/pygtk-2.8 )"
+	perl?   ( dev-perl/Error )
+	gtk?    ( >=dev-python/pygtk-2.8 )"
 
 SITEFILE=71${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
@@ -70,7 +71,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}"/${P}-read-tree.patch
 	epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch
 
 	sed -i \