--- dev-libs/nettle/nettle-3.1.1.ebuild
+++ temp/nettle-3.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
+EAPI=6
 
-inherit eutils autotools-multilib multilib toolchain-funcs
+inherit autotools eutils multilib-build multilib-minimal multilib toolchain-funcs
 
 DESCRIPTION="Low-level cryptographic library"
 HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
@@ -13,7 +12,7 @@
 
 LICENSE="|| ( LGPL-3 LGPL-2.1 )"
 SLOT="0/6" # subslot = libnettle soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )"
@@ -29,6 +28,8 @@
 )
 
 src_prepare() {
+	default
+
 	sed -e '/CFLAGS=/s: -ggdb3::' \
 		-e 's/solaris\*)/sunldsolaris*)/' \
 		-i configure.ac || die
@@ -36,7 +37,7 @@
 	# conditionally build tests and examples required by tests
 	use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
 
-	autotools-utils_src_prepare
+	eautoreconf
 }
 
 multilib_src_configure() {