Fix testsuite functionality with USE=-perl, the add-interactive test uses perl and was not excluded.

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 26 insertions, 3 deletions

diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index e503822af20f..e1df93e017ba 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/git
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.324 2009/03/23 23:16:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.325 2009/04/03 06:12:33 robbat2 Exp $
+
+  03 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/20090305-git-1.6.2-noperl.patch:
+  Fix testsuite functionality with USE=-perl, the add-interactive test uses
+  perl and was not excluded.
 
   23 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Update metadata, ricmm is joining as a maintainer.
diff --git a/dev-util/git/Manifest b/dev-util/git/Manifest
index 95ebdb5100d5..6a8559d0d5c0 100644
--- a/dev-util/git/Manifest
+++ b/dev-util/git/Manifest
@@ -4,7 +4,7 @@ AUX 20080528-git-1.5.5.3-noperl.patch 10902 RMD160 9a0b7c5a11828c0e0cff3486b0318
 AUX 20080626-git-1.5.6.1-noperl.patch 10962 RMD160 d5b71452273dacfff9359a404f800ec9bd5c5b62 SHA1 147782b4e013451c776be54e619ebc8755366667 SHA256 4be119db2b71423d700c1b579ff2f2feb5b132ef24a202cc2e4da4a93fadb3ba
 AUX 20081123-git-1.6.0.4-noperl-cvsserver.patch 880 RMD160 7e42034154ccb951c09426e64810df5be02d98b7 SHA1 9372646c8765662907b3e63b6ddb46f97797af60 SHA256 b597ae1c3efde22e52cc7a37aecab9ae041ecfbe0be29d917635c6df083d1249
 AUX 20090126-git-1.6.1.1-noperl.patch 11351 RMD160 e634e0ef8a0219181cb0cd4eb9ea728f4ae887e2 SHA1 d64526128ecbe1007d115d6bd05d815a42c00155 SHA256 55304324bc02384983fcd1804b3829addd6a20d7a3c6f84165b34685a928a405
-AUX 20090305-git-1.6.2-noperl.patch 11396 RMD160 6efcfbd379a3662e08e311a83f9e7b5344d662ad SHA1 b090b82d9406daee67c5b8e4010e2b94afc44d3e SHA256 f618d78796b53e88aa8bebddab61c0447050ce71e33b4b56c67edcda573ef674
+AUX 20090305-git-1.6.2-noperl.patch 11957 RMD160 2cd78ae5cb0ec9ed99afce8bf535f98c7dd22507 SHA1 c292c0461f76dfe09d84c70a1510f9e18fafb3d2 SHA256 3da4539a601490de420f031839c5e1e79a3b07fc1fe1ac4eb8f5cede3bf0f0c0
 AUX 50git-gentoo.el 473 RMD160 3ae4696cc90d35bf2a1dca17cfe2fda78c0025e4 SHA1 7b67b759e6c3fc27552b211a6a48f3e4e2018c24 SHA256 c32f14d036e5ccb5c4583621dc10903346ab810ee838457e2de6e53d883348c0
 AUX 70git-gentoo.el 88 RMD160 fe9b87bdbe14141580745063092a5d08924f23fd SHA1 332f9cbf5a1dbb176e54646fa23aa140aee917f7 SHA256 7589206de5ea91e912e0332f7dc503689d348cb752e17ba84a724987c4bbe04a
 AUX 72git-gentoo.el 429 RMD160 43797e6aaa00415b1b2394d148a67871ef0a7dd2 SHA1 b8530bdb685f7fb80d9ebdf380fdd08c23a6dc1d SHA256 a152c82e7056c81d80dfe2a3b75effe755235fc97651eabd14aa81bc10941e73
@@ -107,5 +107,5 @@ EBUILD git-1.6.1.2.ebuild 8604 RMD160 d250ff4edad7746b3e06e6a2816e166a373ab1dd S
 EBUILD git-1.6.1.3.ebuild 8605 RMD160 a6478e8eb4afb5dfa6b4b8d99a7c4e97f5704e99 SHA1 8b0e0f5a4c7453cfd5bb5e9a1c78eb930d2c3b54 SHA256 7de1be388d359f7cb81a91f54cd343e04ae6f2ee188de7e142a07c5f64d85407
 EBUILD git-1.6.1.ebuild 8669 RMD160 260375314513971c695787b4da9c2b172419bdf2 SHA1 848d8e40359b93dd596e243899b675b6d8b82a16 SHA256 4f56c7055b75064ea7ea7248d0da213e2fe6a6e08cfb2c3e63ca6139238da5f1
 EBUILD git-1.6.2.ebuild 8443 RMD160 0138c4f89eed7055664bb2a84d6e41bc1be60e2d SHA1 7bc2abe4a18f4150792724e6550817f2802ef48a SHA256 a2c7e4858f2bd21973d818d059023cfd2c98177a0bae2aa1c31fff1e7309ec13
-MISC ChangeLog 48719 RMD160 9faace94f756d1515797f9efa5f6dbc761a790e3 SHA1 e0bee6db71fa9996f28306e41c913ffc864a54aa SHA256 d13bff8166a8a22fa1f28988ce32b3807af52b2a9e54bba4da0e075e178766be
+MISC ChangeLog 48919 RMD160 a5f8ad748e7844ecb1fff2c7da8707f7ae8f1d84 SHA1 27bc7eee0814fb52f80029c625e7c1c39dce03ce SHA256 42960fa58f10abcceda69da3dcfe48510de0dd2aa237db420c87a34f9924464f
 MISC metadata.xml 1535 RMD160 1117b90f1e7550ce3a47f844ac17db78ed803cc3 SHA1 223d8e6b2faf20bf290d90d0d6322473daa49b0c SHA256 58d9f467528fee5c7062d0a2344a3b61ff0b8b7a0a84dffc9f56557f7eadd70b
diff --git a/dev-util/git/files/20090305-git-1.6.2-noperl.patch b/dev-util/git/files/20090305-git-1.6.2-noperl.patch
index b34e7cea33ae..003593a7dadc 100644
--- a/dev-util/git/files/20090305-git-1.6.2-noperl.patch
+++ b/dev-util/git/files/20090305-git-1.6.2-noperl.patch
@@ -15,6 +15,8 @@ Notes: Ported from 20080322-git-1.5.4.5-noperl.patch
 Notes: Ported from 20080528-git-1.5.6.1-noperl.patch
 Notes: Ported from 20080626-git-1.5.6.1-noperl.patch and 20081123-git-1.6.0.4-noperl-cvsserver.patch
 Notes: Ported from 20090126-git-1.6.1.1-noperl.patch
+Notes: t3701-add-interactive.sh block added 2009/04/02 as it was missed, broke
+       testsuite with USE=-perl.
 
 diff --git a/Makefile b/Makefile
 index 0675c43..0adb2b5 100644
@@ -368,3 +370,19 @@ index d2379e7..75bf178 100755
  
  cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
  case "$cvsps_version" in
+--- git-1.6.2.2.orig/t/t3701-add-interactive.sh	2009-04-02 14:26:45.000000000 -0700
++++ git-1.6.2.2/t/t3701-add-interactive.sh	2009-04-02 23:06:20.543358154 -0700
+@@ -3,6 +3,13 @@
+ test_description='add -i basic tests'
+ . ./test-lib.sh
+ 
++if test -n "$NO_PERL"
++then
++	test_expect_success 'skipping add-interactive tests, NO_PERL defined' :
++	test_done
++	exit
++fi
++
+ test_expect_success 'setup (initial)' '
+ 	echo content >file &&
+ 	git add file &&