New upstream version. Remove rc5

Package-Manager: portage-2.1.2.12

6 files changed, 46 insertions, 66 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/Manifest b/dev-util/git/Manifest
index 1e598d77fb7c..a2c3055a10c0 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -17,10 +17,6 @@ AUX git-1.5.3-symlinks.patch 645 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6
 MD5 cae1a7f7e4d1bf7095d2b88616a0a4b5 files/git-1.5.3-symlinks.patch 645
 RMD160 24fc6002042e67611f337cae3867bb400fd8c7d6 files/git-1.5.3-symlinks.patch 645
 SHA256 dc8786302f5806eff376f3d1921c85d4907fda0318aa20c2c4a73ca8aea58340 files/git-1.5.3-symlinks.patch 645
-AUX git-1.5.3_rc5-read-tree.patch 713 RMD160 20fe1d0719a9310e223613b644b11b84e8fd68c3 SHA1 c6fd75c7b79eb5ceb0a372e305117cd9de810b1d SHA256 873c03413c47b5ae38ba7d357306508f63bbc2bf1a02ab851d91c0e95331c03f
-MD5 ac9cee726715f718af476bb30ecd4eab files/git-1.5.3_rc5-read-tree.patch 713
-RMD160 20fe1d0719a9310e223613b644b11b84e8fd68c3 files/git-1.5.3_rc5-read-tree.patch 713
-SHA256 873c03413c47b5ae38ba7d357306508f63bbc2bf1a02ab851d91c0e95331c03f files/git-1.5.3_rc5-read-tree.patch 713
 AUX git-daemon.confd 376 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f SHA1 3a00fa3af96d83bec1589d7ef53eff01ea838ea1 SHA256 266045958a3a4072529f25208d1f84a178bbb10aa0b6fa19543f7a62f9a5e3fe
 MD5 5c96e23fef078682e648254d9197f618 files/git-daemon.confd 376
 RMD160 70cbd0b87cbd2ce6b494f07ead732f33f7ea623f files/git-daemon.confd 376
@@ -35,13 +31,13 @@ RMD160 9c1abde72ac5064e1fc86afd29c2a74079db91a4 files/git-daemon.xinetd 260
 SHA256 6a3503904204163775722e8a455e4ebaa8648f6d288340979387ad4eb55f4c0a files/git-daemon.xinetd 260
 DIST git-1.5.1.6.tar.bz2 1130713 RMD160 20279c817da53d3bc6d5f58121bfe73e8a25e8a1 SHA1 c1e34ce6a6a9a81bb16f158ef84b4576e6be1b0c SHA256 4429ca98c0789b0f564cdbf76e8e8ad4db928b7c7ac94f116e4a0729e4253a21
 DIST git-1.5.2.5.tar.bz2 1192416 RMD160 e4d7165521e1fbe35feab48bbf54ca08ffe571b5 SHA1 5c145b98dbd7b8695e8dcc18ca661454775c869b SHA256 b0b8016a77ed2ef1ab33cf5b82d960025bdbaaf9142c2fb0a01558e8ad017fb9
-DIST git-1.5.3.rc5.tar.bz2 1333359 RMD160 3677a265f8242db0f2baecb088e68b15bfc61b93 SHA1 d31ea29470ee9872f110f1759f1134403964886e SHA256 0eff4c012911d779b96a816ca904ff8aa56e027fdb8c7d77e1e8a82908d9df7c
+DIST git-1.5.3.rc7.tar.bz2 1342581 RMD160 aa676ac692ada42347a6c50852e840bb6502063a SHA1 0d95ee4adb3dcc26f531a095d7a5fb5057300a2c SHA256 caf550f7ebd51930a4ffcd03377a7a2ad4b2510483f4da8a8f613f66f8f7ba76
 DIST git-htmldocs-1.5.1.6.tar.bz2 489138 RMD160 eda63828bbb928699c9b3bb52876d7b7dc489ba7 SHA1 907749b4eba99c696589be750bc9432b9818954b SHA256 566928345f80850bdebb278d52591f017041d9de67b2cd561963065c847c6685
 DIST git-htmldocs-1.5.2.5.tar.bz2 505906 RMD160 000a0c5226866812766fc3c45bcafbc5fe35fb9a SHA1 974a1317078dc5159ef1eafb3937d3c651b4efbc SHA256 74f154b3d8f6dfc6582702f37197a37fd0f498f1ea7ef030d5ea0c999e8f9532
-DIST git-htmldocs-1.5.3.rc5.tar.bz2 535904 RMD160 b4cb74c54b658b2cb6039b31c5aff89b71e9c74d SHA1 705468fbe9e7de24e261477bb2294822e533ac31 SHA256 ee2b490b9d265aae3911cf44a3caa22c97709977762b34def10458e32b5f2a5f
+DIST git-htmldocs-1.5.3.rc7.tar.bz2 537898 RMD160 c8c7cdd3a6d7b823a0cfc7bc52ef6888aa141404 SHA1 4e5ab0a36b8db3e59c98ec392561d4b85236df1c SHA256 7610784f154c7eacfcaa94a9aef6f8683ebf56be36080d01ffe8b80ed6a0874b
 DIST git-manpages-1.5.1.6.tar.bz2 133945 RMD160 ed047e78031882fb1d954ed9368127e4d0019da8 SHA1 f4eeb116aaeeabf329c9de8d49421af42e4a6f51 SHA256 22a06a220a915b3c1493462f0d902ea70d1dee25e0362984a1c896a73c721c4d
 DIST git-manpages-1.5.2.5.tar.bz2 139885 RMD160 6c5e3b1bdf22638adcd914349d307a1934ec8c22 SHA1 47a2f330581c9e4dcb5e8c25d7508c5e8d7d7997 SHA256 c793bc76451cee39b92d173d33e6e33f2b74c8b6b9ac74ecd23031d236722fc4
-DIST git-manpages-1.5.3.rc5.tar.bz2 150206 RMD160 c84867d4adb21ad7147501a4875fd491f62b5906 SHA1 3b5dddc07b096b0923b9ffd0a67f792342b062d0 SHA256 ed3aac966068519e2370b5cc0dcc1046f1b6f31a11797a787f4a15ffaf08a2d3
+DIST git-manpages-1.5.3.rc7.tar.bz2 151570 RMD160 ac256f12afbcc21c29ed03b5a20b56fd209bb3b7 SHA1 0d26a816a97cae1a21a062923aeec89e8b12201f SHA256 a5fa4a4f2d9878909aafab7ce144c8af550b816977a2453e183f1ac736f3be74
 EBUILD git-1.5.1.6.ebuild 4415 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a SHA1 fcf556d35c0162eb74cbf28cca088ff6d8d642f7 SHA256 7970963a050b0a407375c8943408489ef51f995561d34c6d67596ba435b4eff3
 MD5 4c6ba2ac3142c57509ae3405ab1784d4 git-1.5.1.6.ebuild 4415
 RMD160 7c5e1759aa8f269a2a6c3ae8503cfa47c79ee66a git-1.5.1.6.ebuild 4415
@@ -50,14 +46,14 @@ EBUILD git-1.5.2.5.ebuild 4416 RMD160 1c20bee02c6062629da40e4329c1aa49ffb90e0b S
 MD5 a68490eb1c91867d3963f3f9ee8d4f9a git-1.5.2.5.ebuild 4416
 RMD160 1c20bee02c6062629da40e4329c1aa49ffb90e0b git-1.5.2.5.ebuild 4416
 SHA256 681878396976a5b624c60d93faa8c08a6868a96bcf04374cdd5c088e3ea424f8 git-1.5.2.5.ebuild 4416
-EBUILD git-1.5.3_rc5-r1.ebuild 4464 RMD160 eb67962f19aa5bdb30ff69b8d01edeedd9c8c7b0 SHA1 a6db9a38dee9aa9e28c9a9930d345cec00ea626d SHA256 0fb0f21088369c881c0c27f5680d8c15722f9d8c407b17dcad9f99793eca3f5f
-MD5 332c00e8302cd7b6ea985db14401cf9e git-1.5.3_rc5-r1.ebuild 4464
-RMD160 eb67962f19aa5bdb30ff69b8d01edeedd9c8c7b0 git-1.5.3_rc5-r1.ebuild 4464
-SHA256 0fb0f21088369c881c0c27f5680d8c15722f9d8c407b17dcad9f99793eca3f5f git-1.5.3_rc5-r1.ebuild 4464
-MISC ChangeLog 30701 RMD160 60b5cbf341697bbfd5c1cf8881f80c527d871b28 SHA1 bf14e6dbdf820d680177a58155b27365d18b1695 SHA256 774d56083d4d610ffc2303cca9f69bef126d1a8aa091d248b3ed03b8de4aec4b
-MD5 cd14865bff310a532afadf67c31da184 ChangeLog 30701
-RMD160 60b5cbf341697bbfd5c1cf8881f80c527d871b28 ChangeLog 30701
-SHA256 774d56083d4d610ffc2303cca9f69bef126d1a8aa091d248b3ed03b8de4aec4b ChangeLog 30701
+EBUILD git-1.5.3_rc7.ebuild 4423 RMD160 27c89b478c749746aceab80796fd0cf301458656 SHA1 7251417d963e09886ca00aa54c238e706aae364c SHA256 0460ec127227ad02a6be051a315b4d678cd85d6019f3e11fe5a00c9753dd9363
+MD5 a827d83965d0442f43e205895d63d88c git-1.5.3_rc7.ebuild 4423
+RMD160 27c89b478c749746aceab80796fd0cf301458656 git-1.5.3_rc7.ebuild 4423
+SHA256 0460ec127227ad02a6be051a315b4d678cd85d6019f3e11fe5a00c9753dd9363 git-1.5.3_rc7.ebuild 4423
+MISC ChangeLog 30911 RMD160 d64faa084125d0de7bcc4bd714f1a2ca14168219 SHA1 b3c957eed9ce277c0d7841f05279429cfc4521ce SHA256 fc6922a8308066ad3ce87ec3c01a3104a8a506bace9f04bc11237f372d82f54c
+MD5 22505461915aca5231e35a2b31d27111 ChangeLog 30911
+RMD160 d64faa084125d0de7bcc4bd714f1a2ca14168219 ChangeLog 30911
+SHA256 fc6922a8308066ad3ce87ec3c01a3104a8a506bace9f04bc11237f372d82f54c ChangeLog 30911
 MISC metadata.xml 1029 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 SHA1 88453257ccbedf4166357c262f49b0731cc45448 SHA256 2aa15da3001de8d8182ee9c8289cdefae84652b78ccc4cf35b2394f07edc352f
 MD5 c205afae129e41ba63cf04be7f56c7ab metadata.xml 1029
 RMD160 f44ab0f6f9566b2cdb37f6cdd094e163c94e7d11 metadata.xml 1029
@@ -68,13 +64,13 @@ SHA256 301643b4303f5c172513408004ef342288e1faa91aaef68d4ccdbae7ab8ff919 files/di
 MD5 64276a745b68cfa7123ecba383657cde files/digest-git-1.5.2.5 771
 RMD160 554d48bbc7c2e10ee8c64f31046cfe8a8251c708 files/digest-git-1.5.2.5 771
 SHA256 90cff61fb313217b7cc600adb70c46789882d898f1ddd8e378e54ae7dc3bdae7 files/digest-git-1.5.2.5 771
-MD5 4a5b27cab6cdad9b3cdab3200670d318 files/digest-git-1.5.3_rc5-r1 789
-RMD160 a2794c586679d324204f93d9f72567f1a1e468ca files/digest-git-1.5.3_rc5-r1 789
-SHA256 deff53bec38dfe248e642ad3b7d1cfd5d7c2db3d09b129d6ea95b004d7b99926 files/digest-git-1.5.3_rc5-r1 789
+MD5 fc632c1ed6e48c988b88e8a9f0c05ccf files/digest-git-1.5.3_rc7 789
+RMD160 741eb146a3a367ca2b3a472cda58a030138eccf4 files/digest-git-1.5.3_rc7 789
+SHA256 72ac582e38e5f157551038dfa9055cc785ee77f1c50ef2b35ff02876830126b5 files/digest-git-1.5.3_rc7 789
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGzqPgViELBEf1JB0RAtb9AJwP/BsB+kx81i5ywoOqWQ8GxxP4fACeJ/6x
-YTM/xKCe41qu34Ek2c2lomI=
-=2Tnn
+iD8DBQFG1VFxViELBEf1JB0RAsFJAJwMyBVCuLZ5RiiJEMmimRwkfJiligCffbYH
+FaK1OwL2qYx+k4n0kE/thNc=
+=EumS
 -----END PGP SIGNATURE-----
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 \