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

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

diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild
index 930d2cde117ff0d9c7943f3b9926cb7ad8e7c806..55723b4747fc7c1d3ccb0b61b706e211dd503289 100644 (file)
--- 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 60543b74f1bbebe932a7e3b1685f1399139436f8..180e7c5e0ad8a3b422ce2f7c3a39885de43c1576 100644 (file)
--- 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 2bd763bb65cceaa7e55d9d476a5879d2424ef51d..3f1ef7523d9ffb610fdd9fe7044d390af2d5d320 100644 (file)
--- 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 5f06a2647f1d9754243958ee9a16c95d8f3cd982..9b63538a0b313e64477e132255e2d2264e90052c 100644 (file)
--- 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 c1f7a7820634e5590b239cb083ff651a5d65cb61..94966e19df3ae411e413028a0f38757b5e6bbf3b 100644 (file)
--- 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 7d48105fcffd8cd3144a3190b4fc0929866d3054..800b99d0357bfb491edca4d9412af45f492cb856 100644 (file)
--- 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 7091c6dece7e3ec99e2405774f012a1f2089d4f4..f267ea8e5c48328060426c564f8fb4df9173b8e6 100644 (file)
--- 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

diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
index bf410a00dfd08088f7ef3410ce45b89ab2ef96a6..1f394f6f13bfe76383d0908c495a08f0a6a8edff 100644 (file)
--- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild
+++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild
@@ -123,22 +123,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild
index bdbe5cc7ddeadff9c62fbc596720ef2ffd03169b..62b897aa0e7aa87ad6b507139a1d1d73c7fd12ca 100644 (file)
--- a/app-emulation/wine-any/wine-any-2.19.ebuild
+++ b/app-emulation/wine-any/wine-any-2.19.ebuild
@@ -124,22 +124,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild
index dfe4cca912e1c237654e22022b8819266eacb4dd..ceb899dbb839c5f0cc5d394a1999c09f77a554bd 100644 (file)
--- a/app-emulation/wine-any/wine-any-2.20.ebuild
+++ b/app-emulation/wine-any/wine-any-2.20.ebuild
@@ -125,22 +125,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild
index dfe4cca912e1c237654e22022b8819266eacb4dd..ceb899dbb839c5f0cc5d394a1999c09f77a554bd 100644 (file)
--- a/app-emulation/wine-any/wine-any-2.21.ebuild
+++ b/app-emulation/wine-any/wine-any-2.21.ebuild
@@ -125,22 +125,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
index 351fee6c6fb071f4e95519b6558d74ce4aeb210f..4ac2529840fee90a4b4d5438552750f430e1e8c0 100644 (file)
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ b/app-emulation/wine-any/wine-any-9999.ebuild
@@ -127,22 +127,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
index 27edc48d213f8f5d6e96cf9244f27553b8a9f158..296fe4e7b71a957ed3cad2e1028616cdead844bb 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild
@@ -108,22 +108,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
index 442642abc178b2eed3d284a567c9ec3ef9499089..94d819782d2f9b92859382e0b4372b9f95448d68 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild
@@ -109,22 +109,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
index ddbc7bcc947c9b31cfa3f8551167a7e484e1e54c..cd620120b755ec2ad77dca8053f0fb79fc109c31 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild
@@ -110,22 +110,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
index ddbc7bcc947c9b31cfa3f8551167a7e484e1e54c..cd620120b755ec2ad77dca8053f0fb79fc109c31 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild
@@ -110,22 +110,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
index 9025029236ad32aa62b688989e36bc4ba0578a7f..7781bcbed2f833927e49280f842c5ee21331b096 100644 (file)
--- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild
@@ -112,22 +112,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
index 22f656f5a5daaeb47eb8450977432da9cf9ac812..191ee925a443a3a2f8452cce3d4bd0ccc14a0321 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.0-r1.ebuild
@@ -113,22 +113,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-2.19.ebuild b/app-emulation/wine-staging/wine-staging-2.19.ebuild
index bc670878271594bd09c1eee174e166952dabbcd1..e6caef35641a9d92f0c1fc3548ba3fb9204fb877 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.19.ebuild
@@ -114,22 +114,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-2.20.ebuild b/app-emulation/wine-staging/wine-staging-2.20.ebuild
index 9454c3d09a9980a5d0d07055a5c9e9a3d08acbac..3733269fd1312a6159091d0b974f338a4ba0a707 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.20.ebuild
@@ -115,22 +115,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-2.21.ebuild b/app-emulation/wine-staging/wine-staging-2.21.ebuild
index 9454c3d09a9980a5d0d07055a5c9e9a3d08acbac..3733269fd1312a6159091d0b974f338a4ba0a707 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-2.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.21.ebuild
@@ -115,22 +115,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 477b8968d2f72ac259aedfc78d8fa690a6356c59..a231afd2ad8633773d4c425b410778ce59b20c61 100644 (file)
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -117,22 +117,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
index b6970b16cc73767a146e125909314b957cc2e526..122d7b748931411511f97942847724e62c77de5c 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
index f19e2fee2149b5ea76e2dba124bc2475cf59ff66..c701c112800ee6ed951bdfe42333b6a4b2b6701d 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
index f19e2fee2149b5ea76e2dba124bc2475cf59ff66..c701c112800ee6ed951bdfe42333b6a4b2b6701d 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
index dd5dfa1b3911ed09a0c06cbd978de7a81ab2fac3..e24402ac58f6eb3bea7517b97ca2225a72c943b9 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
index c2b9e49b3b081f0aa2f8a1b6322894151c85aae2..1897a5fe7ad6b39e6b915689ad9b40d9e9d69ced 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild
@@ -93,22 +93,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
index 55dd4bac5b7143bf1624e6114e4539ce9c325b08..3f1778611a37813e97833ec8871bc5b8f96385c0 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild
@@ -95,22 +95,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
index 55dd4bac5b7143bf1624e6114e4539ce9c325b08..3f1778611a37813e97833ec8871bc5b8f96385c0 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild
@@ -95,22 +95,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
index 55dd4bac5b7143bf1624e6114e4539ce9c325b08..3f1778611a37813e97833ec8871bc5b8f96385c0 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild
@@ -95,22 +95,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
index cda136eb494ad42a0a66463cd8e2ee1b31fd248d..ad6493ebe95d2d4aaac0f1753f0a28c4c94e774d 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild
@@ -95,22 +95,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
index 1c122ab2e0826cc8958f066a174bff8bfaa938a0..28b84951d9b6c16bda2f1ed07ad9a949703cc4b4 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.1.ebuild
@@ -96,22 +96,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
index 1c122ab2e0826cc8958f066a174bff8bfaa938a0..28b84951d9b6c16bda2f1ed07ad9a949703cc4b4 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-3.2.ebuild
@@ -96,22 +96,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 8126d64529bb3b7a6b5b0f585f8bd5ac32ef95f7..ddf4b23d2eec340a11adb1025f1b21ab1cbf6997 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -97,22 +97,6 @@ COMMON_DEPEND="
        xml? (
                dev-libs/libxml2[${MULTILIB_USEDEP}]
                dev-libs/libxslt[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-db-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-medialibs-20140508-r6
-               !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-opengl-20140508-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-sdl-20140508-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-soundlibs-20140508
-               !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-               !<app-emulation/emul-linux-x86-xlibs-20140508
        )"
 
 RDEPEND="${COMMON_DEPEND}

diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index 3d31db92c7b6732f9da258b95fa679f2b48c9fcb..1206be17c265cffa86693352b0980eadf992b73a 100644 (file)
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -24,22 +24,22 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4
-                !<media-libs/mesa-10.3.4-r1
-                !=media-libs/mesa-10.3.5
-                !=media-libs/mesa-10.3.7-r1
-                !<x11-proto/glproto-1.4.17-r1
-                !<=x11-base/xorg-server-1.12.4-r5
-                !=x11-base/xorg-server-1.15.2-r1
-                !=x11-base/xorg-server-1.15.2-r2
-                !~x11-base/xorg-server-1.16.3
-                !=x11-base/xorg-server-1.16.4
-                !=x11-base/xorg-server-1.16.4-r3
-                !~x11-base/xorg-server-1.17.0
-                !=x11-base/xorg-server-1.17.1
-                !<x11-drivers/ati-drivers-14.9-r2
-                !=x11-drivers/ati-drivers-14.12
-                !<=app-emulation/emul-linux-x86-opengl-20140508"
+RDEPEND="
+       >=app-admin/eselect-1.2.4
+       !<media-libs/mesa-10.3.4-r1
+       !=media-libs/mesa-10.3.5
+       !=media-libs/mesa-10.3.7-r1
+       !<x11-proto/glproto-1.4.17-r1
+       !<=x11-base/xorg-server-1.12.4-r5
+       !=x11-base/xorg-server-1.15.2-r1
+       !=x11-base/xorg-server-1.15.2-r2
+       !~x11-base/xorg-server-1.16.3
+       !=x11-base/xorg-server-1.16.4
+       !=x11-base/xorg-server-1.16.4-r3
+       !~x11-base/xorg-server-1.17.0
+       !=x11-base/xorg-server-1.17.1
+       !<x11-drivers/ati-drivers-14.9-r2
+       !=x11-drivers/ati-drivers-14.12"
 
 S=${WORKDIR}
 

diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
index d64915f06f74c0c6a9b0fa3cc542f819c426e305..0dbca3f2a9e2a40cce304b114717772b1fb7b0b6 100644 (file)
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -14,11 +14,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
-DEPEND=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 

diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 002335ee70c1dbba386253b25b9226556de9b7f0..33ec218e9811f987d0c8ba46699c21601175359d 100644 (file)
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -14,11 +14,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
-DEPEND=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 

diff --git a/dev-db/mariadb/mariadb-10.2.12.ebuild b/dev-db/mariadb/mariadb-10.2.12.ebuild
index 51e0d67ccb02248fcf51b7b93e902e53ee922920..29a68b7734cc0784df96639657dace96eb054abb 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -113,7 +113,6 @@ DEPEND="virtual/yacc
        server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
        ${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
        !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
        server? ( !prefix? ( dev-db/mysql-init-scripts ) )
        !<virtual/mysql-5.6-r9

diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index cc2988c75ed4198a2678ed89de16ddaf20ff4437..c9a11e7250ca90ad0e3506e54433575f60c79af6 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -121,7 +121,6 @@ DEPEND="virtual/yacc
        server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
        ${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
        client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
        !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
        server? ( !prefix? ( dev-db/mysql-init-scripts ) )

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 389572cc9c8ef8278de747c4d333e1cd41a859de..86c88b6342e47a580eecbef195d2d71881e3896e 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -119,7 +119,6 @@ DEPEND="virtual/yacc
        server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
        ${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
        client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
        !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
        server? ( !prefix? ( dev-db/mysql-init-scripts ) )

diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 0fcf8f32eb3ccc813bb6b7e9a71078a1f16a5bad..33cd1b5332c0ac5e5bf5a330d2b7b904d52136de 100644 (file)
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -116,7 +116,6 @@ DEPEND="virtual/yacc
        server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
        ${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
        client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
        !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
        server? ( !prefix? ( dev-db/mysql-init-scripts ) )

diff --git a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
index 1e2fd5944d096bad0c554807ff01e81456a74720..6f390d0e01e911c28542a4d77f576d0926daee86 100644 (file)
--- a/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r1.ebuild
@@ -20,11 +20,7 @@ IUSE=""
 
 RDEPEND="
        dev-db/unixODBC[${MULTILIB_USEDEP}]
-       >=virtual/mysql-5.5[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-       )
-"
+       >=virtual/mysql-5.5[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 

diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
index 5f7d1930d0283f118479bc01dff94952efaefdd6..f44807fe599e4da6918dd66d8579cd48a84493ab 100644 (file)
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
@@ -22,9 +22,6 @@ IUSE=""
 RDEPEND="
        dev-db/unixODBC[${MULTILIB_USEDEP}]
        ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-       )
        !dev-db/mysql-connector-c
        !>=dev-db/mariadb-10.2.0
 "

diff --git a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 62d7f9d9034edf4ce0f74d74eb61d43204d69b9f..1172fce91be00069a053f824ea4982b13fada169 100644 (file)
--- a/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -25,9 +25,6 @@ IUSE=""
 RDEPEND="
        dev-db/unixODBC[${MULTILIB_USEDEP}]
        ~virtual/libmysqlclient-18[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-       )
        !>=dev-db/mariadb-10.2.0[client-libs(+)]
        !dev-db/mariadb-connector-c[mysqlcompat(-)]
 "

diff --git a/dev-db/myodbc/myodbc-5.3.9.ebuild b/dev-db/myodbc/myodbc-5.3.9.ebuild
index 4493cf5bd1e269d389e7498274b4bb27f0772530..bcdb2f0d975c503218e8ec0eb01272a23a84dd7c 100644 (file)
--- a/dev-db/myodbc/myodbc-5.3.9.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.9.ebuild
@@ -24,11 +24,7 @@ IUSE=""
 
 RDEPEND="
        dev-db/unixODBC[${MULTILIB_USEDEP}]
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
-       )
-"
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 S=${WORKDIR}
 
 #src_configure(){ :; }

diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
index 1c718c57f22885d47b26fdadc329f89d377d074f..c885ea8a511e49243d1f108ae4f664532c358b7f 100644 (file)
--- a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
+++ b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: unbundle Qt5
-#              remove emul-linux-x86* deps (bug 484060)
 
 EAPI=5
 inherit eutils games

diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 54df43366cf07449e769ce58daf61833427f380b..0676bfbde5019d0bdec31ae5412b54bf0a827d12 100644 (file)
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -34,11 +34,6 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.35
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
-RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index b46ee33df2a1dddcde56b4f2e5e24553ef3d32c2..5944120e1d8a20fd75e3038b604fe29763b60d74 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -38,10 +38,6 @@ RDEPEND="
                        libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
                        !gnome-extra/gnome-vfs-sftp ) )
        zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )
 "
 DEPEND="${RDEPEND}
        sys-devel/gettext

diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
index 501e0d7be4c975b8351402b6e5b84d4925bc23fc..c84622335aa710f84bc132d9da902290c4fdddb0 100644 (file)
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -28,11 +28,6 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
        tools? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r2
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )"
 
 pkg_setup() {
        use tools && python-single-r1_pkg_setup

diff --git a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
index 66e18ef381df910579ac9a12c41168ec13eaf249..121fa7a0e6ce34d2c53ac16c11f9720d70cf959e 100644 (file)
--- a/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
+++ b/media-libs/a52dec/a52dec-0.7.4-r7.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="djbfft oss static-libs"
 
-RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="djbfft? ( >=sci-libs/djbfft-0.76-r2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog HISTORY NEWS README TODO doc/liba52.txt )
 

diff --git a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
index 31132aaef7732a461bb57521dcd9594217023368..abe8e719be716765b669b182d90d41a673362964 100644 (file)
--- a/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.2.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
        doc? ( >=app-doc/doxygen-1.2.6 )"
 

diff --git a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
index 7116e25d896634c2d19c51d10de10b7694810a4e..3cfe8ecf8ff981309f89916ff7e501d43d38b138 100644 (file)
--- a/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.4.1.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
        doc? ( >=app-doc/doxygen-1.2.6 )"
 

diff --git a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
index 7116e25d896634c2d19c51d10de10b7694810a4e..3cfe8ecf8ff981309f89916ff7e501d43d38b138 100644 (file)
--- a/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.5.ebuild
@@ -17,11 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
        doc? ( >=app-doc/doxygen-1.2.6 )"
 

diff --git a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
index 49417959c20672d5cbcb07ed48b196c215a0660d..17d4aa3aa1aa62659fb4d73fadef91f1a21db7f8 100644 (file)
--- a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
@@ -17,23 +17,20 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<app-emulation/emul-linux-x86-soundlibs-20140406-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
-       )"
+RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
 PATCHES=( "${FILESDIR}/${PN}-1.0.12-hardened.patch" )
 
+src_prepare() {
+       eautoreconf
+}
+
 multilib_src_configure() {
        ECONF_SOURCE=${S} \
        econf $(use_enable static-libs static)
 }
 
-src_prepare() {
-       eautoreconf
-}
-
 multilib_src_install_all() {
        einstalldocs
        prune_libtool_files --all

diff --git a/media-libs/faac/faac-1.28-r4.ebuild b/media-libs/faac/faac-1.28-r4.ebuild
index 8cc1bde10d87a8a7e05bb662e60ec97953418e12..4196ae0cfde322e3635a70258f6ba68c01c5b85b 100644 (file)
--- a/media-libs/faac/faac-1.28-r4.ebuild
+++ b/media-libs/faac/faac-1.28-r4.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libmp4v2:0=
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="media-libs/libmp4v2:0="
 DEPEND="${RDEPEND}"
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 

diff --git a/media-libs/faad2/faad2-2.7-r3.ebuild b/media-libs/faad2/faad2-2.7-r3.ebuild
index 77d19e8993ae4e1ec7391e558e574fc2fb0ea3d8..d9b34c0d9f3df46eed5aea8c454e48f7be953889 100644 (file)
--- a/media-libs/faad2/faad2-2.7-r3.ebuild
+++ b/media-libs/faad2/faad2-2.7-r3.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 DOCS=( AUTHORS ChangeLog NEWS README README.linux TODO )
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND=""
 
 src_prepare() {

diff --git a/media-libs/fontconfig/fontconfig-2.12.4.ebuild b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
index 145a584a1438ed2dd5c4bc4dd0cd2f11513ac24c..154f235079645bf9e94407075893ffc0ae495597 100644 (file)
--- a/media-libs/fontconfig/fontconfig-2.12.4.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.4.ebuild
@@ -17,8 +17,7 @@ IUSE="doc static-libs"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-       >=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+       >=media-libs/freetype-2.5.3-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( =app-text/docbook-sgml-dtd-3.1*

diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
index 2ead8d98ff7bc075da9cac394941fd837814e06f..f912eab682339193997f714c16ded62ad485c239 100644 (file)
--- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
@@ -17,8 +17,7 @@ IUSE="doc static-libs"
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
 # default and used by every distro.  See bug #283191.
 RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-       >=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+       >=media-libs/freetype-2.7.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( =app-text/docbook-sgml-dtd-3.1*

diff --git a/media-libs/freealut/freealut-1.1.0-r3.ebuild b/media-libs/freealut/freealut-1.1.0-r3.ebuild
index dd3f5d75d8e20221ba64c22f2012a918968e9001..87113136ec0c104c449d4b33f1018b49f4a3e80c 100644 (file)
--- a/media-libs/freealut/freealut-1.1.0-r3.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r3.ebuild
@@ -14,10 +14,6 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux
 IUSE="static-libs"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 

diff --git a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
index be1c13cc8e3063b8570309e6bad87dd95a8a4997..5999aa059199facc9a2c030c0b3c8a2c3f72d6a6 100644 (file)
--- a/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
+++ b/media-libs/freeglut/freeglut-2.8.1-r1.ebuild
@@ -19,8 +19,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
        >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]

diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
index bec2908b1a831f7d756a4609c200de402b3d0e81..e1adbfa5560e33917c2cdba3c53ca578f7213050 100644 (file)
--- a/media-libs/freeglut/freeglut-3.0.0.ebuild
+++ b/media-libs/freeglut/freeglut-3.0.0.ebuild
@@ -20,8 +20,7 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
        >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
 # gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/media-libs/freetype/freetype-2.8.1.ebuild b/media-libs/freetype/freetype-2.8.1.ebuild
index baa5cd66018c159dab1642b0cb300cd954e581be..03294bc1c4ef486a13b9140cb3dfb5943a5b414f 100644 (file)
--- a/media-libs/freetype/freetype-2.8.1.ebuild
+++ b/media-libs/freetype/freetype-2.8.1.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
        infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
                        >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
                )
        )"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
        virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-       abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(

diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
index 20b26eccba279e8da48aab4c9c74bb98430f5cc2..4dfd2a7b49625bb0009ae64b14a7d35d49249a49 100644 (file)
--- a/media-libs/freetype/freetype-2.8.ebuild
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
        infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
                        >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
                )
        )"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
        virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-       abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(

diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
index cd02458948faf73a8f9321af9a5ae1a07e9840b1..4d9867d2f4f425cb23d0bce321efa6a093d566a8 100644 (file)
--- a/media-libs/freetype/freetype-2.9.ebuild
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -23,7 +23,7 @@ IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
        infinality png static-libs utils"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
@@ -34,10 +34,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
                        >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
                )
        )"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
        virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-       abi_x86_32? ( utils? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] ) )"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(

diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 4288d7cd6397f8af865d78d6037e244b30ed48a6..4fa091f6769308042100cbdc714ad10e6b2b1eb4 100644 (file)
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -30,7 +30,7 @@ LICENSE="|| ( FTL GPL-2+ )"
 SLOT="2"
 RESTRICT="!bindist? ( bindist )" # bug 541408
 
-CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
        harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
        png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
@@ -41,9 +41,8 @@ CDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
                        >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
                )
        )"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
        virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
 PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
 
 PATCHES=(

diff --git a/media-libs/giflib/giflib-4.1.6-r2.ebuild b/media-libs/giflib/giflib-4.1.6-r2.ebuild
index 5886c855d54807c05ad5fd49e1eca968eafa5c8e..e6dd91121a282c0782babeeb2eac1238eeadacef 100644 (file)
--- a/media-libs/giflib/giflib-4.1.6-r2.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r2.ebuild
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="rle static-libs X"
 
-DEPEND="X? (
+DEPEND="
+       X? (
                x11-libs/libXt
                x11-libs/libX11
                x11-libs/libICE

diff --git a/media-libs/giflib/giflib-4.1.6-r3.ebuild b/media-libs/giflib/giflib-4.1.6-r3.ebuild
index 4376d54abfba67248cc1c2722d8f71bdfd001986..0d7822692362da9e1ea76a797be1493bc44d4ac2 100644 (file)
--- a/media-libs/giflib/giflib-4.1.6-r3.ebuild
+++ b/media-libs/giflib/giflib-4.1.6-r3.ebuild
@@ -16,11 +16,7 @@ IUSE="rle static-libs X"
 
 RDEPEND="
        rle? ( media-libs/urt )
-       X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-       )"
+       X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/giflib/giflib-5.0.6.ebuild b/media-libs/giflib/giflib-5.0.6.ebuild
index e666ee52225bdb4c4870fc75d1b9300c474c2f48..604b886a47a4eaa48e65ae917f79aa8ac6501419 100644 (file)
--- a/media-libs/giflib/giflib-5.0.6.ebuild
+++ b/media-libs/giflib/giflib-5.0.6.ebuild
@@ -15,13 +15,6 @@ SLOT="0/6"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-       )"
-DEPEND="${RDEPEND}"
-
 src_prepare() {
        elibtoolize
 }

diff --git a/media-libs/giflib/giflib-5.1.4-r2.ebuild b/media-libs/giflib/giflib-5.1.4-r2.ebuild
index a5fce8fa5fee1437e4e645933c9d0439e294b551..d18bb15908330f1345ff041fbeaf1d4d60dd3fad 100644 (file)
--- a/media-libs/giflib/giflib-5.1.4-r2.ebuild
+++ b/media-libs/giflib/giflib-5.1.4-r2.ebuild
@@ -14,13 +14,7 @@ SLOT="0/7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-       )"
-DEPEND="${RDEPEND}
-       doc? ( app-text/xmlto )"
+DEPEND="doc? ( app-text/xmlto )"
 
 PATCHES=(
        "${FILESDIR}"/${P}-reallocarray-export.patch

diff --git a/media-libs/giflib/giflib-5.1.4.ebuild b/media-libs/giflib/giflib-5.1.4.ebuild
index e19d5ef53089fd169a4b74b423918ba058f78bae..b92da179a4f96def1c7b7eae68d970bb84b5e88f 100644 (file)
--- a/media-libs/giflib/giflib-5.1.4.ebuild
+++ b/media-libs/giflib/giflib-5.1.4.ebuild
@@ -14,13 +14,7 @@ SLOT="0/7"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
-RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140406-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
-       )"
-DEPEND="${RDEPEND}
-       doc? ( app-text/xmlto )"
+DEPEND="doc? ( app-text/xmlto )"
 
 src_prepare() {
        default

diff --git a/media-libs/glew/glew-1.10.0-r2.ebuild b/media-libs/glew/glew-1.10.0-r2.ebuild
index 65172a9858305ecb67e01a5eb068a14550717565..187ff99392be770a3efc74757aa779fdc68d7057 100644 (file)
--- a/media-libs/glew/glew-1.10.0-r2.ebuild
+++ b/media-libs/glew/glew-1.10.0-r2.ebuild
@@ -18,9 +18,8 @@ RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
        >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-       >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND=${RDEPEND}
+       >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
        sed -i \

diff --git a/media-libs/glew/glew-1.13.0.ebuild b/media-libs/glew/glew-1.13.0.ebuild
index 4725492f80f2d5567403e2245cefb618d231d90f..ef65901cb77353d1cca6d355cf7bece9f1637478 100644 (file)
--- a/media-libs/glew/glew-1.13.0.ebuild
+++ b/media-libs/glew/glew-1.13.0.ebuild
@@ -22,9 +22,7 @@ DEPEND="
        >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
        sed -i \

diff --git a/media-libs/glew/glew-2.0.0.ebuild b/media-libs/glew/glew-2.0.0.ebuild
index 173817c6fa2ce2ee95fbdd0a5ba3aec3640b1be1..cff2091e2d37bd1a0b7bcad648dcad3ae558b724 100644 (file)
--- a/media-libs/glew/glew-2.0.0.ebuild
+++ b/media-libs/glew/glew-2.0.0.ebuild
@@ -22,9 +22,7 @@ DEPEND="
        >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
        >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
        local PATCHES=( "${FILESDIR}"/${P}-install-headers.patch )

diff --git a/media-libs/glu/glu-9.0.0-r1.ebuild b/media-libs/glu/glu-9.0.0-r1.ebuild
index 9069395176c6b2e7d39701a82476f54b956a8599..3f4f63eaf043d6cfad00626abfd6135dde91e95e 100644 (file)
--- a/media-libs/glu/glu-9.0.0-r1.ebuild
+++ b/media-libs/glu/glu-9.0.0-r1.ebuild
@@ -29,8 +29,7 @@ IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
-       !<media-libs/mesa-9
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       !<media-libs/mesa-9"
 
 src_unpack() {
        default

diff --git a/media-libs/glu/glu-9999.ebuild b/media-libs/glu/glu-9999.ebuild
index 8f475014bbfa5fdab2830d599c5930d78be0baa2..684f3b54380af2aeb5db0aaac885d87ba85eb9fa 100644 (file)
--- a/media-libs/glu/glu-9999.ebuild
+++ b/media-libs/glu/glu-9999.ebuild
@@ -30,8 +30,7 @@ IUSE="static-libs"
 
 DEPEND=">=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}
-       !<media-libs/mesa-9
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       !<media-libs/mesa-9"
 
 src_unpack() {
        default

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
index 85ad256b24d915815f4a844ea72b7343c19108b9..a8dd28044648be9214f84d0b3503c17ca3ae0a61 100644 (file)
--- a/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-0.10.36-r2.ebuild
@@ -19,17 +19,11 @@ RDEPEND=">=media-libs/gstreamer-${PV}:0.10[introspection?,${MULTILIB_USEDEP}]
        app-text/iso-codes
        introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
        orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+       !<media-libs/gst-plugins-bad-0.10.10:0.10
 "
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.3
 "
-RDEPEND="${RDEPEND}
-       !<media-libs/gst-plugins-bad-0.10.10:0.10
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20140508-r5
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )
-"
 
 src_prepare() {
        # The AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE even

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
index f001ed06e67fc3b00c9912bb854ef38029b56d4e..16339238ba982d5670fd8ab0b99ed8cda0150a9f 100644 (file)
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
@@ -35,7 +35,9 @@ RDEPEND="
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
                >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+       )
+       !<media-libs/gst-plugins-bad-1.11.90:1.0
 "
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.12
@@ -44,7 +46,6 @@ DEPEND="${RDEPEND}
                >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
                >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
 "
-RDEPEND+="!<media-libs/gst-plugins-bad-1.11.90:1.0" # rawparse move
 
 multilib_src_configure() {
        gstreamer_multilib_src_configure \

diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
index 216f0c3231678476c91ccb69de342205b5e3f3d6..7d3e5f7618e58fc456f5000f7d8691457fbeb64a 100644 (file)
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.4.ebuild
@@ -35,7 +35,9 @@ RDEPEND="
        X? (
                >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
                >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] )
+               >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+       )
+       !<media-libs/gst-plugins-bad-1.11.90:1.0
 "
 DEPEND="${RDEPEND}
        >=dev-util/gtk-doc-am-1.12
@@ -44,7 +46,6 @@ DEPEND="${RDEPEND}
                >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
                >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
 "
-RDEPEND+="!<media-libs/gst-plugins-bad-1.11.90:1.0" # rawparse move
 
 multilib_src_configure() {
        filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340

diff --git a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
index 9164c7e059e09e57edce383c4267b3bad3466626..f701dad72642550e7c45b45fb5053730b5f8d812 100644 (file)
--- a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild
@@ -26,10 +26,6 @@ DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )"
 # gtk-doc-am to install API docs
 RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20140508-r5
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )
        !<media-libs/gst-plugins-base-0.10.26"
        # ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once
 

diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
index 3555b6c14cf5abc6f1b4d6467b5da8b3580b3d85..1bd42de6f2c7e4cdcadb4dd9730bc98f8acbb3ed 100644 (file)
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ b/media-libs/jpeg/jpeg-6b-r12.ebuild
@@ -20,9 +20,7 @@ IUSE=""
 
 DOCS=""
 
-RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/jpeg/jpeg-8d-r1.ebuild b/media-libs/jpeg/jpeg-8d-r1.ebuild
index 6c3a792a61324cd9ea26748bc1877c53e54b5020..2c7155f00bd536419792eead30eb26139ff3ac19 100644 (file)
--- a/media-libs/jpeg/jpeg-8d-r1.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r1.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="!media-libs/libjpeg-turbo:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND="!media-libs/libjpeg-turbo:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
index 445113902da4e8e181c7db1473659689a3da67eb..410e55d3088d99c667c553d11bf887d9474c5b9c 100644 (file)
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ b/media-libs/jpeg/jpeg-8d-r2.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="!=media-libs/jpeg-8*:0
-       !<media-libs/libjpeg-turbo-1.3.0-r2
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       !<media-libs/libjpeg-turbo-1.3.0-r2"
 DEPEND="${RDEPEND}"
 
 DOCS=""

diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
index cefa883934a2fa1d174076016b3a711158b59e55..f9be1eb2b8a02bda566f586ef5377e01bc3995b0 100644 (file)
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.13-r2.ebuild
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
 S="${WORKDIR}/${MY_PN}"
@@ -63,8 +62,6 @@ multilib_src_install_all() {
        dohtml doc/*.html
 
        # Needed for apps like rezound
-       # emul-linux-soundlibs doesnt seem to install this, so keep it only for the
-       # default abi.
        dodir /etc/env.d
        echo "LADSPA_PATH=${EPREFIX}/usr/$(get_libdir)/ladspa" > "${ED}/etc/env.d/60ladspa"
 }

diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
index 02f88a95ee16fb499b3420d80aa176ca3f13c9e9..2e1fd225c4e15c95a8050dfb7b92f2f30d63d145 100644 (file)
--- a/media-libs/lcms/lcms-2.8-r1.ebuild
+++ b/media-libs/lcms/lcms-2.8-r1.ebuild
@@ -16,11 +16,7 @@ IUSE="doc jpeg static-libs +threads test tiff zlib"
 
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
        tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/lcms2-${PV}

diff --git a/media-libs/libao/libao-1.2.0.ebuild b/media-libs/libao/libao-1.2.0.ebuild
index 9895efed9faa1ee063ac201a3874074c8e94d691..8997776bba3e2e8eec88cc11ea109a67f633d1a6 100644 (file)
--- a/media-libs/libao/libao-1.2.0.ebuild
+++ b/media-libs/libao/libao-1.2.0.ebuild
@@ -16,9 +16,7 @@ IUSE="alsa nas mmap pulseaudio static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libcuefile/libcuefile-477-r1.ebuild b/media-libs/libcuefile/libcuefile-477-r1.ebuild
index 645c6d45c62cf2953886624bd9e833dbb135b21c..a9a885574d6ceefb5299d2ab910d48b54fa00c00 100644 (file)
--- a/media-libs/libcuefile/libcuefile-477-r1.ebuild
+++ b/media-libs/libcuefile/libcuefile-477-r1.ebuild
@@ -15,8 +15,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 src_install() {
        cmake-multilib_src_install

diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild
index 6b2282f8e196698c8aa17276fa14043966dd0dd0..6b12d373c53324a89353cbab6a880f7273f38ad8 100644 (file)
--- a/media-libs/libdca/libdca-0.0.5-r3.ebuild
+++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug oss static-libs"
 
-RDEPEND="!media-libs/libdts
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="!media-libs/libdts"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )

diff --git a/media-libs/libdv/libdv-1.0.0-r3.ebuild b/media-libs/libdv/libdv-1.0.0-r3.ebuild
index 719e93034b4a80b296feda69e61f4f9db68cf745..4aaa15a9ac6cdf22d35fc1aaf4244c10b0b2b842 100644 (file)
--- a/media-libs/libdv/libdv-1.0.0-r3.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r3.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
 
-RDEPEND="dev-libs/popt
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r12
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
index 6a62a003f8f48c23957827d8eb01569b10eca38d..b4625bee7abaf8a240a5f53a655af34a4d6c2744 100644 (file)
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
@@ -20,9 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 

diff --git a/media-libs/libdvdread/libdvdread-5.0.3.ebuild b/media-libs/libdvdread/libdvdread-5.0.3.ebuild
index 5eb402370ab0ce8ff4e33a05864a486ebdf08aa8..6834364ffda4cf6f336852d79b7bd3b1455b138d 100644 (file)
--- a/media-libs/libdvdread/libdvdread-5.0.3.ebuild
+++ b/media-libs/libdvdread/libdvdread-5.0.3.ebuild
@@ -20,9 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+css static-libs"
 
-RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS TODO README )

diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
index f5b1ca4ed5782874198710bdc58ab35b6a35ea5a..bd9dcaea9e311e3fa1a6a06066869e1b2d31961e 100644 (file)
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r4.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        dev-util/gperf"
 

diff --git a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
index b1e22f1ee61a03566ac1c1675b049d90a101fbbf..7fd3cfc32eef465b1bf7342690164c5b3646d0af 100644 (file)
--- a/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
+++ b/media-libs/libiec61883/libiec61883-1.2.0-r1.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
 IUSE="examples static-libs"
 
-RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libmad/libmad-0.15.1b-r8.ebuild b/media-libs/libmad/libmad-0.15.1b-r8.ebuild
index 50520a655d241978324c94919206cd938fbeaba4..910beb3d63cdef0e8c2b7ca65e29be98d3a1b400 100644 (file)
--- a/media-libs/libmad/libmad-0.15.1b-r8.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r8.ebuild
@@ -15,8 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-ai
 IUSE="debug static-libs"
 
 DEPEND=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( CHANGES CREDITS README TODO VERSION )
 

diff --git a/media-libs/libmikmod/libmikmod-3.3.10.ebuild b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
index 2d3cc0eb8d6495c923aa88efeded297fbb4a3584..232cef07afbb201fbd24c60afb816f547d0f7761 100644 (file)
--- a/media-libs/libmikmod/libmikmod-3.3.10.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.10.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
        nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
        openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-       !${CATEGORY}/${PN}:2
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
        sys-apps/texinfo
        oss? ( virtual/os-headers )"

diff --git a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
index 51da30fe747a93df54c46ecbd4d909faebf78b30..930d2f28960191eb58d63fb9d3e99e39e5335a39 100644 (file)
--- a/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.1.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
        nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
        openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-       !${CATEGORY}/${PN}:2
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
        sys-apps/texinfo
        oss? ( virtual/os-headers )"

diff --git a/media-libs/libmikmod/libmikmod-3.3.11.ebuild b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
index 7ab9e60a597eac6121e5c9dea9f276cde48cf2f8..1e5e9284220db1a6d37275dc3442147dd396bbca 100644 (file)
--- a/media-libs/libmikmod/libmikmod-3.3.11.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.11.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
        nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
        openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-       !${CATEGORY}/${PN}:2
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
        sys-apps/texinfo
        oss? ( virtual/os-headers )"

diff --git a/media-libs/libmikmod/libmikmod-3.3.8.ebuild b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
index 8311552d4fda0e3dcf43a74ea3e7be073cddf142..59cf8cf14b14641c8a45304b8d999ea46bdd19a2 100644 (file)
--- a/media-libs/libmikmod/libmikmod-3.3.8.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.3.8.ebuild
@@ -19,9 +19,7 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
        nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
        openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
        pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
-       !${CATEGORY}/${PN}:2
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !${CATEGORY}/${PN}:2"
 DEPEND="${RDEPEND}
        sys-apps/texinfo
        oss? ( virtual/os-headers )"

diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index ee64dd118ceaf782a0ae89f10c1e8b73caea60fb..b06b1fc08425b2156eae2861dc1d352830a17625 100644 (file)
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -16,10 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20130224-r8
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )"
+RDEPEND=""
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild
index 424dfc5b61409c7a31ad2e0225c31c2d87a103ad..d387f4f4e7e17a4b30e204e166372cb24c8ac2be 100644 (file)
--- a/media-libs/libmng/libmng-2.0.2-r1.ebuild
+++ b/media-libs/libmng/libmng-2.0.2-r1.ebuild
@@ -15,9 +15,7 @@ IUSE="lcms static-libs"
 
 RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
        >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-       lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 10b866b04fb7fec1ece7d93da834474f35c43a73..5f34855de15db0a3fcbc0f01edda6ff88e954e2a 100644 (file)
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -15,9 +15,7 @@ IUSE="lcms static-libs"
 
 RDEPEND=">=virtual/jpeg-0-r2:0[static-libs?,${MULTILIB_USEDEP}]
        >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
-       lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
index 99f6dc5b198e14ee96fc887c767998e1e238fc2a..b1f05b8655d3132cac7fdd07e28e45715bb5f92c 100644 (file)
--- a/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.8.5.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )

diff --git a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
index bd1229984a9bb7c547b5c21d920c0cff52c61691..b372dbc205b28231c9e5539534859353dd0012a5 100644 (file)
--- a/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
+++ b/media-libs/libmodplug/libmodplug-0.8.9.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )

diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
index b38864838feb58b4d54f83e726b68365a1150349..0404b4793fc8dac662e33a46054d1f0576e6d19b 100644 (file)
--- a/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r2.ebuild
@@ -15,12 +15,12 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 IUSE="sdl static-libs X"
 
 RDEPEND="sdl? ( media-libs/libsdl )
-       X? ( x11-libs/libXv
+       X? (
+               x11-libs/libXv
                x11-libs/libICE
                x11-libs/libSM
-               x11-libs/libXt )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+               x11-libs/libXt
+       )"
 DEPEND="${RDEPEND}
        X? ( x11-proto/xextproto )"
 

diff --git a/media-libs/libofa/libofa-0.9.3-r1.ebuild b/media-libs/libofa/libofa-0.9.3-r1.ebuild
index c02fa8c43d00346b70fe63e79a0364d94edb0976..e85125f172c6f86c059b6591f5550fa439637eca 100644 (file)
--- a/media-libs/libofa/libofa-0.9.3-r1.ebuild
+++ b/media-libs/libofa/libofa-0.9.3-r1.ebuild
@@ -19,9 +19,6 @@ RDEPEND="dev-libs/expat
        >=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 PATCHES=(
        "${FILESDIR}"/${P}-gcc-4.patch

diff --git a/media-libs/libogg/libogg-1.3.2.ebuild b/media-libs/libogg/libogg-1.3.2.ebuild
index 354f18f65a754030380d3c26bc5023418dbb8a06..90ded904e1157d2e93452dc8e14d2f81c3a95807 100644 (file)
--- a/media-libs/libogg/libogg-1.3.2.ebuild
+++ b/media-libs/libogg/libogg-1.3.2.ebuild
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="
-       abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 DOCS=( AUTHORS CHANGES )

diff --git a/media-libs/libpng/libpng-1.2.57.ebuild b/media-libs/libpng/libpng-1.2.57.ebuild
index e94ff6442c3e210ed23f60c00861da5312c50c84..e14eecd581db71db128fd240125c7053a53c62ae 100644 (file)
--- a/media-libs/libpng/libpng-1.2.57.ebuild
+++ b/media-libs/libpng/libpng-1.2.57.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~spa
 IUSE=""
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-       !=media-libs/libpng-1.2*:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       !=media-libs/libpng-1.2*:0"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"
 

diff --git a/media-libs/libpng/libpng-1.5.28.ebuild b/media-libs/libpng/libpng-1.5.28.ebuild
index 4845cc7dca5f193edabaee9f25c7c8fb130f2a05..3253bd3c65b53bc53cb6d545c63da5e8a0310dc5 100644 (file)
--- a/media-libs/libpng/libpng-1.5.28.ebuild
+++ b/media-libs/libpng/libpng-1.5.28.ebuild
@@ -18,9 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
 IUSE="apng neon"
 
 RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-       !=media-libs/libpng-1.5*:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       !=media-libs/libpng-1.5*:0"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"
 

diff --git a/media-libs/libpng/libpng-1.6.29.ebuild b/media-libs/libpng/libpng-1.6.29.ebuild
index 1f2f0316889c3c73ac311a589f886dc5d6b5adbf..af03888d719fbe8828841d1a0faabdce438dbedb 100644 (file)
--- a/media-libs/libpng/libpng-1.6.29.ebuild
+++ b/media-libs/libpng/libpng-1.6.29.ebuild
@@ -15,9 +15,7 @@ SLOT="0/16"
 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="apng cpu_flags_x86_sse neon static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"
 

diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index a4923665e4adbb3512f8b3fcf7df1c1a7181c3b1..75f93df96b81266dcc0913855ddc37a6d7d15397 100644 (file)
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -15,9 +15,7 @@ SLOT="0/16"
 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="apng cpu_flags_x86_sse neon static-libs"
 
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        app-arch/xz-utils"
 

diff --git a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
index 41dbc9c99acc9e5f33813622e8cc70aa8d424e72..2327601f07469dce6dceec7a86d7fbb494f1bb4e 100644 (file)
--- a/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
+++ b/media-libs/libpostproc/libpostproc-10.20140517-r1.ebuild
@@ -37,10 +37,7 @@ done
 
 RDEPEND="
        >=media-video/libav-0.8.2-r2:0=
-       !media-video/ffmpeg:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
+       !media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/libpostproc/libpostproc-9999.ebuild b/media-libs/libpostproc/libpostproc-9999.ebuild
index 92c4722f80b53ff4b8342963aacb8660ce77e2cf..23a7caeab9fb4fb3f51f80d838834aa865252816 100644 (file)
--- a/media-libs/libpostproc/libpostproc-9999.ebuild
+++ b/media-libs/libpostproc/libpostproc-9999.ebuild
@@ -37,10 +37,7 @@ done
 
 RDEPEND="
        >=media-video/libav-0.8.2-r2:0=
-       !media-video/ffmpeg:0
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-"
+       !media-video/ffmpeg:0"
 DEPEND="${RDEPEND}"
 
 multilib_src_configure() {

diff --git a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
index 1eb6a7b305a1b698127a60e442bcefcfdc4cac7b..800279b7b37b21a03b612e5da761be727f758e48 100644 (file)
--- a/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-477-r1.ebuild
@@ -15,8 +15,6 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 src_prepare() {
        cmake-utils_src_prepare

diff --git a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
index b69d708bec88f5877d4161a1c25f2aa162f7003f..ec95a697c75982a3b837b3b23b8bdaa0aac007e6 100644 (file)
--- a/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.9.ebuild
@@ -16,9 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="sndfile static-libs"
 
-RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
index a387ccac9f872d3416f79aa76ec2ab45fbe16bc5..9adcccf9a4b94b95a4f538d25d0d6269c174c2b0 100644 (file)
--- a/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r9.ebuild
@@ -17,10 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
        alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        nas? (

diff --git a/media-libs/libshout/libshout-2.3.1-r1.ebuild b/media-libs/libshout/libshout-2.3.1-r1.ebuild
index 0e79e4b9732ac81a9523f76dc467c441bc4b169f..0824142aa4a8a1157431b55884cdcc94cac28f16 100644 (file)
--- a/media-libs/libshout/libshout-2.3.1-r1.ebuild
+++ b/media-libs/libshout/libshout-2.3.1-r1.ebuild
@@ -16,9 +16,7 @@ IUSE="speex static-libs theora"
 RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
        >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
        speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+       theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libshout/libshout-2.4.1.ebuild b/media-libs/libshout/libshout-2.4.1.ebuild
index d91491a7d46f67699a98a30d2241c0dc8a5e5f8b..05d218d136383dda25d88b7ea91980d4d57d2adb 100644 (file)
--- a/media-libs/libshout/libshout-2.4.1.ebuild
+++ b/media-libs/libshout/libshout-2.4.1.ebuild
@@ -18,9 +18,7 @@ RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
        !libressl? ( dev-libs/openssl:0= )
        libressl? ( dev-libs/libressl )
        speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-       theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+       theora? ( >=media-libs/libtheora-1.1.1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
index ed384559ae1122ef76286baa8d63651bfb24a383..0ef1eeaf03734ca5e4a1fba5fb6d33c2bda6cf20 100644 (file)
--- a/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59-r1.ebuild
@@ -12,8 +12,6 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 DOCS=( AUTHORS DEVELOPER )
 

diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
index 202222f475046710e84d8d59abbd87db88291e7f..2bb0d5a474fd21d36e75d55aedc0b780ac8a6dc0 100644 (file)
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild
@@ -14,8 +14,6 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="static-libs"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
index 5a1eaab830657f202da7bf1ae9b3f3f7ea3f2999..431bf0cc0545da4726be3d870799ee6737c42793 100644 (file)
--- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
@@ -19,9 +19,7 @@ RDEPEND=">=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
                media-libs/libpng:0=
                >=media-libs/libsdl-0.11.0
                media-libs/libvorbis:=
-               )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+       )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
        virtual/pkgconfig"

diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
index c58d02811537e9714f122bcc791521a2f0d82842..0b1dc2d6f1bcc2120b7acc8a646c17128897415c 100644 (file)
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2.ebuild
@@ -18,11 +18,7 @@ IUSE="jpeg"
 # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
        !media-tv/v4l2-ctl
-       !<media-tv/ivtv-utils-1.4.0-r2
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20130224-r5
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )"
+       !<media-tv/ivtv-utils-1.4.0-r2"
 DEPEND="${RDEPEND}
        sys-devel/gettext
        virtual/os-headers

diff --git a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
index d56d2ace6d3a207943bbf4714cdfa99937686956..f5253190906dd7f5e1050db105a28a0779ba19ac 100644 (file)
--- a/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
+++ b/media-libs/libvisual/libvisual-0.4.0-r3.ebuild
@@ -17,9 +17,7 @@ SLOT="0.4"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug nls static-libs threads"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
+DEPEND="
        nls? ( sys-devel/gettext )
        virtual/pkgconfig"
 

diff --git a/media-libs/libvorbis/libvorbis-1.3.5.ebuild b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
index 447efabfe35a3e9bd848808736720a174ed4c3d9..a5b03de8383160477e1b7d782681274681993548 100644 (file)
--- a/media-libs/libvorbis/libvorbis-1.3.5.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.5.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        app-arch/xz-utils
        virtual/pkgconfig"

diff --git a/media-libs/libvorbis/libvorbis-1.3.6.ebuild b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
index 6f1334ceae932afb57d04ca53ebe74cc78996671..219ab7b2306e8ad3506f478f0250440b5744fbfb 100644 (file)
--- a/media-libs/libvorbis/libvorbis-1.3.6.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.6.ebuild
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        app-arch/xz-utils
        virtual/pkgconfig"

diff --git a/media-libs/libvpx/libvpx-1.5.0.ebuild b/media-libs/libvpx/libvpx-1.5.0.ebuild
index cccd48adc00f7127bfe24571903f9a556c317b53..1cfa682061a4cca367399b96dddfddf3cbc39d13 100644 (file)
--- a/media-libs/libvpx/libvpx-1.5.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.5.0.ebuild
@@ -28,7 +28,7 @@ LICENSE="BSD"
 SLOT="0/3"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs svc test +threads"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
        abi_x86_64? ( dev-lang/yasm )
        abi_x86_x32? ( dev-lang/yasm )

diff --git a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
index f4d97726b8bca77852331f619aa16e5060e7a882..55c20e8d6aa98e09f595e19f732355b1cf5f9c5f 100644 (file)
--- a/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.0-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
        abi_x86_64? ( dev-lang/yasm )
        abi_x86_x32? ( dev-lang/yasm )

diff --git a/media-libs/libvpx/libvpx-1.6.1.ebuild b/media-libs/libvpx/libvpx-1.6.1.ebuild
index ba0fcd602664eda95ee221629d08262183d97437..f556462fb05f9495b8e438557bae829629ca0ecb 100644 (file)
--- a/media-libs/libvpx/libvpx-1.6.1.ebuild
+++ b/media-libs/libvpx/libvpx-1.6.1.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 # Disable test phase when USE="-test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
        abi_x86_64? ( dev-lang/yasm )
        abi_x86_x32? ( dev-lang/yasm )

diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index edd1717a22308d4c8d5be95e41645b65b47409d0..d391dc81190ca1fdac42a4d58e9cbc7d00fda8fb 100644 (file)
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="
 # Disable test phase when USE="-test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
        abi_x86_64? ( dev-lang/yasm )
        abi_x86_x32? ( dev-lang/yasm )

diff --git a/media-libs/mesa/mesa-17.1.10.ebuild b/media-libs/mesa/mesa-17.1.10.ebuild
index f2627965e4f6f4de1e0a861d9cffcde0bdc1057c..ed0e205a3b4cd545a22de84258b8a0dd1cce350e 100644 (file)
--- a/media-libs/mesa/mesa-17.1.10.ebuild
+++ b/media-libs/mesa/mesa-17.1.10.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.77"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/mesa/mesa-17.2.8.ebuild b/media-libs/mesa/mesa-17.2.8.ebuild
index 448fc06f3f8f0c667c85bfb506ff0905f12f1874..b009828a1ad22da00da188191ee396fc8ad2bb6d 100644 (file)
--- a/media-libs/mesa/mesa-17.2.8.ebuild
+++ b/media-libs/mesa/mesa-17.2.8.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/mesa/mesa-17.3.7.ebuild b/media-libs/mesa/mesa-17.3.7.ebuild
index 71590c387fcc0b2c90c947c6426ba32776881762..f35082d0d6bfd319388cd6cfdc2feb2e3ac776b2 100644 (file)
--- a/media-libs/mesa/mesa-17.3.7.ebuild
+++ b/media-libs/mesa/mesa-17.3.7.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/mesa/mesa-17.3.8.ebuild b/media-libs/mesa/mesa-17.3.8.ebuild
index 242caedf58d26ec7b7905ba389fb4f40e9d24b5f..6b9e44398fcf431c0dd12e884dbcf8c19e757fda 100644 (file)
--- a/media-libs/mesa/mesa-17.3.8.ebuild
+++ b/media-libs/mesa/mesa-17.3.8.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/mesa/mesa-18.0.0.ebuild b/media-libs/mesa/mesa-18.0.0.ebuild
index 4fb4344b03a67b72c53517d7263979503652112b..6cdc82a5cc3e5d99c85df23bc17871cd934ac4fe 100644 (file)
--- a/media-libs/mesa/mesa-18.0.0.ebuild
+++ b/media-libs/mesa/mesa-18.0.0.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.89"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8c2973875bbf212c20bd1e825fc52502d355b305..161933dd930959aa9ae773053ed4c5ff54195f6c 100644 (file)
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -81,7 +81,6 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91"
 RDEPEND="
        !<x11-base/xorg-server-1.7
        !<=x11-proto/xf86driproto-2.0.3
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
        classic? ( app-eselect/eselect-mesa )
        gallium? ( app-eselect/eselect-mesa )
        >=app-eselect/eselect-opengl-1.3.0

diff --git a/media-libs/openal/openal-1.15.1-r2.ebuild b/media-libs/openal/openal-1.15.1-r2.ebuild
index 8a13e6ee93a7e86a6f34e54c3562a596e8d2e3d0..62795074b203c715a6494c0b4f16445ad17ad3fc 100644 (file)
--- a/media-libs/openal/openal-1.15.1-r2.ebuild
+++ b/media-libs/openal/openal-1.15.1-r2.ebuild
@@ -17,11 +17,7 @@ IUSE="alsa coreaudio debug neon oss portaudio pulseaudio cpu_flags_x86_sse"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<app-emulation/emul-linux-x86-sdl-20131008-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-       )"
+       pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        oss? ( virtual/os-headers )"
 

diff --git a/media-libs/portaudio/portaudio-19.06.00.ebuild b/media-libs/portaudio/portaudio-19.06.00.ebuild
index 816e5e2e390af228451830d93a3e8e4e1b946977..7030a2c59e2ce58c755134667590cc6309067b6d 100644 (file)
--- a/media-libs/portaudio/portaudio-19.06.00.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00.ebuild
@@ -15,9 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8
 IUSE="alsa +cxx debug jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/portaudio/portaudio-19_pre20140130.ebuild b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
index ee2c287d9dbb1403b50ed8d75c45a7b57a4a443a..15fe80c459f26dcfe9afbdaf770c652238a84623 100644 (file)
--- a/media-libs/portaudio/portaudio-19_pre20140130.ebuild
+++ b/media-libs/portaudio/portaudio-19_pre20140130.ebuild
@@ -17,9 +17,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~a
 IUSE="alsa +cxx debug jack oss static-libs"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-       jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       jack? ( virtual/jack[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
index fac4a3ed7d38df2ad76c273476ad20df170ef4ef..540b0e286e8a1d591bcff468db70cfd3d1ff642b 100644 (file)
--- a/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.12-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 IUSE="gif jpeg png static-libs tiff webp"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
        png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )

diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
index b92e2977d366fc0a53f1307a42162b588fa01338..722f378c122a283227832bac0df39df568ebcc50 100644 (file)
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12-r4.ebuild
@@ -41,10 +41,7 @@ RDEPEND=">=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
        )
        vorbis? (
                >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-sdl-20140406-r1
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+               >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
        )"
 DEPEND=${RDEPEND}
 

diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index e921907da071b70e1900fcb04d02127852f78ae0..126aa18d9a2ad1a93e8fbb319b3dbbaa86ae6131 100644 (file)
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="static-libs"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 

diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
index a4f350cfee9a4622bac3a6f13340021ef2bfeebc..ac7df0c6202b13de8109e53187a185dabf40be78 100644 (file)
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos"
 IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
        flac? ( >=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}] )
        mikmod? ( >=media-libs/libmikmod-3.2.0[${MULTILIB_USEDEP}] )

diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
index 6099641223d3221b9c54b17e6e7ee9a3ad050c34..2f74af3349500c18da894c839229c66e3de3c038 100644 (file)
--- a/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
+++ b/media-libs/sdl-ttf/sdl-ttf-2.0.11-r1.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~
 IUSE="static-libs X"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
        >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]"

diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index 3a969315b2524b38084cc95e3faa6f9a476daf47..b564a43ad5f92bf4aaf48c623d725f26772086ad 100644 (file)
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -15,10 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbs
 IUSE="X debug cpu_flags_x86_mmx opengl static-libs"
 
 RDEPEND="
-       abi_x86_32? (
-               !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-               !<=app-emulation/emul-linux-x86-sdl-20140406
-       )
        >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
        opengl? (
                >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]

diff --git a/media-libs/speex/speex-1.2_rc1-r2.ebuild b/media-libs/speex/speex-1.2_rc1-r2.ebuild
index b142744da55eab0fdf53bb2076b84d24c084f263..17a13565651638e62690a743f27907fc124836c4 100644 (file)
--- a/media-libs/speex/speex-1.2_rc1-r2.ebuild
+++ b/media-libs/speex/speex-1.2_rc1-r2.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="ogg cpu_flags_x86_sse static-libs"
 
-RDEPEND="ogg? ( media-libs/libogg:= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="ogg? ( media-libs/libogg:= )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-libs/tiff/tiff-3.9.7-r1.ebuild b/media-libs/tiff/tiff-3.9.7-r1.ebuild
index a691fbf8fd0565412ba2662700a72cae85b97bd1..467c3bb64906928372e506654e28062ca065b2e6 100644 (file)
--- a/media-libs/tiff/tiff-3.9.7-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.7-r1.ebuild
@@ -20,11 +20,7 @@ RDEPEND="jpeg? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] )
        jbig? ( >=media-libs/jbigkit-2.1[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
        !media-libs/tiff-compat
-       !=media-libs/tiff-3*:0
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r10
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !=media-libs/tiff-3*:0"
 DEPEND="${RDEPEND}"
 
 src_prepare() {

diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index f184c546851f1ac5dc83bc891d7c834463bf9f9b..23aa7a1c6be3fcf6a683d42290f0ea9edb6bdab8 100644 (file)
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
        jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
        lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132

diff --git a/media-libs/tiff/tiff-4.0.9-r1.ebuild b/media-libs/tiff/tiff-4.0.9-r1.ebuild
index fbb216176cddfd53ff2da1b9d7a4ed0cf7a0c8e9..72494681d30c752cd96405d63dd2004d9df0a18e 100644 (file)
--- a/media-libs/tiff/tiff-4.0.9-r1.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r1.ebuild
@@ -17,11 +17,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
        jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
        lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132

diff --git a/media-libs/tiff/tiff-4.0.9-r2.ebuild b/media-libs/tiff/tiff-4.0.9-r2.ebuild
index 26a1889a21c7eaaf3622f949708e6ee68c5d6f9a..3bd50a67341eeeba6c5e170c0a813f4fe93cc748 100644 (file)
--- a/media-libs/tiff/tiff-4.0.9-r2.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r2.ebuild
@@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
        jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
        lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132

diff --git a/media-libs/tiff/tiff-4.0.9-r3.ebuild b/media-libs/tiff/tiff-4.0.9-r3.ebuild
index 8d74081824150c48b49b7ea953e0cb3b505009ca..a3fc4bf56e683996221c1e649e36fd14dad56194 100644 (file)
--- a/media-libs/tiff/tiff-4.0.9-r3.ebuild
+++ b/media-libs/tiff/tiff-4.0.9-r3.ebuild
@@ -18,11 +18,7 @@ IUSE="+cxx jbig jpeg lzma static-libs test zlib"
 RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
        jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
        lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
 REQUIRED_USE="test? ( jpeg )" #483132

diff --git a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
index 669b496ef207768748e9ff2c121a14a94a9de877..1a98e36cfd54d328d6aadb6586d147e47548a897 100644 (file)
--- a/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
+++ b/media-libs/webrtc-audio-processing/webrtc-audio-processing-0.1-r1.ebuild
@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux"
 IUSE="static-libs"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 DOCS=( AUTHORS NEWS README )

diff --git a/media-libs/x264/x264-0.0.20160712.ebuild b/media-libs/x264/x264-0.0.20160712.ebuild
index 853a84945eb771afcd4436d51d76ae81f50aadcb..f8d0fea657fcfc5a98e357491af6c8a803d1855e 100644 (file)
--- a/media-libs/x264/x264-0.0.20160712.ebuild
+++ b/media-libs/x264/x264-0.0.20160712.ebuild
@@ -28,9 +28,7 @@ ASM_DEP=">=dev-lang/yasm-1.2.0"
 DEPEND="abi_x86_32? ( ${ASM_DEP} )
        abi_x86_64? ( ${ASM_DEP} )
        opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
 
 DOCS="AUTHORS doc/*.txt"
 

diff --git a/media-libs/xvid/xvid-1.3.3.ebuild b/media-libs/xvid/xvid-1.3.3.ebuild
index 9b80581a9ffaf2a11fcbad51b5dcd7e832787df3..c042d207346fc9672bbc598e54edcb518f9aeba8 100644 (file)
--- a/media-libs/xvid/xvid-1.3.3.ebuild
+++ b/media-libs/xvid/xvid-1.3.3.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
        x86-fbsd? ( ${NASM} )
        x86-macos? ( ${NASM} )
        x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_PN}/build/generic
 

diff --git a/media-libs/xvid/xvid-1.3.4.ebuild b/media-libs/xvid/xvid-1.3.4.ebuild
index 8271e842830948fe22118c63ec2b51c4777dbc85..2611b93fb187ee97b7a8b86106b2778a4cc513b3 100644 (file)
--- a/media-libs/xvid/xvid-1.3.4.ebuild
+++ b/media-libs/xvid/xvid-1.3.4.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
        x86-fbsd? ( ${NASM} )
        x86-macos? ( ${NASM} )
        x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_PN}/build/generic
 

diff --git a/media-libs/xvid/xvid-1.3.5.ebuild b/media-libs/xvid/xvid-1.3.5.ebuild
index f0ddb60833ecb1c361276b24f0b3f62da342bef6..e3d48368da4a6be5d4e12841598e9d3964901e76 100644 (file)
--- a/media-libs/xvid/xvid-1.3.5.ebuild
+++ b/media-libs/xvid/xvid-1.3.5.ebuild
@@ -26,7 +26,7 @@ DEPEND="sys-apps/grep
        x86-fbsd? ( ${NASM} )
        x86-macos? ( ${NASM} )
        x64-macos? ( ${NASM} )"
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_PN}/build/generic"
 

diff --git a/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild b/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild
index 9922359726bcd9f76ae11864ca7921c6e7b9069e..ceb3b6a27f1553570457b45bcd7462f6524f31a5 100644 (file)
--- a/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild
+++ b/media-plugins/alsaequal/alsaequal-0.6-r2.ebuild
@@ -14,9 +14,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
-       >=media-plugins/caps-plugins-0.9.15[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       >=media-plugins/caps-plugins-0.9.15[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}

diff --git a/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild b/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild
index de6dfbd6242c9a7ad6e17f74042c621542f7366c..808268e57c01a272ebee1edb924e92e119cb0dc0 100644 (file)
--- a/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.4.5-r2.ebuild
@@ -16,9 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="media-libs/ladspa-sdk"
-RDEPEND="
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 DOCS=( README CHANGES )

diff --git a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild b/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
index 794811fe2fe501c9ea77ea2246ec7d48cdcfc8d1..18d7a5623ea4fa762cae0f6638ea6e59830f0656 100644 (file)
--- a/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
+++ b/media-plugins/caps-plugins/caps-plugins-0.9.15.ebuild
@@ -17,9 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 DEPEND="media-libs/ladspa-sdk"
-RDEPEND="
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 DOCS=( README CHANGES )

diff --git a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
index 3959e3ddf9ce58c71999a29e77bfca0a1f43bdae..7c9219066f0b2acd5d84b680752a600649b0883e 100644 (file)
--- a/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
+++ b/media-plugins/swh-plugins/swh-plugins-0.4.15-r3.ebuild
@@ -17,9 +17,7 @@ IUSE="cpu_flags_x86_3dnow nls cpu_flags_x86_sse"
 
 RDEPEND="
        >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}]
-       >=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       >=sci-libs/fftw-3.3.3-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        media-libs/ladspa-sdk
        sys-devel/gettext

diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
index db2ce30179e19b6eb99a81a3dbd3f68c00cb7ac8..900c6be96bc1c38cc7a9837dafad1250af09fcd9 100644 (file)
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static-libs"
 
-RDEPEND="app-eselect/eselect-cdparanoia
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="app-eselect/eselect-cdparanoia"
 DEPEND=${RDEPEND}
 
 S=${WORKDIR}/${MY_P}

diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
index 897d7f112012acdc65d64b570c52935486500c99..ef87e2afa1a60f7ff6bc714041f76b371b551711 100644 (file)
--- a/media-sound/gsm/gsm-1.0.13-r1.ebuild
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -12,8 +12,6 @@ LICENSE="gsm"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
-RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
 

diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 0046819ee8b8f86aa5efea0e311ba6231d57cb77..3081514a92e88aa37dd110002dc02bf93992e053 100644 (file)
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -21,9 +21,7 @@ RDEPEND="
        >=media-libs/libsndfile-1.0.0
        alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-       !media-sound/jack-cvs
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !media-sound/jack-cvs"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( app-doc/doxygen )"

diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
index aad1c0fff8f3ab9e751dbb686d0412c88621a34b..5a1fa3d1b5ce01a9f475ed20b4ca505fe2423dbb 100644 (file)
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
        >=media-libs/libsndfile-1.0.0
        alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-       !media-sound/jack-cvs
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !media-sound/jack-cvs"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( app-doc/doxygen )"

diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
index ef695a4bf57182b0a9698da8b1dac7e253e2721d..6686a549bace5b48e1d4e4fbf01dd2300f33ff11 100644 (file)
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -22,9 +22,7 @@ RDEPEND="
        >=media-libs/libsndfile-1.0.0
        alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
        >=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-       !media-sound/jack-cvs
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+       !media-sound/jack-cvs"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? ( app-doc/doxygen )"

diff --git a/media-sound/mpg123/mpg123-1.25.10.ebuild b/media-sound/mpg123/mpg123-1.25.10.ebuild
index 8882ebf1b0d08995201ca1cef7fd8d67ab3c21f9..9ce3ffc8c792238b3dbdc4a9f25ee134c9b85609 100644 (file)
--- a/media-sound/mpg123/mpg123-1.25.10.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
        nas? ( media-libs/nas )
        portaudio? ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
-       sdl? ( media-libs/libsdl )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+       sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
        sys-devel/libtool
        virtual/pkgconfig"

diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
index 30e10ca885c7a29a57e088d6a38500b83f73b5f1..3de21c6e036b220de43aa538eb890480f3535d6c 100644 (file)
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
        nas? ( media-libs/nas )
        portaudio? ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
-       sdl? ( media-libs/libsdl )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+       sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
        sys-devel/libtool
        virtual/pkgconfig"

diff --git a/media-sound/mpg123/mpg123-1.25.8.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild
index 34770e816b60e49ab2344a6b876223f492dc8589..5cb30beae9dc9cca11c3f0638ecbf0b5941ad663 100644 (file)
--- a/media-sound/mpg123/mpg123-1.25.8.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.8.ebuild
@@ -21,11 +21,7 @@ RDEPEND="app-eselect/eselect-mpg123
        nas? ( media-libs/nas )
        portaudio? ( media-libs/portaudio )
        pulseaudio? ( media-sound/pulseaudio )
-       sdl? ( media-libs/libsdl )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
-               !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-       )"
+       sdl? ( media-libs/libsdl )"
 DEPEND="${RDEPEND}
        sys-devel/libtool
        virtual/pkgconfig"

diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
index 696f54ef075e9d9611b691ab61b048ea08d59947..f4f7e4eb5104eda174fd7127c9da34f9a22da7a5 100644 (file)
--- a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -18,8 +18,6 @@ IUSE=""
 
 RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
        >=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r5
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
        !media-libs/libmpcdec
        !media-libs/libmpcdecsv7"
 DEPEND="${RDEPEND}"

diff --git a/media-sound/twolame/twolame-0.3.13-r1.ebuild b/media-sound/twolame/twolame-0.3.13-r1.ebuild
index 72f6a6d3ffdcabfa48f64ced615ab65779afc081..f3080949bd24e368a04adc4067f67ae4bfff359d 100644 (file)
--- a/media-sound/twolame/twolame-0.3.13-r1.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r1.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
index d2ba75d3fbe3b661082821f2c71c9a1bf82aeb68..e9b23313266b95e8aed3a516c643728878a1a95d 100644 (file)
--- a/media-sound/twolame/twolame-0.3.13-r2.ebuild
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 

diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
index 90e2d630992facb249b41ebda231f2b55c65e424..acc5b7de98454c919b28a02967064f022d5f3b8a 100644 (file)
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -15,9 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND=">=virtual/libiconv-0-r1
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
-                                       !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"
 
 DOCS=( ChangeLog README )

diff --git a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
index 4ff6951374b43a07d7fbffc2cb8bce3abdbb2182..1a9f556fd7b2e69e6370204fb1d362191651cdd5 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.6.ebuild
@@ -254,10 +254,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
index 5cf850715a9e863e27807077faddee1f4526ff2b..f0b768a683dea325cb9c537e00e03013866250da 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.2.7.ebuild
@@ -254,10 +254,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
index 6c79a334315962bcb9255715853a74e9a3acce62..7c79a4b4a0231e63d32c366067123bf00091df37 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.4.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
index e0a2600142fa2a5ac06666c91ecb425f54d6c42d..ed98cbe5041882ce868bd5d48fc7e3706577ac33 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.5.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index ad5b411cc743e107fca197af28d7b6e0ad773780..d522d44d299e9f8052ab318497a55b3bd1c821f4 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -274,10 +274,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
index 4d8f8d283fcea8fd1b0a1893e0008b751189645f..aa8b226963bb7e88dc2102573148f26b85e13514 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.2-r1.ebuild
@@ -263,10 +263,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-3.4.2.ebuild b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
index d6095bce04b27c0c736c07df61ed20c96dc05add..bbadaf6cc1923fcb5d990983152c031a9ef711f9 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.2.ebuild
@@ -262,10 +262,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f25f8ea00468f1742cb1fd289c28457592809692..398296eb187393b9fa985d0075f760e67cee4be9 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -265,10 +265,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # Code requiring FFmpeg to be built under gpl license
 GPL_REQUIRED_USE="
        postproc? ( gpl )

diff --git a/media-video/libav/libav-11.8.ebuild b/media-video/libav/libav-11.8.ebuild
index 04dccfd24e3fd4bc3a996ad2f3d0d8612d996dab..86c3ec705693a38e726daa43dc210696043c6098 100644 (file)
--- a/media-video/libav/libav-11.8.ebuild
+++ b/media-video/libav/libav-11.8.ebuild
@@ -122,10 +122,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/libav/libav-11.9999.ebuild b/media-video/libav/libav-11.9999.ebuild
index f97572a73515576dd1ffdc4c3f7b3ea89a8038e4..7e5f92570421723cf70631f75c50d8272715034e 100644 (file)
--- a/media-video/libav/libav-11.9999.ebuild
+++ b/media-video/libav/libav-11.9999.ebuild
@@ -122,10 +122,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild
index 4d3632d6996989ca04059d3e2f0b4eed7641f9c5..41a6b2cf7eac39c02d580fb729ea06743da36157 100644 (file)
--- a/media-video/libav/libav-12.2.ebuild
+++ b/media-video/libav/libav-12.2.ebuild
@@ -123,10 +123,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/libav/libav-13_pre20171219.ebuild b/media-video/libav/libav-13_pre20171219.ebuild
index 3958953fa54fa7702fae58526ef5a8b788d27d47..6bd86f8e6d1b4df0874f7abcdb744015b8cc267d 100644 (file)
--- a/media-video/libav/libav-13_pre20171219.ebuild
+++ b/media-video/libav/libav-13_pre20171219.ebuild
@@ -119,10 +119,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/libav/libav-9.17.ebuild b/media-video/libav/libav-9.17.ebuild
index ed4682dcaaf7ebd8a039e0714db5c1ffef5c5334..96df976112513111111d2d8e6ce53d8991a09683 100644 (file)
--- a/media-video/libav/libav-9.17.ebuild
+++ b/media-video/libav/libav-9.17.ebuild
@@ -114,10 +114,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index d56d1db06ef81df90a14456fc92f01f90c180a9c..ca54c7a80c29ce538c35be3b62b1907d90edbc3e 100644 (file)
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -119,10 +119,6 @@ DEPEND="${RDEPEND}
        v4l? ( sys-kernel/linux-headers )
 "
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
 # faac can't be binary distributed
 # openssl support marked as nonfree
 # faac and aac are concurent implementations

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
index 4c26bb3b89e51170fcfe0e9911b6b88ee42cbeb2..99e778a7bbac68b4762e8bf2f1b78ffa3c83fb3d 100644 (file)
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r2.ebuild
@@ -31,12 +31,6 @@ DEPEND="${RDEPEND}
        virtual/awk
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20140508-r4
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )"
-
 src_prepare() {
        epatch "${FILESDIR}"/${P}-pic.patch
        # https://sourceforge.net/p/mjpeg/bugs/139/

diff --git a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
index 2a79372d49cc12fdd69c05c2be4bd760a850e3d8..7d41dcbe21859dab39c5250fc474b0dd4f6c81cf 100644 (file)
--- a/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
+++ b/media-video/mjpegtools/mjpegtools-2.1.0-r3.ebuild
@@ -31,12 +31,6 @@ DEPEND="${RDEPEND}
        virtual/awk
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
 
-RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-medialibs-20140508-r4
-               !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
-       )"
-
 src_prepare() {
        epatch "${FILESDIR}"/${P}-pic.patch
        # https://sourceforge.net/p/mjpeg/bugs/139/

diff --git a/net-dns/libidn/libidn-1.33-r2.ebuild b/net-dns/libidn/libidn-1.33-r2.ebuild
index 03d490b1a431979a770abb3bdf29b37d75a76484..abbb94b63817279bb82fea6808ddcb4b883cf49b 100644 (file)
--- a/net-dns/libidn/libidn-1.33-r2.ebuild
+++ b/net-dns/libidn/libidn-1.33-r2.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
        java? (
                >=virtual/jre-1.5
        )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch

diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild
index 9d732304a1f056caf52d018dbd19f387361dfd61..9e70e212809af2c3f3e4a4836e25914eaf76a332 100644 (file)
--- a/net-dns/libidn/libidn-1.33.ebuild
+++ b/net-dns/libidn/libidn-1.33.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
        java? (
                >=virtual/jre-1.5
        )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )
 "
 
 pkg_setup() {

diff --git a/net-dns/libidn/libidn-1.34.ebuild b/net-dns/libidn/libidn-1.34.ebuild
index 5ab3e8e681d30bb37b57700f349c272050db92e5..b8f545507a9d0a84e46ac9c709966ef9f16a87c6 100644 (file)
--- a/net-dns/libidn/libidn-1.34.ebuild
+++ b/net-dns/libidn/libidn-1.34.ebuild
@@ -33,10 +33,6 @@ RDEPEND="${COMMON_DEPEND}
        java? (
                >=virtual/jre-1.5
        )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )
 "
 
 pkg_setup() {

diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 7e0a5dd1b45d3fbb807ddeb8c4c20c923c79b77b..55582fba7fa14a8c743b5ffd2bd670084052103b 100644 (file)
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -29,11 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
        nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
        doc? ( dev-util/gtk-doc )

diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
index f736ba5e1b5bae7681abeba8cc4fa2fe20667bae..53fe75f66288a98295a7963964609a72a8806398 100644 (file)
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.18.ebuild
@@ -29,11 +29,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
        nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
        zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
        doc? ( dev-util/gtk-doc )

diff --git a/net-libs/gnutls/gnutls-3.6.2.ebuild b/net-libs/gnutls/gnutls-3.6.2.ebuild
index 1c8e4281985b37841de8ae70f1f851306c91918e..cc2a7e26e1e843af916a3237d66b3d7aecde8762 100644 (file)
--- a/net-libs/gnutls/gnutls-3.6.2.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.2.ebuild
@@ -28,11 +28,7 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
        guile? ( >=dev-scheme/guile-1.8:=[networking] )
        nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
-       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
        doc? ( dev-util/gtk-doc )

diff --git a/net-misc/curl/curl-7.57.0-r1.ebuild b/net-misc/curl/curl-7.57.0-r1.ebuild
index d27658e4732517ca8614bb7c053fdc1f1a8a0ab9..9abd5e011fcf9aa9c4653ff7728337ba7217c766 100644 (file)
--- a/net-misc/curl/curl-7.57.0-r1.ebuild
+++ b/net-misc/curl/curl-7.57.0-r1.ebuild
@@ -53,11 +53,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
        rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
        ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 
 # Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
 #      rtmp? (

diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
index e2b69c36295f75404643eef3f989065ed0619425..8dfb1f27f4cded680c28eacb46315c0d1fe984c6 100644 (file)
--- a/net-misc/curl/curl-7.57.0.ebuild
+++ b/net-misc/curl/curl-7.57.0.ebuild
@@ -52,11 +52,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
        rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
        ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 
 # Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
 #      rtmp? (

diff --git a/net-misc/curl/curl-7.58.0.ebuild b/net-misc/curl/curl-7.58.0.ebuild
index 2240efbd3a893757bdaa1aade439129cf9ee9dc4..421abad2466e054d54d3a4023226e8531a48d512 100644 (file)
--- a/net-misc/curl/curl-7.58.0.ebuild
+++ b/net-misc/curl/curl-7.58.0.ebuild
@@ -53,11 +53,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
        rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
        ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 
 # Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
 #      rtmp? (

diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild
index ffbfa22f6c56e7f1bdf1017cc36589418aa48c73..ff9a19fed9eb3a67b65d19108d1bd4680db02b01 100644 (file)
--- a/net-misc/curl/curl-7.59.0.ebuild
+++ b/net-misc/curl/curl-7.59.0.ebuild
@@ -53,11 +53,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
        metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
        rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
        ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-       sys-libs/zlib[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r13
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       sys-libs/zlib[${MULTILIB_USEDEP}]"
 
 # Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
 #      rtmp? (

diff --git a/net-nds/openldap/openldap-2.4.44-r1.ebuild b/net-nds/openldap/openldap-2.4.44-r1.ebuild
index 2c0a46f3c1b8a7ae722073f90dfaebbcabc4d540..9a2496805c414ec43eb50993254201f5e2456260 100644 (file)
--- a/net-nds/openldap/openldap-2.4.44-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.44-r1.ebuild
@@ -77,10 +77,6 @@ CDEPEND="
                        kinit? ( !app-crypt/heimdal )
                        )
                cxx? ( dev-libs/cyrus-sasl:= )
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r3
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 DEPEND="${CDEPEND}
        sys-apps/groff"

diff --git a/net-nds/openldap/openldap-2.4.44.ebuild b/net-nds/openldap/openldap-2.4.44.ebuild
index 224368aab689b610b4d07345d9abb8eda4a17edf..9ff3e77920a1a891a9f48e42d9f651931cb3b79f 100644 (file)
--- a/net-nds/openldap/openldap-2.4.44.ebuild
+++ b/net-nds/openldap/openldap-2.4.44.ebuild
@@ -76,10 +76,6 @@ CDEPEND="
                        kinit? ( !app-crypt/heimdal )
                        )
                cxx? ( dev-libs/cyrus-sasl:= )
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r3
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 DEPEND="${CDEPEND}
        sys-apps/groff"

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild
index 7b031230377d71006303ac6d4d3eb51ca619fdb0..5e128b5c465fdaa729d1625c598a40514a180095 100644 (file)
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -77,10 +77,6 @@ CDEPEND="
                        kinit? ( !app-crypt/heimdal )
                        )
                cxx? ( dev-libs/cyrus-sasl:= )
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r3
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )"
 DEPEND="${CDEPEND}
        sys-apps/groff"

diff --git a/net-print/cups/cups-2.1.4.ebuild b/net-print/cups/cups-2.1.4.ebuild
index 2885a5f8901efb1b6d6184f86941b9eb239e6525..f3ca5bc789d96cd2f24e75625ef1328492367479 100644 (file)
--- a/net-print/cups/cups-2.1.4.ebuild
+++ b/net-print/cups/cups-2.1.4.ebuild
@@ -57,10 +57,6 @@ CDEPEND="
        X? ( x11-misc/xdg-utils )
        xinetd? ( sys-apps/xinetd )
        zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )
 "
 
 DEPEND="${CDEPEND}

diff --git a/net-print/cups/cups-2.2.6.ebuild b/net-print/cups/cups-2.2.6.ebuild
index b3f5292bcee6ee141e35c4e6f5646fd4fd1efd98..362712966b7a9cda98cdb94bdd19430c87286b2b 100644 (file)
--- a/net-print/cups/cups-2.2.6.ebuild
+++ b/net-print/cups/cups-2.2.6.ebuild
@@ -56,10 +56,6 @@ CDEPEND="
        X? ( x11-misc/xdg-utils )
        xinetd? ( sys-apps/xinetd )
        zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )
 "
 
 DEPEND="${CDEPEND}

diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index 3420a6f7fc2d3897d96530d585a6651752699d57..762f4a985238fb530d2563ad52c0d07c123499a3 100644 (file)
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="nls static-libs"
 
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )"
 

diff --git a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild
index 6dfcf00898c31003077be50e80a7d18db6729eea..76ba3d7e08df545831239047d947c71d04dd38cb 100644 (file)
--- a/sys-apps/attr/attr-2.4.47-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.47-r2.ebuild
@@ -16,10 +16,7 @@ IUSE="nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )
        sys-devel/autoconf"
-RDEPEND="abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+RDEPEND=""
 
 src_prepare() {
        sed -i \

diff --git a/sys-apps/dbus/dbus-1.10.18.ebuild b/sys-apps/dbus/dbus-1.10.18.ebuild
index 3bd2f2d691d025cbb488b832bf060e1ec64f5fb8..3a57a0a8f3ff6cb67801ee16b0e593aa7cb96cb7 100644 (file)
--- a/sys-apps/dbus/dbus-1.10.18.ebuild
+++ b/sys-apps/dbus/dbus-1.10.18.ebuild
@@ -23,16 +23,12 @@ CDEPEND="
        >=dev-libs/expat-2
        selinux? (
                sys-libs/libselinux
-               )
+       )
        elogind? ( sys-auth/elogind )
        systemd? ( sys-apps/systemd:0= )
        X? (
                x11-libs/libX11
                x11-libs/libXt
-               )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
        )
 "
 DEPEND="${CDEPEND}
@@ -43,7 +39,7 @@ DEPEND="${CDEPEND}
        test? (
                >=dev-libs/glib-2.36:2
                ${PYTHON_DEPS}
-               )
+       )
 "
 RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-dbus )

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index c68b8acb2668ae57b5f75b0f3313c388ce43b7b5..5dd6f75e4ce1519421db83df2e4f6c1b654c5468 100644 (file)
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -14,11 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+RDEPEND=""
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
 pkg_setup() {

diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
index 5688ca238f9cb5caaec75477e15e29bd4e535218..6769a5b8e41afce674af0391bb9a028a0bf1b2f8 100644 (file)
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.4.1.ebuild
@@ -22,11 +22,7 @@ DEPEND="kmod? ( sys-apps/kmod )
        !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
        udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-       sys-apps/hwids
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r14
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       sys-apps/hwids"
 DEPEND="${DEPEND}
        kmod? ( virtual/pkgconfig )"
 

diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 1661ac965008e5cc0d6ecfe5dd319698da8ecb79..0d53bc5e946acdfd0c29b574ae25b5f8032be621 100644 (file)
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}

diff --git a/sys-apps/systemd/systemd-238-r2.ebuild b/sys-apps/systemd/systemd-238-r2.ebuild
index a6d00af1933dc79f5ffdb30fe67ef8c1582e587e..41ec7ba2128a45c3f2e3f8376c9c2e5d8f83c053 100644 (file)
--- a/sys-apps/systemd/systemd-238-r2.ebuild
+++ b/sys-apps/systemd/systemd-238-r2.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}

diff --git a/sys-apps/systemd/systemd-238-r4.ebuild b/sys-apps/systemd/systemd-238-r4.ebuild
index 0aca5fbb302926ad73f6e6659abf01f350d43647..afc515ee26189e0b5eeb8abd0858aad966e60dc2 100644 (file)
--- a/sys-apps/systemd/systemd-238-r4.ebuild
+++ b/sys-apps/systemd/systemd-238-r4.ebuild
@@ -59,9 +59,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}

diff --git a/sys-apps/systemd/systemd-238-r6.ebuild b/sys-apps/systemd/systemd-238-r6.ebuild
index 8625668cfff435a931ae1e791a6c1a1bb8b30504..fdb75ee3a4f3b758d524a646fb08f076031d528e 100644 (file)
--- a/sys-apps/systemd/systemd-238-r6.ebuild
+++ b/sys-apps/systemd/systemd-238-r6.ebuild
@@ -59,9 +59,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a57c2ffe12cf29f99f243cfb0d032622fe7d2111..dd80472a480413b96d57780a822d8a8879d973cc 100644 (file)
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -58,9 +58,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
        qrcode? ( media-gfx/qrencode:0= )
        seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
        selinux? ( sys-libs/libselinux:0= )
-       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
 
 # baselayout-2.2 has /run
 RDEPEND="${COMMON_DEPEND}

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 44faddac36fad754c8f2dd1159513bf6d5f1e050..211b1a2ca2982a6d1fd66d5c4df149c8b6e26340 100644 (file)
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -18,11 +18,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="ipv6 netgroups static-libs"
 
-RDEPEND="
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 

diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
index 8183106781f9b0a5149433ce4205e8db135be5ce..4f91439d3705c803245e338f152599bb4599c36d 100644 (file)
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r3.ebuild
@@ -15,11 +15,6 @@ IUSE="search-domains"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-0.10-avahi-socket.patch \

diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index 57382a2b44f001ddec1b6d4ca12cc0ef41a7ae95..d17aae5251a3237eaadffecb7ac3803b23ee385d 100644 (file)
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
@@ -19,11 +19,7 @@ DEPEND=">=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
                kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
                ssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
-               !<net-fs/autofs-4.1.3
-               abi_x86_32? (
-                       !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-                       !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-               )"
+               !<net-fs/autofs-4.1.3"
 
 src_prepare() {
        if use prefix; then

diff --git a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
index a1817e2870d3690c8a9a689989918f7e5bfad345..c84e807e6fcebff501059062513df97f67723374 100644 (file)
--- a/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
+++ b/sys-auth/pam_ldap/pam_ldap-186-r1.ebuild
@@ -17,11 +17,7 @@ DEPEND="|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 )
        >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
        >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}]
        sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+RDEPEND="${DEPEND}"
 
 multilib_src_configure() {
        local myconf=(

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index c176d25b8fdb6a3bd05675dd8f314ed7228e89a2..c6a7d356982c745b973ee14d7c168892c39e5490 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -75,9 +75,7 @@ DEPEND="${COMMON_DEPEND}
        ocaml? ( test? ( dev-ml/ounit ) )
        ${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
-       clang? ( !<=sys-devel/clang-${PV}-r99 )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       clang? ( !<=sys-devel/clang-${PV}-r99 )"
 PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )
        kernel_Darwin? ( =sys-libs/libcxx-${PV}* )"
 

diff --git a/sys-devel/llvm/llvm-3.9.1-r1.ebuild b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
index bc9897f9842ef81313c05bcc6c1d579519bb9cda..39e45f7ddb793c9d351ca75d8549060ee1b77c99 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
@@ -80,9 +80,7 @@ DEPEND="${COMMON_DEPEND}
                test? ( dev-ml/ounit ) )
        ${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
-       clang? ( !<=sys-devel/clang-${PV}-r99 )
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+       clang? ( !<=sys-devel/clang-${PV}-r99 )"
 PDEPEND="
        clang? (
                =sys-devel/clang-${PV}-r100

diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 99eda5dc01c440ffc1134bc762f95aaab3095ca4..1a1aa6cc31118a2be1d69afe030edc15492b3f7c 100644 (file)
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        virtual/os-headers

diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index ca9066fea928e4228bdc28cf3c818ecf3f5c981d..53390437fcefb0a50f32d4e4c7eab93e1cf0f300 100644 (file)
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        virtual/os-headers

diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index b5e3ec9c3111d002913f9297187c565d3a1ecb41..8e32a0f959f0d9e7c389f5d90fbce9fc3300b4e6 100644 (file)
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        virtual/os-headers

diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 63bc0e99dec522bb6e724118fac0a7f261d7e044..4e3f3bb3c604df094d37de027d58a05fe88bc3c5 100644 (file)
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        virtual/os-headers

diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild
index 39ea2e597567600ec6857fdc104db03baa36fc8e..3d009073e05b30ab345194246e884490ccbd5530 100644 (file)
--- a/sys-fs/udev/udev-216.ebuild
+++ b/sys-fs/udev/udev-216.ebuild
@@ -37,11 +37,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf

diff --git a/sys-fs/udev/udev-225-r1.ebuild b/sys-fs/udev/udev-225-r1.ebuild
index 8108a9b3c74b7301e174efb1c14281dc51e698fa..ee167a2d7ecaa8e10e2c7385ad2b38a857388d92 100644 (file)
--- a/sys-fs/udev/udev-225-r1.ebuild
+++ b/sys-fs/udev/udev-225-r1.ebuild
@@ -35,11 +35,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.24
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf

diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index 0b8e3832c2d7665bfbe6de154d24750567f8f1e7..9ca311c705fcf457920a80be10d619baa4001f03 100644 (file)
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf

diff --git a/sys-fs/udev/udev-234-r1.ebuild b/sys-fs/udev/udev-234-r1.ebuild
index dba9ae2424cb8ac87dfca165c34648d6cdcd717b..58780e73818eaa00effc460914b5c80bd03036fc 100644 (file)
--- a/sys-fs/udev/udev-234-r1.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/sys-fs/udev/udev-235.ebuild b/sys-fs/udev/udev-235.ebuild
index 6c88b45642fefb6d50300658f0f027a866df64b5..b92b31ab23cab10b84964a30172a8d7769ea639a 100644 (file)
--- a/sys-fs/udev/udev-235.ebuild
+++ b/sys-fs/udev/udev-235.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild
index 606402bb58a82abf840d7dfb9fe71eb44eda65a1..2b6fc1317b211247b0818c644c01fc4e3dcaf3cd 100644 (file)
--- a/sys-fs/udev/udev-236-r1.ebuild
+++ b/sys-fs/udev/udev-236-r1.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/sys-fs/udev/udev-237.ebuild b/sys-fs/udev/udev-237.ebuild
index 3b794e7c3ded36690a653945b7ef69305d07ed17..5825a197ca7d84a89826ed5fe921d3c8bff95ee1 100644 (file)
--- a/sys-fs/udev/udev-237.ebuild
+++ b/sys-fs/udev/udev-237.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild
index 3b794e7c3ded36690a653945b7ef69305d07ed17..5825a197ca7d84a89826ed5fe921d3c8bff95ee1 100644 (file)
--- a/sys-fs/udev/udev-238.ebuild
+++ b/sys-fs/udev/udev-238.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 3b794e7c3ded36690a653945b7ef69305d07ed17..5825a197ca7d84a89826ed5fe921d3c8bff95ee1 100644 (file)
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
        selinux? ( >=sys-libs/libselinux-2.1.9 )
        !<sys-libs/glibc-2.11
        !sys-apps/gentoo-systemd-integration
-       !sys-apps/systemd
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-       )"
+       !sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
        dev-util/gperf
        >=dev-util/intltool-0.50

diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild b/x11-libs/cairo/cairo-1.14.10.ebuild
index a6ea82e1c3643c826f03b2445c047b67541ca4e0..5aaa2fe51429a6db3148ff3f7437e55a250c4040 100644 (file)
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ b/x11-libs/cairo/cairo-1.14.10.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
        )
        xcb? (
                >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
        )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index 37c94b9168c56f9d6ee71e28e24abf7f63f35286..b6e16c5bd43c58fc18adcc63b017733050751cde 100644 (file)
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
        )
        xcb? (
                >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
        )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index 0d661077e6fd7a4d8e69cce05ac81ae8dda670ab..d09ee28f153134236220878e011fc621619a3624 100644 (file)
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -42,10 +42,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
        )
        xcb? (
                >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
        )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 7f294e891d560c467cced0a79a1157b0ed01904f..278ea13a4cdcaf5313df56ceacd08299b9b05537 100644 (file)
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -43,10 +43,6 @@ RDEPEND="
        )
        xcb? (
                >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
-       )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
        )"
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/x11-libs/libdrm/libdrm-2.4.82.ebuild b/x11-libs/libdrm/libdrm-2.4.82.ebuild
index 5455efcdc753df7583773fd5cd814e19ebb3174c..00588bdc7a77aed331cc0ad4d7b5e7efa88077ab 100644 (file)
--- a/x11-libs/libdrm/libdrm-2.4.82.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.82.ebuild
@@ -24,8 +24,7 @@ IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
 RESTRICT="test" # see bug #236845
 
 RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        valgrind? ( dev-util/valgrind )"
 

diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
index 7a5da3105ebd4311454618a1b336901f4028c437..47f126e4ab316c1a6edd736fa566bc87f75190a1 100644 (file)
--- a/x11-libs/libdrm/libdrm-2.4.88.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -24,8 +24,7 @@ IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
 RESTRICT="test" # see bug #236845
 
 RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        valgrind? ( dev-util/valgrind )"
 

diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
index 2b385218f074b193e07db90461a0ec2fe4b37c7d..cc8b1e46112a555dac117f8b8e5bb7275fc0c6cd 100644 (file)
--- a/x11-libs/libdrm/libdrm-2.4.89.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -24,8 +24,7 @@ IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
 RESTRICT="test" # see bug #236845
 
 RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        valgrind? ( dev-util/valgrind )"
 

diff --git a/x11-libs/libdrm/libdrm-2.4.90.ebuild b/x11-libs/libdrm/libdrm-2.4.90.ebuild
index f9f91008a7acf73e794f06b0d9e80dd262f5e149..7548eee91644d9da06fea5f09b923356a99c668c 100644 (file)
--- a/x11-libs/libdrm/libdrm-2.4.90.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.90.ebuild
@@ -24,8 +24,7 @@ IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
 RESTRICT="test" # see bug #236845
 
 RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+       video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
        valgrind? ( dev-util/valgrind )"
 

diff --git a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
index a9837898069fc8fbfa7e7caf534f392a5db32c9a..37cf439581e5336aace813ce9e264c2e1c8bc3bc 100644 (file)
--- a/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.1.1.ebuild
@@ -18,8 +18,7 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
        dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
        !=x11-drivers/nvidia-drivers-180*
        !=x11-drivers/nvidia-drivers-185*
-       !=x11-drivers/nvidia-drivers-190*
-       abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+       !=x11-drivers/nvidia-drivers-190*"
 DEPEND="${RDEPEND}
        virtual/pkgconfig
        doc? (

diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
index 052e36a4474bc306be3ea3d445faf8e2e97611c5..82aed893e05d91c8f7b1ffced65ca8fce53eec55 100644 (file)
--- a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -17,10 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
        >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
        >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )
 "
 DEPEND="${RDEPEND}
        virtual/pkgconfig

diff --git a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild
index 6a6d19a811a128673b0f963446576dd0fa6b9def..f735edb2261cdb657a13f45285e75528a1c3ed18 100644 (file)
--- a/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild
+++ b/x11-themes/gtk-engines-murrine/gtk-engines-murrine-0.98.2-r1.ebuild
@@ -20,11 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]
        >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
        >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-       >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )"
+       >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]"
 PDEPEND="themes? ( x11-themes/murrine-themes )"
 DEPEND="${RDEPEND}
        >=dev-util/intltool-0.37.1

diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
index 9b9b63c585644aae364b5f5f791212ad8357deb7..637b867fef9eb7f12b747e543900293fd121977d 100644 (file)
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r200.ebuild
@@ -15,11 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-       >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )"
+       >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]"
 

diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
index 1d3b5aaa476230dc92c4560f8397969b1d64ed54..4002d528b7069fb8e575ec89aa4d991543b3c370 100644 (file)
--- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
+++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.2.0-r300.ebuild
@@ -14,14 +14,9 @@ SLOT="3"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug"
 
-COMMON_DEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}]
        >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON_DEPEND}
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r5
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
        virtual/pkgconfig[${MULTILIB_USEDEP}]"
 
 S=${WORKDIR}/${MY_PN}-${PV}

diff --git a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
index 9527c13d033eb5e7959edba8b58b0dc1bd4a7a68..e28c96f539b8aa3fed263f932473a9aedc946282 100644 (file)
--- a/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.20.2-r2.ebuild
@@ -19,10 +19,6 @@ IUSE="accessibility lua"
 RDEPEND="
        >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
        lua? ( dev-lang/lua:0[${MULTILIB_USEDEP}] )
-       abi_x86_32? (
-               !<=app-emulation/emul-linux-x86-gtklibs-20140508
-               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-       )
 "
 DEPEND="${RDEPEND}
        >=dev-util/intltool-0.31