~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 32 insertions, 65 deletions

diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 0aea9bfdee41..e326831ee964 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.148 2012/08/22 04:44:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.149 2012/08/22 05:10:14 robbat2 Exp $
+
+  22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> git-1.7.12-r1.ebuild,
+  git-1.7.12.ebuild, git-9999.ebuild:
+  ~amd64-fbsd was not placed in all ebuilds. Also sync live ebuild.
 
 *git-1.7.12-r1 (22 Aug 2012)
 *git-1.7.12 (22 Aug 2012)
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 3cf741f26280..ca7792346d09 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -66,8 +66,8 @@ EBUILD git-1.6.4.5.ebuild 10406 SHA256 186e72aa90b3c98448a64b7ae718772675a601c80
 EBUILD git-1.7.10.2.ebuild 16480 SHA256 251dee03c550c64a91fd0a0f01f6a4dc5829bc88c64e1b761d1d5d4f98ed7d93 SHA512 9b5e31c796c77680e894b0282138ca633690d4fd6236ebea588369dfcc061b4d9cdbd7028331259f63ab7574ff38ecee87148e8ee2d9ae8b584802fd325dae4a WHIRLPOOL 6bcdc20a2a1ef7252483a8afdbc0abee548962c29501f742345d656341aa042dc31b3115dfe46126bf5a2729a03d104bcd291af1eae550416a3064111fa83611
 EBUILD git-1.7.10.ebuild 16477 SHA256 01123e296ddf96a8a949e224e18d783edabd64f6b95275827bca37bdc3dba3e7 SHA512 bd6307fe23fc952669e5f4010b77f6422008b3ab55b7be1c2159afc920b84f1dfeab3d917f67805fbd035bc8c7c10453541bf794acde2222d1bb764ab1d25c05 WHIRLPOOL 4212e9b5e0c89d3e5810578006d9b7961ebf0ec5067fe28a1ebe6ea871597d224e8b4a1abd66626df281c770e77c1852a4a13b77b337d74fc22f3f3763bfa9d6
 EBUILD git-1.7.11.1.ebuild 16499 SHA256 de0a1dd0e716d69e6b86e0d49a1c8d9f02ffc0a8c4d58aaf1612b1aa489d31b9 SHA512 e24476b2a6d6a4b637ec432793af557a76760a2c98585e7521aab4ba522cf4d0c71a5167ae20247a489f75a62c5444ae7ad67f0ad398e8e3a6392f70ffca5b88 WHIRLPOOL 0e0f5f38a4e1932ece197b6c7fa6f592316bd4adc7dcb818ac372a8341a700178f4df5494e3c2d8b435da88a408aefe5614de2e9d468c5f67899620a4d74d239
-EBUILD git-1.7.12-r1.ebuild 14793 SHA256 5aa06143749bbab953b4dfe537a29de5113c23ec3028e3b1be3ed2316ec02fce SHA512 eab3086fe5dd12fd88e5e9c537997a19b1b0d2954e955d825b9eccf7f14da4d3acb9db4bea4b5c46238471c0f51f918c076c096d2381e2f3e97105aa0699f7fa WHIRLPOOL 42692fe010d2b63b955a084e44ced90b5f6b9b20968fa12bcad7aed0f88901be3a9daabfd068f725c82eb5e06b14bf8858313445fc1fe1e61d2ab5af6489894f
-EBUILD git-1.7.12.ebuild 14791 SHA256 ee36594a4cc13667bc2b46ec8e72cf6729f5a996bfb3fbb2549c7bcfe637c575 SHA512 d157710099d711f12a4ca6037d64d7483708e69ede96856f351ba07587d475ad0f822b885274418ba3f4a6ee84fa439b5c565ec11bb0c1c4cfe8cc067647a5ab WHIRLPOOL 72edcec2b0100ddf4187f95334f79e7fea9a4608023f244c3e8653b2bdb075387f5f17bad1d6a1f44240e602fff2297c8160f52e4bb0ada0932adf29426b1800
+EBUILD git-1.7.12-r1.ebuild 14805 SHA256 5b747d49af2557e0c91c7a62f16e68aa55e445048d3bd24b3ba876e1fc23d78e SHA512 878224c30ab7d825b0b154afac2d1497eb7f331f24597bcc6d07b2b1313ff22d3ed7306bc642d12b6803f53ca6d2002f914ffa0f6ad7552dcf9f210c1ab143f6 WHIRLPOOL d4e89e156cc3a6f02471d67438e9631ec477c75ad92b1ae594cecf56b1bbd3fddd13413a2ea13e6b571ec3b490060fd41905203ca11a2ebe780ad523561167c0
+EBUILD git-1.7.12.ebuild 14803 SHA256 4a01fed07480ec8dfe0986fde57de0d7bf78dad512afcb46d68d81401f94d8e7 SHA512 4deee8319b3855bd27d4c99d822475649443f51cc831282b47be4c15e1b476dc1cd1755ae8f8da5332c2fcb1eb13d44e1c82ea8782faacd36d783dfc82582533 WHIRLPOOL 56b89166ccb589ffc6f36bacf34c0b3f22804232c9662f9ff8229d8a94bfb864cb6af9f412ee5a7ec9016e2bf5175e194cc758c5a47191f1b3819b16b589c448
 EBUILD git-1.7.2.5.ebuild 13520 SHA256 666e01293c6884d6ac11578b45f1fdcdf298cdb6d194c249f8e993d6c1b27343 SHA512 4784305ad792b86459e3641a5b86092512b85a149f3a222e55a3d26cd0c3cc63360555741812a8eae9a65a6b2bcb2962a40b220dd909f7f4866c047a38a6b9b1 WHIRLPOOL c08205a6b74fc22be4862544f44376fe8e3c651435a9f4e5d6bf63e677371ff356792a54af07006bb519372d9d8b62628f3f1f7039c1ae97b1c9bf72d6cd47d1
 EBUILD git-1.7.3.4-r1.ebuild 14029 SHA256 9d0c67c61774f8f1f644b182c551d53bdf305dffaad390d0f0aa3cc048c4f662 SHA512 7ec9d3a609d5de63bee9f2d74ab87013dad12b033e15a9a9daa730754a7b5fe9f16f5f96fb2d237b97887c88908435983004ffbce865af9881e5a9a9d63a7e83 WHIRLPOOL 1ab4ab72833d11853226171d481ed88db85473766033bcc6200a12958e07a8581fd81e7d460e0f91f697de000b3d99214742d6428f889567277795bb73a5754a
 EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd48417d6830eced6ec0b595cbd0 SHA512 7ef0bc6125d06100636bfc15fef7d0cacef08f2c9a75beaa7331f1e5c5e06a7cd96f84b0ec975be8fd290efccaf0b9e40edb524063a2a9bfe69870bd2b2c9185 WHIRLPOOL 06ed98a81369963955aafa2186b30fa64ec544f8f1b268c7bb228d83c0e371e70223a69f7ed69da7df47ddc1a10459c40f36e3b2659d9c85c57e0dc036870d9c
@@ -78,6 +78,6 @@ EBUILD git-1.7.9.4.ebuild 16478 SHA256 f38f9c61d4813bb7342248ad8f9b8d1f743d5c4af
 EBUILD git-1.7.9.7.ebuild 16390 SHA256 aa860adfdb9e2633615e7889140405f95b98339d458cd89a1c607396f77a6056 SHA512 bbad1584d3f012ef1cc5d28c8c318b21911f8a5424160ec61420d436577f7b7dd0c5d6dd2f51e3ad876ee325c90e7bd8ece51501f5bd0c10d168b5ff15c52ba0 WHIRLPOOL 2a0cb447a53ec68e25bb563fdef40986539bdc840b3e27dfb37391645f8251235fcb146928c964c04f50bf5deed0aab0c2a2513e9b7b752d4a45fdfafcd9c446
 EBUILD git-1.7.9.ebuild 16476 SHA256 7f80b6058d151746d295595df3a2193f37e10f5930c817144107eae535aa9f92 SHA512 a66f968e946d169d0ca8c93a965f36025366d928fbdc94135aaa13b3296a700afab1106d72bb7e09592c445975d0573ad93e248318026fdd4912c0f611199422 WHIRLPOOL 6a965cb166c6f98783529b517fa6f152ce7059b3168ea59b72f89d70008f2af247bca0ffeba6384ef384f00a85114c426a1e44e6a513369a80f5bacd7ac6f9c7
 EBUILD git-1.7.9_rc2.ebuild 16036 SHA256 0eb93296b4353374da0f7254a04f2cdf0b8d08210ef9d08f9ed11ded9baa401a SHA512 f70d16f4d3de459c034b8d237483e689a46ad199be7c6cddd2bb7ce67358b5bb1ed0f8d17493db0df3601277927290ae1b543101637e1865299565ff560a2954 WHIRLPOOL 1964b24328615fcefd5c42cf2f7c55e87cd3b53c7bf00ce0c5dba8514f34249c9e2fe79e770457e6751f32bb8f7dbe9550a515c5d4bb4ce0ad7f68a21f4b0fad
-EBUILD git-9999.ebuild 16033 SHA256 ae6378530c481d867808ff2d999262a91be6757c0941658ec5e04c947d2cef3b SHA512 11d55847e18092006f001165a623088e5587b72db0ff4d953a695f17bc4a72496684db011c89701f68d15b52551a368e08fa5c26231174bcd10d2405b2adf14d WHIRLPOOL e87a5da2805ddd947cb877a9644eaba8f39fe62eada5e81d26183aa3a84377cd9bba9e5f7323b8d7996a8314f0312ed299fea5772c6befe5602750d371996ce4
-MISC ChangeLog 90971 SHA256 3d0c4f2f0344e5425d1534c7cba48cae0db118e5536b5c6ac5875efe64921023 SHA512 56176260f31cf8e8757d23b1517aef7c8ab747055a7bbdbc0d3209b7ba1f63b22e2a87637ea48dcca69627ff3781cf9382aa204c34bea057c62e276d4834a2cc WHIRLPOOL 75851a1d2421fc03bc2a6add6a677a8b6f5c73111a1351546d658973f27400d354effeaf4d161845de4611409f457c6e3b9e10dd08187935fcec6fecafefd6db
+EBUILD git-9999.ebuild 14801 SHA256 aa7f22e4096be3389ba575dc3522e3545881c3c4797a726f745ae37dfa35f409 SHA512 ed677124897d63515940791b03fb56c1173c5af2b3727c4b57c4c332eb016035e342fa106e3945cc3dfb284a313c08dd393e6ef46df391afca4d69ecf56c7b11 WHIRLPOOL 182c774425050d1a9cd965c664ec2a5e5fa2e43047207a9d5cbfd7afb68e2320eed005d0035cf3e99dcb2170c6dd28ca0a7753753d9be85f08cf7eb20d73a32f
+MISC ChangeLog 91153 SHA256 aec9e840504ef485ded637453acc9dd2f23c6cb86e0a086ff51bcc80ce67004d SHA512 7b90dbb53aa914a555042230bae26573665571bfeefcacccd856d6238194b57992fa61c5aa7ba9bfc576bfe188f904c4c8efbfcfe77d3fbf08a68f2ab97ad8df WHIRLPOOL 88daeeab0995603d813489bf5d3677348c88e9db1130f82b5a8c9f71def9e529278495816703862a9a15767e54dee90c578b25e30b5cd6d0ebbce34a8ba287c6
 MISC metadata.xml 1633 SHA256 d755feb6f78130bdad7592120067448f46e760430599a39c734a5340ef0d7ae8 SHA512 71aba84643f81abf3c9ad845803bb15b5dbddf1192fe98101998826311090726167ee638b6bd352d8b9c36193e44c3f8702333ddde38967d376c685eb8361934 WHIRLPOOL 38f0469034aa82eebddd78986c10d2783478e98dd6cd11d7281ddad953ab18706ffc61f5faae9902286093bba6cd99f4db4edec0c8c5f7c1453a7426be7e1f0f
diff --git a/dev-vcs/git/git-1.7.12-r1.ebuild b/dev-vcs/git/git-1.7.12-r1.ebuild
index ff1a3bfc20ee..a034e6681fed 100644
--- a/dev-vcs/git/git-1.7.12-r1.ebuild
+++ b/dev-vcs/git/git-1.7.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-vcs/git/git-1.7.12.ebuild b/dev-vcs/git/git-1.7.12.ebuild
index 550200f0c155..96c07596c9db 100644
--- a/dev-vcs/git/git-1.7.12.ebuild
+++ b/dev-vcs/git/git-1.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.2 2012/08/22 05:10:14 robbat2 Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 09a2756c3d0a..93b358bb4240 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.34 2012/06/14 05:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.35 2012/08/22 05:10:14 robbat2 Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	SRC_URI=""
 	KEYWORDS=""
@@ -46,10 +46,10 @@ IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcs
 CDEPEND="
 	!blksha1? ( dev-libs/openssl )
 	sys-libs/zlib
-	pcre?   ( dev-libs/libpcre )
-	perl?   ( dev-lang/perl[-build] )
-	tk?     ( dev-lang/tk )
-	curl?   (
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
 	)
@@ -207,28 +207,12 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Noperl is being merged to upstream as of 2009/04/05
-	#epatch "${FILESDIR}"/20090305-git-1.6.2-noperl.patch
-
-	# GetOpt-Long v2.38 is strict
-	# Merged in 1.6.3 final 2009/05/07
-	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
-
-	# JS install fixup
-	# Merged in 1.7.5.x
-	#epatch "${FILESDIR}"/git-1.7.2-always-install-js.patch
-
-	# Fix false positives with t3404 due to SHELL=/bin/false for the portage
-	# user.
-	# Merged upstream
-	#epatch "${FILESDIR}"/git-1.7.3.4-avoid-shell-issues.patch
-
-	# bug #350075: t9001: fix missing prereq on some tests
-	# Merged upstream
-	#epatch "${FILESDIR}"/git-1.7.3.4-fix-perl-test-prereq.patch
+	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation.
+	epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
 
 	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-1.7.11-optional-cvs.patch
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
 
 	sed -i \
 		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
@@ -247,36 +231,6 @@ src_prepare() {
 	# Fix docbook2texi command
 	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
-
-	# bug #318289
-	# Merged upstream
-	#epatch "${FILESDIR}"/git-1.7.3.2-interix.patch
-
-	# merged upstream
-	#epatch "${FILESDIR}"/git-1.7.5-interix.patch
-
-	# merged upstream
-	#epatch "${FILESDIR}"/git-1.7.6-interix.patch
-
-	# Newer versions of SVN hate a whitespace in the file URL.
-	# So we avoid that by replaced the space with an underscore.
-	#Initialized empty Git repository in /dev/shm/portage/dev-vcs/git-9999/work/git-9999/t/t d.t9155/git_project/.git/
-	#svn: E235000: In file 'subversion/libsvn_subr/dirent_uri.c' line 2291: assertion failed (svn_uri_is_canonical(url, pool))
-	#
-	# With this change the following tests still fail: t9100 t9118 t9120
-	# Without it, MOST of t91* fails, due to the space tripping up the
-	# svn_uri_is_canonical.
-    #
-	# git-svn actually needs to be fixed here, but this chagne is useful for
-	# testing it.
-	#
-	# This patch is my work to date on fixing git-svn, but it causes more
-	# breakage than it fixes (it's manually-edited now to do nothing).
-	epatch "${FILESDIR}"/git-1.7.8-git-svn-1.7-canonical-path.patch
-	cd "${S}"/t
-	sed -i \
-		-e 's/trash directory/trash_directory/g' \
-		test-lib.sh t0000-basic.sh Makefile || die "sed failed"
 }
 
 git_emake() {
@@ -307,6 +261,8 @@ src_configure() {
 }
 
 src_compile() {
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
 	git_emake || die "emake failed"
 
 	if use emacs ; then
@@ -375,6 +331,8 @@ src_install() {
 		dodoc "${S}"/contrib/gitview/gitview.txt
 	fi
 
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
 	newbin contrib/fast-import/import-tars.perl import-tars
 	newbin contrib/git-resurrect.sh git-resurrect
 
@@ -455,6 +413,8 @@ src_test() {
 		t1004-read-tree-m-u-wf.sh \
 		t3700-add.sh \
 		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
 
 	# Unzip is used only for the testcase code, not by any normal parts of Git.
 	if ! has_version app-arch/unzip ; then
@@ -490,6 +450,9 @@ src_test() {
 		disabled="${disabled} ${tests_perl}"
 	fi
 
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
 	# Reset all previously disabled tests
 	cd "${S}/t"
 	for i in *.sh.DISABLED ; do