--- libgcrypt-1.6.1.ebuild	2014-02-04 03:38:53.000000000 +0100
+++ libgcrypt-1.6.1-r1.ebuild	2014-02-28 11:31:14.479926591 +0100
@@ -5,7 +5,7 @@
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
 
-inherit autotools-utils flag-o-matic
+inherit autotools-multilib flag-o-matic
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="http://www.gnupg.org/"
@@ -17,7 +17,11 @@ SLOT="0/20" # subslot = soname major ver
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/libgpg-error-1.11"
+RDEPEND=">=dev-libs/libgpg-error-1.11
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
@@ -28,7 +32,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.0-serial-tests.patch
 )
 
-src_configure() {
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+multilib_src_configure() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		# ASM code uses GNU ELF syntax, divide in particular, we need to
 		# allow this via ASFLAGS, since we don't have a flag-o-matic