From: amynka@gentoo.org <amynka@gentoo.org>
Date: Thu, 19 Apr 2018 19:32:45 +0000 (+0200)
Subject: */*: [QA] remove emul-linux-* blockers
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=35f63607907561d6f9b03531925d1c014b52a159;p=gentoo.git

*/*: [QA] remove emul-linux-* blockers

Closes: https://github.com/gentoo/gentoo/pull/8074
---

diff --git a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
index b740e392602f..5d32ceb301f5 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.102.ebuild
@@ -19,11 +19,7 @@ CDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.4 )"
-RDEPEND="${CDEPEND}
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
diff --git a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
index f1ed3e06d61a..bedbed4a0a89 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.108.ebuild
@@ -22,12 +22,7 @@ DEPEND="${CDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 "
-RDEPEND="${CDEPEND}
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
+RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
diff --git a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
index 85c48abd88a0..79b4c02e2d66 100644
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@@ -22,12 +22,7 @@ DEPEND="${CDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
 "
-RDEPEND="${CDEPEND}
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-"
+RDEPEND="${CDEPEND}"
 
 DOCS=( AUTHORS ChangeLog HACKING NEWS README )
 
diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild
index ac705fc827fa..9a4ba03a1ee9 100644
--- a/dev-libs/expat/expat-2.2.1.ebuild
+++ b/dev-libs/expat/expat-2.2.1.ebuild
@@ -12,8 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( AUTHORS Changes README )
 
diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild
index 36b9284d2a6b..5ff41c1f875f 100644
--- a/dev-libs/expat/expat-2.2.4.ebuild
+++ b/dev-libs/expat/expat-2.2.4.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( README.md )
 
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
index e480a0c3af75..e4888fba94b3 100644
--- a/dev-libs/expat/expat-2.2.5.ebuild
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( README.md )
 
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
index f84e757e93f3..e4c50be0f93a 100644
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.6.ebuild
@@ -18,9 +18,7 @@ IUSE="static-libs"
 
 RESTRICT="test" #397347
 
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/dev-libs/json-c/json-c-0.12.ebuild b/dev-libs/json-c/json-c-0.12.ebuild
index 195693270132..c973e9c31b5e 100644
--- a/dev-libs/json-c/json-c-0.12.ebuild
+++ b/dev-libs/json-c/json-c-0.12.ebuild
@@ -16,11 +16,7 @@ SLOT="0/2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r3
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 
 # tests break otherwise
 AUTOTOOLS_IN_SOURCE_BUILD=1
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index 11f2def1ef08..98d0962d4f44 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
-RDEPEND="!dev-libs/elfutils
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r11
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="!dev-libs/elfutils"
 DEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( ChangeLog README )
diff --git a/dev-libs/libffi/libffi-3.2.1-r1.ebuild b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
index 576885b268aa..20b4510e96ba 100644
--- a/dev-libs/libffi/libffi-3.2.1-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r1.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
 DOCS="ChangeLog* README"
diff --git a/dev-libs/libffi/libffi-3.2.1-r2.ebuild b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
index 533e9afa08e2..3661338c6afc 100644
--- a/dev-libs/libffi/libffi-3.2.1-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1-r2.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
 DOCS="ChangeLog* README"
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 8c52b8375f3e..c6f9feea53e0 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug pax_kernel static-libs test"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="test? ( dev-util/dejagnu )"
 
 DOCS="ChangeLog* README"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
index 686e8788fa4e..6b4a94d3540b 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
@@ -15,11 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
-	!dev-libs/libgcrypt:0/11
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+	!dev-libs/libgcrypt:0/11"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
index 2f0aed6ee170..361413f50a04 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.1.ebuild
@@ -14,11 +14,7 @@ SLOT="0/20" # subslot = soname major version
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
index d11865ef41c2..f5f5899b7265 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
index 728bcb0f7499..5eaff80fbe2b 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r2.ebuild
@@ -14,11 +14,7 @@ SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc o-flag-munging static-libs"
 
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
index fea45ce9d9eb..41a6baf100a1 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2.ebuild
@@ -14,11 +14,7 @@ SLOT="0/20" # subslot = soname major version
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( virtual/texi2dvi )"
 
diff --git a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
index 438569792a3e..9f78904467c4 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.27-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
-	)"
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
index ce896dc99821..2576649e58dd 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.29.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls static-libs"
 
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r12
-	)"
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 7179425cbe86..a6a8e15d8865 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -18,11 +18,7 @@ IUSE="static-libs"
 # libltdl doesn't have a testsuite.
 RESTRICT="test"
 
-RDEPEND="!<sys-devel/libtool-2.4.3-r2:2
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="!<sys-devel/libtool-2.4.3-r2:2"
 DEPEND="app-arch/xz-utils"
 
 S="${WORKDIR}/${MY_P}/libltdl"
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
index a0477299395e..d623fb202531 100644
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild
@@ -23,10 +23,6 @@ IUSE="static-libs python utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index ccd0aac9e390..96413581c263 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -22,10 +22,6 @@ IUSE="static-libs python utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index ebe525ac9df0..65e5dfb9b481 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -18,10 +18,6 @@ IUSE="static-libs python utils"
 
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 DEPEND="
 	${RDEPEND}
diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
index d75f2a77362a..68e14d481b05 100644
--- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild
@@ -13,9 +13,7 @@ SLOT="0.3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples static-libs test"
 
-RDEPEND="examples? ( dev-libs/glib:2 )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="examples? ( dev-libs/glib:2 )"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	virtual/pkgconfig"
diff --git a/dev-libs/libpcre/libpcre-8.41-r1.ebuild b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
index 27c7f365fd95..ef823d588f9e 100644
--- a/dev-libs/libpcre/libpcre-8.41-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-8.41-r1.ebuild
@@ -35,10 +35,6 @@ DEPEND="
 "
 RDEPEND="
 	${RDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 "
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
index 9fa2edb00af8..b1be42b9c534 100644
--- a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
@@ -19,13 +19,9 @@ DEPEND=">=dev-lang/perl-5.6
 	virtual/yacc"
 RDEPEND="
 	valgrind? ( dev-util/valgrind )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r16
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
-
 PATCHES=(
 	"${FILESDIR}/${P}-CVE-2017-10790.patch"
 )
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index beffdd9cdbeb..661e20439f60 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -19,10 +19,7 @@ DEPEND=">=dev-lang/perl-5.6
 	virtual/yacc"
 RDEPEND="
 	valgrind? ( dev-util/valgrind )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r16
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+"
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS )
 
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild
index 53ece749148c..2d7312f7d5d7 100644
--- a/dev-libs/lzo/lzo-2.09.ebuild
+++ b/dev-libs/lzo/lzo-2.09.ebuild
@@ -14,10 +14,7 @@ SLOT="2"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-	)"
+RDEPEND=""
 
 DOCS="BUGS ChangeLog README THANKS doc/*"
 
diff --git a/dev-libs/nettle/nettle-3.3-r2.ebuild b/dev-libs/nettle/nettle-3.3-r2.ebuild
index a3b714e5e54a..678fb2445ce8 100644
--- a/dev-libs/nettle/nettle-3.3-r2.ebuild
+++ b/dev-libs/nettle/nettle-3.3-r2.ebuild
@@ -15,11 +15,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/nettle/nettle-stdint.h
diff --git a/dev-libs/nettle/nettle-3.4.ebuild b/dev-libs/nettle/nettle-3.4.ebuild
index c158c949b07c..e211ed6ce11e 100644
--- a/dev-libs/nettle/nettle-3.4.ebuild
+++ b/dev-libs/nettle/nettle-3.4.ebuild
@@ -15,11 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes"
 
 DEPEND="gmp? ( >=dev-libs/gmp-5.0:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r17
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="${DEPEND}"
 
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/nettle/nettle-stdint.h
diff --git a/dev-libs/nspr/nspr-4.13.1.ebuild b/dev-libs/nspr/nspr-4.13.1.ebuild
index 1f044860766f..37480aac7750 100644
--- a/dev-libs/nspr/nspr-4.13.1.ebuild
+++ b/dev-libs/nspr/nspr-4.13.1.ebuild
@@ -16,11 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/nspr-config
diff --git a/dev-libs/nss/nss-3.29.5.ebuild b/dev-libs/nss/nss-3.29.5.ebuild
index f2e16e8523fe..c758958bb937 100644
--- a/dev-libs/nss/nss-3.29.5.ebuild
+++ b/dev-libs/nss/nss-3.29.5.ebuild
@@ -27,11 +27,7 @@ DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
 	${CDEPEND}"
 RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	${CDEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	${CDEPEND}"
 
 RESTRICT="test"
 
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
index f573e495c90e..c64a38b4f3a5 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
@@ -25,10 +25,6 @@ RESTRICT="!bindist? ( bindist )"
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 	!=dev-libs/openssl-0.9.8*:0"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
diff --git a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
index 6ef3483361b9..ab73da7680e4 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8.ebuild
@@ -25,10 +25,6 @@ RESTRICT="!bindist? ( bindist )"
 RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
 	!=dev-libs/openssl-0.9.8*:0"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
index 90ba74d7be28..1231af279799 100644
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ b/dev-libs/udis86/udis86-1.7-r2.ebuild
@@ -20,8 +20,7 @@ DEPEND="test? (
 		x86? ( dev-lang/yasm )
 		x86-fbsd? ( dev-lang/yasm )
 	)"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-yasm.patch
diff --git a/dev-libs/udis86/udis86-1.7.2.ebuild b/dev-libs/udis86/udis86-1.7.2.ebuild
index f4d5d661c043..cd7cf07a9bc6 100644
--- a/dev-libs/udis86/udis86-1.7.2.ebuild
+++ b/dev-libs/udis86/udis86-1.7.2.ebuild
@@ -20,8 +20,7 @@ DEPEND="test? (
 		x86? ( dev-lang/yasm )
 		x86-fbsd? ( dev-lang/yasm )
 	)"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-docdir.patch
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r2.ebuild
index 37d23a102be2..b19ec4fc505c 100644
--- a/sys-libs/db/db-4.8.30-r2.ebuild
+++ b/sys-libs/db/db-4.8.30-r2.ebuild
@@ -38,11 +38,7 @@ DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jdk-1.5 )
 	>=sys-devel/binutils-2.16.1"
 RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.5 )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r2
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	java? ( >=virtual/jre-1.5 )"
 
 src_prepare() {
 	cd "${WORKDIR}"/"${MY_P}" || die
diff --git a/sys-libs/gdbm/gdbm-1.11.ebuild b/sys-libs/gdbm/gdbm-1.11.ebuild
index a1c16be88349..ab6f9f6401a5 100644
--- a/sys-libs/gdbm/gdbm-1.11.ebuild
+++ b/sys-libs/gdbm/gdbm-1.11.ebuild
@@ -16,11 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls static-libs"
 
-RDEPEND="
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND=""
 
 EX_S="${WORKDIR}"/${EX_P}
 
diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index 943ef06732c3..4cef2cfe09fe 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="selinux static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	selinux? ( sec-policy/selinux-gpm )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	selinux? ( sec-policy/selinux-gpm )"
 DEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
 	app-arch/xz-utils
 	sys-apps/texinfo
diff --git a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
index cd8892d47731..530fa3d022b7 100644
--- a/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
+++ b/sys-libs/libavc1394/libavc1394-0.5.4-r1.ebuild
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
index e7f484ab5de5..90b9144911a3 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.0-r1.ebuild
@@ -17,5 +17,4 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 DEPEND="app-arch/xz-utils"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
diff --git a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
index 65b0c7bf7d67..ec729644728f 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.1.ebuild
@@ -17,5 +17,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="app-arch/xz-utils"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
diff --git a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
index b9be065a79c0..f06036c8c1c4 100644
--- a/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
+++ b/sys-libs/libraw1394/libraw1394-2.1.2.ebuild
@@ -17,5 +17,4 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="app-arch/xz-utils"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=""
diff --git a/sys-libs/ncurses/ncurses-6.1-r2.ebuild b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
index a13f47d42f2c..4a58bd1d79bb 100644
--- a/sys-libs/ncurses/ncurses-6.1-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-6.1-r2.ebuild
@@ -25,8 +25,7 @@ RDEPEND="${DEPEND}
 	!<=sys-libs/ncurses-5.9-r4:5
 	!<sys-libs/slang-2.3.2_pre23
 	!<x11-terms/rxvt-unicode-9.06-r3
-	!<x11-terms/st-0.6-r1
-	!app-emulation/emul-linux-x86-baselibs"
+	!<x11-terms/st-0.6-r1"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/sys-libs/pam/pam-1.2.1-r2.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild
index 8abbce599950..c9eeb83b1078 100644
--- a/sys-libs/pam/pam-1.2.1-r2.ebuild
+++ b/sys-libs/pam/pam-1.2.1-r2.ebuild
@@ -35,11 +35,7 @@ PDEPEND="sys-auth/pambase"
 RDEPEND="${RDEPEND}
 	!<sys-apps/openrc-0.11.8
 	!sys-auth/openpam
-	!sys-auth/pam_userdb
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!sys-auth/pam_userdb"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-libs/readline/readline-6.3_p8-r3.ebuild b/sys-libs/readline/readline-6.3_p8-r3.ebuild
index a5caff50ed3f..1142505f8711 100644
--- a/sys-libs/readline/readline-6.3_p8-r3.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r3.ebuild
@@ -36,11 +36,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs utils"
 
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r7
-	)"
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
index 72a283b1cb0f..aeddd1a694db 100644
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!<dev-libs/libxml2-2.7.7" #309623
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild
index e8653b406ed5..a7d2cb8d2a9b 100644
--- a/sys-libs/zlib/zlib-1.2.11.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)
-	!<dev-libs/libxml2-2.7.7" #309623
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
 
 src_prepare() {
 	if use minizip ; then