diff -u -r1.1 gimp-2.7.4.ebuild
--- gimp-2.7.4.ebuild	1 Jan 2012 15:36:55 -0000	1.1
+++ gimp-2.7.4.ebuild	2 Jan 2012 12:45:49 -0000
@@ -5,7 +5,7 @@
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit versionator gnome2 fdo-mime multilib python
+inherit versionator autotools eutils gnome2 fdo-mime multilib python
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
@@ -57,7 +57,8 @@
 	>=sys-devel/gettext-0.17
 	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-2.2
-	>=sys-devel/automake-1.11"
+	>=sys-devel/automake-1.11
+	dev-util/gtk-doc-am"  # due to our call to eautoreconf below (bug #386453)
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
@@ -97,6 +98,9 @@
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-deprecation.patch  # bug 395695, comment 9
+	eautoreconf  # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
+
 	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
 }