diff options
| author |   David Seifert <soap@gentoo.org> | 2018-04-20 10:04:08 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2018-04-20 10:04:34 +0200 |
| commit | 83f82c477f328cfbd174ce89c535b825ab103b19 (patch) | |
| tree | e83e51cb36d7ff52254c05629c89ba004355e745 | |
| parent | sci-mathematics/pari: Remove old version (diff) | |
| download | gentoo-83f82c477f328cfbd174ce89c535b825ab103b19.tar.gz gentoo-83f82c477f328cfbd174ce89c535b825ab103b19.tar.bz2 gentoo-83f82c477f328cfbd174ce89c535b825ab103b19.zip | |
*/*: Remove emul-linux-x86-* blockers
Closes: https://github.com/gentoo/gentoo/pull/8073
243 files changed, 190 insertions, 1222 deletions
diff --git a/app-crypt/heimdal/heimdal-7.4.0.ebuild b/app-crypt/heimdal/heimdal-7.4.0.ebuild index 930d2cde117f..55723b4747fc 100644 --- a/app-crypt/heimdal/heimdal-7.4.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.4.0.ebuild @@ -31,12 +31,10 @@ CDEPEND=" >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libXau - x11-libs/libXt ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl" diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild index 60543b74f1bb..180e7c5e0ad8 100644 --- a/app-crypt/heimdal/heimdal-7.5.0.ebuild +++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild @@ -31,12 +31,10 @@ CDEPEND=" >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) - X? ( x11-libs/libX11 + X? ( + x11-libs/libX11 x11-libs/libXau - x11-libs/libXt ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl" diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild index 2bd763bb65cc..3f1ef7523d9f 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.15.2-r1.ebuild @@ -31,11 +31,7 @@ CDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) - xinetd? ( sys-apps/xinetd ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + xinetd? ( sys-apps/xinetd )" DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc diff --git a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild index 5f06a2647f1d..9b63538a0b31 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.15.2.ebuild @@ -31,11 +31,7 @@ CDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) - xinetd? ( sys-apps/xinetd ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + xinetd? ( sys-apps/xinetd )" DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild index c1f7a7820634..94966e19df3a 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.16-r1.ebuild @@ -34,11 +34,7 @@ CDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) - xinetd? ( sys-apps/xinetd ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + xinetd? ( sys-apps/xinetd )" DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc diff --git a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild index 7d48105fcffd..800b99d0357b 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.16-r2.ebuild @@ -35,11 +35,7 @@ CDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) - xinetd? ( sys-apps/xinetd ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + xinetd? ( sys-apps/xinetd )" DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc diff --git a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild index 7091c6dece7e..f267ea8e5c48 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.16.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.16.ebuild @@ -34,11 +34,7 @@ CDEPEND=" !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) ) - xinetd? ( sys-apps/xinetd ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" + xinetd? ( sys-apps/xinetd )" DEPEND="${CDEPEND} ${PYTHON_DEPS} virtual/yacc 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 bf410a00dfd0..1f394f6f13bf 100644 --- 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 bdbe5cc7ddea..62b897aa0e7a 100644 --- 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 dfe4cca912e1..ceb899dbb839 100644 --- 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 dfe4cca912e1..ceb899dbb839 100644 --- 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 351fee6c6fb0..4ac2529840fe 100644 --- 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 27edc48d213f..296fe4e7b71a 100644 --- 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 442642abc178..94d819782d2f 100644 --- 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 ddbc7bcc947c..cd620120b755 100644 --- 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 ddbc7bcc947c..cd620120b755 100644 --- 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 9025029236ad..7781bcbed2f8 100644 --- 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 22f656f5a5da..191ee925a443 100644 --- 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 bc6708782715..e6caef35641a 100644 --- 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 9454c3d09a99..3733269fd131 100644 --- 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 9454c3d09a99..3733269fd131 100644 --- 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 477b8968d2f7..a231afd2ad86 100644 --- 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 b6970b16cc73..122d7b748931 100644 --- 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 f19e2fee2149..c701c112800e 100644 --- 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 f19e2fee2149..c701c112800e 100644 --- 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 dd5dfa1b3911..e24402ac58f6 100644 --- 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 c2b9e49b3b08..1897a5fe7ad6 100644 --- 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 55dd4bac5b71..3f1778611a37 100644 --- 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 55dd4bac5b71..3f1778611a37 100644 --- 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 55dd4bac5b71..3f1778611a37 100644 --- 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 cda136eb494a..ad6493ebe95d 100644 --- 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 1c122ab2e082..28b84951d9b6 100644 --- 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 1c122ab2e082..28b84951d9b6 100644 --- 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 8126d64529bb..ddf4b23d2eec 100644 --- 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 3d31db92c7b6..1206be17c265 100644 --- 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 d64915f06f74..0dbca3f2a9e2 100644 --- 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 002335ee70c1..33ec218e9811 100644 --- 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 51e0d67ccb02..29a68b7734cc 100644 --- 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 cc2988c75ed4..c9a11e7250ca 100644 --- 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 389572cc9c8e..86c88b6342e4 100644 --- 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 0fcf8f32eb3c..33cd1b5332c0 100644 --- 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 1e2fd5944d09..6f390d0e01e9 100644 --- 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 5f7d1930d028..f44807fe599e 100644 --- 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 62d7f9d9034e..1172fce91be0 100644 --- 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 4493cf5bd1e2..bcdb2f0d975c 100644 --- 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 1c718c57f228..c885ea8a511e 100644 --- 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 54df43366cf0..0676bfbde501 100644 --- 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 b46ee33df2a1..5944120e1d8a 100644 --- 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 501e0d7be4c9..c84622335aa7 100644 --- 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 66e18ef381df..121fa7a0e6ce 100644 --- 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 31132aaef773..abe8e719be71 100644 --- 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 7116e25d8966..3cfe8ecf8ff9 100644 --- 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 7116e25d8966..3cfe8ecf8ff9 100644 --- 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 49417959c206..17d4aa3aa1aa 100644 --- 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 8cc1bde10d87..4196ae0cfde3 100644 --- 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 77d19e8993ae..d9b34c0d9f3d 100644 --- 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 145a584a1438..154f23507964 100644 --- 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 2ead8d98ff7b..f912eab68233 100644 --- 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 dd3f5d75d8e2..87113136ec0c 100644 --- 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 be1c13cc8e30..5999aa059199 100644 --- 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 bec2908b1a83..e1adbfa5560e 100644 --- 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 baa5cd66018c..03294bc1c4ef 100644 --- 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 20b26eccba27..4dfd2a7b4962 100644 --- 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 cd02458948fa..4d9867d2f4f4 100644 --- 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 4288d7cd6397..4fa091f67693 100644 --- 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 5886c855d548..e6dd91121a28 100644 --- 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 4376d54abfba..0d7822692362 100644 --- 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 e666ee52225b..604b886a47a4 100644 --- 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 a5fce8fa5fee..d18bb1590833 100644 --- 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 e19d5ef53089..b92da179a4f9 100644 --- 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 65172a985830..187ff99392be 100644 --- 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 4725492f80f2..ef65901cb773 100644 --- 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 173817c6fa2c..cff2091e2d37 100644 --- 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 9069395176c6..3f4f63eaf043 100644 --- 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 8f475014bbfa..684f3b54380a 100644 --- 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 85ad256b24d9..a8dd28044648 100644 --- 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 f001ed06e67f..16339238ba98 100644 --- 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 216f0c323167..7d3e5f7618e5 100644 --- 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 9164c7e059e0..f701dad72642 100644 --- 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 3555b6c14cf5..1bd42de6f2c7 100644 --- 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 6c3a792a6132..2c7155f00bd5 100644 --- 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 445113902da4..410e55d3088d 100644 --- 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 cefa883934a2..f9be1eb2b8a0 100644 --- 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 02f88a95ee16..2e1fd225c4e1 100644 --- 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 9895efed9faa..8997776bba3e 100644 --- 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 645c6d45c62c..a9a885574d6c 100644 --- 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 6b2282f8e196..6b12d373c533 100644 --- 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 719e93034b4a..4aaa15a9ac6c 100644 --- 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 6a62a003f8f4..b4625bee7aba 100644 --- 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 5eb402370ab0..6834364ffda4 100644 --- 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 f5b1ca4ed578..bd9dcaea9e31 100644 --- 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 b1e22f1ee61a..7fd3cfc32eef 100644 --- 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 50520a655d24..910beb3d63cd 100644 --- 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 2d3cc0eb8d64..232cef07afbb 100644 --- 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 51da30fe747a..930d2f289601 100644 --- 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 7ab9e60a597e..1e5e9284220d 100644 --- 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 8311552d4fda..59cf8cf14b14 100644 --- 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 ee64dd118cea..b06b1fc08425 100644 --- 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 424dfc5b6140..d387f4f4e7e1 100644 --- 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 10b866b04fb7..5f34855de15d 100644 --- 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 99f6dc5b198e..b1f05b8655d3 100644 --- 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 bd1229984a9b..b372dbc205b2 100644 --- 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 b38864838feb..0404b4793fc8 100644 --- 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 c02fa8c43d00..e85125f172c6 100644 --- 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 354f18f65a75..90ded904e115 100644 --- 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 e94ff6442c3e..e14eecd581db 100644 --- 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 4845cc7dca5f..3253bd3c65b5 100644 --- 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 1f2f0316889c..af03888d719f 100644 --- 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 a4923665e4ad..75f93df96b81 100644 --- 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 41dbc9c99acc..2327601f0746 100644 --- 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 92c4722f80b5..23a7caeab9fb 100644 --- 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 1eb6a7b305a1..800279b7b37b 100644 --- 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 b69d708bec88..ec95a697c759 100644 --- 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 a387ccac9f87..9adcccf9a4b9 100644 --- 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 0e79e4b9732a..0824142aa4a8 100644 --- 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 d91491a7d46f..05d218d13638 100644 --- 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 ed384559ae11..0ef1eeaf0373 100644 --- 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 202222f47504..2bb0d5a474fd 100644 --- 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 5a1eaab83065..431bf0cc0545 100644 --- 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 c58d02811537..0b1dc2d6f1bc 100644 --- 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 d56d2ace6d3a..f5253190906d 100644 --- 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 447efabfe35a..a5b03de83831 100644 --- 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 6f1334ceae93..219ab7b2306e 100644 --- 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 cccd48adc00f..1cfa682061a4 100644 --- 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 f4d97726b8bc..55c20e8d6aa9 100644 --- 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 ba0fcd602664..f556462fb05f 100644 --- 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 edd1717a2230..d391dc81190c 100644 --- 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 f2627965e4f6..ed0e205a3b4c 100644 --- 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 448fc06f3f8f..b009828a1ad2 100644 --- 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 71590c387fcc..f35082d0d6bf 100644 --- 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 242caedf58d2..6b9e44398fcf 100644 --- 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 4fb4344b03a6..6cdc82a5cc3e 100644 --- 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 8c2973875bbf..161933dd9309 100644 --- 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 8a13e6ee93a7..62795074b203 100644 --- 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 816e5e2e390a..7030a2c59e2c 100644 --- 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 ee2c287d9dbb..15fe80c459f2 100644 --- 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 fac4a3ed7d38..540b0e286e8a 100644 --- 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 b92e2977d366..722f378c122a 100644 --- 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 e921907da071..126aa18d9a2a 100644 --- 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 a4f350cfee9a..ac7df0c6202b 100644 --- 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 6099641223d3..2f74af334950 100644 --- 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 3a969315b252..b564a43ad5f9 100644 --- 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 b142744da55e..17a135656516 100644 --- 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 a691fbf8fd05..467c3bb64906 100644 --- 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 f184c546851f..23aa7a1c6be3 100644 --- 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 fbb216176cdd..72494681d30c 100644 --- 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 26a1889a21c7..3bd50a67341e 100644 --- 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 8d7408182415..a3fc4bf56e68 100644 --- 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 669b496ef207..1a98e36cfd54 100644 --- 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 853a84945eb7..f8d0fea657fc 100644 --- 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 9b80581a9ffa..c042d207346f 100644 --- 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 8271e8428309..2611b93fb187 100644 --- 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 f0ddb60833ec..e3d48368da4a 100644 --- 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 9922359726bc..ceb3b6a27f15 100644 --- 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 de6dfbd6242c..808268e57c01 100644 --- 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 794811fe2fe5..18d7a5623ea4 100644 --- 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 3959e3ddf9ce..7c9219066f0b 100644 --- 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 db2ce30179e1..900c6be96bc1 100644 --- 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 897d7f112012..ef87e2afa1a6 100644 --- 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 0046819ee8b8..3081514a92e8 100644 --- 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 aad1c0fff8f3..5a1fa3d1b5ce 100644 --- 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 ef695a4bf571..6686a549bace 100644 --- 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 8882ebf1b0d0..9ce3ffc8c792 100644 --- 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 30e10ca885c7..3de21c6e036b 100644 --- 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 34770e816b60..5cb30beae9dc 100644 --- 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 696f54ef075e..f4f7e4eb5104 100644 --- 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 72f6a6d3ffdc..f3080949bd24 100644 --- 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 d2ba75d3fbe3..e9b23313266b 100644 --- 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 90e2d630992f..acc5b7de9845 100644 --- 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 4ff6951374b4..1a9f556fd7b2 100644 --- 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 5cf850715a9e..f0b768a683de 100644 --- 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 6c79a3343159..7c79a4b4a023 100644 --- 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 e0a2600142fa..ed98cbe50418 100644 --- 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 ad5b411cc743..d522d44d299e 100644 --- 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 4d8f8d283fce..aa8b226963bb 100644 --- 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 d6095bce04b2..bbadaf6cc192 100644 --- 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 f25f8ea00468..398296eb1873 100644 --- 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 04dccfd24e3f..86c3ec705693 100644 --- 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 f97572a73515..7e5f92570421 100644 --- 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 4d3632d69969..41a6b2cf7eac 100644 --- 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 3958953fa54f..6bd86f8e6d1b 100644 --- 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 ed4682dcaaf7..96df97611251 100644 --- 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 d56d1db06ef8..ca54c7a80c29 100644 --- 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 4c26bb3b89e5..99e778a7bbac 100644 --- 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 2a79372d49cc..7d41dcbe2185 100644 --- 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 03d490b1a431..abbb94b63817 100644 --- 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 9d732304a1f0..9e70e212809a 100644 --- 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 5ab3e8e681d3..b8f545507a9d 100644 --- 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 7e0a5dd1b45d..55582fba7fa1 100644 --- 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 f736ba5e1b5b..53fe75f66288 100644 --- 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 1c8e4281985b..cc2a7e26e1e8 100644 --- 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 d27658e47325..9abd5e011fcf 100644 --- 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 e2b69c36295f..8dfb1f27f4cd 100644 --- 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 2240efbd3a89..421abad2466e 100644 --- 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 ffbfa22f6c56..ff9a19fed9eb 100644 --- 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 2c0a46f3c1b8..9a2496805c41 100644 --- 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 224368aab689..9ff3e77920a1 100644 --- 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 7b031230377d..5e128b5c465f 100644 --- 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 2885a5f8901e..f3ca5bc789d9 100644 --- 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 b3f5292bcee6..362712966b7a 100644 --- 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 3420a6f7fc2d..762f4a985238 100644 --- 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 6dfcf00898c3..76ba3d7e08df 100644 --- 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 3bd2f2d691d0..3a57a0a8f3ff 100644 --- 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 c68b8acb2668..5dd6f75e4ce1 100644 --- 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 5688ca238f9c..6769a5b8e41a 100644 --- 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 1661ac965008..0d53bc5e946a 100644 --- 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 a6d00af1933d..41ec7ba2128a 100644 --- 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 0aca5fbb3029..afc515ee2618 100644 --- 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 8625668cfff4..fdb75ee3a4f3 100644 --- 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 a57c2ffe12cf..dd80472a4804 100644 --- 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 44faddac36fa..211b1a2ca298 100644 --- 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 8183106781f9..4f91439d3705 100644 --- 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 57382a2b44f0..d17aae5251a3 100644 --- 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 a1817e2870d3..c84e807e6fce 100644 --- 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 c176d25b8fdb..c6a7d356982c 100644 --- 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 bc9897f9842e..39e45f7ddb79 100644 --- 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 99eda5dc01c4..1a1aa6cc3111 100644 --- 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 ca9066fea928..53390437fcef 100644 --- 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 b5e3ec9c3111..8e32a0f959f0 100644 --- 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 63bc0e99dec5..4e3f3bb3c604 100644 --- 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 39ea2e597567..3d009073e05b 100644 --- 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 8108a9b3c74b..ee167a2d7eca 100644 --- 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 0b8e3832c2d7..9ca311c705fc 100644 --- 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 dba9ae2424cb..58780e73818e 100644 --- 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 6c88b45642fe..b92b31ab23ca 100644 --- 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 606402bb58a8..2b6fc1317b21 100644 --- 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 3b794e7c3ded..5825a197ca7d 100644 --- 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 3b794e7c3ded..5825a197ca7d 100644 --- 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 3b794e7c3ded..5825a197ca7d 100644 --- 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 a6ea82e1c364..5aaa2fe51429 100644 --- 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 37c94b9168c5..b6e16c5bd43c 100644 --- 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 0d661077e6fd..d09ee28f1531 100644 --- 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 7f294e891d56..278ea13a4cdc 100644 --- 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 5455efcdc753..00588bdc7a77 100644 --- 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 7a5da3105ebd..47f126e4ab31 100644 --- 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 2b385218f074..cc8b1e46112a 100644 --- 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 f9f91008a7ac..7548eee91644 100644 --- 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 a9837898069f..37cf439581e5 100644 --- 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 052e36a4474b..82aed893e05d 100644 --- 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 6a6d19a811a1..f735edb2261c 100644 --- 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 9b9b63c58564..637b867fef9e 100644 --- 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 1d3b5aaa4762..4002d528b706 100644 --- 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 9527c13d033e..e28c96f539b8 100644 --- 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 |