--- /usr/portage/dev-vcs/git/git-2.4.6.ebuild	2015-08-02 15:01:09.000000000 -0400
+++ /usr/portage/dev-vcs/git/git-2.4.6.ebuild	2015-08-09 07:17:37.000000000 -0400
@@ -52,7 +52,8 @@ 
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/libgnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	iconv? ( virtual/libiconv )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
@@ -195,8 +196,10 @@ 
 
 	# Bug 290465:
 	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
+	if [[ "${CHOST}" == *-uclibc* ]]; then
 		myopts+=" NO_NSEC=YesPlease"
+		use iconv && myopts+=" NEEDS_LIBICONV=YesPlease"
+	fi
 
 	export MY_MAKEOPTS="${myopts}"
 	export EXTLIBS="${extlibs}"