--- old/app-admin/collectd/collectd-5.5.0.ebuild	2016-01-03 19:58:51.000000000 +0100
+++ new/app-admin/collectd/collectd-5.5.0.ebuild	2016-01-03 20:00:16.000000000 +0100
@@ -4,12 +4,13 @@
 
 EAPI="5"
 
+AUTOTOOLS_AUTORECONF="yes"
 GENTOO_DEPEND_ON_PERL="no"
 JAVA_PKG_OPT_USE="collectd_plugins_java"
 # XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils fcaps java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user
+inherit autotools-utils eutils fcaps java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user
 
 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
 
@@ -220,9 +221,6 @@
 }
 
 src_prepare() {
-	default
-	epatch_user
-
 	# There's some strange prefix handling in the default config file, resulting in
 	# paths like "/usr/var/..."
 	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
@@ -239,7 +237,7 @@
 
 	rm -r libltdl || die
 
-	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {