--- /Volumes/Shared/prefix-64/usr/portage/dev-vcs/git/git-1.7.1.ebuild	2010-05-02 19:02:00.000000000 +0200
+++ git-1.7.1.ebuild	2010-05-03 16:43:22.000000000 +0200
@@ -196,8 +196,11 @@
 	# Merged in 1.6.3 final 2009/05/07
 	#epatch "${FILESDIR}"/20090505-git-1.6.2.5-getopt-fixes.patch
 
-	[[ ${CHOST} == *-mint* ]] && epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch
-
+	if [[ ${CHOST} == *-mint* ]]; then
+		epatch "${FILESDIR}"/${PN}-1.6.3.3-mint.patch
+		epatch "${FILESDIR}"/${PN}-1.6.6.1-interix.patch
+		epatch "${FILESDIR}"/${PN}-1.6.6.1-interix6.patch
+	fi
 	# JS install fixup
 	epatch "${FILESDIR}"/git-1.7.1-always-install-js.patch
 
@@ -218,9 +221,6 @@
 	# Fix docbook2texi command
 	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
 		Documentation/Makefile || die "sed failed"
-
-	epatch "${FILESDIR}"/${PN}-1.6.6.1-interix.patch
-	epatch "${FILESDIR}"/${PN}-1.6.6.1-interix6.patch
 }
 
 git_emake() {