*/*: Remove emul-linux-x86-* blockers

Closes: https://github.com/gentoo/gentoo/pull/8073

7 files changed, 11 insertions, 35 deletions

diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
index 930d2cde117f..55723b4747fc 100644
--- a/app-crypt/heimdal/heimdal-7.4.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild
@@ -31,12 +31,10 @@ CDEPEND="
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	afs? ( net-fs/openafs )
 	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		x11-libs/libXt
 	)
 	!!app-crypt/mit-krb5
 	!!app-crypt/mit-krb5-appl"
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index 60543b74f1bb..180e7c5e0ad8 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -31,12 +31,10 @@ CDEPEND="
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	afs? ( net-fs/openafs )
 	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXau
-		x11-libs/libXt )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		x11-libs/libXt
 	)
 	!!app-crypt/mit-krb5
 	!!app-crypt/mit-krb5-appl"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
index 2bd763bb65cc..3f1ef7523d9f 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild
@@ -31,11 +31,7 @@ CDEPEND="
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 	)
-	xinetd? ( sys-apps/xinetd )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	virtual/yacc
diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
index 5f06a2647f1d..9b63538a0b31 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild
@@ -31,11 +31,7 @@ CDEPEND="
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 	)
-	xinetd? ( sys-apps/xinetd )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	virtual/yacc
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
index c1f7a7820634..94966e19df3a 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild
@@ -34,11 +34,7 @@ CDEPEND="
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 	)
-	xinetd? ( sys-apps/xinetd )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	virtual/yacc
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
index 7d48105fcffd..800b99d0357b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild
@@ -35,11 +35,7 @@ CDEPEND="
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 	)
-	xinetd? ( sys-apps/xinetd )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	virtual/yacc
diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
index 7091c6dece7e..f267ea8e5c48 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild
@@ -34,11 +34,7 @@ CDEPEND="
 		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 	)
-	xinetd? ( sys-apps/xinetd )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	xinetd? ( sys-apps/xinetd )"
 DEPEND="${CDEPEND}
 	${PYTHON_DEPS}
 	virtual/yacc