--- git-1.6.0.3.ebuild	29 Oct 2008 01:33:13 -0000	1.1
+++ git-1.6.0.3.ebuild	30 Oct 2008 07:15:41 -0000
@@ -43,7 +43,7 @@
 			)
 	gtk?  ( >=dev-python/pygtk-2.8 )"
 
-SITEFILE=72${PN}-gentoo.el
+SITEFILE=50${PN}-gentoo.el
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -134,12 +134,12 @@
 	dobashcompletion contrib/completion/git-completion.bash ${PN}
 
 	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/{,vc-}git.el* || \
-			die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
 		# don't add automatically to the load-path, so the sitefile
 		# can do a conditional loading
-		touch "${D}"/"${SITELISP}"/${PN}/.nosearch
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	fi
 
 	if use gtk ; then
@@ -270,12 +270,7 @@
 }
 
 pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "GNU Emacs has built-in Git support in versions greater 22.1."
-		elog "You can disable the emacs USE flag for dev-util/git"
-		elog "if you are using such a version."
-	fi
+	use emacs && elisp-site-regen
 	if use subversion && ! built_with_use dev-util/subversion perl ; then
 		ewarn "You must build dev-util/subversion with USE=perl"
 		ewarn "to get the full functionality of git-svn!"