--- a/sys-libs/libsemanage/libsemanage-2.2-r2.ebuild	2014-03-23 20:29:35.000000000 +0100
+++ b/sys-libs/libsemanage/libsemanage-2.2-r3.ebuild	2014-05-09 10:00:53.289097645 +0200
@@ -21,7 +21,10 @@
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}
 	>=sys-libs/libselinux-${SELNX_VER}
-	dev-libs/ustr
+	abi_x86_32? (
+	    !<dev-libs/ustr-1.0.4-r4
+	    !dev-libs/ustr[-abi_x86_32(-)]
+	)
 	sys-process/audit"
 DEPEND="${RDEPEND}
 	sys-devel/bison
@@ -66,26 +69,41 @@
 }
 
 multilib_src_compile() {
-	emake AR="$(tc-getAR)" CC="$(tc-getCC)" all || die
+	building() {
+	    emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		"$@" || die
+	}
+
+	multilib_foreach_abi building all
 
 	if multilib_is_native_abi && use python; then
-		building() {
+		building_py() {
 			python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
 			emake CC="$(tc-getCC)" PYINC="-I${PYTHON_INCLUDEDIR}" PYTHONLBIDIR="${PYTHON_LIBPATH}" PYPREFIX="${EPYTHON##*/}" "$@"
 		}
-		python_foreach_impl building swigify
-		python_foreach_impl building pywrap
+		python_foreach_impl building_py swigify
+		python_foreach_impl building_py pywrap
 	fi
 }
 
 multilib_src_install() {
-	LIBDIR="\$(PREFIX)/$(get_libdir)" SHLIBDIR="\$(PREFIX)/$(get_libdir)" \
-		emake DESTDIR="${D}" install
+	installation() {
+	    emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SHLIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" "$@"
+	}
+
+	multilib_foreach_abi installation install
 
 	if multilib_is_native_abi && use python; then
-		installation() {
+		installation_py() {
 			emake DESTDIR="${D}" install-pywrap
 		}
-		python_foreach_impl installation
+		python_foreach_impl installation_py
 	fi
 }