--- gmp-5.1.2.ebuild	2013-05-27 19:03:48.972045113 -0400
+++ gmp-5.1.2-r1.ebuild	2013-08-16 09:04:28.236331032 -0400
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.2.ebuild,v 1.2 2013/05/26 16:14:48 vapier Exp $
 
-inherit flag-o-matic eutils libtool unpacker toolchain-funcs
+EAPI=4
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -24,9 +26,11 @@
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpacker_src_unpack
-	cd "${S}"
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+src_prepare() {
 	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
 	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
 
@@ -48,7 +52,7 @@
 	chmod a+rx configure
 }
 
-src_compile() {
+multilib_src_configure() {
 	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
 	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
 	if [[ ${CHOST} == hppa2.0-* ]] ; then
@@ -64,31 +68,33 @@
 	export GMPABI
 
 	tc-export CC
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--localstatedir=/var/state/gmp \
 		$(use_enable cxx) \
 		$(use_enable static-libs static)
+}
 
-	emake || die
+multilib_src_compile() {
+	emake
 
 	if use pgo ; then
-		emake -j1 -C tune tuneup || die
+		emake -j1 -C tune tuneup
 		ebegin "Trying to generate tuned data"
 		./tune/tuneup | tee gmp.mparam.h.new
 		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
 			mv gmp-mparam.h.new gmp-mparam.h
-			emake clean || die
-			emake || die
+			emake clean
+			emake
 		fi
 	fi
 }
 
-src_test() {
+multilib_src_test() {
 	emake check
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+multilib_src_install() {
+	emake DESTDIR="${D}" install
 
 	# should be a standalone lib
 	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
@@ -97,11 +103,9 @@
 	use static-libs \
 		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
 		|| rm -f "${la}"
+}
 
-	dodoc AUTHORS ChangeLog NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-
+multilib_src_install_all() {
 	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
 }