--- gtk-doc-1.8.ebuild	2007-07-15 19:12:08.000000000 +0200
+++ gtk-doc-1.8-r1.ebuild	2007-07-29 22:38:47.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/gtk-doc-1.8.ebuild,v 1.11 2007/07/12 01:05:42 mr_bones_ Exp $
 
-inherit elisp-common gnome2
+inherit eutils elisp-common gnome2
 
 DESCRIPTION="GTK+ Documentation Generator"
 HOMEPAGE="http://www.gtk.org/gtk-doc/"
@@ -26,10 +26,17 @@
 	>=dev-util/pkgconfig-0.19
 	>=app-text/scrollkeeper-0.3.5"
 
-SITEFILE="60gtk-doc-gentoo.el"
+SITEFILE=61${PN}-gentoo.el
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}"/${P}-emacs-keybindings.patch
+}
+
 src_compile() {
 	gnome2_src_compile
 
@@ -53,7 +60,12 @@
 }
 
 pkg_postinst() {
-	use emacs && elisp-site-regen
+	if use emacs; then
+		elisp-site-regen
+		elog "gtk-doc does no longer define global key bindings for Emacs."
+		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
+		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
+	fi
 }
 
 pkg_postrm() {