--- libsepol-2.1.9-r1.ebuild	2013-06-17 11:34:47.593921221 -0400
+++ libsepol-2.1.9-r2.ebuild	2013-08-14 13:51:42.820843757 -0400
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libsepol/libsepol-2.1.9-r1.ebuild,v 1.2 2013/06/16 18:11:28 swift Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit multilib toolchain-funcs eutils
+inherit multilib toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="http://userspace.selinuxproject.org"
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
@@ -30,20 +30,16 @@
 	EPATCH_FORCE="yes" \
 	epatch
 
-	# fix up paths for multilib
-	sed -i -e "/^LIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib LIBDIR failed."
-	sed -i -e "/^SHLIBDIR/s/lib/$(get_libdir)/" src/Makefile \
-		|| die "Fix for multilib SHLIBDIR failed."
-
 	epatch_user
+	multilib_copy_sources
 }
 
-src_compile() {
+multilib_src_compile() {
 	tc-export RANLIB;
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" || die
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
+multilib_src_install() {
+	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(DESTDIR)/$(get_libdir)" \
+		emake DESTDIR="${D}" install
 }