--- git/git-1.5.3.3.ebuild	2007-09-30 14:01:34.000000000 +0200
+++ /home/fauli/git-1.5.3.3.ebuild	2007-10-04 12:35:06.000000000 +0200
@@ -69,7 +69,7 @@
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-1.5.3-symlinks.patch
 
@@ -113,6 +113,9 @@
 		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
 			die "elisp-install failed"
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/.nosearch"
 	fi
 
 	if use gtk ; then
@@ -141,7 +144,11 @@
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
+	if use emacs; then
+		 elisp-site-regen
+		 elog "GNU Emacs has built-in Git support in versions greater 22.1.  You can disable the emacs USE"
+		 elog "flag for dev-util/git if you are using such a version."
+	fi
 	elog "These additional scripts need some dependencies:"
 	echo
 	showpkgdeps git-archimport "dev-util/tla"