Bug #350075: t/t9001: fix missing prereq on some tests.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 49 insertions, 4 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 6ba28f65717d..66c9ea9c1c8b 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.64 2010/12/27 14:52:55 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.65 2010/12/29 21:05:43 robbat2 Exp $
+
+  29 Dec 2010; Robin H. Johnson <robbat2@gentoo.org> git-1.7.3.4-r1.ebuild,
+  +files/git-1.7.3.4-fix-perl-test-prereq.patch:
+  Bug #350075: t/t9001: fix missing prereq on some tests.
 
   27 Dec 2010; Brent Baude <ranger@gentoo.org> git-1.6.4.5.ebuild,
   git-1.7.2.5.ebuild, git-1.7.3.4-r1.ebuild:
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index a04e9f8299fb..50476206e5b1 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -8,6 +8,7 @@ AUX git-1.7.1-noiconv-segfault-fix.patch 1786 RMD160 592f84005bccdfbc020ad79d66c
 AUX git-1.7.2-always-install-js.patch 1167 RMD160 36cae52a1dbcb2450a521b60ce66dbd48e58b3a9 SHA1 45f652281e36627f80b2d559a6861e784b8afa75 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e
 AUX git-1.7.3.2-interix.patch 2283 RMD160 2c448d5a8bfb9696cbc55a52328e04617de9fcf1 SHA1 b35a35d6b6729c3868482c689a7c629b35c7e414 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6
 AUX git-1.7.3.4-avoid-shell-issues.patch 1165 RMD160 674c080efe0e9b99fecf4bf19106c15fc0d3510a SHA1 bc4bfab9c0520139a107d0a634c48ce7fa28adf9 SHA256 7dd0eef0b93ed52e1c744d2d1888387c0aafecbdaf2d889c8ad48f45ed68d5d5
+AUX git-1.7.3.4-fix-perl-test-prereq.patch 1396 RMD160 d340a46fbb490f4b6ce09c4021a8d498c2ee87e3 SHA1 81a5acb7ac1079d440d740a2c16a995656da16f1 SHA256 a339767c3d3b8eb6b06adc54a68eb978884a114947ff04c56e6dcad920c0b75a
 AUX git-daemon.confd 700 RMD160 2dea5af0c6b3aa5304aa5417bb40099bd4cdb45b SHA1 0b7c3078c4d284eb2572a5fb7c1efff5a4837f6e SHA256 9ca387e81ca875d4e543fa64398620451ff74273fa06b122a6af47db1fee1630
 AUX git-daemon.initd 738 RMD160 23de3f02cd33251ce0f66c1b6e1d6a20ee45ee5b SHA1 b6f8e80130ddddf8cbd70a553b31706d570f7d5a SHA256 48e7e1228c9811079dce8fecc560000cf645de5b4bb697f8f8ad3f906906330b
 AUX git-daemon.xinetd 260 RMD160 5bfeca2541488bb955ca349474c1fa3e80913aef SHA1 88d6fc44644c88ed6f2ce54a936f41dc15d2268e SHA256 5025efbceed83835378cada3728448cbf445a1584e7cbd7736f568f4b6b52a67
@@ -49,8 +50,8 @@ EBUILD git-1.7.2.5.ebuild 13797 RMD160 5aa398550756163c4c844ec8652f4567e93e189f
 EBUILD git-1.7.3.2-r1.ebuild 13535 RMD160 a583cd8ebf1336ec4d5b21537af76f0a700fced4 SHA1 9b7889f4e1d29064e3216f6ccfc0c7526a9e67f0 SHA256 41768438269f77dc7eccf9d57dbcd50f92ef2abe1f0be51caeeb4e408cc718a9
 EBUILD git-1.7.3.2.ebuild 13259 RMD160 d9dfaf93219b9d01fba25aac9d954b846f21e0ed SHA1 696421578fd5cdaeb51902556fc16db4395da14b SHA256 0c9c1cf290fabfcd65a9528aba50f38a0789c97977aaae8b5cfa7b6caf809123
 EBUILD git-1.7.3.3.ebuild 13532 RMD160 6a01b8f3f230121e511aaf3acd3530de855a48bb SHA1 cda24e434870be8d4d3bb2fee884cfd2159b5469 SHA256 1dcf2d0df9ddf7bd0e5cf45b4cc6e7d898014e47ef49a8e06d7caaab090cab7e
-EBUILD git-1.7.3.4-r1.ebuild 13818 RMD160 040e1c23b576270068bbe0696c90f006bbcc533b SHA1 d207f76ea293265cd644cf5f8e9fcd660f14b593 SHA256 30e442e4f25d1f0c046d791c7880bf3df2e80fa6c669888330926d0737a5ab3e
+EBUILD git-1.7.3.4-r1.ebuild 13935 RMD160 6cd1092f7dd49e844950264f22a39fa8b3b96fec SHA1 caa8e8d31414e7e94b55903cc61f82c5c105b419 SHA256 de9ca68f02d478052cb597f1472b9194fd7a25a083c5549d2a934263965a1f38
 EBUILD git-1.7.3.4.ebuild 13532 RMD160 b379ddde309f7100100918e35ba2c3d01ca6ee91 SHA1 07e6b99f28385aba1af0fed2fc8b9f520431995a SHA256 db389597432ac36a5b7040df99cc3db11e1c3d267e4c2e7e8da0c9658105fdd6
 EBUILD git-9999.ebuild 13382 RMD160 a5bfe144fc88e4c1808c8ec93ee7f44563b9a6d9 SHA1 699c1320d25dbcafc2aeafc2a1c52eaf9ed39fec SHA256 c1e9a3b0d920729f0740e5a6eef770c892544e752a91255f42d04b71be3a5893
-MISC ChangeLog 75338 RMD160 2e8d88a938a40b922e84bc0b156482b98b5090c1 SHA1 4e485fee021c064049600385561a2ac75944a7e3 SHA256 09fcd61404adc37499ee668b9ff128235004ce1b2f1ac35b8deaed3857a0af85
+MISC ChangeLog 75523 RMD160 8c324eb5b132a75d943aece3b499cbede7d492b5 SHA1 2a916e50f9847ada54136e3f2686af2135dabca1 SHA256 e774fd10dcb173146a3f25a0640372952979e587e00d42212cebca7cf3f3c900
 MISC metadata.xml 1609 RMD160 80bd2234e48fccd7a442fd6cce3ad9e2f8a05d33 SHA1 0b3b2f486530e009fbe055a87d58a161722f64b1 SHA256 2450bc31e647972be38e76068c6cf27c34e00cd8077f139a137f9d4c14d52a0b
diff --git a/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch b/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch
new file mode 100644
index 000000000000..90a758962aaa
--- /dev/null
+++ b/dev-vcs/git/files/git-1.7.3.4-fix-perl-test-prereq.patch
@@ -0,0 +1,37 @@
+From e8725dd4b11c487c138ff0b68cd647265f24a105 Mon Sep 17 00:00:00 2001
+From: Robin H. Johnson <robbat2@gentoo.org>
+Date: Wed, 29 Dec 2010 20:59:22 +0000
+Subject: [PATCH] t9001: Fix test prerequisites
+
+Add in missing Perl prerequisites for new tests of send-email.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ t/t9001-send-email.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
+index 1dc4a92..3271426 100755
+--- a/t/t9001-send-email.sh
++++ b/t/t9001-send-email.sh
+@@ -1135,7 +1135,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
+ # Note that the patches in this test are deliberately out of order; we
+ # want to make sure it works even if the cover-letter is not in the
+ # first mail.
+-test_expect_success 'refusing to send cover letter template' '
++test_expect_success $PREREQ 'refusing to send cover letter template' '
+ 	clean_fake_sendmail &&
+ 	rm -fr outdir &&
+ 	git format-patch --cover-letter -2 -o outdir &&
+@@ -1151,7 +1151,7 @@ test_expect_success 'refusing to send cover letter template' '
+ 	test -z "$(ls msgtxt*)"
+ '
+ 
+-test_expect_success '--force sends cover letter template anyway' '
++test_expect_success $PREREQ '--force sends cover letter template anyway' '
+ 	clean_fake_sendmail &&
+ 	rm -fr outdir &&
+ 	git format-patch --cover-letter -2 -o outdir &&
+-- 
+1.7.3.2
+
diff --git a/dev-vcs/git/git-1.7.3.4-r1.ebuild b/dev-vcs/git/git-1.7.3.4-r1.ebuild
index 2a9c76f6ace9..bd4141b2416c 100644
--- a/dev-vcs/git/git-1.7.3.4-r1.ebuild
+++ b/dev-vcs/git/git-1.7.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.9 2010/12/28 17:35:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.3.4-r1.ebuild,v 1.10 2010/12/29 21:05:43 robbat2 Exp $
 
 EAPI=3
 
@@ -200,6 +200,9 @@ src_prepare() {
 	# user.
 	epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
 
+	# bug #350075: t9001: fix missing prereq on some tests
+	epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
 		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \